From: Michael D. <mik...@us...> - 2004-12-16 21:57:49
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18557/NHibernate.DomainModel Modified Files: ABC.hbm.xml ABCProxy.hbm.xml Container.hbm.xml FooBar.hbm.xml Glarch.hbm.xml Qux.hbm.xml WZ.hbm.xml Log Message: proxy attribute has been added to classes that had them in hibernate test suite. Index: Container.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Container.hbm.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Container.hbm.xml 11 Jul 2004 21:07:24 -0000 1.8 --- Container.hbm.xml 16 Dec 2004 21:57:39 -0000 1.9 *************** *** 14,22 **** <class name="NHibernate.DomainModel.Container, NHibernate.DomainModel" > - <!-- - proxy doesn't work yet - proxy="NHibernate.DomainModel.Container, NHibernate.DomainModel" - --> <id name="Id" --- 14,19 ---- <class name="NHibernate.DomainModel.Container, NHibernate.DomainModel" + proxy="NHibernate.DomainModel.Container, NHibernate.DomainModel" > <id name="Id" *************** *** 161,169 **** <class name="NHibernate.DomainModel.Contained, NHibernate.DomainModel" > - <!-- - proxy doesn't work yet - proxy="NHibernate.DomainModel.Contained, NHibernate.DomainModel" - --> <id name="Id" --- 158,163 ---- <class name="NHibernate.DomainModel.Contained, NHibernate.DomainModel" + proxy="NHibernate.DomainModel.Contained, NHibernate.DomainModel" > <id name="Id" Index: FooBar.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/FooBar.hbm.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** FooBar.hbm.xml 20 Nov 2004 15:20:10 -0000 1.19 --- FooBar.hbm.xml 16 Dec 2004 21:57:39 -0000 1.20 *************** *** 7,10 **** --- 7,11 ---- <class name="NHibernate.DomainModel.Foo, NHibernate.DomainModel" + proxy="NHibernate.DomainModel.FooProxy, NHibernate.DomainModel" table="`foos`" discriminator-value="F" *************** *** 12,20 **** dynamic-insert="true" > - <!-- - proxy doesn't work yet - proxy="NHibernate.DomainModel.FooProxy, NHibernate.DomainModel" - --> - <jcs-cache usage="nonstrict-read-write"/> --- 13,16 ---- *************** *** 158,175 **** <subclass name="NHibernate.DomainModel.Trivial, NHibernate.DomainModel" discriminator-value="T" /> - <!-- - proxy doesn't work yet - proxy="NHibernate.DomainModel.FooProxy, NHibernate.DomainModel" - --> <subclass name="NHibernate.DomainModel.Abstract, NHibernate.DomainModel" discriminator-value="null" > - <!-- - proxy doesn't work yet - proxy="NHibernate.DomainModel.AbstractProxy, NHibernate.DomainModel" - --> <set name="Abstracts"> <key column="abstract_id"/> --- 154,165 ---- <subclass name="NHibernate.DomainModel.Trivial, NHibernate.DomainModel" + proxy="NHibernate.DomainModel.FooProxy, NHibernate.DomainModel" discriminator-value="T" /> <subclass name="NHibernate.DomainModel.Abstract, NHibernate.DomainModel" + proxy="NHibernate.DomainModel.AbstractProxy, NHibernate.DomainModel" discriminator-value="null" > <set name="Abstracts"> <key column="abstract_id"/> *************** *** 179,188 **** <subclass name="NHibernate.DomainModel.Bar, NHibernate.DomainModel" discriminator-value="B" > - <!-- - proxy doesn't work yet - proxy="NHibernate.DomainModel.BarProxy, NHibernate.DomainModel" - --> <many-to-one name="Baz"/> <property name="BarString"> --- 169,175 ---- <subclass name="NHibernate.DomainModel.Bar, NHibernate.DomainModel" + proxy="NHibernate.DomainModel.BarProxy, NHibernate.DomainModel" discriminator-value="B" > <many-to-one name="Baz"/> <property name="BarString"> Index: WZ.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/WZ.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WZ.hbm.xml 11 Jul 2004 21:07:24 -0000 1.2 --- WZ.hbm.xml 16 Dec 2004 21:57:39 -0000 1.3 *************** *** 21,31 **** <class name="NHibernate.DomainModel.W, NHibernate.DomainModel" discriminator-value="0" > - <!-- - proxy doesn't work yet - proxy="NHibernate.DomainModel.Z, NHibernate.DomainModel" - --> - <id name="Id" unsaved-value="0"> <generator class="hilo"/> --- 21,27 ---- <class name="NHibernate.DomainModel.W, NHibernate.DomainModel" + proxy="NHibernate.DomainModel.Z, NHibernate.DomainModel" discriminator-value="0" > <id name="Id" unsaved-value="0"> <generator class="hilo"/> Index: ABC.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/ABC.hbm.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ABC.hbm.xml 27 Aug 2004 13:29:57 -0000 1.8 --- ABC.hbm.xml 16 Dec 2004 21:57:39 -0000 1.9 *************** *** 57,67 **** </class> <class ! name="NHibernate.DomainModel.D, NHibernate.DomainModel" discriminator-value="0" > - <!-- - proxy does not work yet - proxy="NHibernate.DomainModel.D, NHibernate.DomainModel" - --> <id name="Id" --- 57,64 ---- </class> <class ! name="NHibernate.DomainModel.D, NHibernate.DomainModel" ! proxy="NHibernate.DomainModel.D, NHibernate.DomainModel" discriminator-value="0" > <id name="Id" Index: Qux.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Qux.hbm.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Qux.hbm.xml 9 Aug 2004 18:26:22 -0000 1.7 --- Qux.hbm.xml 16 Dec 2004 21:57:39 -0000 1.8 *************** *** 2,13 **** <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> <class ! name="NHibernate.DomainModel.Qux, NHibernate.DomainModel" table="quux" > - <!-- - proxy doesn't work yet - once proxy is working remove the - [Serializable] attribute from the class. - proxy="NHibernate.DomainModel.Qux, NHibernate.DomainModel" - --> <id name="Key" column="qux_key" unsaved-value="0"> <generator class="hilo" /> --- 2,9 ---- <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> <class ! name="NHibernate.DomainModel.Qux, NHibernate.DomainModel" ! proxy="NHibernate.DomainModel.Qux, NHibernate.DomainModel" table="quux" > <id name="Key" column="qux_key" unsaved-value="0"> <generator class="hilo" /> Index: ABCProxy.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/ABCProxy.hbm.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ABCProxy.hbm.xml 11 Jul 2004 21:07:24 -0000 1.6 --- ABCProxy.hbm.xml 16 Dec 2004 21:57:39 -0000 1.7 *************** *** 1,9 **** <?xml version="1.0" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class name="NHibernate.DomainModel.A, NHibernate.DomainModel" discriminator-value="0"> ! <!-- ! proxy doesn't work yet ! proxy="NHibernate.DomainModel.A, NHibernate.DomainModel" ! --> <id name="Id" unsaved-value="0" type="Int64"> <generator class="native" /> --- 1,9 ---- <?xml version="1.0" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class ! name="NHibernate.DomainModel.A, NHibernate.DomainModel" ! proxy="NHibernate.DomainModel.A, NHibernate.DomainModel" ! discriminator-value="0" ! > <id name="Id" unsaved-value="0" type="Int64"> <generator class="native" /> *************** *** 11,19 **** <discriminator column="clazz" type="Int32" force="true" not-null="false" /> <property name="Name" /> ! <subclass name="NHibernate.DomainModel.B, NHibernate.DomainModel" discriminator-value="null"> ! <!-- ! proxy doesn't work yet proxy="NHibernate.DomainModel.B, NHibernate.DomainModel" ! --> <property name="Count" column="count_" type="Int32" /> <map name="Map"> --- 11,19 ---- <discriminator column="clazz" type="Int32" force="true" not-null="false" /> <property name="Name" /> ! <subclass ! name="NHibernate.DomainModel.B, NHibernate.DomainModel" proxy="NHibernate.DomainModel.B, NHibernate.DomainModel" ! discriminator-value="null" ! > <property name="Count" column="count_" type="Int32" /> <map name="Map"> *************** *** 22,44 **** <element column="MAPVAL" type="Int32" /> </map> ! <subclass name="NHibernate.DomainModel.C1, NHibernate.DomainModel" discriminator-value="1" ! proxy="NHibernate.DomainModel.C1, NHibernate.DomainModel"> <property name="Address" column="c1" /> <one-to-one name="D" class="NHibernate.DomainModel.D, NHibernate.DomainModel" /> </subclass> ! <subclass name="NHibernate.DomainModel.C2, NHibernate.DomainModel" discriminator-value="2"> ! <!-- ! proxy doesn't work yet ! proxy="NHibernate.DomainModel.C2, NHibernate.DomainModel" ! --> <property name="Address" column="c2" /> </subclass> </subclass> </class> ! <class name="NHibernate.DomainModel.D, NHibernate.DomainModel" discriminator-value="0" > ! <!-- ! proxy doesn't work yet ! proxy="NHibernate.DomainModel.D, NHibernate.DomainModel" ! --> <id name="Id" unsaved-value="0" type="Int64"> <generator class="assigned" /> --- 22,47 ---- <element column="MAPVAL" type="Int32" /> </map> ! <subclass ! name="NHibernate.DomainModel.C1, NHibernate.DomainModel" ! discriminator-value="1" ! proxy="NHibernate.DomainModel.C1, NHibernate.DomainModel" ! > <property name="Address" column="c1" /> <one-to-one name="D" class="NHibernate.DomainModel.D, NHibernate.DomainModel" /> </subclass> ! <subclass ! name="NHibernate.DomainModel.C2, NHibernate.DomainModel" ! proxy="NHibernate.DomainModel.C2, NHibernate.DomainModel" ! discriminator-value="2" ! > <property name="Address" column="c2" /> </subclass> </subclass> </class> ! <class ! name="NHibernate.DomainModel.D, NHibernate.DomainModel" ! proxy="NHibernate.DomainModel.D, NHibernate.DomainModel" ! discriminator-value="0" ! > <id name="Id" unsaved-value="0" type="Int64"> <generator class="assigned" /> Index: Glarch.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Glarch.hbm.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Glarch.hbm.xml 31 Aug 2004 21:22:58 -0000 1.9 --- Glarch.hbm.xml 16 Dec 2004 21:57:39 -0000 1.10 *************** *** 3,14 **** <class name="NHibernate.DomainModel.Glarch, NHibernate.DomainModel" table="`glarchez`" dynamic-update="true" > - <!-- - proxy doesn't work yet - proxy="NHibernate.DomainModel.GlarchProxy, NHibernate.DomainModel" - --> - <!-- <jcs-cache usage="read-write" /> --> <!-- commented out in h2.0.3 also --> --- 3,10 ---- <class name="NHibernate.DomainModel.Glarch, NHibernate.DomainModel" + proxy="NHibernate.DomainModel.GlarchProxy, NHibernate.DomainModel" table="`glarchez`" dynamic-update="true" > <!-- <jcs-cache usage="read-write" /> --> <!-- commented out in h2.0.3 also --> |