Menu
▾
▴
[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel Assignable.cs,NONE,1.1 BasicNameable.cs,NONE,1.1 Blobber.cs,NONE,1.1 Category.cs,NONE,1.1 Circular.cs,NONE,1.1 Contained.cs,NONE,1.1 Container.cs,NONE,1.1 Custom.cs,NONE,1.1 CustomPersister.cs,NONE,1.1 Detail.cs,NONE,1.1 Master.cs,NONE,1.1 Abstract.cs,1.1,1.2 AbstractProxy.cs,1.1,1.2 Bar.cs,1.1,1.2 BarProxy.cs,1.1,1.2 Baz.hbm.xml,1.7,1.8 Child.cs,1.1,1.2 ComponentCollection.cs,1.1,1.2 FooBar.hbm.xml,1.5,1.6 NestingComponent.cs,1.1,1.2 NHibernate.DomainModel-1.1.csproj,1.11,1.12
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4291 Modified Files: Abstract.cs AbstractProxy.cs Bar.cs BarProxy.cs Baz.hbm.xml Child.cs ComponentCollection.cs FooBar.hbm.xml NestingComponent.cs NHibernate.DomainModel-1.1.csproj Added Files: Assignable.cs BasicNameable.cs Blobber.cs Category.cs Circular.cs Contained.cs Container.cs Custom.cs CustomPersister.cs Detail.cs Master.cs Log Message: Began the process of synching the classes in testing. Index: Bar.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Bar.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Bar.cs 8 Apr 2004 17:22:08 -0000 1.1 --- Bar.cs 2 Jun 2004 04:53:24 -0000 1.2 *************** *** 14,20 **** /// <summary> ! /// Gets or sets the _x /// </summary> ! public new int x { get --- 14,20 ---- /// <summary> ! /// Gets or sets the X /// </summary> ! public int X { get *************** *** 36,40 **** /// Gets or sets the _barString /// </summary> ! public string barString { get --- 36,40 ---- /// Gets or sets the _barString /// </summary> ! public string BarString { get *************** *** 56,60 **** /// Gets or sets the _barComponent /// </summary> ! public FooComponent barComponent { get --- 56,60 ---- /// Gets or sets the _barComponent /// </summary> ! public FooComponent BarComponent { get *************** *** 76,80 **** /// Gets or sets the _baz /// </summary> ! public Baz baz { get --- 76,80 ---- /// Gets or sets the _baz /// </summary> ! public Baz Baz { get *************** *** 96,100 **** /// Gets or sets the _name /// </summary> ! public string name { get --- 96,100 ---- /// Gets or sets the _name /// </summary> ! public string Name { get *************** *** 116,120 **** /// Gets or sets the _object /// </summary> ! public object @object { get --- 116,120 ---- /// Gets or sets the _object /// </summary> ! public object Object { get Index: NestingComponent.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/NestingComponent.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** NestingComponent.cs 8 Apr 2004 17:22:08 -0000 1.1 --- NestingComponent.cs 2 Jun 2004 04:53:24 -0000 1.2 *************** *** 4,8 **** namespace NHibernate.DomainModel { ! public class NestingComponent { /// <summary> /// Holds the _nested --- 4,8 ---- namespace NHibernate.DomainModel { ! [Serializable] public class NestingComponent { /// <summary> /// Holds the _nested *************** *** 13,17 **** /// Gets or sets the _nested /// </summary> ! public ComponentCollection nested { get --- 13,17 ---- /// Gets or sets the _nested /// </summary> ! public ComponentCollection Nested { get Index: Abstract.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Abstract.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Abstract.cs 8 Apr 2004 16:44:19 -0000 1.1 --- Abstract.cs 2 Jun 2004 04:53:24 -0000 1.2 *************** *** 15,19 **** /// Gets or sets the _time /// </summary> ! public DateTime time { get --- 15,19 ---- /// Gets or sets the _time /// </summary> ! public DateTime Time { get *************** *** 34,38 **** /// Gets or sets the _abstract /// </summary> ! public IList abstracts { get --- 34,38 ---- /// Gets or sets the _abstract /// </summary> ! public IList Abstracts { get --- NEW FILE: CustomPersister.cs --- using System; namespace NHibernate.DomainModel { /// <summary> /// Summary description for CustomPersister. /// </summary> public class CustomPersister { public CustomPersister() { // // TODO: Add constructor logic here // } } } --- NEW FILE: Custom.cs --- using System; namespace NHibernate.DomainModel { /// <summary> /// Summary description for Custom. /// </summary> public class Custom : ICloneable { long _id; string _name; public long Id { get { return _id; } set { _id = value; } } public string Name { get { return _name; } set { _name = value; } } #region ICloneable Members public object Clone() { return this.MemberwiseClone(); //TODO: h2.0.3 had a try-catch block -> not sure where it was used. } #endregion } } --- NEW FILE: Detail.cs --- using System; using System.Collections; namespace NHibernate.DomainModel { /// <summary> /// Summary description for Detail. /// </summary> [Serializable] public class Detail { private Master _master; private int _i; private IDictionary _details; //set in mapping private int _x; public Master Master { get { return _master;} set { _master = value; } } public int I { get { return _i;} set {_i = value; } } public IDictionary SubDetails { get { return _details;} set { _details = value; } } public int X { get { return _x;} set { _x = value; } } } } Index: FooBar.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/FooBar.hbm.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FooBar.hbm.xml 29 Apr 2004 16:04:57 -0000 1.5 --- FooBar.hbm.xml 2 Jun 2004 04:53:24 -0000 1.6 *************** *** 107,125 **** proxy="NHibernate.DomainModel.AbstractProxy, NHibernate.DomainModel" discriminator-value="null"> ! <set name="abstracts"> <key column="abstract_id"/> <one-to-many class="NHibernate.DomainModel.Abstract, NHibernate.DomainModel"/> </set> ! <property name="time" column="the_time"/> <subclass name="NHibernate.DomainModel.Bar, NHibernate.DomainModel" proxy="NHibernate.DomainModel.BarProxy, NHibernate.DomainModel" discriminator-value="B"> ! <many-to-one name="baz"/> ! <property name="barString"> <column name="bar_String" length="24"/> </property> ! <property name="name" column="name_name"/> ! <component name="barComponent" class="NHibernate.DomainModel.FooComponent, NHibernate.DomainModel"> <parent name="parent"/> <property name="count" column="bar_count"/> --- 107,125 ---- proxy="NHibernate.DomainModel.AbstractProxy, NHibernate.DomainModel" discriminator-value="null"> ! <set name="Abstracts"> <key column="abstract_id"/> <one-to-many class="NHibernate.DomainModel.Abstract, NHibernate.DomainModel"/> </set> ! <property name="Time" column="the_time"/> <subclass name="NHibernate.DomainModel.Bar, NHibernate.DomainModel" proxy="NHibernate.DomainModel.BarProxy, NHibernate.DomainModel" discriminator-value="B"> ! <many-to-one name="Baz"/> ! <property name="BarString"> <column name="bar_String" length="24"/> </property> ! <property name="Name" column="name_name"/> ! <component name="BarComponent" class="NHibernate.DomainModel.FooComponent, NHibernate.DomainModel"> <parent name="parent"/> <property name="count" column="bar_count"/> *************** *** 131,135 **** </array> </component> ! <any name="object" id-type="Int64" cascade="all"> <column name="clazz" length="100"/> <column name="gen_id"/> --- 131,135 ---- </array> </component> ! <any name="Object" id-type="Int64" cascade="all"> <column name="clazz" length="100"/> <column name="gen_id"/> Index: Baz.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Baz.hbm.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Baz.hbm.xml 3 May 2004 04:52:48 -0000 1.7 --- Baz.hbm.xml 2 Jun 2004 04:53:24 -0000 1.8 *************** *** 224,234 **** <component name="collectionComponent"> ! <component name="nested"> ! <property name="str"/> ! <bag name="foos" cascade="all"> <key column="baz_compon_id"/> <one-to-many class="NHibernate.DomainModel.Foo, NHibernate.DomainModel"/> </bag> ! <bag name="floats" table="baz_floats_bag"> <key column="baz_compon_id"/> <element type="Int64" column="float_value"/> --- 224,234 ---- <component name="collectionComponent"> ! <component name="Nested"> ! <property name="Str"/> ! <bag name="Foos" cascade="all"> <key column="baz_compon_id"/> <one-to-many class="NHibernate.DomainModel.Foo, NHibernate.DomainModel"/> </bag> ! <bag name="Floats" table="baz_floats_bag"> <key column="baz_compon_id"/> <element type="Int64" column="float_value"/> Index: AbstractProxy.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/AbstractProxy.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AbstractProxy.cs 8 Apr 2004 16:44:19 -0000 1.1 --- AbstractProxy.cs 2 Jun 2004 04:53:24 -0000 1.2 *************** *** 6,15 **** public interface AbstractProxy : FooProxy { ! IList abstracts { get; set; } ! DateTime time { get; --- 6,15 ---- public interface AbstractProxy : FooProxy { ! IList Abstracts { get; set; } ! DateTime Time { get; --- NEW FILE: Container.cs --- using System; namespace NHibernate.DomainModel { //TODO: write all of this... /// <summary> /// Summary description for Container. /// </summary> public class Container { public Container() { // // TODO: Add constructor logic here // } } } Index: Child.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Child.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Child.cs 10 Feb 2004 19:12:58 -0000 1.1 --- Child.cs 2 Jun 2004 04:53:24 -0000 1.2 *************** *** 4,7 **** --- 4,8 ---- namespace NHibernate.DomainModel { + //TODO: this conflicts with a H2.0.3 class for testing... /// <summary> /// Summary description for Child. --- NEW FILE: Circular.cs --- using System; namespace NHibernate.DomainModel { /// <summary> /// Summary description for Circular. /// </summary> public class Circular { private string _id; private System.Type _clazz; private Circular _other; private object _anyEntity; public string Id { get { return _id; } set { _id = value; } } public System.Type Clazz { get { return _clazz; } set { _clazz = value; } } public Circular Other { get { return _other; } set { _other = value; } } public object AnyEntity { get { return _anyEntity; } set { _anyEntity = value; } } } } --- NEW FILE: Master.cs --- using System; namespace NHibernate.DomainModel { /// <summary> /// Summary description for Master. /// </summary> public class Master { public Master() { // // TODO: Add constructor logic here // } } } Index: NHibernate.DomainModel-1.1.csproj =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel-1.1.csproj,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** NHibernate.DomainModel-1.1.csproj 11 May 2004 19:44:58 -0000 1.11 --- NHibernate.DomainModel-1.1.csproj 2 Jun 2004 04:53:24 -0000 1.12 *************** *** 118,121 **** --- 118,126 ---- /> <File + RelPath = "Assignable.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "AuditComponent.cs" SubType = "Code" *************** *** 147,150 **** --- 152,160 ---- /> <File + RelPath = "BasicNameable.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "Baz.cs" SubType = "Code" *************** *** 156,159 **** --- 166,174 ---- /> <File + RelPath = "Blobber.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "C1.cs" SubType = "Code" *************** *** 166,169 **** --- 181,189 ---- /> <File + RelPath = "Category.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "Child.cs" SubType = "Code" *************** *** 175,178 **** --- 195,203 ---- /> <File + RelPath = "Circular.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "ClassWithCompositeId.cs" SubType = "Code" *************** *** 199,206 **** --- 224,251 ---- /> <File + RelPath = "Contained.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "Container.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "Container.hbm.xml" BuildAction = "EmbeddedResource" /> <File + RelPath = "Custom.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "CustomPersister.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "D.cs" SubType = "Code" *************** *** 208,211 **** --- 253,261 ---- /> <File + RelPath = "Detail.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "DoubleStringType.cs" SubType = "Code" *************** *** 322,325 **** --- 372,380 ---- /> <File + RelPath = "Master.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "Multiplicity.cs" SubType = "Code" --- NEW FILE: Contained.cs --- using System; using System.Collections; namespace NHibernate.DomainModel { /// <summary> /// Summary description for Contained. /// </summary> public class Contained { private Container _container; private long _id; private IList _bag = new ArrayList(); private IList _lazyBag = new ArrayList(); # region object overrides public override bool Equals(object obj) { if(obj==null) return false; return _id==( (Contained)obj).Id; } public override int GetHashCode() { return _id.GetHashCode(); } #endregion public Container Container { get { return _container; } set { _container = value; } } public long Id { get { return _id; } set { _id = value; } } public IList Bag { get { return _bag; } set { _bag = value; } } public IList LazyBag { get { return _lazyBag; } set { _lazyBag = value; } } } } Index: BarProxy.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/BarProxy.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BarProxy.cs 8 Apr 2004 17:22:08 -0000 1.1 --- BarProxy.cs 2 Jun 2004 04:53:24 -0000 1.2 *************** *** 6,24 **** public interface BarProxy : AbstractProxy { ! Baz baz { get; set; } ! FooComponent barComponent { get; set; } ! string barString { get; } ! object @object { get; --- 6,24 ---- public interface BarProxy : AbstractProxy { ! Baz Baz { get; set; } ! FooComponent BarComponent { get; set; } ! string BarString { get; } ! object Object { get; --- NEW FILE: Blobber.cs --- using System; namespace NHibernate.DomainModel { /// <summary> /// Summary description for Blobber. /// </summary> public class Blobber { public Blobber() { // // TODO: Add constructor logic here // } } } Index: ComponentCollection.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/ComponentCollection.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ComponentCollection.cs 8 Apr 2004 17:22:08 -0000 1.1 --- ComponentCollection.cs 2 Jun 2004 04:53:24 -0000 1.2 *************** *** 4,7 **** --- 4,8 ---- namespace NHibernate.DomainModel { + [Serializable] public class ComponentCollection { /// <summary> *************** *** 13,17 **** /// Gets or sets the _foos /// </summary> ! public IList foos { get --- 14,18 ---- /// Gets or sets the _foos /// </summary> ! public IList Foos { get *************** *** 34,38 **** /// Gets or sets the _str /// </summary> ! public string str { get --- 35,39 ---- /// Gets or sets the _str /// </summary> ! public string Str { get *************** *** 52,56 **** /// Gets or sets the _floats /// </summary> ! public IList floats { get --- 53,57 ---- /// Gets or sets the _floats /// </summary> ! public IList Floats { get --- NEW FILE: Assignable.cs --- using System; using System.Collections; namespace NHibernate.DomainModel { /// <summary> /// Summary description for Assignable. /// </summary> public class Assignable { private string _id; private ICollection _categories; public string Id { get { return _id; } set { _id = value; } } public ICollection Categories { get { return _categories; } set { _categories = value; } } } } --- NEW FILE: Category.cs --- using System; using System.Collections; namespace NHibernate.DomainModel { /// <summary> /// Summary description for Category. /// </summary> public class Category { private static readonly string RootCategory = "/"; private long _id; private string _name; private IList _subcategories = new ArrayList(); private Assignable _assignable; public long Id { get { return _id; } set { _id = value; } } public string Name { get { return _name; } set { _name = value; } } public IList Subcategories { get { return _subcategories; } set { _subcategories = value; } } public Assignable Assignable { get { return _assignable; } set { _assignable = value; } } } } --- NEW FILE: BasicNameable.cs --- using System; namespace NHibernate.DomainModel { /// <summary> /// Summary description for BasicNameable. /// </summary> public class BasicNameable { private string _name; private long _id; public string Name { get { return _name; } set { _name = value; } } public long Key { get { return _id; } set { _id = value; } } } } |
