Menu
▾
▴
[Nhibernate-commit] nhibernate/src/NHibernate.DomainModel ABC.hbm.xml,1.6,1.7 ABCProxy.hbm.xml,1.5,1.6 Container.hbm.xml,1.7,1.8 FooBar.hbm.xml,1.8,1.9 Glarch.hbm.xml,1.5,1.6 Qux.hbm.xml,1.5,1.6 WZ.hbm.xml,1.1,1.2
|
From: Michael D. <mik...@us...> - 2004-07-11 21:07:33
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29909/src/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: Removed proxy attribute from classes to help with testing. The OuterJoinLoader was running into problems with classes that had a proxy attribute since there is no proxy implementation. Index: Container.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Container.hbm.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Container.hbm.xml 9 Jul 2004 19:22:11 -0000 1.7 --- Container.hbm.xml 11 Jul 2004 21:07:24 -0000 1.8 *************** *** 14,19 **** <class name="NHibernate.DomainModel.Container, NHibernate.DomainModel" - proxy="NHibernate.DomainModel.Container, NHibernate.DomainModel" > <id name="Id" --- 14,22 ---- <class name="NHibernate.DomainModel.Container, NHibernate.DomainModel" > + <!-- + proxy doesn't work yet + proxy="NHibernate.DomainModel.Container, NHibernate.DomainModel" + --> <id name="Id" *************** *** 158,163 **** <class name="NHibernate.DomainModel.Contained, NHibernate.DomainModel" - proxy="NHibernate.DomainModel.Contained, 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" Index: FooBar.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/FooBar.hbm.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** FooBar.hbm.xml 29 Jun 2004 14:26:27 -0000 1.8 --- FooBar.hbm.xml 11 Jul 2004 21:07:24 -0000 1.9 *************** *** 8,16 **** name="NHibernate.DomainModel.Foo, NHibernate.DomainModel" table="`foos`" - proxy="NHibernate.DomainModel.FooProxy, NHibernate.DomainModel" discriminator-value="F" dynamic-update="true" dynamic-insert="true" > <jcs-cache usage="nonstrict-read-write"/> --- 8,19 ---- name="NHibernate.DomainModel.Foo, NHibernate.DomainModel" table="`foos`" discriminator-value="F" dynamic-update="true" dynamic-insert="true" > + <!-- + proxy doesn't work yet + proxy="NHibernate.DomainModel.FooProxy, NHibernate.DomainModel" + --> <jcs-cache usage="nonstrict-read-write"/> *************** *** 147,158 **** <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"/> --- 150,167 ---- <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"/> *************** *** 162,167 **** <subclass name="NHibernate.DomainModel.Bar, NHibernate.DomainModel" ! proxy="NHibernate.DomainModel.BarProxy, NHibernate.DomainModel" ! discriminator-value="B"> <many-to-one name="Baz"/> <property name="BarString"> --- 171,180 ---- <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"> Index: WZ.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/WZ.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WZ.hbm.xml 3 Jun 2004 18:01:24 -0000 1.1 --- WZ.hbm.xml 11 Jul 2004 21:07:24 -0000 1.2 *************** *** 22,27 **** name="NHibernate.DomainModel.W, NHibernate.DomainModel" discriminator-value="0" - proxy="NHibernate.DomainModel.Z, NHibernate.DomainModel" > <id name="Id" unsaved-value="0"> --- 22,30 ---- 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"> Index: ABC.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/ABC.hbm.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ABC.hbm.xml 9 Jul 2004 19:22:11 -0000 1.6 --- ABC.hbm.xml 11 Jul 2004 21:07:24 -0000 1.7 *************** *** 58,63 **** name="NHibernate.DomainModel.D, NHibernate.DomainModel" discriminator-value="0" - proxy="NHibernate.DomainModel.D, NHibernate.DomainModel" > <id name="Id" --- 58,66 ---- name="NHibernate.DomainModel.D, NHibernate.DomainModel" discriminator-value="0" > + <!-- + proxy does not work yet + proxy="NHibernate.DomainModel.D, NHibernate.DomainModel" + --> <id name="Id" Index: Qux.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Qux.hbm.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Qux.hbm.xml 6 Jul 2004 04:32:49 -0000 1.5 --- Qux.hbm.xml 11 Jul 2004 21:07:24 -0000 1.6 *************** *** 4,9 **** name="NHibernate.DomainModel.Qux, NHibernate.DomainModel" table="quux" - proxy="NHibernate.DomainModel.Qux, NHibernate.DomainModel" > <id name="Key" column="qux_key" unsaved-value="0"> <generator class="hilo" /> --- 4,12 ---- name="NHibernate.DomainModel.Qux, NHibernate.DomainModel" table="quux" > + <!-- + proxy doesn't work yet + proxy="NHibernate.DomainModel.Qux, NHibernate.DomainModel" + --> <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.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ABCProxy.hbm.xml 9 Jul 2004 19:22:11 -0000 1.5 --- ABCProxy.hbm.xml 11 Jul 2004 21:07:24 -0000 1.6 *************** *** 1,6 **** <?xml version="1.0" ?> <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class name="NHibernate.DomainModel.A, NHibernate.DomainModel" discriminator-value="0" ! 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" 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" /> *************** *** 8,13 **** <discriminator column="clazz" type="Int32" force="true" not-null="false" /> <property name="Name" /> ! <subclass name="NHibernate.DomainModel.B, NHibernate.DomainModel" discriminator-value="null" ! 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" discriminator-value="null"> ! <!-- ! proxy doesn't work yet ! proxy="NHibernate.DomainModel.B, NHibernate.DomainModel" ! --> <property name="Count" column="count_" type="Int32" /> <map name="Map"> *************** *** 21,32 **** <one-to-one name="D" class="NHibernate.DomainModel.D, NHibernate.DomainModel" /> </subclass> ! <subclass name="NHibernate.DomainModel.C2, NHibernate.DomainModel" discriminator-value="2" ! 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="NHibernate.DomainModel.D, NHibernate.DomainModel"> <id name="Id" unsaved-value="0" type="Int64"> <generator class="assigned" /> --- 27,44 ---- <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" /> Index: Glarch.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Glarch.hbm.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Glarch.hbm.xml 30 Jun 2004 18:23:09 -0000 1.5 --- Glarch.hbm.xml 11 Jul 2004 21:07:24 -0000 1.6 *************** *** 4,10 **** name="NHibernate.DomainModel.Glarch, NHibernate.DomainModel" table="`glarchez`" - proxy="NHibernate.DomainModel.GlarchProxy, NHibernate.DomainModel" dynamic-update="true" > <!-- <jcs-cache usage="read-write" /> --> --- 4,13 ---- 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" /> --> |
