Menu
▾
▴
[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel Custom.hbm.xml,NONE,1.1 ParentChild.hbm.xml,NONE,1.1 Child.cs,1.2,1.3 Multi.hbm.xml,1.2,1.3 NHibernate.DomainModel-1.1.csproj,1.17,1.18 Parent.cs,1.2,1.3 Po.cs,1.1,1.2 AuditComponent.cs,1.1,NONE BasicClass.cs,1.4,NONE BasicClass.hbm.xml,1.6,NONE Child.hbm.xml,1.5,NONE ClassWithCompositeId.cs,1.1,NONE ClassWithCompositeId.hbm.xml,1.4,NONE CompositeId.cs,1.1,NONE JoinedSubclass.hbm.xml,1.5,NONE JoinedSubclassBase.cs,1.1,NONE JoinedSubclassOne.cs,1.1,NONE Node.cs,1.1,NONE Node.hbm.xml,1.1,NONE Parent.hbm.xml,1.5,NONE ParentComparer.cs,1.1,NONE SexType.cs,1.1,NONE SexType.hbm.xml,1.4,NONE SimpleComponent.cs,1.1,NONE SimpleComponent.hbm.xml,1.5,NONE Subclass.hbm.xml,1.3,NONE Team.cs,1.1,NONE Team.hbm.xml,1.4,NONE UnsavedType.cs,1.1,NONE UnsavedType.hbm.xml,1.3,NONE
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21374 Modified Files: Child.cs Multi.hbm.xml NHibernate.DomainModel-1.1.csproj Parent.cs Po.cs Added Files: Custom.hbm.xml ParentChild.hbm.xml Removed Files: AuditComponent.cs BasicClass.cs BasicClass.hbm.xml Child.hbm.xml ClassWithCompositeId.cs ClassWithCompositeId.hbm.xml CompositeId.cs JoinedSubclass.hbm.xml JoinedSubclassBase.cs JoinedSubclassOne.cs Node.cs Node.hbm.xml Parent.hbm.xml ParentComparer.cs SexType.cs SexType.hbm.xml SimpleComponent.cs SimpleComponent.hbm.xml Subclass.hbm.xml Team.cs Team.hbm.xml UnsavedType.cs UnsavedType.hbm.xml Log Message: Added more domain classes and move the new ones I made to use to get NHibernate testing up and going to their own namespace because there was some name conflicts with h2.0.3 classes. --- SimpleComponent.cs DELETED --- --- Node.hbm.xml DELETED --- --- JoinedSubclassOne.cs DELETED --- --- Subclass.hbm.xml DELETED --- --- SexType.hbm.xml DELETED --- --- SimpleComponent.hbm.xml DELETED --- --- BasicClass.cs DELETED --- --- UnsavedType.hbm.xml DELETED --- --- Parent.hbm.xml DELETED --- --- SexType.cs DELETED --- --- Child.hbm.xml DELETED --- Index: Po.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Po.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Po.cs 3 Jun 2004 13:31:52 -0000 1.1 --- Po.cs 9 Jun 2004 01:03:59 -0000 1.2 *************** *** 14,17 **** --- 14,18 ---- //<set> mapping private IDictionary _set; + private IList _list; public long Id *************** *** 33,36 **** --- 34,42 ---- } + public IList List + { + get { return _list; } + set { _list = value; } + } Index: NHibernate.DomainModel-1.1.csproj =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/NHibernate.DomainModel-1.1.csproj,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** NHibernate.DomainModel-1.1.csproj 3 Jun 2004 18:01:24 -0000 1.17 --- NHibernate.DomainModel-1.1.csproj 9 Jun 2004 01:03:59 -0000 1.18 *************** *** 123,131 **** /> <File - RelPath = "AuditComponent.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File RelPath = "B.cs" SubType = "Code" --- 123,126 ---- *************** *** 143,155 **** /> <File - RelPath = "BasicClass.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "BasicClass.hbm.xml" - BuildAction = "EmbeddedResource" - /> - <File RelPath = "BasicNameable.cs" SubType = "Code" --- 138,141 ---- *************** *** 195,202 **** /> <File - RelPath = "Child.hbm.xml" - BuildAction = "EmbeddedResource" - /> - <File RelPath = "Circular.cs" SubType = "Code" --- 181,184 ---- *************** *** 208,220 **** /> <File - RelPath = "ClassWithCompositeId.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "ClassWithCompositeId.hbm.xml" - BuildAction = "EmbeddedResource" - /> - <File RelPath = "ComponentCollection.cs" SubType = "Code" --- 190,193 ---- *************** *** 227,235 **** /> <File - RelPath = "CompositeId.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File RelPath = "Contained.cs" SubType = "Code" --- 200,203 ---- *************** *** 392,409 **** /> <File - RelPath = "JoinedSubclass.hbm.xml" - BuildAction = "EmbeddedResource" - /> - <File - RelPath = "JoinedSubclassBase.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "JoinedSubclassOne.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File RelPath = "LessSimple.cs" SubType = "Code" --- 360,363 ---- *************** *** 490,502 **** /> <File - RelPath = "Node.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "Node.hbm.xml" - BuildAction = "EmbeddedResource" - /> - <File RelPath = "One.cs" SubType = "Code" --- 444,447 ---- *************** *** 523,535 **** /> <File ! RelPath = "Parent.hbm.xml" BuildAction = "EmbeddedResource" /> <File - RelPath = "ParentComparer.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File RelPath = "Po.cs" SubType = "Code" --- 468,475 ---- /> <File ! RelPath = "ParentChild.hbm.xml" BuildAction = "EmbeddedResource" /> <File RelPath = "Po.cs" SubType = "Code" *************** *** 561,702 **** /> <File ! RelPath = "SexType.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "SexType.hbm.xml" BuildAction = "EmbeddedResource" /> <File ! RelPath = "Simple.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Simple.hbm.xml" BuildAction = "EmbeddedResource" /> <File ! RelPath = "SimpleComponent.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "SimpleComponent.hbm.xml" ! BuildAction = "EmbeddedResource" /> <File ! RelPath = "Single.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "SingleSeveral.hbm.xml" BuildAction = "EmbeddedResource" /> <File ! RelPath = "Sortable.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "StringComparator.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Stuff.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Stuff.hbm.xml" BuildAction = "EmbeddedResource" /> <File ! RelPath = "Subclass.hbm.xml" BuildAction = "EmbeddedResource" /> <File ! RelPath = "SubDetail.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "SubMulti.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Super.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Team.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Team.hbm.xml" BuildAction = "EmbeddedResource" /> <File ! RelPath = "Trivial.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "TrivialClass.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "UnsavedType.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "UnsavedType.hbm.xml" BuildAction = "EmbeddedResource" /> <File ! RelPath = "Vetoer.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Vetoer.hbm.xml" BuildAction = "EmbeddedResource" /> <File ! RelPath = "W.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "WZ.hbm.xml" BuildAction = "EmbeddedResource" /> <File ! RelPath = "X.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "XY.hbm.xml" BuildAction = "EmbeddedResource" /> <File ! RelPath = "Y.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Z.cs" SubType = "Code" BuildAction = "Compile" /> </Include> </Files> --- 501,716 ---- /> <File ! RelPath = "Simple.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Simple.hbm.xml" BuildAction = "EmbeddedResource" /> <File ! RelPath = "Single.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "SingleSeveral.hbm.xml" BuildAction = "EmbeddedResource" /> <File ! RelPath = "Sortable.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "StringComparator.cs" ! SubType = "Code" ! BuildAction = "Compile" /> <File ! RelPath = "Stuff.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Stuff.hbm.xml" BuildAction = "EmbeddedResource" /> <File ! RelPath = "SubDetail.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "SubMulti.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Super.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Trivial.cs" ! SubType = "Code" ! BuildAction = "Compile" ! /> ! <File ! RelPath = "TrivialClass.cs" ! SubType = "Code" ! BuildAction = "Compile" ! /> ! <File ! RelPath = "Vetoer.cs" ! SubType = "Code" ! BuildAction = "Compile" ! /> ! <File ! RelPath = "Vetoer.hbm.xml" BuildAction = "EmbeddedResource" /> <File ! RelPath = "W.cs" ! SubType = "Code" ! BuildAction = "Compile" ! /> ! <File ! RelPath = "WZ.hbm.xml" BuildAction = "EmbeddedResource" /> <File ! RelPath = "X.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "XY.hbm.xml" ! BuildAction = "EmbeddedResource" ! /> ! <File ! RelPath = "Y.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "Z.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "NHSpecific\AuditComponent.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "NHSpecific\BasicClass.cs" ! SubType = "Code" ! BuildAction = "Compile" ! /> ! <File ! RelPath = "NHSpecific\BasicClass.hbm.xml" BuildAction = "EmbeddedResource" /> <File ! RelPath = "NHSpecific\Child.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "NHSpecific\Child.hbm.xml" ! BuildAction = "EmbeddedResource" ! /> ! <File ! RelPath = "NHSpecific\ClassWithCompositeId.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "NHSpecific\ClassWithCompositeId.hbm.xml" ! BuildAction = "EmbeddedResource" ! /> ! <File ! RelPath = "NHSpecific\CompositeId.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "NHSpecific\JoinedSubclass.hbm.xml" BuildAction = "EmbeddedResource" /> <File ! RelPath = "NHSpecific\JoinedSubclassBase.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "NHSpecific\JoinedSubclassOne.cs" ! SubType = "Code" ! BuildAction = "Compile" ! /> ! <File ! RelPath = "NHSpecific\Node.cs" ! SubType = "Code" ! BuildAction = "Compile" ! /> ! <File ! RelPath = "NHSpecific\Node.hbm.xml" BuildAction = "EmbeddedResource" /> <File ! RelPath = "NHSpecific\Parent.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "NHSpecific\Parent.hbm.xml" BuildAction = "EmbeddedResource" /> <File ! RelPath = "NHSpecific\ParentComparer.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "NHSpecific\SexType.cs" ! SubType = "Code" ! BuildAction = "Compile" ! /> ! <File ! RelPath = "NHSpecific\SexType.hbm.xml" BuildAction = "EmbeddedResource" /> <File ! RelPath = "NHSpecific\SimpleComponent.cs" SubType = "Code" BuildAction = "Compile" /> <File ! RelPath = "NHSpecific\SimpleComponent.hbm.xml" ! BuildAction = "EmbeddedResource" ! /> ! <File ! RelPath = "NHSpecific\Subclass.hbm.xml" ! BuildAction = "EmbeddedResource" ! /> ! <File ! RelPath = "NHSpecific\Team.cs" ! SubType = "Code" ! BuildAction = "Compile" ! /> ! <File ! RelPath = "NHSpecific\Team.hbm.xml" ! BuildAction = "EmbeddedResource" ! /> ! <File ! RelPath = "NHSpecific\UnsavedType.cs" SubType = "Code" BuildAction = "Compile" /> + <File + RelPath = "NHSpecific\UnsavedType.hbm.xml" + BuildAction = "EmbeddedResource" + /> </Include> </Files> --- ParentComparer.cs DELETED --- --- NEW FILE: Custom.hbm.xml --- Index: Child.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Child.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Child.cs 2 Jun 2004 04:53:24 -0000 1.2 --- Child.cs 9 Jun 2004 01:03:59 -0000 1.3 *************** *** 1,8 **** using System; - using System.Collections; namespace NHibernate.DomainModel { - //TODO: this conflicts with a H2.0.3 class for testing... /// <summary> /// Summary description for Child. --- 1,6 ---- *************** *** 10,109 **** public class Child { ! private int id; ! private string fullName; ! private IDictionary parents; ! private SexType sex; ! ! private IList siblings; ! ! private Child[] friends; ! ! private System.DateTime favoriteDate; ! ! public Child() ! { ! friends = new Child[3]; ! } ! public int Id { ! get {return id;} ! set {id = value;} ! } ! ! public string FullName { ! get {return fullName;} ! set {fullName = value;} ! } ! ! public IList Siblings { ! get { ! if(siblings==null) siblings = new ArrayList(); ! return siblings; ! } ! set {siblings = value;} ! } ! ! public Child FirstSibling { ! get{ ! return (Child)Siblings[0]; ! } ! set {Siblings.Insert(0, value);} ! } ! ! ! public Child SecondSibling { ! get{ ! return (Child)Siblings[1]; ! } ! set {Siblings.Insert(1, value);} ! } ! ! public IDictionary Parents { ! get { ! if(parents==null) parents = new Hashtable(); ! return parents; ! } ! set {parents = value;} ! } ! ! public Parent Mom { ! get { return (Parent)Parents["mom"];} ! set { ! if(Parents.Contains("mom")==false) { ! Parents.Add("mom", value); ! } ! else { ! Parents["mom"] = value; ! } ! } ! } ! ! public Parent Dad { ! get { return (Parent)Parents["dad"];} ! set { ! if(Parents.Contains("dad")==false) { ! Parents.Add("dad", value); ! } ! else { ! Parents["dad"] = value; ! } ! ! } } ! public SexType Sex { ! get { return sex;} ! set { sex = value;} } ! public Child[] Friends { ! get { return friends;} ! set { friends = value;} } ! ! public System.DateTime FavoriteDate{ ! get {return favoriteDate;} ! set {favoriteDate = value;} } --- 8,37 ---- public class Child { ! private Parent _parent; ! private int _count; ! private int _x; ! public Parent Parent ! { ! get { return _parent; } ! set { _parent = value; } } ! public int Count ! { ! get { return _count; } ! set { _count = value; } } ! public int X ! { ! get { return _x; } ! set { _x = value; } } ! public long Id ! { ! get { return _parent.Id; } ! set { } } --- ClassWithCompositeId.hbm.xml DELETED --- --- AuditComponent.cs DELETED --- Index: Parent.cs =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Parent.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Parent.cs 3 Jun 2004 14:54:40 -0000 1.2 --- Parent.cs 9 Jun 2004 01:03:59 -0000 1.3 *************** *** 1,8 **** using System; - using System.Collections; namespace NHibernate.DomainModel { - //TODO: replace this with H2.0.3 version /// <summary> /// Summary description for Parent. --- 1,6 ---- *************** *** 10,46 **** public class Parent { ! private int id; ! private string adultName; ! private IDictionary children; ! private IDictionary adultFriends; ! ! ! public Parent() { ! adultFriends = new SortedList(new ParentComparer()); ! } ! ! public int Id { ! get {return id;} ! set {id = value;} } ! public string AdultName { ! get {return adultName;} ! set {adultName = value;} } ! public IDictionary Children { ! get {return children;} ! set {children = value;} } ! public IDictionary AdultFriends { ! get {return adultFriends;} ! set {adultFriends = value;} } ! public void AddFriend(Parent friend) { ! adultFriends.Add(friend, friend); } --- 8,47 ---- public class Parent { ! private long _id; ! private int _count; ! private Child _child; ! private object _any; ! private int _x; ! ! public long Id { ! get { return _id; } ! set { _id = value; } } ! public int Count ! { ! get { return _count; } ! set { _count = value; } } ! public Child Child ! { ! get { return _child; } ! set { _child = value; } } ! ! public object Any ! { ! get { return _any; } ! set { _any = value; } } ! ! public int X ! { ! get { return _x; } ! set { _x = value; } } --- Node.cs DELETED --- --- UnsavedType.cs DELETED --- --- Team.cs DELETED --- --- Team.hbm.xml DELETED --- --- NEW FILE: ParentChild.hbm.xml --- <?xml version="1.0"?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0">> <class name="NHibernate.DomainModel.Parent, NHibernate.DomainModel" > <id name="Id" type="Int64"> <generator class="native"> <!--seqhilo--> <!--<param>foo_seq</param>--> </generator> </id> <property name="X"/> <property name="Count" column="count_"/> <one-to-one name="Child"/> <property name="Any" type="Object"> <column name="any_id"/> <column name="any_class"/> </property> </class> <class name="NHibernate.DomainModel.Child, NHibernate.DomainModel" > <id name="Id" type="Int64"> <generator class="assigned"/> </id> <property name="X"/> <one-to-one name="Parent" class="NHibernate.DomainModel.Parent, NHibernate.DomainModel" constrained="true" /> <property name="Count" column="count_"/> </class> </hibernate-mapping> Index: Multi.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Multi.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Multi.hbm.xml 7 Jun 2004 20:41:06 -0000 1.2 --- Multi.hbm.xml 9 Jun 2004 01:03:59 -0000 1.3 *************** *** 74,82 **** /> <many-to-one ! name="Yetanother" column="other3" class="NHibernate.DomainModel.LessSimple, NHibernate.DomainModel" /> ! <property name="foo"/> <set name="Set" --- 74,82 ---- /> <many-to-one ! name="YetAnother" column="other3" class="NHibernate.DomainModel.LessSimple, NHibernate.DomainModel" /> ! <property name="Foo"/> <set name="Set" *************** *** 94,101 **** <many-to-many column="simple2" ! class="NHibernate.DomainModel.Simple" /> </bag> ! <one-to-one name="Mypo"/> </joined-subclass> --- 94,101 ---- <many-to-many column="simple2" ! class="NHibernate.DomainModel.Simple, NHibernate.DomainModel" /> </bag> ! <one-to-one name="MyPo"/> </joined-subclass> *************** *** 105,109 **** > <key column="sid"/> ! <property name="extraProp"/> <many-to-one name="Other" --- 105,109 ---- > <key column="sid"/> ! <property name="ExtraProp"/> <many-to-one name="Other" *************** *** 114,118 **** <component ! name="comp" class="NHibernate.DomainModel.Multi+Component, NHibernate.DomainModel" > --- 114,118 ---- <component ! name="Comp" class="NHibernate.DomainModel.Multi+Component, NHibernate.DomainModel" > *************** *** 126,130 **** > <key column="sid"/> ! <property name="amount"/> <bag name="Children" --- 126,130 ---- > <key column="sid"/> ! <property name="Amount"/> <bag name="Children" *************** *** 135,140 **** <one-to-many class="NHibernate.DomainModel.SubMulti, NHibernate.DomainModel"/> </bag> ! <many-to-one name="parent"/> ! <list name="moreChildren" lazy="true"> <key column="another_parent"/> <index column="list_ind"/> --- 135,140 ---- <one-to-many class="NHibernate.DomainModel.SubMulti, NHibernate.DomainModel"/> </bag> ! <many-to-one name="Parent"/> ! <list name="MoreChildren" lazy="true"> <key column="another_parent"/> <index column="list_ind"/> *************** *** 162,166 **** /> <list ! name="list" cascade="all" > --- 162,166 ---- /> <list ! name="List" cascade="all" > --- JoinedSubclassBase.cs DELETED --- --- JoinedSubclass.hbm.xml DELETED --- --- CompositeId.cs DELETED --- --- BasicClass.hbm.xml DELETED --- --- ClassWithCompositeId.cs DELETED --- |
