From: Michael D. <mik...@us...> - 2004-06-03 18:56:07
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10432 Modified Files: Container.hbm.xml Fo.hbm.xml Fum.cs Fum.hbm.xml FumCompositeID.cs Fumm.hbm.xml Holder.hbm.xml Location.cs Location.hbm.xml Many.hbm.xml One.hbm.xml Stuff.hbm.xml Vetoer.hbm.xml XY.hbm.xml Log Message: Continued to add Domain Classes and mappings for test fixtures. Index: Location.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Location.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Location.cs 3 Jun 2004 14:29:00 -0000 1.1 --- Location.cs 3 Jun 2004 18:55:57 -0000 1.2 *************** *** 1,3 **** --- 1,4 ---- using System; + using System.Globalization; namespace NHibernate.DomainModel *************** *** 13,17 **** private string _streetName; private string _countryCode; ! // private Locale _locale; TODO: how to do this in .net?? private string _description; --- 14,18 ---- private string _streetName; private string _countryCode; ! private CultureInfo _locale; private string _description; *************** *** 47,50 **** --- 48,56 ---- } + public CultureInfo Locale + { + get { return _locale; } + set { _locale = value; } + } #region System.Object Members Index: Location.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Location.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Location.hbm.xml 6 Apr 2004 13:36:18 -0000 1.2 --- Location.hbm.xml 3 Jun 2004 18:55:57 -0000 1.3 *************** *** 1,13 **** <?xml version="1.0" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class name="net.sf.hibernate.test.Location"> <composite-id> ! <key-property name="streetNumber" /> ! <key-property name="streetName" length="20" /> ! <key-property name="city" length="20" /> ! <key-property name="countryCode" length="2" /> </composite-id> ! <property name="locale" /> ! <property name="description" /> </class> </hibernate-mapping> \ No newline at end of file --- 1,24 ---- <?xml version="1.0" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class ! name="NHibernate.DomainModel.Location, NHibernate.DomainModel" ! > <composite-id> ! <key-property name="StreetNumber" /> ! <key-property ! name="StreetName" ! length="20" ! /> ! <key-property ! name="City" ! length="20" ! /> ! <key-property ! name="CountryCode" ! length="2" ! /> </composite-id> ! <property name="Locale" /> ! <property name="Description" /> </class> </hibernate-mapping> \ No newline at end of file Index: Stuff.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Stuff.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Stuff.hbm.xml 6 Apr 2004 13:36:18 -0000 1.2 --- Stuff.hbm.xml 3 Jun 2004 18:55:57 -0000 1.3 *************** *** 1,29 **** <?xml version="1.0" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class name="net.sf.hibernate.test.MoreStuff"> <composite-id> ! <key-property name="intId" /> ! <key-property name="stringId" length="32" /> </composite-id> ! <property name="name" /> ! <bag name="stuffs" inverse="true" lazy="false" cascade="all"> <key> <!--unfortunately have to specify not-null here because of limitation in schema export....--> ! <column name="moreInt" not-null="true" /> ! <column name="moreString" not-null="true" length="32" /> </key> ! <one-to-many class="net.sf.hibernate.test.Stuff" /> </bag> </class> ! <class name="net.sf.hibernate.test.Stuff"> <composite-id unsaved-value="any"> ! <key-property name="id" /> ! <key-many-to-one name="foo" class="net.sf.hibernate.test.Foo" /> ! <key-many-to-one name="moreStuff" class="net.sf.hibernate.test.MoreStuff"> ! <column name="moreInt" /> ! <column name="moreString" length="32" /> </key-many-to-one> </composite-id> ! <property name="property" /> </class> </hibernate-mapping> \ No newline at end of file --- 1,67 ---- <?xml version="1.0" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class ! name="NHibernate.DomainModel.MoreStuff, NHibernate.DomainModel" ! > <composite-id> ! <key-property ! name="IntId" ! /> ! <key-property ! name="StringId" ! length="32" ! /> </composite-id> ! <property name="Name" /> ! <bag ! name="Stuffs" ! inverse="true" ! lazy="false" ! cascade="all" ! > <key> <!--unfortunately have to specify not-null here because of limitation in schema export....--> ! <column ! name="moreInt" ! not-null="true" ! /> ! <column ! name="moreString" ! not-null="true" ! length="32" ! /> </key> ! <one-to-many ! class="NHibernate.DomainModel.Stuff, NHibernate.DomainModel" ! /> </bag> </class> ! <class ! name="NHibernate.DomainModel.Stuff, NHibernate.DomainModel" ! > <composite-id unsaved-value="any"> ! <key-property name="Id" /> ! <key-many-to-one ! name="Foo" ! class="NHibernate.DomainModel.Foo, NHibernate.DomainModel" ! /> ! <key-many-to-one ! name="MoreStuff" ! class="NHibernate.DomainModel.MoreStuff, NHibernate.DomainModel" ! > ! ! <column ! name="moreInt" ! /> ! <column ! name="moreString" ! length="32" ! /> </key-many-to-one> </composite-id> ! <!-- ! TODO: in h2.0.3 this is mapped to a TimeZone - what to use in .net??? ! <property name="Property" /> ! --> </class> </hibernate-mapping> \ No newline at end of file Index: Fumm.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Fumm.hbm.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Fumm.hbm.xml 29 Apr 2004 15:16:00 -0000 1.4 --- Fumm.hbm.xml 3 Jun 2004 18:55:57 -0000 1.5 *************** *** 3,11 **** <class name="NHibernate.DomainModel.Fumm, NHibernate.DomainModel"> <composite-id name="Id"> ! <key-property name="string"> <column name="string_" length="10" /> </key-property> ! <key-property name="short" column="short_" /> ! <key-property name="date" column="date_" type="DateTime" /> </composite-id> --- 3,11 ---- <class name="NHibernate.DomainModel.Fumm, NHibernate.DomainModel"> <composite-id name="Id"> ! <key-property name="String"> <column name="string_" length="10" /> </key-property> ! <key-property name="Short" column="short_" /> ! <key-property name="Date" column="date_" type="DateTime" /> </composite-id> Index: Fum.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Fum.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Fum.cs 3 Jun 2004 03:23:33 -0000 1.3 --- Fum.cs 3 Jun 2004 18:55:57 -0000 1.4 *************** *** 24,30 **** FumCompositeID fid = new FumCompositeID(); ! fid.date= new DateTime(2004, 4, 29, 9, 50, 0, 0); ! fid.@short= (short) ( id.@short + 33 ); ! fid.@string= id.@string + "dd"; Fum f = new Fum(); --- 24,30 ---- FumCompositeID fid = new FumCompositeID(); ! fid.Date= new DateTime(2004, 4, 29, 9, 50, 0, 0); ! fid.Short= (short) ( id.Short + 33 ); ! fid.String= id.String + "dd"; Fum f = new Fum(); Index: XY.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/XY.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** XY.hbm.xml 6 Apr 2004 13:36:18 -0000 1.2 --- XY.hbm.xml 3 Jun 2004 18:55:57 -0000 1.3 *************** *** 1,18 **** <?xml version="1.0" encoding="UTF-8" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class name="net.sf.hibernate.test.X"> ! <id name="id" unsaved-value="0"> <generator class="foreign"> ! <param name="property">y</param> </generator> </id> ! <one-to-one name="y" constrained="true" cascade="all" /> </class> ! <class name="net.sf.hibernate.test.Y"> ! <id name="id"> <generator class="hilo" /> </id> ! <property name="x" /> ! <one-to-one name="theX" cascade="save-update" /> </class> </hibernate-mapping> --- 1,18 ---- <?xml version="1.0" encoding="UTF-8" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class name="NHibernate.DomainModel.X, NHibernate.DomainModel"> ! <id name="Id" unsaved-value="0"> <generator class="foreign"> ! <param name="property">Y</param> </generator> </id> ! <one-to-one name="Y" constrained="true" cascade="all" /> </class> ! <class name="NHibernate.DomainModel.Y, NHibernate.DomainModel"> ! <id name="Id"> <generator class="hilo" /> </id> ! <property name="X" /> ! <one-to-one name="TheX" cascade="save-update" /> </class> </hibernate-mapping> Index: One.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/One.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** One.hbm.xml 6 Apr 2004 13:36:18 -0000 1.2 --- One.hbm.xml 3 Jun 2004 18:55:57 -0000 1.3 *************** *** 1,13 **** <?xml version="1.0" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class name="net.sf.hibernate.test.One" table="one"> ! <id name="key" column="one_key"> <generator class="native" /> </id> ! <property name="x" /> ! <property column="one_value" name="value" /> ! <set name="manies" inverse="true" lazy="true"> <key column="one_key" /> ! <one-to-many class="net.sf.hibernate.test.Many" /> </set> </class> --- 1,28 ---- <?xml version="1.0" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class ! name="NHibernate.DomainModel.One, NHibernate.DomainModel" ! table="one" ! > ! <id ! name="Key" ! column="one_key" ! > <generator class="native" /> </id> ! <property name="X" /> ! <property ! column="one_value" ! name="Value" ! /> ! <set ! name="Manies" ! inverse="true" ! lazy="true" ! > <key column="one_key" /> ! <one-to-many ! class="NHibernate.DomainModel.Many, NHibernate.DomainModel" ! /> </set> </class> Index: Many.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Many.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Many.hbm.xml 6 Apr 2004 13:36:18 -0000 1.2 --- Many.hbm.xml 3 Jun 2004 18:55:57 -0000 1.3 *************** *** 1,10 **** <?xml version="1.0" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class name="net.sf.hibernate.test.Many" table="many"> ! <id name="key" column="many_key"> <generator class="native" /> </id> ! <property name="x" /> ! <many-to-one name="one" column="one_key" class="net.sf.hibernate.test.One" /> </class> </hibernate-mapping> --- 1,20 ---- <?xml version="1.0" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class ! name="NHibernate.DomainModel.Many, NHibernate.DomainModel" ! table="many" ! > ! <id ! name="Key" ! column="many_key" ! > <generator class="native" /> </id> ! <property name="X" /> ! <many-to-one ! name="One" ! column="one_key" ! class="NHibernate.DomainModel.One, NHibernate.DomainModel" ! /> </class> </hibernate-mapping> Index: Fum.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Fum.hbm.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Fum.hbm.xml 9 Apr 2004 13:14:53 -0000 1.3 --- Fum.hbm.xml 3 Jun 2004 18:55:57 -0000 1.4 *************** *** 3,11 **** <class name="NHibernate.DomainModel.Fum, NHibernate.DomainModel"> <composite-id name="id" unsaved-value="any"> ! <key-property name="string"> <column name="string_" length="10" /> </key-property> ! <key-property name="short" column="short_" /> ! <key-property name="date" column="date_" type="DateTime" /> </composite-id> <version name="lastUpdated" type="DateTime" /> --- 3,11 ---- <class name="NHibernate.DomainModel.Fum, NHibernate.DomainModel"> <composite-id name="id" unsaved-value="any"> ! <key-property name="String"> <column name="string_" length="10" /> </key-property> ! <key-property name="Short" column="short_" /> ! <key-property name="Date" column="date_" type="DateTime" /> </composite-id> <version name="lastUpdated" type="DateTime" /> Index: Container.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Container.hbm.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Container.hbm.xml 3 Jun 2004 18:01:24 -0000 1.3 --- Container.hbm.xml 3 Jun 2004 18:55:57 -0000 1.4 *************** *** 14,18 **** <class name="NHibernate.DomainModel.Container, NHibernate.DomainModel" ! proxy="net.sf.hibernate.test.Container" > <id --- 14,18 ---- <class name="NHibernate.DomainModel.Container, NHibernate.DomainModel" ! proxy="NHibernate.DomainModel.Container, NHibernate.DomainModel" > <id *************** *** 40,44 **** <index column="list_index" /> <many-to-many ! class="net.sf.hibernate.test.Simple" /> </list> --- 40,44 ---- <index column="list_index" /> <many-to-many ! class="NHibernate.DomainModel.Simple, NHibernate.DomainModel" /> </list> *************** *** 133,137 **** <index column="idx" ! type="string" length="32" /> --- 133,137 ---- <index column="idx" ! type="String(32)" length="32" /> Index: FumCompositeID.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/FumCompositeID.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FumCompositeID.cs 3 Jun 2004 03:23:33 -0000 1.2 --- FumCompositeID.cs 3 Jun 2004 18:55:57 -0000 1.3 *************** *** 7,58 **** public class FumCompositeID { ! String string_; ! DateTime date_; ! short short_; ! ! public override bool Equals(object obj) { ! FumCompositeID that = (FumCompositeID) obj; ! return this.string_.Equals(that.string_) && this.short_==that.short_; } ! ! public override int GetHashCode() { ! return string_.GetHashCode(); } ! ! public string @string { ! get ! { ! return string_; ! } ! set ! { ! this.string_ = value; ! } } ! public DateTime date { ! get ! { ! return date_; ! } ! set ! { ! this.date_ = value; ! } } ! public short @short { ! get ! { ! return short_; ! } ! set ! { ! this.short_ = value; ! } } } } \ No newline at end of file --- 7,45 ---- public class FumCompositeID { ! String _string; ! DateTime _date; ! short _short; ! ! public string String { ! get { return _string; } ! set { _string = value; } } ! public DateTime Date { ! get { return _date; } ! set { _date = value; } } ! public short Short { ! get { return _short; } ! set { _short = value; } } ! ! ! #region System.Object Members ! ! public override bool Equals(object obj) { ! FumCompositeID that = (FumCompositeID) obj; ! return this._string.Equals(that._string) && this._short==that._short; } ! ! public override int GetHashCode() { ! return _string.GetHashCode(); } + + #endregion } } \ No newline at end of file Index: Fo.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Fo.hbm.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Fo.hbm.xml 9 Apr 2004 13:14:53 -0000 1.3 --- Fo.hbm.xml 3 Jun 2004 18:55:57 -0000 1.4 *************** *** 1,16 **** <?xml version="1.0" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class name="net.sf.hibernate.test.Fo" table="foes"> ! <composite-id class="net.sf.hibernate.test.FumCompositeID"> ! <key-property name="string"> ! <column name="string_" length="20" /> </key-property> ! <key-property name="short" column="short_" /> ! <key-property name="date" column="date_" type="DateTime" /> </composite-id> ! <version name="version" type="long" /> ! <property name="serial" column="serial_" /> ! <property name="buf" /> ! <property name="x" /> </class> </hibernate-mapping> \ No newline at end of file --- 1,40 ---- <?xml version="1.0" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class ! name="NHibernate.DomainModel.Fo, NHibernate.DomainModel" ! table="foes" ! > ! <composite-id ! class="NHibernate.DomainModel.FumCompositeID, NHibernate.DomainModel" ! > ! <key-property name="String"> ! <column ! name="String_" ! length="20" ! /> </key-property> ! <key-property ! name="Short" ! column="short_" ! /> ! <key-property ! name="Date" ! column="date_" ! type="DateTime" ! /> </composite-id> ! <version ! name="Version" ! type="Int64" ! /> ! <!-- ! TODO: commented out because couldn't find a Type ! <property ! name="Serial" ! column="serial_" ! /> ! --> ! <property name="Buf" /> ! <property name="X" /> </class> </hibernate-mapping> \ No newline at end of file Index: Holder.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Holder.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Holder.hbm.xml 6 Apr 2004 13:36:18 -0000 1.2 --- Holder.hbm.xml 3 Jun 2004 18:55:57 -0000 1.3 *************** *** 1,22 **** <?xml version="1.0" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class name="net.sf.hibernate.test.Holder"> ! <id name="id" column="id_" type="string" length="32" unsaved-value="null"> <generator class="uuid.hex" /> </id> ! <property name="name" unique="true" not-null="true" length="36" /> ! <list name="ones"> <key column="holder" /> <index column="i" /> ! <one-to-many class="net.sf.hibernate.test.One" /> </list> ! <array name="fooArray"> <key column="holder1" /> <index column="j1" /> ! <one-to-many class="net.sf.hibernate.test.Foo" /> </array> ! <set name="foos"> <key column="holder2" /> ! <one-to-many class="net.sf.hibernate.test.Foo" /> </set> </class> --- 1,38 ---- <?xml version="1.0" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class name="NHibernate.DomainModel.Holder, NHibernate.DomainModel"> ! <id name="Id" ! column="id_" ! type="String(32)" ! length="32" ! unsaved-value="null" ! > <generator class="uuid.hex" /> </id> ! <property ! name="Name" ! unique="true" ! not-null="true" ! length="36" ! /> ! <list name="Ones"> <key column="holder" /> <index column="i" /> ! <one-to-many ! class="NHibernate.DomainModel.One, NHibernate.DomainModel" ! /> </list> ! <array name="FooArray"> <key column="holder1" /> <index column="j1" /> ! <one-to-many ! class="NHibernate.DomainModel.Foo, NHibernate.DomainModel" ! /> </array> ! <set name="Foos"> <key column="holder2" /> ! <one-to-many ! class="NHibernate.DomainModel.Foo, NHibernate.DomainModel" ! /> </set> </class> Index: Vetoer.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Vetoer.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Vetoer.hbm.xml 6 Apr 2004 13:36:18 -0000 1.2 --- Vetoer.hbm.xml 3 Jun 2004 18:55:57 -0000 1.3 *************** *** 1,10 **** <?xml version="1.0" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class name="net.sf.hibernate.test.Vetoer"> ! <id type="string" column="id_" length="32"> <generator class="uuid.hex" /> </id> ! <property name="name" /> ! <property name="strings" /> </class> </hibernate-mapping> \ No newline at end of file --- 1,16 ---- <?xml version="1.0" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class ! name="NHibernate.DomainModel.Vetoer, NHibernate.DomainModel" ! > ! <id ! type="String(32)" ! column="id_" ! length="32" ! > <generator class="uuid.hex" /> </id> ! <property name="Name" /> ! <property name="Strings" /><!-- TODO: fix that NH is not recognizing this as an array --> </class> </hibernate-mapping> \ No newline at end of file |