[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel A.cs,NONE,1.1 ABC.hbm.xml,NONE,1.1 ABCProxy.hbm.xml,NONE,1.1 B.cs,NONE,1.1 C1.cs,NONE,1.1 C2.cs,NONE,1.1 D.cs,NONE,1.1 NHibernate.DomainModel-1.1.csproj,1.3,1.4

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

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

Modified Files:
	NHibernate.DomainModel-1.1.csproj 
Added Files:
	A.cs ABC.hbm.xml ABCProxy.hbm.xml B.cs C1.cs C2.cs D.cs 
Log Message:
Made another fix in incrementgenerator. Made a few fixes in hbm2net. Added new abcproxytest, and ignored it because of proxy problems.


Index: NHibernate.DomainModel-1.1.csproj
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel-1.1.csproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NHibernate.DomainModel-1.1.csproj	24 Mar 2004 19:55:30 -0000	1.3
--- NHibernate.DomainModel-1.1.csproj	6 Apr 2004 10:51:42 -0000	1.4
***************
*** 85,88 ****
--- 85,101 ----
              <Include>
                  <File
+                     RelPath = "A.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "ABC.hbm.xml"
+                     BuildAction = "EmbeddedResource"
+                 />
+                 <File
+                     RelPath = "ABCProxy.hbm.xml"
+                     BuildAction = "EmbeddedResource"
+                 />
+                 <File
                      RelPath = "AssemblyInfo.cs"
                      SubType = "Code"
***************
*** 95,98 ****
--- 108,116 ----
                  />
                  <File
+                     RelPath = "B.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "BasicClass.cs"
                      SubType = "Code"
***************
*** 104,107 ****
--- 122,135 ----
                  />
                  <File
+                     RelPath = "C1.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
+                     RelPath = "C2.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "Child.cs"
                      SubType = "Code"
***************
*** 127,130 ****
--- 155,163 ----
                  />
                  <File
+                     RelPath = "D.cs"
+                     SubType = "Code"
+                     BuildAction = "Compile"
+                 />
+                 <File
                      RelPath = "JoinedSubclass.hbm.xml"
                      BuildAction = "EmbeddedResource"

--- NEW FILE: C1.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 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 NHibernate.DomainModel.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, NHibernate.DomainModel.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 String address
	{
		get
		{
			return this._address;
		}
		set
		{
			this._address = value;
		}
	}
	
	/// <summary>
	/// Get/set for d
	/// </summary>
	public NHibernate.DomainModel.D d
	{
		get
		{
			return this._d;
		}
		set
		{
			this._d = value;
		}
	}
	
	#endregion
 }
}
--- NEW FILE: B.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 B
 /// </summary>
 /// <remark>
 /// This class is autogenerated
 /// </remark>
 [Serializable]
 public class B : A
 {

	#region Fields
	/// <summary>
	/// Holder for count
	/// </summary>
	private Int32 _count;
	
	/// <summary>
	/// Holder for map
	/// </summary>
	private System.Collections.IDictionary _map;
	
	#endregion

	#region Constructors
	/// <summary>
	/// Default constructor for class B
	/// </summary>
	public B()
	{
	}
	
	/// <summary>
	/// Constructor for class B
	/// </summary>
	/// <param name="name">Initial name value</param>
	/// <param name="count">Initial count value</param>
	/// <param name="map">Initial map value</param>
	public B(String name, Int32 count, System.Collections.IDictionary map)
		: base(name)
	{
		this._count = count;
		this._map = map;
	}
	
	/// <summary>
	/// Minimal constructor for class B
	/// </summary>
	/// <param name="map">Initial map value</param>
	public B(System.Collections.IDictionary map)
	{
		this._map = map;
	}
	#endregion
	
	#region Properties
	/// <summary>
	/// Get/set for count
	/// </summary>
	public Int32 count
	{
		get
		{
			return this._count;
		}
		set
		{
			this._count = value;
		}
	}
	
	/// <summary>
	/// Get/set for map
	/// </summary>
	public System.Collections.IDictionary map
	{
		get
		{
			return this._map;
		}
		set
		{
			this._map = value;
		}
	}
	
	#endregion
 }
}
--- NEW FILE: ABC.hbm.xml ---
<?xml version="1.0"?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">

	<class name="NHibernate.DomainModel.A, NHibernate.DomainModel" discriminator-value="0">
		<id name = "id" unsaved-value = "null">
			<generator class="increment"/>
		</id>
		<discriminator column="clazz" type="Int32" not-null="false"/>
		<property name="name"/>
		<subclass name="NHibernate.DomainModel.B, NHibernate.DomainModel" discriminator-value="-1">
			<property name="count" column="count_" type="Int32"/>
			<subclass name="NHibernate.DomainModel.C1, NHibernate.DomainModel" discriminator-value="null">
				<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">
				<property name="address" column="c2"/>
			</subclass>
		</subclass>
	</class>

	<class name="NHibernate.DomainModel.D, NHibernate.DomainModel" discriminator-value="0" proxy="NHibernate.DomainModel.D">
		<id name = "id" unsaved-value = "null">
			<generator class="assigned"/>
		</id>
		<property name="amount" type="Double"/>
	</class>
	
</hibernate-mapping>
--- NEW FILE: D.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 D
 /// </summary>
 /// <remark>
 /// This class is autogenerated
 /// </remark>
 [Serializable]
 public class D
 {

	#region Fields
	/// <summary>
	/// Holder for id
	/// </summary>
	private Int64 _id;
	
	/// <summary>
	/// Holder for amount
	/// </summary>
	private Double _amount;
	
	#endregion

	#region Constructors
	/// <summary>
	/// Default constructor for class D
	/// </summary>
	public D()
	{
	}
	
	/// <summary>
	/// Constructor for class D
	/// </summary>
	/// <param name="id">Initial id value</param>
	/// <param name="amount">Initial amount value</param>
	public D(Int64 id, Double amount)
	{
		this._id = id;
		this._amount = amount;
	}
	
	/// <summary>
	/// Minimal constructor for class D
	/// </summary>
	/// <param name="id">Initial id value</param>
	public D(Int64 id)
	{
		this._id = id;
	}
	#endregion
	
	#region Properties
	/// <summary>
	/// Get/set for id
	/// </summary>
	public Int64 id
	{
		get
		{
			return this._id;
		}
		set
		{
			this._id = value;
		}
	}
	
	/// <summary>
	/// Get/set for amount
	/// </summary>
	public Double amount
	{
		get
		{
			return this._amount;
		}
		set
		{
			this._amount = value;
		}
	}
	
	#endregion
 }
}
--- NEW FILE: ABCProxy.hbm.xml ---
<?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="null" type="Int64">
			<generator class="increment">
				<param name="table">A</param>
				<param name="column">id</param>
			</generator>
		</id>
		<discriminator column="clazz" type="Int32" force="true" not-null="false" />
		<property name="name" />
		<subclass name="NHibernate.DomainModel.B, NHibernate.DomainModel" discriminator-value="null"
			proxy="NHibernate.DomainModel.B, NHibernate.DomainModel">
			<property name="count" column="count_" type="Int32" />
			<map name="map">
				<key column="BID" />
				<index column="MAPKEY" type="String" />
				<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" 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="null" type="Int64">
			<generator class="assigned" />
		</id>
		<property name="amount" type="Double" />
	</class>
</hibernate-mapping>
--- NEW FILE: A.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 A
 /// </summary>
 /// <remark>
 /// This class is autogenerated
 /// </remark>
 [Serializable]
 public class A
 {

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

	#region Constructors
	/// <summary>
	/// Default constructor for class A
	/// </summary>
	public A()
	{
	}
	
	/// <summary>
	/// Constructor for class A
	/// </summary>
	/// <param name="name">Initial name value</param>
	public A(String name)
	{
		this._name = name;
	}
	
	#endregion
	
	#region Properties
	/// <summary>
	/// Get/set for id
	/// </summary>
	public Int64 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
 }
}
--- NEW FILE: C2.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 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 String address
	{
		get
		{
			return this._address;
		}
		set
		{
			this._address = value;
		}
	}
	
	#endregion
 }
}