Menu
▾
▴
[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel Bar.cs,1.5,1.6 Baz.cs,1.14,1.15 Baz.hbm.xml,1.17,1.18 Foo.cs,1.17,1.18 FooBar.hbm.xml,1.22,1.23 Glarch.cs,1.9,1.10 Holder.cs,1.3,1.4 Master.cs,1.7,1.8
|
From: Sergey K. <jus...@us...> - 2005-04-24 19:38:05
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31965/src/NHibernate.DomainModel Modified Files: Bar.cs Baz.cs Baz.hbm.xml Foo.cs FooBar.hbm.xml Glarch.cs Holder.cs Master.cs Log Message: Integrated two more tests from H2.1, fixed uncovered bugs. Index: FooBar.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/FooBar.hbm.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** FooBar.hbm.xml 17 Jan 2005 03:31:52 -0000 1.22 --- FooBar.hbm.xml 24 Apr 2005 19:37:56 -0000 1.23 *************** *** 3,7 **** <import class="NHibernate.DomainModel.FooStatus, NHibernate.DomainModel" /> <import class="NHibernate.DomainModel.Result, NHibernate.DomainModel" /> ! <import class="NHibernate.DomainModel.Named, NHibernate.DomainModel" /> <class --- 3,7 ---- <import class="NHibernate.DomainModel.FooStatus, NHibernate.DomainModel" /> <import class="NHibernate.DomainModel.Result, NHibernate.DomainModel" /> ! <import class="NHibernate.DomainModel.INamed, NHibernate.DomainModel" /> <class Index: Glarch.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Glarch.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Glarch.cs 18 Nov 2004 02:45:43 -0000 1.9 --- Glarch.cs 24 Apr 2005 19:37:56 -0000 1.10 *************** *** 5,9 **** { [Serializable] ! public class Glarch : Super, GlarchProxy, ILifecycle { --- 5,9 ---- { [Serializable] ! public class Glarch : Super, GlarchProxy, ILifecycle, INamed { Index: Holder.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Holder.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Holder.cs 26 Mar 2005 13:24:35 -0000 1.3 --- Holder.cs 24 Apr 2005 19:37:56 -0000 1.4 *************** *** 16,19 **** --- 16,27 ---- private Holder _otherHolder; + public Holder() + { + } + + public Holder( string name ) + { + _name = name; + } public string Id Index: Baz.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Baz.hbm.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Baz.hbm.xml 3 Nov 2004 03:37:05 -0000 1.17 --- Baz.hbm.xml 24 Apr 2005 19:37:56 -0000 1.18 *************** *** 314,318 **** </many-to-any> </map> ! <bag name="Bazez" lazy="true" order-by="name_b desc" cascade="all"> <key column="`baz id`"/> --- 314,327 ---- </many-to-any> </map> ! ! <list name="ManyToAny" lazy="true"> ! <key column="baz"/> ! <index column="ind"/> ! <many-to-any id-type="string"> ! <column name="el_clazz_"/> ! <column name="el_id_"/> ! </many-to-any> ! </list> ! <bag name="Bazez" lazy="true" order-by="name_b desc" cascade="all"> <key column="`baz id`"/> Index: Foo.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Foo.cs,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Foo.cs 17 Jan 2005 03:31:52 -0000 1.17 --- Foo.cs 24 Apr 2005 19:37:56 -0000 1.18 *************** *** 65,68 **** --- 65,73 ---- { } + + public Foo( int x ) + { + _x = x; + } #endregion Index: Bar.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Bar.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Bar.cs 9 Aug 2004 18:26:21 -0000 1.5 --- Bar.cs 24 Apr 2005 19:37:56 -0000 1.6 *************** *** 5,9 **** { [Serializable] ! public class Bar : Abstract, BarProxy { private int _x; --- 5,9 ---- { [Serializable] ! public class Bar : Abstract, BarProxy, INamed { private int _x; Index: Master.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Master.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Master.cs 31 Mar 2005 12:40:23 -0000 1.7 --- Master.cs 24 Apr 2005 19:37:56 -0000 1.8 *************** *** 8,12 **** /// </summary> [Serializable] ! public class Master { private static object _emptyObject = new object(); --- 8,12 ---- /// </summary> [Serializable] ! public class Master : INamed { private static object _emptyObject = new object(); Index: Baz.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Baz.cs,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Baz.cs 17 Jan 2005 03:40:49 -0000 1.14 --- Baz.cs 24 Apr 2005 19:37:56 -0000 1.15 *************** *** 13,17 **** /// </remark> [Serializable] ! public class Baz : IComparable { --- 13,17 ---- /// </remark> [Serializable] ! public class Baz : INamed, IComparable { *************** *** 39,42 **** --- 39,43 ---- private System.Collections.IDictionary _stringGlarchMap; private System.Collections.IDictionary _anyToAny; + private System.Collections.IList _manyToAny; private Iesi.Collections.ISet _fooSet; private Iesi.Collections.ISet _stringSet; *************** *** 47,53 **** private System.Collections.IList _bag; private System.Collections.IList _fooBag; - private System.Collections.IList _bazez; private System.Collections.IList _idFooBag; private System.Collections.IList _byteBag; #endregion --- 48,54 ---- private System.Collections.IList _bag; private System.Collections.IList _fooBag; private System.Collections.IList _idFooBag; private System.Collections.IList _byteBag; + private System.Collections.IList _bazez; #endregion *************** *** 315,319 **** } ! /// <summary> /// Gets or sets the intArray /// </summary> --- 316,335 ---- } ! /// <summary> ! /// Get/set for manyToAny ! /// </summary> ! public System.Collections.IList ManyToAny ! { ! get ! { ! return this._manyToAny; ! } ! set ! { ! this._manyToAny = value; ! } ! } ! ! /// <summary> /// Gets or sets the intArray /// </summary> *************** *** 557,562 **** StringDateMap.Add( "now", DateTime.Now ); StringDateMap.Add( "never", null ); ! StringDateMap.Add( "millenium", new DateTime( 2000, 01, 01 ) ); ! //StringDateMap.Add( "big bang", new DateTime(0) ); ArrayList list = new ArrayList(); list.AddRange( StringSet ); --- 573,578 ---- StringDateMap.Add( "now", DateTime.Now ); StringDateMap.Add( "never", null ); ! StringDateMap.Add( "big bang", new DateTime(0L) ); ! //StringDateMap.Add( "millenium", new DateTime( 2000, 01, 01 ) ); ArrayList list = new ArrayList(); list.AddRange( StringSet ); |
