hibernate-commits

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

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test
In directory sc8-pr-cvs1:/tmp/cvs-serv3374/hibernate/test

Modified Files:
	ABC.hbm.xml ABCProxy.hbm.xml Baz.hbm.xml Blobber.hbm.xml 
	Blobber.java Category.hbm.xml Circular.hbm.xml 
	Container.hbm.xml Custom.hbm.xml Fee.hbm.xml Fo.hbm.xml 
	FooBar.hbm.xml Fum.hbm.xml Fumm.hbm.xml Glarch.hbm.xml 
	Holder.hbm.xml Immutable.hbm.xml Location.hbm.xml Many.hbm.xml 
	MasterDetail.hbm.xml Multi.hbm.xml Nameable.hbm.xml 
	One.hbm.xml ParentChild.hbm.xml ParentChildTest.java 
	Qux.hbm.xml Simple.hbm.xml SingleSeveral.hbm.xml Stuff.hbm.xml 
	Vetoer.hbm.xml 
Log Message:
re-reworked import functionality

Index: ABC.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/ABC.hbm.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ABC.hbm.xml	29 Mar 2003 04:08:48 -0000	1.5
--- ABC.hbm.xml	29 Mar 2003 07:36:22 -0000	1.6
***************
*** 3,7 ****
  <hibernate-mapping>
  
! 	<class name="net.sf.hibernate.test.A" import="A" discriminator-value="0">
  		<id name = "id" unsaved-value = "null">
  			<generator class="vm"/>
--- 3,7 ----
  <hibernate-mapping>
  
! 	<class name="net.sf.hibernate.test.A" discriminator-value="0">
  		<id name = "id" unsaved-value = "null">
  			<generator class="vm"/>
***************
*** 9,13 ****
  		<discriminator column="clazz" type="integer" not-null="false"/>
  		<property name="name"/>
! 		<subclass name="net.sf.hibernate.test.B" import="B" discriminator-value="-1">
  			<property name="count" column="count_"/>
  			<subclass name="net.sf.hibernate.test.C1" discriminator-value="null">
--- 9,13 ----
  		<discriminator column="clazz" type="integer" not-null="false"/>
  		<property name="name"/>
! 		<subclass name="net.sf.hibernate.test.B" discriminator-value="-1">
  			<property name="count" column="count_"/>
  			<subclass name="net.sf.hibernate.test.C1" discriminator-value="null">
***************
*** 21,25 ****
  	</class>
  
! 	<class name="net.sf.hibernate.test.D" discriminator-value="0" import="D" proxy="net.sf.hibernate.test.D">
  		<id name = "id" unsaved-value = "null">
  			<generator class="assigned"/>
--- 21,25 ----
  	</class>
  
! 	<class name="net.sf.hibernate.test.D" discriminator-value="0" proxy="net.sf.hibernate.test.D">
  		<id name = "id" unsaved-value = "null">
  			<generator class="assigned"/>

Index: ABCProxy.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/ABCProxy.hbm.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ABCProxy.hbm.xml	29 Mar 2003 04:08:48 -0000	1.6
--- ABCProxy.hbm.xml	29 Mar 2003 07:36:22 -0000	1.7
***************
*** 3,7 ****
  <hibernate-mapping>
  
! 	<class name="net.sf.hibernate.test.A" discriminator-value="0" import="A" proxy="net.sf.hibernate.test.A">
  		<id name = "id" unsaved-value = "null">
  			<generator class="vm"/>
--- 3,7 ----
  <hibernate-mapping>
  
! 	<class name="net.sf.hibernate.test.A" discriminator-value="0" proxy="net.sf.hibernate.test.A">
  		<id name = "id" unsaved-value = "null">
  			<generator class="vm"/>
***************
*** 9,19 ****
  		<discriminator column="clazz" type="integer" force="true" not-null="false"/>
  		<property name="name"/>
! 		<subclass name="net.sf.hibernate.test.B" discriminator-value="null" import="B" proxy="net.sf.hibernate.test.B">
  			<property name="count" column="count_"/>
! 			<subclass name="net.sf.hibernate.test.C1" discriminator-value="1" import="C1" proxy="net.sf.hibernate.test.C1">
  				<property name="address" column="c1"/>
  				<one-to-one name="d"/>
  			</subclass>
! 			<subclass name="net.sf.hibernate.test.C2" discriminator-value="2" import="C2" proxy="net.sf.hibernate.test.C2">
  				<property name="address" column="c2"/>
  			</subclass>
--- 9,19 ----
  		<discriminator column="clazz" type="integer" force="true" not-null="false"/>
  		<property name="name"/>
! 		<subclass name="net.sf.hibernate.test.B" discriminator-value="null" proxy="net.sf.hibernate.test.B">
  			<property name="count" column="count_"/>
! 			<subclass name="net.sf.hibernate.test.C1" discriminator-value="1" proxy="net.sf.hibernate.test.C1">
  				<property name="address" column="c1"/>
  				<one-to-one name="d"/>
  			</subclass>
! 			<subclass name="net.sf.hibernate.test.C2" discriminator-value="2" proxy="net.sf.hibernate.test.C2">
  				<property name="address" column="c2"/>
  			</subclass>
***************
*** 21,25 ****
  	</class>
  
! 	<class name="net.sf.hibernate.test.D" discriminator-value="0" proxy="net.sf.hibernate.test.D" import="D">
  		<id name = "id" unsaved-value = "null">
  			<generator class="assigned"/>
--- 21,25 ----
  	</class>
  
! 	<class name="net.sf.hibernate.test.D" discriminator-value="0" proxy="net.sf.hibernate.test.D">
  		<id name = "id" unsaved-value = "null">
  			<generator class="assigned"/>

Index: Baz.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Baz.hbm.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Baz.hbm.xml	29 Mar 2003 04:08:49 -0000	1.13
--- Baz.hbm.xml	29 Mar 2003 07:36:22 -0000	1.14
***************
*** 3,7 ****
  <hibernate-mapping>
  
! 	<class name="net.sf.hibernate.test.Baz" import="Baz" >
  		<id name="code" type="string">
  			<column name="baz_id" length="32"/>
--- 3,7 ----
  <hibernate-mapping>
  
! 	<class name="net.sf.hibernate.test.Baz">
  		<id name="code" type="string">
  			<column name="baz_id" length="32"/>

Index: Blobber.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Blobber.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Blobber.hbm.xml	29 Mar 2003 04:08:49 -0000	1.2
--- Blobber.hbm.xml	29 Mar 2003 07:36:22 -0000	1.3
***************
*** 2,6 ****
  <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
  <hibernate-mapping>
! 	<class name="net.sf.hibernate.test.Blobber" import="Blobber" dynamic-update="true">
  		<id name="id">
  			<generator class="hilo"/>
--- 2,6 ----
  <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
  <hibernate-mapping>
! 	<class name="net.sf.hibernate.test.Blobber" dynamic-update="true">
  		<id name="id">
  			<generator class="hilo"/>

Index: Blobber.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Blobber.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Blobber.java	15 Feb 2003 01:00:56 -0000	1.1
--- Blobber.java	29 Mar 2003 07:36:22 -0000	1.2
***************
*** 4,15 ****
  import java.sql.Clob;
  
- /**
-  * @author Administrator
-  *
-  * To change this generated comment edit the template variable "typecomment":
-  * Window>Preferences>Java>Templates.
-  * To enable and disable the creation of type comments go to
-  * Window>Preferences>Java>Code Generation.
-  */
  public class Blobber {
  	private int id;
--- 4,7 ----

Index: Category.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Category.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Category.hbm.xml	29 Mar 2003 04:08:49 -0000	1.3
--- Category.hbm.xml	29 Mar 2003 07:36:22 -0000	1.4
***************
*** 3,7 ****
  <hibernate-mapping>
  
! <class name="net.sf.hibernate.test.Category" import="Category" table="category">
  	<id name="id" unsaved-value="0">
  		<generator class="native"/>
--- 3,7 ----
  <hibernate-mapping>
  
! <class name="net.sf.hibernate.test.Category" table="category">
  	<id name="id" unsaved-value="0">
  		<generator class="native"/>

Index: Circular.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Circular.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Circular.hbm.xml	29 Mar 2003 04:08:49 -0000	1.3
--- Circular.hbm.xml	29 Mar 2003 07:36:22 -0000	1.4
***************
*** 3,7 ****
  <hibernate-mapping default-cascade="save-update">
  
!     <class name="net.sf.hibernate.test.Circular" import="Circular" >
          <id name="id" column="id_" length="64" unsaved-value="null">
              <generator class="uuid.hex"/>
--- 3,7 ----
  <hibernate-mapping default-cascade="save-update">
  
!     <class name="net.sf.hibernate.test.Circular">
          <id name="id" column="id_" length="64" unsaved-value="null">
              <generator class="uuid.hex"/>

Index: Container.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Container.hbm.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Container.hbm.xml	29 Mar 2003 04:08:49 -0000	1.6
--- Container.hbm.xml	29 Mar 2003 07:36:22 -0000	1.7
***************
*** 3,8 ****
  <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
  
! <hibernate-mapping>
! 	<class name="net.sf.hibernate.test.Container" import="Container" proxy="net.sf.hibernate.test.Container">
  		<id name="id" column="container_id">
  			<generator class="native" />
--- 3,13 ----
  <!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">
  			<generator class="native" />
***************
*** 74,78 ****
  	</class>
  	
! 	<class name="net.sf.hibernate.test.Contained" import="Contained" proxy="net.sf.hibernate.test.Contained">
  		<id name="id" column="container_id" unsaved-value="0">
  			<generator class="native" />
--- 79,83 ----
  	</class>
  	
! 	<class name="net.sf.hibernate.test.Contained" proxy="net.sf.hibernate.test.Contained">
  		<id name="id" column="container_id" unsaved-value="0">
  			<generator class="native" />

Index: Custom.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Custom.hbm.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Custom.hbm.xml	29 Mar 2003 04:08:49 -0000	1.4
--- Custom.hbm.xml	29 Mar 2003 07:36:22 -0000	1.5
***************
*** 3,7 ****
  <hibernate-mapping>
  
!     <class name="net.sf.hibernate.test.Custom" import="Custom" persister="net.sf.hibernate.test.CustomPersister">
          <id type="string" name="key" column="id_" length="64" unsaved-value="null">
              <generator class="uuid.hex"/>
--- 3,7 ----
  <hibernate-mapping>
  
!     <class name="net.sf.hibernate.test.Custom" persister="net.sf.hibernate.test.CustomPersister">
          <id type="string" name="key" column="id_" length="64" unsaved-value="null">
              <generator class="uuid.hex"/>

Index: Fee.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Fee.hbm.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Fee.hbm.xml	29 Mar 2003 04:08:49 -0000	1.5
--- Fee.hbm.xml	29 Mar 2003 07:36:22 -0000	1.6
***************
*** 3,7 ****
  <hibernate-mapping>
  
!     <class name="net.sf.hibernate.test.Fee" import="Fee" >
          <id type="string" name="key" column="id_" length="64" unsaved-value="null">
              <generator class="uuid.hex"/>
--- 3,7 ----
  <hibernate-mapping>
  
!     <class name="net.sf.hibernate.test.Fee">
          <id type="string" name="key" column="id_" length="64" unsaved-value="null">
              <generator class="uuid.hex"/>

Index: Fo.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Fo.hbm.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Fo.hbm.xml	29 Mar 2003 04:08:49 -0000	1.4
--- Fo.hbm.xml	29 Mar 2003 07:36:22 -0000	1.5
***************
*** 3,7 ****
  <hibernate-mapping>
  
! 	<class name="net.sf.hibernate.test.Fo" import="Fo" table="foes">
  		<composite-id class="net.sf.hibernate.test.FumCompositeID">
  			<key-property name="string">
--- 3,7 ----
  <hibernate-mapping>
  
! 	<class name="net.sf.hibernate.test.Fo" table="foes">
  		<composite-id class="net.sf.hibernate.test.FumCompositeID">
  			<key-property name="string">

Index: FooBar.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/FooBar.hbm.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FooBar.hbm.xml	29 Mar 2003 04:08:49 -0000	1.10
--- FooBar.hbm.xml	29 Mar 2003 07:36:22 -0000	1.11
***************
*** 11,16 ****
    	proxy="net.sf.hibernate.test.FooProxy"
    	discriminator-value="F"
!   	dynamic-update="true"
!   	import="Foo">
    	
    	<jcs-cache usage="read-write"/>
--- 11,15 ----
    	proxy="net.sf.hibernate.test.FooProxy"
    	discriminator-value="F"
!   	dynamic-update="true">
    	
    	<jcs-cache usage="read-write"/>
***************
*** 112,117 ****
          	name="net.sf.hibernate.test.Bar" 
          	proxy="net.sf.hibernate.test.BarProxy"
!         	discriminator-value="B"
!         	import="Bar" >
            <many-to-one name="baz"/>
            <property name="barString">
--- 111,115 ----
          	name="net.sf.hibernate.test.Bar" 
          	proxy="net.sf.hibernate.test.BarProxy"
!         	discriminator-value="B">
            <many-to-one name="baz"/>
            <property name="barString">

Index: Fum.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Fum.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Fum.hbm.xml	29 Mar 2003 04:08:49 -0000	1.3
--- Fum.hbm.xml	29 Mar 2003 07:36:22 -0000	1.4
***************
*** 3,7 ****
  <hibernate-mapping>
  
! 	<class name="net.sf.hibernate.test.Fum" import="Fum">
  		<composite-id name="id" unsaved-value="any">
  			<key-property name="string">
--- 3,7 ----
  <hibernate-mapping>
  
! 	<class name="net.sf.hibernate.test.Fum">
  		<composite-id name="id" unsaved-value="any">
  			<key-property name="string">

Index: Fumm.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Fumm.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Fumm.hbm.xml	29 Mar 2003 04:08:49 -0000	1.3
--- Fumm.hbm.xml	29 Mar 2003 07:36:22 -0000	1.4
***************
*** 3,7 ****
  <hibernate-mapping>
  
! 	<class name="net.sf.hibernate.test.Fumm" import="Fumm">
  		<composite-id name="id">
  			<key-property name="string">
--- 3,7 ----
  <hibernate-mapping>
  
! 	<class name="net.sf.hibernate.test.Fumm">
  		<composite-id name="id">
  			<key-property name="string">

Index: Glarch.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Glarch.hbm.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Glarch.hbm.xml	29 Mar 2003 04:08:49 -0000	1.9
--- Glarch.hbm.xml	29 Mar 2003 07:36:22 -0000	1.10
***************
*** 3,7 ****
  <hibernate-mapping>
  
!     <class name="net.sf.hibernate.test.Glarch" table="glarchez" import="Glarch" proxy="net.sf.hibernate.test.GlarchProxy">
          <!--<jcs-cache usage="read-write"/>-->
          <id type="string" column="tha_key" length="32">
--- 3,7 ----
  <hibernate-mapping>
  
!     <class name="net.sf.hibernate.test.Glarch" table="glarchez" proxy="net.sf.hibernate.test.GlarchProxy">
          <!--<jcs-cache usage="read-write"/>-->
          <id type="string" column="tha_key" length="32">

Index: Holder.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Holder.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Holder.hbm.xml	29 Mar 2003 04:08:49 -0000	1.3
--- Holder.hbm.xml	29 Mar 2003 07:36:22 -0000	1.4
***************
*** 2,6 ****
  <!DOCTYPE hibernate-mapping SYSTEM "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" >
  <hibernate-mapping>
! 	<class name="net.sf.hibernate.test.Holder" import="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>
--- 2,6 ----
  <!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>

Index: Immutable.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Immutable.hbm.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Immutable.hbm.xml	29 Mar 2003 04:08:49 -0000	1.4
--- Immutable.hbm.xml	29 Mar 2003 07:36:22 -0000	1.5
***************
*** 3,7 ****
  <hibernate-mapping>
  	
! 	<class name="net.sf.hibernate.test.Immutable" import="Immutable" table="immut" mutable="false">
  		<jcs-cache usage="read-only"/> 
  		<id name="id" column="id_" length="64">
--- 3,7 ----
  <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">

Index: Location.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Location.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Location.hbm.xml	29 Mar 2003 04:08:49 -0000	1.3
--- Location.hbm.xml	29 Mar 2003 07:36:22 -0000	1.4
***************
*** 3,7 ****
  <hibernate-mapping>
  
! 	<class name="net.sf.hibernate.test.Location" import="Location">
  		<composite-id>
  			<key-property name="streetNumber"/>
--- 3,7 ----
  <hibernate-mapping>
  
! 	<class name="net.sf.hibernate.test.Location">
  		<composite-id>
  			<key-property name="streetNumber"/>

Index: Many.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Many.hbm.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Many.hbm.xml	29 Mar 2003 04:08:49 -0000	1.6
--- Many.hbm.xml	29 Mar 2003 07:36:22 -0000	1.7
***************
*** 4,8 ****
  
  <hibernate-mapping>
!   <class name="net.sf.hibernate.test.Many" import="Many" table="many">
      <id name="key" column="many_key" unsaved-value="0">
        <generator class="native" />
--- 4,8 ----
  
  <hibernate-mapping>
!   <class name="net.sf.hibernate.test.Many" table="many">
      <id name="key" column="many_key" unsaved-value="0">
        <generator class="native" />

Index: MasterDetail.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/MasterDetail.hbm.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MasterDetail.hbm.xml	29 Mar 2003 04:08:49 -0000	1.6
--- MasterDetail.hbm.xml	29 Mar 2003 07:36:22 -0000	1.7
***************
*** 3,7 ****
  <hibernate-mapping>
  
! 	<class name="net.sf.hibernate.test.Master" import="Master">
  		<id column="master_key" type="long">
  			<generator class="native"/>
--- 3,7 ----
  <hibernate-mapping>
  
! 	<class name="net.sf.hibernate.test.Master">
  		<id column="master_key" type="long">
  			<generator class="native"/>
***************
*** 32,36 ****
  	</class>
  	
! 	<class name="net.sf.hibernate.test.Detail" import="Detail">
  		<id column="detail_key" type="long">
  			<generator class="native"/>
--- 32,36 ----
  	</class>
  	
! 	<class name="net.sf.hibernate.test.Detail">
  		<id column="detail_key" type="long">
  			<generator class="native"/>
***************
*** 46,50 ****
  	</class>
  	
! 	<class name="net.sf.hibernate.test.SubDetail" import="SubDetail">
  		<id column="subdetail_key" type="long">
  			<generator class="native">
--- 46,50 ----
  	</class>
  	
! 	<class name="net.sf.hibernate.test.SubDetail">
  		<id column="subdetail_key" type="long">
  			<generator class="native">

Index: Multi.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Multi.hbm.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Multi.hbm.xml	29 Mar 2003 04:08:49 -0000	1.7
--- Multi.hbm.xml	29 Mar 2003 07:36:22 -0000	1.8
***************
*** 3,7 ****
  <hibernate-mapping>
  
!     <class name="net.sf.hibernate.test.Simple" table="rootclass" import="Simple" dynamic-update="true">
          <jcs-cache usage="read-write"/>
          <id type="long" column="id_" >
--- 3,7 ----
  <hibernate-mapping>
  
!     <class name="net.sf.hibernate.test.Simple" table="rootclass" dynamic-update="true">
          <jcs-cache usage="read-write"/>
          <id type="long" column="id_" >
***************
*** 13,17 ****
          <property name="date" column="date_"/>
          
!         <joined-subclass name="net.sf.hibernate.test.Mono" import="Mono" table="mono">
          	<key column="superid"/>
          	<set name="strings" table="monostrings">
--- 13,17 ----
          <property name="date" column="date_"/>
          
!         <joined-subclass name="net.sf.hibernate.test.Mono" table="mono">
          	<key column="superid"/>
          	<set name="strings" table="monostrings">
***************
*** 21,29 ****
          </joined-subclass>
          
!         <joined-subclass name="net.sf.hibernate.test.TrivialClass" import="TrivialClass">
          	<key column="tcid"/>
          </joined-subclass>
          
! 	    <joined-subclass name="net.sf.hibernate.test.LessSimple" import="LessSimple" table="leafsubclass">
  	        <key column="id__"/>
  	        <property name="intprop" not-null="true"/>
--- 21,29 ----
          </joined-subclass>
          
!         <joined-subclass name="net.sf.hibernate.test.TrivialClass">
          	<key column="tcid"/>
          </joined-subclass>
          
! 	    <joined-subclass name="net.sf.hibernate.test.LessSimple" table="leafsubclass">
  	        <key column="id__"/>
  	        <property name="intprop" not-null="true"/>
***************
*** 43,47 ****
  	    </joined-subclass>
  	    
! 	    <joined-subclass name="net.sf.hibernate.test.Multi" table="nonleafsubclass" import="Multi" dynamic-update="true">
  	    	<key column="sid"/>
  	        <property name="extraProp"/>
--- 43,47 ----
  	    </joined-subclass>
  	    
! 	    <joined-subclass name="net.sf.hibernate.test.Multi" table="nonleafsubclass" dynamic-update="true">
  	    	<key column="sid"/>
  	        <property name="extraProp"/>
***************
*** 54,58 ****
  	        </component>
  	        
! 	        <joined-subclass name="net.sf.hibernate.test.SubMulti" import="SubMulti" table="leafsubsubclass">
  	        	<key column="sid"/>
  	        	<property name="amount"/>
--- 54,58 ----
  	        </component>
  	        
! 	        <joined-subclass name="net.sf.hibernate.test.SubMulti" table="leafsubsubclass">
  	        	<key column="sid"/>
  	        	<property name="amount"/>
***************
*** 68,72 ****
      </class>
      
!     <class name="net.sf.hibernate.test.Po" import="Po">
      	<id type="long" column="id_">
      		<generator class="native"/>
--- 68,72 ----
      </class>
      
!     <class name="net.sf.hibernate.test.Po">
      	<id type="long" column="id_">
      		<generator class="native"/>

Index: Nameable.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Nameable.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Nameable.hbm.xml	29 Mar 2003 04:08:49 -0000	1.3
--- Nameable.hbm.xml	29 Mar 2003 07:36:22 -0000	1.4
***************
*** 3,7 ****
  <hibernate-mapping>
  
!     <class name="net.sf.hibernate.test.Nameable" import="Nameable">
          <id name="key" column="key_">
          	<generator class="native"/>
--- 3,7 ----
  <hibernate-mapping>
  
!     <class name="net.sf.hibernate.test.Nameable">
          <id name="key" column="key_">
          	<generator class="native"/>

Index: One.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/One.hbm.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** One.hbm.xml	29 Mar 2003 04:08:49 -0000	1.6
--- One.hbm.xml	29 Mar 2003 07:36:22 -0000	1.7
***************
*** 4,8 ****
  
  <hibernate-mapping>
! 	<class name="net.sf.hibernate.test.One" import="One" table="one">
  		<id name="key" column="one_key" unsaved-value="0">
  			<generator class="native" />
--- 4,8 ----
  
  <hibernate-mapping>
! 	<class name="net.sf.hibernate.test.One" table="one">
  		<id name="key" column="one_key" unsaved-value="0">
  			<generator class="native" />

Index: ParentChild.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/ParentChild.hbm.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ParentChild.hbm.xml	29 Mar 2003 04:08:49 -0000	1.6
--- ParentChild.hbm.xml	29 Mar 2003 07:36:22 -0000	1.7
***************
*** 3,7 ****
  <hibernate-mapping>
  	
! 	<class name="net.sf.hibernate.test.Parent" import="Parent">
  		<id name="id" type="long">
  			<generator class="native"> <!--seqhilo-->
--- 3,7 ----
  <hibernate-mapping>
  	
! 	<class name="net.sf.hibernate.test.Parent">
  		<id name="id" type="long">
  			<generator class="native"> <!--seqhilo-->
***************
*** 18,22 ****
  	</class>
  	
! 	<class name="net.sf.hibernate.test.Child" import="Child">
  		<id name="id" type="long">
  			<generator class="assigned"/>
--- 18,22 ----
  	</class>
  	
! 	<class name="net.sf.hibernate.test.Child">
  		<id name="id" type="long">
  			<generator class="assigned"/>

Index: ParentChildTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/ParentChildTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ParentChildTest.java	23 Feb 2003 01:32:21 -0000	1.7
--- ParentChildTest.java	29 Mar 2003 07:36:22 -0000	1.8
***************
*** 47,97 ****
  		s.save(c);
  		assertTrue(
! 			s.find("select c from c in class Container, s in class Simple where c.oneToMany[2] = s")
  			.size() == 1 
  		);
  		assertTrue(
! 			s.find("select c from c in class Container, s in class Simple where c.manyToMany[2] = s")
  			.size() == 1 
  		);
  		assertTrue(
! 			s.find("select c from c in class Container, s in class Simple where s = c.oneToMany[2]")
  			.size() == 1 
  		);
  		assertTrue(
! 			s.find("select c from c in class Container, s in class Simple where s = c.manyToMany[2]")
  			.size() == 1 
  		);
  		assertTrue(
! 			s.find("select c from c in class Container where c.oneToMany[0].name = 's'")
  			.size() == 1
  		);
  		assertTrue(
! 			s.find("select c from c in class Container where c.manyToMany[0].name = 's'")
  			.size() == 1 
  		);
  		assertTrue(
! 			s.find("select c from c in class Container where 's' = c.oneToMany[2 - 2].name")
  			.size() == 1 
  		);
  		assertTrue(
! 			s.find("select c from c in class Container where 's' = c.manyToMany[(3+1)/4-1].name")
  			.size() == 1 
  		);
  		if ( ! ( dialect instanceof MySQLDialect ) ) {
  			assertTrue(
! 				s.find("select c from c in class Container where c.manyToMany[ c.manyToMany.maxIndex ].count = 2")
  				.size() == 1 
  			);
  			assertTrue(
! 				s.find("select c from c in class Container where c.manyToMany[ maxindex(c.manyToMany) ].count = 2")
  				.size() == 1 
  			);
  		}
  		assertTrue(
! 			s.find("select c from c in class Container where c.oneToMany[ c.manyToMany[0].count ].name = 's'")
  			.size() == 1 
  		);
  		assertTrue(
! 			s.find("select c from c in class Container where c.manyToMany[ c.oneToMany[0].count ].name = 's'")
  			.size() == 1 
  		);
--- 47,97 ----
  		s.save(c);
  		assertTrue(
! 			s.find("select c from c in class ContainerX, s in class Simple where c.oneToMany[2] = s")
  			.size() == 1 
  		);
  		assertTrue(
! 			s.find("select c from c in class ContainerX, s in class Simple where c.manyToMany[2] = s")
  			.size() == 1 
  		);
  		assertTrue(
! 			s.find("select c from c in class ContainerX, s in class Simple where s = c.oneToMany[2]")
  			.size() == 1 
  		);
  		assertTrue(
! 			s.find("select c from c in class ContainerX, s in class Simple where s = c.manyToMany[2]")
  			.size() == 1 
  		);
  		assertTrue(
! 			s.find("select c from c in class ContainerX where c.oneToMany[0].name = 's'")
  			.size() == 1
  		);
  		assertTrue(
! 			s.find("select c from c in class ContainerX where c.manyToMany[0].name = 's'")
  			.size() == 1 
  		);
  		assertTrue(
! 			s.find("select c from c in class ContainerX where 's' = c.oneToMany[2 - 2].name")
  			.size() == 1 
  		);
  		assertTrue(
! 			s.find("select c from c in class ContainerX where 's' = c.manyToMany[(3+1)/4-1].name")
  			.size() == 1 
  		);
  		if ( ! ( dialect instanceof MySQLDialect ) ) {
  			assertTrue(
! 				s.find("select c from c in class ContainerX where c.manyToMany[ c.manyToMany.maxIndex ].count = 2")
  				.size() == 1 
  			);
  			assertTrue(
! 				s.find("select c from c in class ContainerX where c.manyToMany[ maxindex(c.manyToMany) ].count = 2")
  				.size() == 1 
  			);
  		}
  		assertTrue(
! 			s.find("select c from c in class ContainerX where c.oneToMany[ c.manyToMany[0].count ].name = 's'")
  			.size() == 1 
  		);
  		assertTrue(
! 			s.find("select c from c in class ContainerX where c.manyToMany[ c.oneToMany[0].count ].name = 's'")
  			.size() == 1 
  		);
***************
*** 215,219 ****
  		c1 = (Contained) s.load( Contained.class, new Long(c1.getId()) );
  		assertTrue( c1.getBag().size()==0 );
! 		s.delete("from c in class Container");
  		s.delete("from c in class Contained");
  		s.delete("from s in class Simple");
--- 215,219 ----
  		c1 = (Contained) s.load( Contained.class, new Long(c1.getId()) );
  		assertTrue( c1.getBag().size()==0 );
! 		s.delete("from c in class ContainerX");
  		s.delete("from c in class Contained");
  		s.delete("from s in class Simple");
***************
*** 361,365 ****
  		s.close();
  		s=sessions.openSession();
! 		c = (Container) s.iterate("from c in class Container").next();
  		cic = (Container.ContainerInnerClass) c.getCascades().iterator().next();
  		assertTrue( cic.getMany()!=null && cic.getOne()!=null );
--- 361,365 ----
  		s.close();
  		s=sessions.openSession();
! 		c = (Container) s.iterate("from c in class ContainerX").next();
  		cic = (Container.ContainerInnerClass) c.getCascades().iterator().next();
  		assertTrue( cic.getMany()!=null && cic.getOne()!=null );
***************
*** 383,387 ****
  		s.close();
  		s=sessions.openSession();
! 		c = (Container) s.iterate("from c in class Container").next();
  		cic = (Container.ContainerInnerClass) c.getCascades().iterator().next();
  		assertTrue( cic.getMany()!=null && cic.getOne()!=null );
--- 383,387 ----
  		s.close();
  		s=sessions.openSession();
! 		c = (Container) s.iterate("from c in class ContainerX").next();
  		cic = (Container.ContainerInnerClass) c.getCascades().iterator().next();
  		assertTrue( cic.getMany()!=null && cic.getOne()!=null );
***************
*** 414,418 ****
  		s = sessions.openSession();
  		t = s.beginTransaction();
! 		c = (Container) s.find("from c in class Container").get(0);
  		Contained c3 = new Contained();
  		//c.getBag().add(c3);
--- 414,418 ----
  		s = sessions.openSession();
  		t = s.beginTransaction();
! 		c = (Container) s.find("from c in class ContainerX").get(0);
  		Contained c3 = new Contained();
  		//c.getBag().add(c3);
***************
*** 425,429 ****
  		s = sessions.openSession();
  		t = s.beginTransaction();
! 		c = (Container) s.find("from c in class Container").get(0);
  		Contained c4 = new Contained();
  		c.getLazyBag().add(c4);
--- 425,429 ----
  		s = sessions.openSession();
  		t = s.beginTransaction();
! 		c = (Container) s.find("from c in class ContainerX").get(0);
  		Contained c4 = new Contained();
  		c.getLazyBag().add(c4);
***************
*** 436,440 ****
  		s = sessions.openSession();
  		t = s.beginTransaction();
! 		c = (Container) s.find("from c in class Container").get(0);
  		Iterator i = c.getBag().iterator();
  		int j=0;
--- 436,440 ----
  		s = sessions.openSession();
  		t = s.beginTransaction();
! 		c = (Container) s.find("from c in class ContainerX").get(0);
  		Iterator i = c.getBag().iterator();
  		int j=0;
***************
*** 498,502 ****
  		assertTrue( c.getOther().getOther().getOther()==c);
  		assertTrue( c.getAnyEntity()==c.getOther() );
! 		assertTrue( s.delete("from o in class java.lang.Object")==3 );
  		tx.commit();
  		s.close();
--- 498,502 ----
  		assertTrue( c.getOther().getOther().getOther()==c);
  		assertTrue( c.getAnyEntity()==c.getOther() );
! 		assertTrue( s.delete("from o in class Universe")==3 );
  		tx.commit();
  		s.close();
***************
*** 506,510 ****
  		Session s = sessions.openSession();
  		assertTrue( s.delete("from s in class Simple")==0 );
! 		assertTrue( s.delete("from o in class java.lang.Object")==0 );
  		s.close();
  	}
--- 506,510 ----
  		Session s = sessions.openSession();
  		assertTrue( s.delete("from s in class Simple")==0 );
! 		assertTrue( s.delete("from o in class Universe")==0 );
  		s.close();
  	}

Index: Qux.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Qux.hbm.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Qux.hbm.xml	29 Mar 2003 04:08:49 -0000	1.5
--- Qux.hbm.xml	29 Mar 2003 07:36:22 -0000	1.6
***************
*** 3,7 ****
  <hibernate-mapping>
  	
! 	<class name="net.sf.hibernate.test.Qux" table="quux" import="Qux" proxy="net.sf.hibernate.test.Qux"> <!---->
  		<id name="key" column="qux_key" unsaved-value="0">
  			<generator class="hilo"/>
--- 3,7 ----
  <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"/>

Index: Simple.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Simple.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Simple.hbm.xml	29 Mar 2003 04:08:49 -0000	1.3
--- Simple.hbm.xml	29 Mar 2003 07:36:22 -0000	1.4
***************
*** 3,7 ****
  <hibernate-mapping>
  
!     <class name="net.sf.hibernate.test.Simple" import="Simple">
          <id type="long" column="id_">
              <generator class="assigned"/>
--- 3,7 ----
  <hibernate-mapping>
  
!     <class name="net.sf.hibernate.test.Simple">
          <id type="long" column="id_">
              <generator class="assigned"/>

Index: SingleSeveral.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/SingleSeveral.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SingleSeveral.hbm.xml	29 Mar 2003 04:08:49 -0000	1.3
--- SingleSeveral.hbm.xml	29 Mar 2003 07:36:22 -0000	1.4
***************
*** 5,9 ****
  <hibernate-mapping>
  
! 	<class name="net.sf.hibernate.test.Single" import="Single">
  		<composite-id>
  			<key-property name="id" length="32"/>
--- 5,9 ----
  <hibernate-mapping>
  
! 	<class name="net.sf.hibernate.test.Single">
  		<composite-id>
  			<key-property name="id" length="32"/>
***************
*** 20,24 ****
  	</class>
  	
! 	<class name="net.sf.hibernate.test.Several" import="Several">
  		<composite-id>
  			<key-property name="id" length="32"/>
--- 20,24 ----
  	</class>
  	
! 	<class name="net.sf.hibernate.test.Several">
  		<composite-id>
  			<key-property name="id" length="32"/>

Index: Stuff.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Stuff.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Stuff.hbm.xml	29 Mar 2003 04:08:49 -0000	1.3
--- Stuff.hbm.xml	29 Mar 2003 07:36:22 -0000	1.4
***************
*** 3,7 ****
  <hibernate-mapping>
  	
! 	<class name="net.sf.hibernate.test.MoreStuff" import="MoreStuff">
  		<composite-id>
  			<key-property name="intId"/>
--- 3,7 ----
  <hibernate-mapping>
  	
! 	<class name="net.sf.hibernate.test.MoreStuff">
  		<composite-id>
  			<key-property name="intId"/>
***************
*** 19,23 ****
  	</class>
  	
!     <class name="net.sf.hibernate.test.Stuff" import="Stuff">
          <composite-id>
              <key-property name="id"/>
--- 19,23 ----
  	</class>
  	
!     <class name="net.sf.hibernate.test.Stuff">
          <composite-id>
              <key-property name="id"/>

Index: Vetoer.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Vetoer.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Vetoer.hbm.xml	29 Mar 2003 04:08:49 -0000	1.3
--- Vetoer.hbm.xml	29 Mar 2003 07:36:22 -0000	1.4
***************
*** 3,7 ****
  <hibernate-mapping>
  
!     <class name="net.sf.hibernate.test.Vetoer" import="Vetoer">
          <id type="string" column="id_" length="32">
              <generator class="uuid.hex"/>
--- 3,7 ----
  <hibernate-mapping>
  
!     <class name="net.sf.hibernate.test.Vetoer">
          <id type="string" column="id_" length="32">
              <generator class="uuid.hex"/>