[Hibernate-commits] Hibernate/cirrus/hibernate/test Baz.hbm.xml,1.19,1.20 Multi.hbm.xml,1.12,1.13

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/test
In directory usw-pr-cvs1:/tmp/cvs-serv22899/cirrus/hibernate/test

Modified Files:
	Baz.hbm.xml Multi.hbm.xml 
Log Message:
updates to hibernate-mapping-1.1.dtd and documentation

Index: Baz.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Baz.hbm.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Baz.hbm.xml	22 Oct 2002 11:53:32 -0000	1.19
--- Baz.hbm.xml	5 Nov 2002 13:40:53 -0000	1.20
***************
*** 5,18 ****
  	<set role="stringSet" lazy="true" sort="natural">
  		<!--<jcs-cache usage="read-write"/>-->
! 		<key column="id_" type="string" length="32">
    			<generator class="uuid.hex"/>
! 		</key>
  		<element column="element" type="string" not-null="true"/>
  	</set>
  
  	<map role="stringDateMap" lazy="true" sort="cirrus.hibernate.test.ReverseComparator">
! 		<key column="id_" type="string" length="32">
    			<generator class="uuid.hex"/>
! 		</key>
  		<index column="map_key" type="string" length="32"/>
  		<element column="map_value" type="date"/>
--- 5,18 ----
  	<set role="stringSet" lazy="true" sort="natural">
  		<!--<jcs-cache usage="read-write"/>-->
! 		<generated-key column="id_" type="string" length="32">
    			<generator class="uuid.hex"/>
! 		</generated-key>
  		<element column="element" type="string" not-null="true"/>
  	</set>
  
  	<map role="stringDateMap" lazy="true" sort="cirrus.hibernate.test.ReverseComparator">
! 		<generated-key column="id_" type="string" length="32">
    			<generator class="uuid.hex"/>
! 		</generated-key>
  		<index column="map_key" type="string" length="32"/>
  		<element column="map_value" type="date"/>
***************
*** 21,27 ****
  	<array role="fooArray" element-class="cirrus.hibernate.test.FooProxy">
  		<!--<jcs-cache usage="read-write"/>-->
! 		<key column="id_" type="string" length="32">
    			<generator class="uuid.hex"/>
! 		</key>
  		<index column="i"/>
  		<many-to-many class="cirrus.hibernate.test.Foo">
--- 21,27 ----
  	<array role="fooArray" element-class="cirrus.hibernate.test.FooProxy">
  		<!--<jcs-cache usage="read-write"/>-->
! 		<generated-key column="id_" type="string" length="32">
    			<generator class="uuid.hex"/>
! 		</generated-key>
  		<index column="i"/>
  		<many-to-many class="cirrus.hibernate.test.Foo">
***************
*** 31,37 ****
  
  	<array role="stringArray">
! 		<key column="id_" type="long">
    			<generator class="hilo.long"/>
! 		</key>
  		<index column="i"/>
  		<element column="name" type="string"/>
--- 31,37 ----
  
  	<array role="stringArray">
! 		<generated-key column="id_" type="long">
    			<generator class="hilo.long"/>
! 		</generated-key>
  		<index column="i"/>
  		<element column="name" type="string"/>
***************
*** 39,48 ****
  
  	<array role="setArray" table="set_array">
! 		<key column="id_" type="long">
    			<generator class="hilo.long">
    				<param>uid_gen</param>
    				<param>uid_hi</param>
    			</generator>
! 		</key>
  		<index column="i"/>
  		<subcollection column="names_" length="32" role="stringSet" not-null="true" unique="true"/>
--- 39,48 ----
  
  	<array role="setArray" table="set_array">
! 		<generated-key column="id_" type="long">
    			<generator class="hilo.long">
    				<param>uid_gen</param>
    				<param>uid_hi</param>
    			</generator>
! 		</generated-key>
  		<index column="i"/>
  		<subcollection column="names_" length="32" role="stringSet" not-null="true" unique="true"/>
***************
*** 50,56 ****
  
  	<map role="stringArrayMap" table="str_array_map" lazy="true">
! 		<key column="id_" type="string" length="32">
    			<generator class="uuid.hex"/>
! 		</key>
  		<index column="map_key" type="string" length="32"/>
  		<subcollection column="map_value" role="stringArray"/>
--- 50,56 ----
  
  	<map role="stringArrayMap" table="str_array_map" lazy="true">
! 		<generated-key column="id_" type="string" length="32">
    			<generator class="uuid.hex"/>
! 		</generated-key>
  		<index column="map_key" type="string" length="32"/>
  		<subcollection column="map_value" role="stringArray"/>
***************
*** 58,64 ****
  
  	<list role="setList" table="set_list" lazy="true">
! 		<key column="id_" type="string" length="32">
    			<generator class="uuid.hex"/>
! 		</key>
  		<index column="i"/>
  		<subcollection column="element" role="stringSet"/>
--- 58,64 ----
  
  	<list role="setList" table="set_list" lazy="true">
! 		<generated-key column="id_" type="string" length="32">
    			<generator class="uuid.hex"/>
! 		</generated-key>
  		<index column="i"/>
  		<subcollection column="element" role="stringSet"/>
***************
*** 66,72 ****
  	
  	<list role="anotherSetList" table="set_list_2" lazy="true">
! 		<key column="id_" type="long">
    			<generator class="hilo.long"/>
! 		</key>
  		<index column="i"/>
  		<subcollection column="element" role="stringSet"/>
--- 66,72 ----
  	
  	<list role="anotherSetList" table="set_list_2" lazy="true">
! 		<generated-key column="id_" type="long">
    			<generator class="hilo.long"/>
! 		</generated-key>
  		<index column="i"/>
  		<subcollection column="element" role="stringSet"/>
***************
*** 74,80 ****
  	
  	<list role="customs">
! 		<key column="id_" type="long">
    			<generator class="hilo.long"/>
! 		</key>
  		<index column="indx"/>
  		<element type="cirrus.hibernate.test.DoubleStringType">
--- 74,80 ----
  	
  	<list role="customs">
! 		<generated-key column="id_" type="long">
    			<generator class="hilo.long"/>
! 		</generated-key>
  		<index column="indx"/>
  		<element type="cirrus.hibernate.test.DoubleStringType">
***************
*** 86,92 ****
  	<array role="baz_dates">
  		<!--<jcs-cache usage="read-write"/>-->
! 		<key column="id_" type="long">
  			<generator class="hilo.long"/>
! 		</key>
  		<index column="i"/>
  		<element type="date" column="the_date"/>
--- 86,92 ----
  	<array role="baz_dates">
  		<!--<jcs-cache usage="read-write"/>-->
! 		<generated-key column="id_" type="long">
  			<generator class="hilo.long"/>
! 		</generated-key>
  		<index column="i"/>
  		<element type="date" column="the_date"/>
***************
*** 95,101 ****
  	<list role="components" table="topcomponents">
  		<!--<jcs-cache usage="read-write"/>-->
! 		<key column="id_" type="long">
  			<generator class="hilo.long"/>
! 		</key>
  		<index column="i"/>
  		<composite-element class="cirrus.hibernate.test.FooComponent">
--- 95,101 ----
  	<list role="components" table="topcomponents">
  		<!--<jcs-cache usage="read-write"/>-->
! 		<generated-key column="id_" type="long">
  			<generator class="hilo.long"/>
! 		</generated-key>
  		<index column="i"/>
  		<composite-element class="cirrus.hibernate.test.FooComponent">
***************
*** 107,120 ****
  	
  	<set role="topbar">
! 		<key column="idtopbar" type="string" length="32">
  			<generator class="uuid.hex"/>
! 		</key>
  		<one-to-many class = "cirrus.hibernate.test.Bar"/>
  	</set>
  
  	<map role="topglarch">
! 		<key column="idtopglarch" type="string">
  			<generator class="uuid.hex"/>
! 		</key>
  		<index column="mapkey" type="character"/>
  		<one-to-many class = "cirrus.hibernate.test.Glarch"/>
--- 107,120 ----
  	
  	<set role="topbar">
! 		<generated-key column="idtopbar" type="string" length="32">
  			<generator class="uuid.hex"/>
! 		</generated-key>
  		<one-to-many class = "cirrus.hibernate.test.Bar"/>
  	</set>
  
  	<map role="topglarch">
! 		<generated-key column="idtopglarch" type="string">
  			<generator class="uuid.hex"/>
! 		</generated-key>
  		<index column="mapkey" type="character"/>
  		<one-to-many class = "cirrus.hibernate.test.Glarch"/>

Index: Multi.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Multi.hbm.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Multi.hbm.xml	5 Nov 2002 10:42:52 -0000	1.12
--- Multi.hbm.xml	5 Nov 2002 13:40:53 -0000	1.13
***************
*** 13,17 ****
          
  	    <joined-subclass name="cirrus.hibernate.test.LessSimple" table="subclass">
! 	        <superclass-key column="id_"/>
  	        <property name="intprop" not-null="true"/>
  	        <one-to-one name="other" class="cirrus.hibernate.test.LessSimple"/>
--- 13,17 ----
          
  	    <joined-subclass name="cirrus.hibernate.test.LessSimple" table="subclass">
! 	        <key column="id_"/>
  	        <property name="intprop" not-null="true"/>
  	        <one-to-one name="other" class="cirrus.hibernate.test.LessSimple"/>
***************
*** 26,35 ****
  	    
  	    <joined-subclass name="cirrus.hibernate.test.Multi" table="nuthasubclass">
! 	    	<superclass-key column="sid"/>
  	        <property name="extraProp"/>
  	        <many-to-one name="other" column="other2" class="cirrus.hibernate.test.Multi" />
  	        
  	        <joined-subclass name="cirrus.hibernate.test.SubMulti" table="submulti">
! 	        	<superclass-key column="sid"/>
  	        	<property name="amount"/>
  	        </joined-subclass>
--- 26,35 ----
  	    
  	    <joined-subclass name="cirrus.hibernate.test.Multi" table="nuthasubclass">
! 	    	<key column="sid"/>
  	        <property name="extraProp"/>
  	        <many-to-one name="other" column="other2" class="cirrus.hibernate.test.Multi" />
  	        
  	        <joined-subclass name="cirrus.hibernate.test.SubMulti" table="submulti">
! 	        	<key column="sid"/>
  	        	<property name="amount"/>
  	        </joined-subclass>