Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test In directory sc8-pr-cvs1:/tmp/cvs-serv26035/sf/hibernate/test Modified Files: ABC.hbm.xml ABCProxy.hbm.xml Category.hbm.xml Circular.hbm.xml Container.hbm.xml Custom.hbm.xml CustomPersister.java Fee.hbm.xml Fo.hbm.xml FooBarTest.java Fum.hbm.xml Fumm.hbm.xml Glarch.hbm.xml Glarch.java GlarchProxy.java Holder.hbm.xml Immutable.hbm.xml Location.hbm.xml Many.hbm.xml MasterDetail.hbm.xml Nameable.hbm.xml One.hbm.xml ParentChild.hbm.xml Qux.hbm.xml Simple.hbm.xml SingleSeveral.hbm.xml Stuff.hbm.xml Vetoer.hbm.xml Log Message: renamed 'mutable' to 'update' added 'insert' attribute removed old dtds Index: ABC.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/ABC.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ABC.hbm.xml 9 Jan 2003 12:24:51 -0000 1.2 --- ABC.hbm.xml 28 Jan 2003 10:22:21 -0000 1.3 *************** *** 1,4 **** <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-1.1.dtd" > <hibernate-mapping> --- 1,4 ---- <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > <hibernate-mapping> Index: ABCProxy.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/ABCProxy.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ABCProxy.hbm.xml 9 Jan 2003 12:24:51 -0000 1.2 --- ABCProxy.hbm.xml 28 Jan 2003 10:22:21 -0000 1.3 *************** *** 1,4 **** <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-1.1.dtd" > <hibernate-mapping> --- 1,4 ---- <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > <hibernate-mapping> Index: Category.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Category.hbm.xml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Category.hbm.xml 1 Jan 2003 13:56:46 -0000 1.1.1.1 --- Category.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2 *************** *** 1,18 **** <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-1.1.dtd" > <hibernate-mapping> <class name="net.sf.hibernate.test.Category" table="category"> ! <id name="id"> ! <generator class="native"/> ! </id> ! <list role="subcategories" lazy="true" cascade="all"> ! <key column="parent"/> ! <index column="ord"/> ! <one-to-many class="net.sf.hibernate.test.Category"/> ! </list> ! <property name="name"/> </class> --- 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.Category" table="category"> ! <id name="id" unsaved-value="0"> ! <generator class="native"/> ! </id> ! <list name="subcategories" lazy="true" cascade="all"> ! <key column="parent"/> ! <index column="ord"/> ! <one-to-many class="net.sf.hibernate.test.Category"/> ! </list> ! <property name="name"/> </class> Index: Circular.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Circular.hbm.xml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Circular.hbm.xml 1 Jan 2003 13:56:47 -0000 1.1.1.1 --- Circular.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2 *************** *** 1,4 **** <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping.dtd" > <hibernate-mapping default-cascade="save-update"> --- 1,4 ---- <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > <hibernate-mapping default-cascade="save-update"> Index: Container.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Container.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Container.hbm.xml 27 Jan 2003 07:12:04 -0000 1.2 --- Container.hbm.xml 28 Jan 2003 10:22:21 -0000 1.3 *************** *** 1,5 **** <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping.dtd" > <hibernate-mapping> --- 1,5 ---- <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > <hibernate-mapping> *************** *** 8,22 **** <generator class="native" /> </id> ! <list role="oneToMany" lazy="true"> <key column = "container_id1"/> <index column = "list_index"/> <one-to-many class="net.sf.hibernate.test.Simple"/> </list> ! <list role="manyToMany" lazy="true"> <key column = "container_id2"/> <index column = "list_index"/> <many-to-many class="net.sf.hibernate.test.Simple"/> </list> ! <list role="components" lazy="true"> <key column = "container_id"/> <index column = "list_index"/> --- 8,22 ---- <generator class="native" /> </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"/> *************** *** 28,32 **** </composite-element> </list> ! <set role="composites" lazy="true"> <key column = "container_id"/> <composite-element class="net.sf.hibernate.test.Container$ContainerInnerClass"> --- 28,32 ---- </composite-element> </list> ! <set name="composites" lazy="true"> <key column = "container_id"/> <composite-element class="net.sf.hibernate.test.Container$ContainerInnerClass"> *************** *** 37,49 **** </composite-element> </set> ! <bag role="bag" readonly="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 role="lazyBag" readonly="true" lazy="true" table="LCCBAG" cascade="save-update"> <key column="container_id"/> <many-to-many column="contained_id" class="net.sf.hibernate.test.Contained"/> </bag> ! <map role="ternaryMap"> <key column="container_id"/> <index column="idx" type="string" length="32"/> --- 37,49 ---- </composite-element> </set> ! <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"> <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"/> *************** *** 54,58 **** </composite-element> </map> ! <set role="ternarySet"> <key column="container_id"/> <composite-element class="net.sf.hibernate.test.Container$Ternary"> --- 54,58 ---- </composite-element> </map> ! <set name="ternarySet"> <key column="container_id"/> <composite-element class="net.sf.hibernate.test.Container$Ternary"> *************** *** 68,76 **** <generator class="native" /> </id> ! <bag role="bag" table="CCBAG"> <key column="contained_id"/> <many-to-many column="container_id" class="net.sf.hibernate.test.Container" outer-join="false"/> </bag> ! <bag role="lazyBag" lazy="true" table="LCCBAG"> <key column="contained_id"/> <many-to-many column="container_id" class="net.sf.hibernate.test.Container"/> --- 68,76 ---- <generator class="native" /> </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"/> Index: Custom.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Custom.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Custom.hbm.xml 9 Jan 2003 12:24:51 -0000 1.2 --- Custom.hbm.xml 28 Jan 2003 10:22:21 -0000 1.3 *************** *** 1,4 **** <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping.dtd" > <hibernate-mapping> --- 1,4 ---- <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > <hibernate-mapping> Index: CustomPersister.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/CustomPersister.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CustomPersister.java 24 Jan 2003 16:16:00 -0000 1.5 --- CustomPersister.java 28 Jan 2003 10:22:21 -0000 1.6 *************** *** 438,442 **** * @see net.sf.hibernate.persister.ClassPersister#getPropertyMutability() */ ! public boolean[] getPropertyMutability() { return MUTABILITY; } --- 438,449 ---- * @see net.sf.hibernate.persister.ClassPersister#getPropertyMutability() */ ! public boolean[] getPropertyUpdateability() { ! return MUTABILITY; ! } ! ! /** ! * @see net.sf.hibernate.persister.ClassPersister#getPropertyInsertability() ! */ ! public boolean[] getPropertyInsertability() { return MUTABILITY; } Index: Fee.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Fee.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Fee.hbm.xml 9 Jan 2003 12:24:51 -0000 1.2 --- Fee.hbm.xml 28 Jan 2003 10:22:21 -0000 1.3 *************** *** 1,4 **** <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping.dtd" > <hibernate-mapping> --- 1,4 ---- <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > <hibernate-mapping> *************** *** 11,15 **** <many-to-one name="anotherFee"/> <many-to-one name="qux" cascade="all"/> ! <set role="fees"> <key column="fee_id"/> <element column="str_" type="string"/> --- 11,15 ---- <many-to-one name="anotherFee"/> <many-to-one name="qux" cascade="all"/> ! <set name="fees"> <key column="fee_id"/> <element column="str_" type="string"/> Index: Fo.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Fo.hbm.xml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Fo.hbm.xml 1 Jan 2003 13:56:52 -0000 1.1.1.1 --- Fo.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2 *************** *** 1,4 **** <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-1.1.dtd" > <hibernate-mapping> --- 1,4 ---- <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > <hibernate-mapping> Index: FooBarTest.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/FooBarTest.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** FooBarTest.java 26 Jan 2003 01:33:36 -0000 1.15 --- FooBarTest.java 28 Jan 2003 10:22:21 -0000 1.16 *************** *** 1238,1241 **** --- 1238,1242 ---- g2 = (GlarchProxy) s.load( Glarch.class, g2id ); assertTrue( g.getVersion()==1, "version" ); + assertTrue( g.getDerivedVersion()==1, "version" ); assertTrue( g2.getVersion()==0, "version" ); g.setName("foo"); *************** *** 1252,1255 **** --- 1253,1257 ---- g2 = (GlarchProxy) s.load( Glarch.class, g2id ); assertTrue( g.getVersion()==3, "version" ); + assertTrue( g.getDerivedVersion()==3, "version" ); assertTrue( g2.getVersion()==0, "version" ); g.setNext(null); Index: Fum.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Fum.hbm.xml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Fum.hbm.xml 1 Jan 2003 13:57:05 -0000 1.1.1.1 --- Fum.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2 *************** *** 1,8 **** <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-1.1.dtd" > <hibernate-mapping> <class name="net.sf.hibernate.test.Fum"> ! <composite-id name="id"> <key-property name="string"> <column name="string_" length="10"/> --- 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.Fum"> ! <composite-id name="id" unsaved-value="any"> <key-property name="string"> <column name="string_" length="10"/> *************** *** 17,21 **** <column name="fo_date"/> </many-to-one> ! <set role="friends"> <key> <column name="fr_string" length="10"/> --- 17,21 ---- <column name="fo_date"/> </many-to-one> ! <set name="friends"> <key> <column name="fr_string" length="10"/> *************** *** 25,29 **** <one-to-many class="net.sf.hibernate.test.Fum"/> </set> ! <array role="quxArray"> <key> <column name="fum_str_" length="10"/> --- 25,29 ---- <one-to-many class="net.sf.hibernate.test.Fum"/> </set> ! <array name="quxArray"> <key> <column name="fum_str_" length="10"/> Index: Fumm.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Fumm.hbm.xml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Fumm.hbm.xml 1 Jan 2003 13:57:05 -0000 1.1.1.1 --- Fumm.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2 *************** *** 1,4 **** <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-1.1.dtd" > <hibernate-mapping> --- 1,4 ---- <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > <hibernate-mapping> Index: Glarch.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Glarch.hbm.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Glarch.hbm.xml 24 Jan 2003 16:16:01 -0000 1.3 --- Glarch.hbm.xml 28 Jan 2003 10:22:21 -0000 1.4 *************** *** 44,48 **** <one-to-many class="net.sf.hibernate.test.Glarch"/> </set> ! <property name="immutable" mutable="false"/> </class> --- 44,49 ---- <one-to-many class="net.sf.hibernate.test.Glarch"/> </set> ! <property name="immutable" update="false"/> ! <property name="derivedVersion" insert="false" update="false" column="version"/> </class> Index: Glarch.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Glarch.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Glarch.java 24 Jan 2003 16:16:02 -0000 1.5 --- Glarch.java 28 Jan 2003 10:22:21 -0000 1.6 *************** *** 31,34 **** --- 31,35 ---- private transient DynaBean dynaBean; private String immutable; + private int derivedVersion; public int getVersion() { *************** *** 174,177 **** --- 175,194 ---- public void setImmutable(String immutable) { this.immutable = immutable; + } + + /** + * Returns the derivedVersion. + * @return int + */ + public int getDerivedVersion() { + return derivedVersion; + } + + /** + * Sets the derivedVersion. + * @param derivedVersion The derivedVersion to set + */ + public void setDerivedVersion(int derivedVersion) { + this.derivedVersion = derivedVersion; } Index: GlarchProxy.java =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/GlarchProxy.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** GlarchProxy.java 19 Jan 2003 11:47:08 -0000 1.4 --- GlarchProxy.java 28 Jan 2003 10:22:21 -0000 1.5 *************** *** 10,13 **** --- 10,14 ---- public int getVersion(); + public int getDerivedVersion(); public void setVersion(int version); Index: Holder.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Holder.hbm.xml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Holder.hbm.xml 1 Jan 2003 13:57:07 -0000 1.1.1.1 --- Holder.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2 *************** *** 1,8 **** <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping.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 role="ones"> <key column="holder" type="string"/> <index column="i"/> <one-to-many class="net.sf.hibernate.test.One"/> </list> <array role="fooArray"> <key column="holder1" type="string"/> <index column="j1"/> <one-to-many class="net.sf.hibernate.test.Foo"/> </array> ! <set role="foos"> <key column="holder2" type="string"/> <one-to-many class="net.sf.hibernate.test.Foo"/> </set> </class> </hibernate-mapping> --- 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> Index: Immutable.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Immutable.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Immutable.hbm.xml 27 Jan 2003 07:12:04 -0000 1.2 --- Immutable.hbm.xml 28 Jan 2003 10:22:21 -0000 1.3 *************** *** 1,4 **** <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping.dtd" > <hibernate-mapping> --- 1,4 ---- <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > <hibernate-mapping> Index: Location.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Location.hbm.xml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Location.hbm.xml 1 Jan 2003 13:57:08 -0000 1.1.1.1 --- Location.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2 *************** *** 1,4 **** <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-1.1.dtd" > <hibernate-mapping> --- 1,4 ---- <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > <hibernate-mapping> Index: Many.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Many.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Many.hbm.xml 9 Jan 2003 12:24:51 -0000 1.2 --- Many.hbm.xml 28 Jan 2003 10:22:21 -0000 1.3 *************** *** 1,5 **** <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping.dtd" > <hibernate-mapping> --- 1,5 ---- <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > <hibernate-mapping> Index: MasterDetail.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/MasterDetail.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MasterDetail.hbm.xml 9 Jan 2003 15:15:37 -0000 1.2 --- MasterDetail.hbm.xml 28 Jan 2003 10:22:21 -0000 1.3 *************** *** 1,4 **** <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping.dtd" > <hibernate-mapping> --- 1,4 ---- <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > <hibernate-mapping> *************** *** 12,28 **** <column name="big_dec" sql-type="DECIMAL(5,3)"/> </property> ! <set role="details" readonly="true" lazy="true" order-by="i asc"> <key column="master_key"/> <one-to-many class="net.sf.hibernate.test.Detail"/> </set> ! <set role="moreDetails" cascade="all" lazy="true" order-by="i desc"> <key column="more_master_key"/> <one-to-many class="net.sf.hibernate.test.Detail"/> </set> ! <set role="incoming" lazy="true" table="mtm"> <key column="outg"/> <many-to-many class="net.sf.hibernate.test.Master" column="incm"/> </set> ! <set role="outgoing" lazy="true" table="mtm" readonly="true"> <key column="incm"/> <many-to-many class="net.sf.hibernate.test.Master" column="outg"/> --- 12,28 ---- <column name="big_dec" sql-type="DECIMAL(5,3)"/> </property> ! <set name="details" inverse="true" lazy="true" order-by="i asc"> <key column="master_key"/> <one-to-many class="net.sf.hibernate.test.Detail"/> </set> ! <set name="moreDetails" cascade="all" lazy="true" order-by="i desc"> <key column="more_master_key"/> <one-to-many class="net.sf.hibernate.test.Detail"/> </set> ! <set name="incoming" lazy="true" table="mtm"> <key column="outg"/> <many-to-many class="net.sf.hibernate.test.Master" column="incm"/> </set> ! <set name="outgoing" lazy="true" table="mtm" inverse="true"> <key column="incm"/> <many-to-many class="net.sf.hibernate.test.Master" column="outg"/> *************** *** 38,42 **** <many-to-one name="master" column="master_key"/> <!--not-null="true"--> <!-- <cache timeout="10000" type="readwrite"/> --> ! <set role="subDetails" lazy="true" cascade="all"> <key column="detail_key"/> <one-to-many class="net.sf.hibernate.test.SubDetail"/> --- 38,42 ---- <many-to-one name="master" column="master_key"/> <!--not-null="true"--> <!-- <cache timeout="10000" type="readwrite"/> --> ! <set name="subDetails" lazy="true" cascade="all"> <key column="detail_key"/> <one-to-many class="net.sf.hibernate.test.SubDetail"/> Index: Nameable.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Nameable.hbm.xml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Nameable.hbm.xml 1 Jan 2003 13:57:12 -0000 1.1.1.1 --- Nameable.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2 *************** *** 1,4 **** <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-1.1.dtd" > <hibernate-mapping> --- 1,4 ---- <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > <hibernate-mapping> Index: One.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/One.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** One.hbm.xml 9 Jan 2003 12:24:51 -0000 1.2 --- One.hbm.xml 28 Jan 2003 10:22:21 -0000 1.3 *************** *** 1,5 **** <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping.dtd" > <hibernate-mapping> --- 1,5 ---- <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > <hibernate-mapping> *************** *** 9,13 **** </id> <property column="one_value" name="value"/> ! <set role="manies" readonly="true" lazy="true"> <key column="one_key"/> <one-to-many class="net.sf.hibernate.test.Many"/> --- 9,13 ---- </id> <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"/> Index: ParentChild.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/ParentChild.hbm.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ParentChild.hbm.xml 9 Jan 2003 12:24:51 -0000 1.2 --- ParentChild.hbm.xml 28 Jan 2003 10:22:21 -0000 1.3 *************** *** 1,4 **** <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping.dtd" > <hibernate-mapping> --- 1,4 ---- <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > <hibernate-mapping> Index: Qux.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Qux.hbm.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Qux.hbm.xml 27 Jan 2003 12:12:41 -0000 1.3 --- Qux.hbm.xml 28 Jan 2003 10:22:21 -0000 1.4 *************** *** 1,4 **** <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping.dtd" > <hibernate-mapping> --- 1,4 ---- <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > <hibernate-mapping> *************** *** 16,20 **** <property name="childKey" type="long"/> <property name="stuff"/> ! <set role="fums" lazy="true"> <key column="qux_id"/> <many-to-many class="net.sf.hibernate.test.Fum"> --- 16,20 ---- <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"> *************** *** 24,28 **** </many-to-many> </set> ! <list role="moreFums" lazy="true"> <key column="qux_id"/> <index column="posn"/> --- 24,28 ---- </many-to-many> </set> ! <list name="moreFums" lazy="true"> <key column="qux_id"/> <index column="posn"/> Index: Simple.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Simple.hbm.xml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Simple.hbm.xml 1 Jan 2003 13:57:18 -0000 1.1.1.1 --- Simple.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2 *************** *** 1,4 **** <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping.dtd"> <hibernate-mapping> --- 1,4 ---- <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd"> <hibernate-mapping> Index: SingleSeveral.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/SingleSeveral.hbm.xml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** SingleSeveral.hbm.xml 1 Jan 2003 13:57:18 -0000 1.1.1.1 --- SingleSeveral.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2 *************** *** 1,5 **** <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-1.1.dtd" > <hibernate-mapping> --- 1,5 ---- <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > <hibernate-mapping> *************** *** 11,15 **** </composite-id> <property name="prop"/> ! <bag role="several" readonly="true" lazy="false" cascade="all"> <!--important: test for bidirectional with lazy="false" --> <key> <column name="single_id" not-null="true"/> --- 11,15 ---- </composite-id> <property name="prop"/> ! <bag name="several" inverse="true" lazy="false" cascade="all"> <!--important: test for bidirectional with lazy="false" --> <key> <column name="single_id" not-null="true"/> Index: Stuff.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Stuff.hbm.xml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Stuff.hbm.xml 1 Jan 2003 13:57:19 -0000 1.1.1.1 --- Stuff.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2 *************** *** 1,4 **** <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-1.1.dtd" > <hibernate-mapping> --- 1,4 ---- <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > <hibernate-mapping> *************** *** 9,13 **** </composite-id> <property name="name"/> ! <bag role="stuffs" readonly="true" lazy="false" cascade="all"> <key> <!--unfortunately have to specify not-null here because of limitation in schema export....--> --- 9,13 ---- </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....--> Index: Vetoer.hbm.xml =================================================================== RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Vetoer.hbm.xml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Vetoer.hbm.xml 1 Jan 2003 13:57:21 -0000 1.1.1.1 --- Vetoer.hbm.xml 28 Jan 2003 10:22:21 -0000 1.2 *************** *** 1,4 **** <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping.dtd" > <hibernate-mapping> --- 1,4 ---- <?xml version="1.0"?> ! <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > <hibernate-mapping> |