From: Michael D. <mik...@us...> - 2004-12-10 16:40:43
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14749/NHibernate Modified Files: nhibernate-mapping-2.0.xsd Log Message: NH-131: Describe joined-subclasses and subclasses in seperate files. Also refactored the test a little bit. Going to being moving away from the NHibernate.DomainModel and just include everything in the TestFixture. Making the domain classes smaller and easier to demonstrate the conepts. Borrowed some of the ideas from hibernate 3 Index: nhibernate-mapping-2.0.xsd =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/nhibernate-mapping-2.0.xsd,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** nhibernate-mapping-2.0.xsd 27 Nov 2004 19:00:27 -0000 1.7 --- nhibernate-mapping-2.0.xsd 10 Dec 2004 16:40:01 -0000 1.8 *************** *** 10,14 **** <xs:element ref='meta' minOccurs='0' maxOccurs='unbounded' /> <xs:element ref='import' minOccurs='0' maxOccurs='unbounded' /> ! <xs:element ref='class' minOccurs='0' maxOccurs='unbounded' /> <xs:element ref='query' minOccurs='0' maxOccurs='unbounded' /> </xs:sequence> --- 10,18 ---- <xs:element ref='meta' minOccurs='0' maxOccurs='unbounded' /> <xs:element ref='import' minOccurs='0' maxOccurs='unbounded' /> ! <xs:choice minOccurs='0' maxOccurs='unbounded'> ! <xs:element ref='class'/> ! <xs:element ref='subclass'/> ! <xs:element ref='joined-subclass'/> ! </xs:choice> <xs:element ref='query' minOccurs='0' maxOccurs='unbounded' /> </xs:sequence> *************** *** 322,325 **** --- 326,331 ---- </xs:simpleType> </xs:attribute> + <xs:attribute name='extends' use='optional'> + </xs:attribute> </xs:complexType> </xs:element> *************** *** 378,381 **** --- 384,389 ---- </xs:simpleType> </xs:attribute> + <xs:attribute name='extends' use='optional'> + </xs:attribute> </xs:complexType> </xs:element> |