From: Peter S. <sz...@us...> - 2004-04-06 13:49:10
|
Update of /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19133/NHibernate.DomainModel Modified Files: Container.hbm.xml Fee.hbm.xml Fo.hbm.xml Fum.hbm.xml Fumm.hbm.xml Glarch.hbm.xml Holder.hbm.xml Immutable.hbm.xml Location.hbm.xml Many.hbm.xml One.hbm.xml Qux.hbm.xml Stuff.hbm.xml Vetoer.hbm.xml XY.hbm.xml Log Message: Added executestatement to testcase and to testcases. Modified hbms' doctype accordingly. Index: Location.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Location.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Location.hbm.xml 6 Apr 2004 12:56:38 -0000 1.1 --- Location.hbm.xml 6 Apr 2004 13:36:18 -0000 1.2 *************** *** 1,16 **** ! <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > ! <hibernate-mapping> ! ! <class name="net.sf.hibernate.test.Location"> ! <composite-id> ! <key-property name="streetNumber"/> ! <key-property name="streetName" length="20"/> ! <key-property name="city" length="20"/> ! <key-property name="countryCode" length="2"/> ! </composite-id> ! <property name="locale"/> ! <property name="description"/> ! </class> ! </hibernate-mapping> \ No newline at end of file --- 1,13 ---- ! <?xml version="1.0" ?> ! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class name="net.sf.hibernate.test.Location"> ! <composite-id> ! <key-property name="streetNumber" /> ! <key-property name="streetName" length="20" /> ! <key-property name="city" length="20" /> ! <key-property name="countryCode" length="2" /> ! </composite-id> ! <property name="locale" /> ! <property name="description" /> ! </class> </hibernate-mapping> \ No newline at end of file Index: Stuff.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Stuff.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Stuff.hbm.xml 6 Apr 2004 12:56:38 -0000 1.1 --- Stuff.hbm.xml 6 Apr 2004 13:36:18 -0000 1.2 *************** *** 1,33 **** ! <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > ! <hibernate-mapping> ! ! <class name="net.sf.hibernate.test.MoreStuff"> ! <composite-id> ! <key-property name="intId"/> ! <key-property name="stringId" length="32"/> ! </composite-id> ! <property name="name"/> ! <bag name="stuffs" inverse="true" lazy="false" cascade="all"> ! <key> ! <!--unfortunately have to specify not-null here because of limitation in schema export....--> ! <column name="moreInt" not-null="true"/> ! <column name="moreString" not-null="true" length="32"/> ! </key> ! <one-to-many class="net.sf.hibernate.test.Stuff"/> ! </bag> ! </class> ! ! <class name="net.sf.hibernate.test.Stuff"> ! <composite-id unsaved-value="any"> ! <key-property name="id"/> ! <key-many-to-one name="foo" class="net.sf.hibernate.test.Foo"/> ! <key-many-to-one name="moreStuff" class="net.sf.hibernate.test.MoreStuff"> ! <column name="moreInt"/> ! <column name="moreString" length="32"/> ! </key-many-to-one> ! </composite-id> ! <property name="property"/> ! </class> ! </hibernate-mapping> \ No newline at end of file --- 1,29 ---- ! <?xml version="1.0" ?> ! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class name="net.sf.hibernate.test.MoreStuff"> ! <composite-id> ! <key-property name="intId" /> ! <key-property name="stringId" length="32" /> ! </composite-id> ! <property name="name" /> ! <bag name="stuffs" inverse="true" lazy="false" cascade="all"> ! <key> ! <!--unfortunately have to specify not-null here because of limitation in schema export....--> ! <column name="moreInt" not-null="true" /> ! <column name="moreString" not-null="true" length="32" /> ! </key> ! <one-to-many class="net.sf.hibernate.test.Stuff" /> ! </bag> ! </class> ! <class name="net.sf.hibernate.test.Stuff"> ! <composite-id unsaved-value="any"> ! <key-property name="id" /> ! <key-many-to-one name="foo" class="net.sf.hibernate.test.Foo" /> ! <key-many-to-one name="moreStuff" class="net.sf.hibernate.test.MoreStuff"> ! <column name="moreInt" /> ! <column name="moreString" length="32" /> ! </key-many-to-one> ! </composite-id> ! <property name="property" /> ! </class> </hibernate-mapping> \ No newline at end of file Index: Fumm.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Fumm.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Fumm.hbm.xml 6 Apr 2004 12:56:38 -0000 1.1 --- Fumm.hbm.xml 6 Apr 2004 13:36:18 -0000 1.2 *************** *** 1,17 **** ! <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > ! <hibernate-mapping> ! ! <class name="net.sf.hibernate.test.Fumm"> ! <composite-id name="id"> ! <key-property name="string"> ! <column name="string_" length="10"/> ! </key-property> ! <key-property name="short" column="short_"/> ! <key-property name="date" column="date_" type="date"/> ! </composite-id> ! <property name="locale"/> ! <one-to-one name="fum" cascade="all" constrained="true"/> ! </class> ! </hibernate-mapping> \ No newline at end of file --- 1,14 ---- ! <?xml version="1.0" ?> ! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class name="net.sf.hibernate.test.Fumm"> ! <composite-id name="id"> ! <key-property name="string"> ! <column name="string_" length="10" /> ! </key-property> ! <key-property name="short" column="short_" /> ! <key-property name="date" column="date_" type="date" /> ! </composite-id> ! <property name="locale" /> ! <one-to-one name="fum" cascade="all" constrained="true" /> ! </class> </hibernate-mapping> \ No newline at end of file Index: XY.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/XY.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** XY.hbm.xml 6 Apr 2004 12:56:38 -0000 1.1 --- XY.hbm.xml 6 Apr 2004 13:36:18 -0000 1.2 *************** *** 1,22 **** ! <?xml version="1.0" encoding="UTF-8"?> ! <!DOCTYPE hibernate-mapping ! PUBLIC "-//Hibernate/Hibernate Mapping DTD 2.0//EN" ! "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd"> ! <hibernate-mapping> ! <class name="net.sf.hibernate.test.X"> ! <id name="id" unsaved-value="0"> ! <generator class="foreign"> ! <param name="property">y</param> ! </generator> ! </id> ! <one-to-one name="y" constrained="true" cascade="all"/> ! </class> ! <class name="net.sf.hibernate.test.Y"> ! <id name="id"> ! <generator class="hilo"/> ! </id> ! <property name="x"/> ! <one-to-one name="theX" cascade="save-update"/> ! </class> ! </hibernate-mapping> ! \ No newline at end of file --- 1,18 ---- ! <?xml version="1.0" encoding="UTF-8" ?> ! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class name="net.sf.hibernate.test.X"> ! <id name="id" unsaved-value="0"> ! <generator class="foreign"> ! <param name="property">y</param> ! </generator> ! </id> ! <one-to-one name="y" constrained="true" cascade="all" /> ! </class> ! <class name="net.sf.hibernate.test.Y"> ! <id name="id"> ! <generator class="hilo" /> ! </id> ! <property name="x" /> ! <one-to-one name="theX" cascade="save-update" /> ! </class> ! </hibernate-mapping> Index: Immutable.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Immutable.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Immutable.hbm.xml 6 Apr 2004 12:56:38 -0000 1.1 --- Immutable.hbm.xml 6 Apr 2004 13:36:18 -0000 1.2 *************** *** 1,14 **** ! <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > ! <hibernate-mapping> ! <class name="net.sf.hibernate.test.Immutable" table="immut" mutable="false"> ! <jcs-cache usage="read-only"/> <id name="id" column="id_" length="64"> ! <generator class="uuid.hex"/> </id> ! <property name="foo"/> ! <property name="bar"/> </class> - </hibernate-mapping> \ No newline at end of file --- 1,11 ---- ! <?xml version="1.0" ?> ! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> <class name="net.sf.hibernate.test.Immutable" table="immut" mutable="false"> ! <jcs-cache usage="read-only" /> <id name="id" column="id_" length="64"> ! <generator class="uuid.hex" /> </id> ! <property name="foo" /> ! <property name="bar" /> </class> </hibernate-mapping> \ No newline at end of file Index: One.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/One.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** One.hbm.xml 6 Apr 2004 12:56:38 -0000 1.1 --- One.hbm.xml 6 Apr 2004 13:36:18 -0000 1.2 *************** *** 1,18 **** ! <?xml version="1.0"?> ! ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > ! ! <hibernate-mapping> <class name="net.sf.hibernate.test.One" table="one"> <id name="key" column="one_key"> <generator class="native" /> </id> ! <property name="x"/> ! <property column="one_value" name="value"/> <set name="manies" inverse="true" lazy="true"> ! <key column="one_key"/> ! <one-to-many class="net.sf.hibernate.test.Many"/> </set> </class> </hibernate-mapping> - --- 1,14 ---- ! <?xml version="1.0" ?> ! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> <class name="net.sf.hibernate.test.One" table="one"> <id name="key" column="one_key"> <generator class="native" /> </id> ! <property name="x" /> ! <property column="one_value" name="value" /> <set name="manies" inverse="true" lazy="true"> ! <key column="one_key" /> ! <one-to-many class="net.sf.hibernate.test.Many" /> </set> </class> </hibernate-mapping> Index: Many.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Many.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Many.hbm.xml 6 Apr 2004 12:56:38 -0000 1.1 --- Many.hbm.xml 6 Apr 2004 13:36:18 -0000 1.2 *************** *** 1,14 **** ! <?xml version="1.0"?> ! ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > ! ! <hibernate-mapping> ! <class name="net.sf.hibernate.test.Many" table="many"> ! <id name="key" column="many_key"> ! <generator class="native" /> ! </id> ! <property name="x"/> ! <many-to-one name="one" column="one_key" class="net.sf.hibernate.test.One"/> ! </class> </hibernate-mapping> - --- 1,10 ---- ! <?xml version="1.0" ?> ! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class name="net.sf.hibernate.test.Many" table="many"> ! <id name="key" column="many_key"> ! <generator class="native" /> ! </id> ! <property name="x" /> ! <many-to-one name="one" column="one_key" class="net.sf.hibernate.test.One" /> ! </class> </hibernate-mapping> Index: Fum.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Fum.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Fum.hbm.xml 6 Apr 2004 12:56:38 -0000 1.1 --- Fum.hbm.xml 6 Apr 2004 13:36:17 -0000 1.2 *************** *** 1,39 **** ! <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > ! <hibernate-mapping> ! <class name="net.sf.hibernate.test.Fum"> <composite-id name="id" unsaved-value="any"> <key-property name="string"> ! <column name="string_" length="10"/> </key-property> ! <key-property name="short" column="short_"/> ! <key-property name="date" column="date_" type="date"/> </composite-id> ! <version name="lastUpdated" type="calendar"/> ! <property name="fum" not-null="true"/> <many-to-one name="fo"> ! <column name="fo_string" length="10"/> ! <column name="fo_short"/> ! <column name="fo_date"/> </many-to-one> <set name="friends"> <key> ! <column name="fr_string" length="10"/> ! <column name="fr_short"/> ! <column name="fr_date"/> </key> ! <one-to-many class="net.sf.hibernate.test.Fum"/> </set> <array name="quxArray"> <key> ! <column name="fum_str_" length="10"/> ! <column name="fum_sho_"/> ! <column name="fum_dat_"/> </key> ! <index column="i"/> ! <one-to-many class="net.sf.hibernate.test.Qux"/> </array> </class> - </hibernate-mapping> \ No newline at end of file --- 1,36 ---- ! <?xml version="1.0" ?> ! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> <class name="net.sf.hibernate.test.Fum"> <composite-id name="id" unsaved-value="any"> <key-property name="string"> ! <column name="string_" length="10" /> </key-property> ! <key-property name="short" column="short_" /> ! <key-property name="date" column="date_" type="date" /> </composite-id> ! <version name="lastUpdated" type="calendar" /> ! <property name="fum" not-null="true" /> <many-to-one name="fo"> ! <column name="fo_string" length="10" /> ! <column name="fo_short" /> ! <column name="fo_date" /> </many-to-one> <set name="friends"> <key> ! <column name="fr_string" length="10" /> ! <column name="fr_short" /> ! <column name="fr_date" /> </key> ! <one-to-many class="net.sf.hibernate.test.Fum" /> </set> <array name="quxArray"> <key> ! <column name="fum_str_" length="10" /> ! <column name="fum_sho_" /> ! <column name="fum_dat_" /> </key> ! <index column="i" /> ! <one-to-many class="net.sf.hibernate.test.Qux" /> </array> </class> </hibernate-mapping> \ No newline at end of file Index: Container.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Container.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Container.hbm.xml 6 Apr 2004 12:56:38 -0000 1.1 --- Container.hbm.xml 6 Apr 2004 13:36:17 -0000 1.2 *************** *** 1,12 **** ! <?xml version="1.0"?> ! ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > ! ! <hibernate-mapping auto-import="false"> ! ! <import class="net.sf.hibernate.test.Container" rename="ContainerX"/> ! <import class="net.sf.hibernate.test.Contained"/> ! <import class="java.lang.Object" rename="Universe"/> ! <class name="net.sf.hibernate.test.Container" proxy="net.sf.hibernate.test.Container"> <id name="id" column="container_id"> --- 1,7 ---- ! <?xml version="1.0" ?> ! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0" auto-import="false"> ! <import class="net.sf.hibernate.test.Container" rename="ContainerX" /> ! <import class="net.sf.hibernate.test.Contained" /> ! <import class="java.lang.Object" rename="Universe" /> <class name="net.sf.hibernate.test.Container" proxy="net.sf.hibernate.test.Container"> <id name="id" column="container_id"> *************** *** 14,83 **** </id> <list name="oneToMany" lazy="true"> ! <key column = "container_id1"/> ! <index column = "list_index"/> ! <one-to-many class="net.sf.hibernate.test.Simple"/> </list> <list name="manyToMany" lazy="true"> ! <key column = "container_id2"/> ! <index column = "list_index"/> ! <many-to-many class="net.sf.hibernate.test.Simple"/> </list> <list name="components" lazy="true"> ! <key column = "container_id"/> ! <index column = "list_index"/> <composite-element class="net.sf.hibernate.test.Container$ContainerInnerClass"> ! <property name="name"/> ! <property name="count" column="count_"/> ! <many-to-one name="simple"/> ! <many-to-one name="one"/> ! <many-to-one name="many"/> </composite-element> </list> <set name="composites" lazy="true"> ! <key column = "container_id"/> <composite-element class="net.sf.hibernate.test.Container$ContainerInnerClass"> ! <property name="name"/> ! <many-to-one name="simple"/> ! <many-to-one name="one"/> ! <many-to-one name="many"/> </composite-element> </set> <bag name="cascades" cascade="all" table="abcd"> ! <key column="container_id"/> <composite-element class="net.sf.hibernate.test.Container$ContainerInnerClass"> ! <property name="name"/> ! <many-to-one name="simple" cascade="all"/> ! <many-to-one name="one" cascade="all" not-null="true"/> ! <many-to-one name="many" cascade="all" not-null="true"/> </composite-element> </bag> <bag name="bag" inverse="true" cascade="save-update" table="CCBAG"> ! <key column="container_id"/> ! <many-to-many column="contained_id" class="net.sf.hibernate.test.Contained" outer-join="true"/> </bag> <bag name="lazyBag" inverse="true" lazy="true" table="LCCBAG" cascade="save-update"> <!--jcs-cache usage="read-write"--> ! <key column="container_id"/> ! <many-to-many column="contained_id" class="net.sf.hibernate.test.Contained"/> </bag> <map name="ternaryMap"> ! <key column="container_id"/> ! <index column="idx" type="string" length="32"/> <composite-element class="net.sf.hibernate.test.Container$Ternary"> ! <property name="name"/> ! <many-to-one name="foo"/> ! <many-to-one name="glarch"/> </composite-element> </map> <set name="ternarySet"> ! <key column="container_id"/> <composite-element class="net.sf.hibernate.test.Container$Ternary"> ! <property name="name"/> ! <many-to-one name="foo"/> ! <many-to-one name="glarch"/> </composite-element> </set> </class> - <class name="net.sf.hibernate.test.Contained" proxy="net.sf.hibernate.test.Contained"> <id name="id" column="container_id" unsaved-value="0"> --- 9,77 ---- </id> <list name="oneToMany" lazy="true"> ! <key column="container_id1" /> ! <index column="list_index" /> ! <one-to-many class="net.sf.hibernate.test.Simple" /> </list> <list name="manyToMany" lazy="true"> ! <key column="container_id2" /> ! <index column="list_index" /> ! <many-to-many class="net.sf.hibernate.test.Simple" /> </list> <list name="components" lazy="true"> ! <key column="container_id" /> ! <index column="list_index" /> <composite-element class="net.sf.hibernate.test.Container$ContainerInnerClass"> ! <property name="name" /> ! <property name="count" column="count_" /> ! <many-to-one name="simple" /> ! <many-to-one name="one" /> ! <many-to-one name="many" /> </composite-element> </list> <set name="composites" lazy="true"> ! <key column="container_id" /> <composite-element class="net.sf.hibernate.test.Container$ContainerInnerClass"> ! <property name="name" /> ! <many-to-one name="simple" /> ! <many-to-one name="one" /> ! <many-to-one name="many" /> </composite-element> </set> <bag name="cascades" cascade="all" table="abcd"> ! <key column="container_id" /> <composite-element class="net.sf.hibernate.test.Container$ContainerInnerClass"> ! <property name="name" /> ! <many-to-one name="simple" cascade="all" /> ! <many-to-one name="one" cascade="all" not-null="true" /> ! <many-to-one name="many" cascade="all" not-null="true" /> </composite-element> </bag> <bag name="bag" inverse="true" cascade="save-update" table="CCBAG"> ! <key column="container_id" /> ! <many-to-many column="contained_id" class="net.sf.hibernate.test.Contained" outer-join="true" /> </bag> <bag name="lazyBag" inverse="true" lazy="true" table="LCCBAG" cascade="save-update"> <!--jcs-cache usage="read-write"--> ! <key column="container_id" /> ! <many-to-many column="contained_id" class="net.sf.hibernate.test.Contained" /> </bag> <map name="ternaryMap"> ! <key column="container_id" /> ! <index column="idx" type="string" length="32" /> <composite-element class="net.sf.hibernate.test.Container$Ternary"> ! <property name="name" /> ! <many-to-one name="foo" /> ! <many-to-one name="glarch" /> </composite-element> </map> <set name="ternarySet"> ! <key column="container_id" /> <composite-element class="net.sf.hibernate.test.Container$Ternary"> ! <property name="name" /> ! <many-to-one name="foo" /> ! <many-to-one name="glarch" /> </composite-element> </set> </class> <class name="net.sf.hibernate.test.Contained" proxy="net.sf.hibernate.test.Contained"> <id name="id" column="container_id" unsaved-value="0"> *************** *** 85,96 **** </id> <bag name="bag" table="CCBAG"> ! <key column="contained_id"/> ! <many-to-many column="container_id" class="net.sf.hibernate.test.Container" outer-join="false"/> </bag> <bag name="lazyBag" lazy="true" table="LCCBAG"> ! <key column="contained_id"/> ! <many-to-many column="container_id" class="net.sf.hibernate.test.Container"/> </bag> </class> - </hibernate-mapping> --- 79,89 ---- </id> <bag name="bag" table="CCBAG"> ! <key column="contained_id" /> ! <many-to-many column="container_id" class="net.sf.hibernate.test.Container" outer-join="false" /> </bag> <bag name="lazyBag" lazy="true" table="LCCBAG"> ! <key column="contained_id" /> ! <many-to-many column="container_id" class="net.sf.hibernate.test.Container" /> </bag> </class> </hibernate-mapping> Index: Vetoer.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Vetoer.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Vetoer.hbm.xml 6 Apr 2004 12:56:38 -0000 1.1 --- Vetoer.hbm.xml 6 Apr 2004 13:36:18 -0000 1.2 *************** *** 1,13 **** ! <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > ! <hibernate-mapping> ! ! <class name="net.sf.hibernate.test.Vetoer"> ! <id type="string" column="id_" length="32"> ! <generator class="uuid.hex"/> ! </id> ! <property name="name"/> ! <property name="strings"/> ! </class> ! </hibernate-mapping> \ No newline at end of file --- 1,10 ---- ! <?xml version="1.0" ?> ! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class name="net.sf.hibernate.test.Vetoer"> ! <id type="string" column="id_" length="32"> ! <generator class="uuid.hex" /> ! </id> ! <property name="name" /> ! <property name="strings" /> ! </class> </hibernate-mapping> \ No newline at end of file Index: Qux.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Qux.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Qux.hbm.xml 6 Apr 2004 12:56:38 -0000 1.1 --- Qux.hbm.xml 6 Apr 2004 13:36:18 -0000 1.2 *************** *** 1,33 **** ! <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > ! <hibernate-mapping> ! <class name="net.sf.hibernate.test.Qux" table="quux" proxy="net.sf.hibernate.test.Qux"> <!----> <id name="key" column="qux_key" unsaved-value="0"> ! <generator class="hilo"/> </id> <many-to-one name="foo" class="net.sf.hibernate.test.Foo"> ! <column name="foo" length="36"/> </many-to-one> ! <property name="deleted"/> ! <property name="loaded"/> ! <property name="stored"/> ! <property name="created"/> ! <property name="childKey" type="long"/> ! <property name="stuff"/> <set name="fums" lazy="true"> ! <key column="qux_id"/> <many-to-many class="net.sf.hibernate.test.Fum"> ! <column name="fum_string" length="10" not-null="true"/> ! <column name="fum_short" not-null="true"/> ! <column name="fum_date" not-null="true"/> </many-to-many> </set> <list name="moreFums" lazy="true"> ! <key column="qux_id"/> ! <index column="posn"/> ! <one-to-many class="net.sf.hibernate.test.Fum"/> </list> </class> - </hibernate-mapping> \ No newline at end of file --- 1,30 ---- ! <?xml version="1.0" ?> ! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> <class name="net.sf.hibernate.test.Qux" table="quux" proxy="net.sf.hibernate.test.Qux"> <!----> <id name="key" column="qux_key" unsaved-value="0"> ! <generator class="hilo" /> </id> <many-to-one name="foo" class="net.sf.hibernate.test.Foo"> ! <column name="foo" length="36" /> </many-to-one> ! <property name="deleted" /> ! <property name="loaded" /> ! <property name="stored" /> ! <property name="created" /> ! <property name="childKey" type="long" /> ! <property name="stuff" /> <set name="fums" lazy="true"> ! <key column="qux_id" /> <many-to-many class="net.sf.hibernate.test.Fum"> ! <column name="fum_string" length="10" not-null="true" /> ! <column name="fum_short" not-null="true" /> ! <column name="fum_date" not-null="true" /> </many-to-many> </set> <list name="moreFums" lazy="true"> ! <key column="qux_id" /> ! <index column="posn" /> ! <one-to-many class="net.sf.hibernate.test.Fum" /> </list> </class> </hibernate-mapping> \ No newline at end of file Index: Fo.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Fo.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Fo.hbm.xml 6 Apr 2004 12:56:38 -0000 1.1 --- Fo.hbm.xml 6 Apr 2004 13:36:17 -0000 1.2 *************** *** 1,19 **** ! <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > ! <hibernate-mapping> ! <class name="net.sf.hibernate.test.Fo" table="foes"> <composite-id class="net.sf.hibernate.test.FumCompositeID"> <key-property name="string"> ! <column name="string_" length="20"/> </key-property> ! <key-property name="short" column="short_"/> ! <key-property name="date" column="date_" type="date"/> </composite-id> ! <version name="version" type="long"/> ! <property name="serial" column="serial_"/> ! <property name="buf"/> ! <property name="x"/> </class> - </hibernate-mapping> \ No newline at end of file --- 1,16 ---- ! <?xml version="1.0" ?> ! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> <class name="net.sf.hibernate.test.Fo" table="foes"> <composite-id class="net.sf.hibernate.test.FumCompositeID"> <key-property name="string"> ! <column name="string_" length="20" /> </key-property> ! <key-property name="short" column="short_" /> ! <key-property name="date" column="date_" type="date" /> </composite-id> ! <version name="version" type="long" /> ! <property name="serial" column="serial_" /> ! <property name="buf" /> ! <property name="x" /> </class> </hibernate-mapping> \ No newline at end of file Index: Holder.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Holder.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Holder.hbm.xml 6 Apr 2004 12:56:38 -0000 1.1 --- Holder.hbm.xml 6 Apr 2004 13:36:18 -0000 1.2 *************** *** 1,8 **** ! <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > ! <hibernate-mapping> ! <class name="net.sf.hibernate.test.Holder"> <id name="id" column="id_" type="string" length="32" unsaved-value="null"> <generator class="uuid.hex"/> </id> <property name="name" unique="true" not-null="true" length="36"/> <list name="ones"> <key column="holder"/> <index column="i"/> <one-to-many class="net.sf.hibernate.test.One"/> </list> <array name="fooArray"> <key column="holder1"/> <index column="j1"/> ! <one-to-many class="net.sf.hibernate.test.Foo"/> </array> ! <set name="foos"> <key column="holder2"/> <one-to-many class="net.sf.hibernate.test.Foo"/> </set> </class> </hibernate-mapping> \ No newline at end of file --- 1,23 ---- ! <?xml version="1.0" ?> ! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class name="net.sf.hibernate.test.Holder"> ! <id name="id" column="id_" type="string" length="32" unsaved-value="null"> ! <generator class="uuid.hex" /> ! </id> ! <property name="name" unique="true" not-null="true" length="36" /> ! <list name="ones"> ! <key column="holder" /> ! <index column="i" /> ! <one-to-many class="net.sf.hibernate.test.One" /> ! </list> ! <array name="fooArray"> ! <key column="holder1" /> ! <index column="j1" /> ! <one-to-many class="net.sf.hibernate.test.Foo" /> </array> ! <set name="foos"> ! <key column="holder2" /> ! <one-to-many class="net.sf.hibernate.test.Foo" /> ! </set> ! </class> </hibernate-mapping> \ No newline at end of file Index: Fee.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Fee.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Fee.hbm.xml 6 Apr 2004 12:56:38 -0000 1.1 --- Fee.hbm.xml 6 Apr 2004 13:36:17 -0000 1.2 *************** *** 1,24 **** ! <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > ! <hibernate-mapping> ! ! <class name="net.sf.hibernate.test.Fee" table="`the fees`"> ! <id type="string" name="key" column="id_" length="64" unsaved-value="null"> ! <generator class="uuid.hex"/> ! </id> ! <property name="fi"/> ! <many-to-one name="fee"/> ! <many-to-one name="anotherFee"/> ! <many-to-one name="qux" cascade="all"/> ! <property name="count" column="count_"/> ! <set name="fees"> ! <key column="fee_id"/> ! <element column="str_" type="string"/> ! </set> ! <component name="compon" update="false"> ! <property name="name"/> ! <property name="null" column="null_prop"/> ! </component> ! </class> ! </hibernate-mapping> \ No newline at end of file --- 1,21 ---- ! <?xml version="1.0" ?> ! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class name="net.sf.hibernate.test.Fee" table="`the fees`"> ! <id type="string" name="key" column="id_" length="64" unsaved-value="null"> ! <generator class="uuid.hex" /> ! </id> ! <property name="fi" /> ! <many-to-one name="fee" /> ! <many-to-one name="anotherFee" /> ! <many-to-one name="qux" cascade="all" /> ! <property name="count" column="count_" /> ! <set name="fees"> ! <key column="fee_id" /> ! <element column="str_" type="string" /> ! </set> ! <component name="compon" update="false"> ! <property name="name" /> ! <property name="null" column="null_prop" /> ! </component> ! </class> </hibernate-mapping> \ No newline at end of file Index: Glarch.hbm.xml =================================================================== RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate.DomainModel/Glarch.hbm.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Glarch.hbm.xml 6 Apr 2004 12:56:38 -0000 1.1 --- Glarch.hbm.xml 6 Apr 2004 13:36:18 -0000 1.2 *************** *** 1,62 **** ! <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > ! <hibernate-mapping> ! ! <class name="net.sf.hibernate.test.Glarch" ! table="`glarchez`" ! proxy="net.sf.hibernate.test.GlarchProxy" ! dynamic-update="true"> ! <!--<jcs-cache usage="read-write"/>--> ! <id type="string" column="tha_key" length="32"> ! <generator class="uuid.hex"/> ! </id> ! <version name="version"/> ! <property name="name" column="namecvbnmasdf"/> ! <!-- <property name="currency"/> --> ! <many-to-one name="next" column="next_" class="net.sf.hibernate.test.Glarch"/> ! <property name="order" column="order_"/> ! <dynabean name="dynaBean" dynaclass="foo"> ! <property name="foo" type="string"/> ! <property name="bar" type="integer"/> ! </dynabean> ! <property name="x"/> ! <list name="strings"> ! <key column="glarch_key"/> ! <index column="`!@# i`"/> ! <element type="string" column="`tha_stryng`"/> ! </list> ! <list name="fooComponents" lazy="true" cascade="all"> ! <key column="glarch_key"/> ! <index column="tha_indecks"/> ! <composite-element class="net.sf.hibernate.test.FooComponent"> ! <property name="name" column="name_"/> ! <property name="count" column="count_"/> ! <nested-composite-element name="subcomponent" class="net.sf.hibernate.test.FooComponent"> ! <property name="name" column="x_"/> ! <property name="count" column="y_"/> ! </nested-composite-element> ! <many-to-one name="fee" cascade="all" outer-join="true"/> ! </composite-element> ! </list> ! <array name="proxyArray" element-class="net.sf.hibernate.test.GlarchProxy"> ! <key column="array_key"/> ! <index column="array_indecks"/> ! <one-to-many class="net.sf.hibernate.test.Glarch"/> ! </array> ! <set name="proxySet"> ! <key column="set_key"/> ! <one-to-many class="net.sf.hibernate.test.Glarch"/> ! </set> ! <property name="immutable" update="false"/> ! <property name="derivedVersion" insert="false" update="false" column="version"/> ! <property name="any" type="object"> ! <column name="`any_id of object`"/> ! <column name="`any_class of object`"/> ! </property> ! <property name="multiple" type="net.sf.hibernate.test.MultiplicityType"> ! <column name="count_"/> ! <column name="glarch_"/> ! </property> ! </class> ! </hibernate-mapping> \ No newline at end of file --- 1,57 ---- ! <?xml version="1.0" ?> ! <hibernate-mapping xmlns="urn:nhibernate-mapping-2.0"> ! <class name="net.sf.hibernate.test.Glarch" table="`glarchez`" proxy="net.sf.hibernate.test.GlarchProxy" ! dynamic-update="true"> ! <!--<jcs-cache usage="read-write"/>--> ! <id type="string" column="tha_key" length="32"> ! <generator class="uuid.hex" /> ! </id> ! <version name="version" /> ! <property name="name" column="namecvbnmasdf" /> ! <!-- <property name="currency"/> --> ! <many-to-one name="next" column="next_" class="net.sf.hibernate.test.Glarch" /> ! <property name="order" column="order_" /> ! <dynabean name="dynaBean" dynaclass="foo"> ! <property name="foo" type="string" /> ! <property name="bar" type="integer" /> ! </dynabean> ! <property name="x" /> ! <list name="strings"> ! <key column="glarch_key" /> ! <index column="`!@# i`" /> ! <element type="string" column="`tha_stryng`" /> ! </list> ! <list name="fooComponents" lazy="true" cascade="all"> ! <key column="glarch_key" /> ! <index column="tha_indecks" /> ! <composite-element class="net.sf.hibernate.test.FooComponent"> ! <property name="name" column="name_" /> ! <property name="count" column="count_" /> ! <nested-composite-element name="subcomponent" class="net.sf.hibernate.test.FooComponent"> ! <property name="name" column="x_" /> ! <property name="count" column="y_" /> ! </nested-composite-element> ! <many-to-one name="fee" cascade="all" outer-join="true" /> ! </composite-element> ! </list> ! <array name="proxyArray" element-class="net.sf.hibernate.test.GlarchProxy"> ! <key column="array_key" /> ! <index column="array_indecks" /> ! <one-to-many class="net.sf.hibernate.test.Glarch" /> ! </array> ! <set name="proxySet"> ! <key column="set_key" /> ! <one-to-many class="net.sf.hibernate.test.Glarch" /> ! </set> ! <property name="immutable" update="false" /> ! <property name="derivedVersion" insert="false" update="false" column="version" /> ! <property name="any" type="object"> ! <column name="`any_id of object`" /> ! <column name="`any_class of object`" /> ! </property> ! <property name="multiple" type="net.sf.hibernate.test.MultiplicityType"> ! <column name="count_" /> ! <column name="glarch_" /> ! </property> ! </class> </hibernate-mapping> \ No newline at end of file |