[Hibernate-commits] Hibernate/doc brief.aft,1.13,1.14 brief.html,1.54,1.55 dtd.aft,1.9,1.10 dtd.html,1.21,1.22 hibernate.html,1.32,1.33

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

Update of /cvsroot/hibernate/Hibernate/doc
In directory usw-pr-cvs1:/tmp/cvs-serv1425/doc

Modified Files:
	brief.aft brief.html dtd.aft dtd.html hibernate.html 
Log Message:
1.2 beta 1

Index: brief.aft
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/doc/brief.aft,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** brief.aft	14 Sep 2002 11:48:55 -0000	1.13
--- brief.aft	11 Nov 2002 16:04:54 -0000	1.14
***************
*** 3,7 ****
  #---PASS-HTML <img src="logo.jpg" alt="Hibernate">
  --------------------------------------------------------------------------
! ''Hibernate 1.1 is now available for''
  #---PASS-HTML <a href="http://sourceforge.net/project/showfiles.php?group_id=40712">
  ''download''
--- 3,7 ----
  #---PASS-HTML <img src="logo.jpg" alt="Hibernate">
  --------------------------------------------------------------------------
! ''Hibernate 1.2 beta is now available for''
  #---PASS-HTML <a href="http://sourceforge.net/project/showfiles.php?group_id=40712">
  ''download''

Index: brief.html
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/doc/brief.html,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** brief.html	5 Nov 2002 08:03:58 -0000	1.54
--- brief.html	11 Nov 2002 16:04:54 -0000	1.55
***************
*** 16,20 ****
  <img src="logo.jpg" alt="Hibernate"><hr>
  <p class="Body">
! <em>Hibernate 1.1 is now available for</em>
  <a href="http://sourceforge.net/project/showfiles.php?group_id=40712"><em>download</em>
  </a><hr>
--- 16,20 ----
  <img src="logo.jpg" alt="Hibernate"><hr>
  <p class="Body">
! <em>Hibernate 1.2 beta is now available for</em>
  <a href="http://sourceforge.net/project/showfiles.php?group_id=40712"><em>download</em>
  </a><hr>

Index: dtd.aft
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/doc/dtd.aft,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** dtd.aft	22 Oct 2002 20:22:16 -0000	1.9
--- dtd.aft	11 Nov 2002 16:04:55 -0000	1.10
***************
*** 5,15 ****
  
  	<?xml version='1.0' encoding='utf-8'?>
! 
  	<!-- Hibernate Mapping DTD.
! 
  	<!DOCTYPE hibernate-mapping PUBLIC 
! 		"-//Hibernate/Hibernate Mapping DTD//EN"
! 		"http://hibernate.sourceforge.net/hibernate-mapping.dtd">
! 
  	An instance of this XML document may contain mappings for an arbitrary 
  	number of classes. The class mappings may contain associations to classes
--- 5,15 ----
  
  	<?xml version='1.0' encoding='utf-8'?>
! 	
  	<!-- Hibernate Mapping DTD.
! 	
  	<!DOCTYPE hibernate-mapping PUBLIC 
! 		"-//Hibernate/Hibernate Mapping DTD 1.1//EN"
! 		"http://hibernate.sourceforge.net/hibernate-mapping-1.1.dtd">
! 	
  	An instance of this XML document may contain mappings for an arbitrary 
  	number of classes. The class mappings may contain associations to classes
***************
*** 19,27 ****
  	be referenced by later class and collection mappings in the same document. 
  	(They must be declared before they are used.)
! 
  	-->
! 
  	<!-- The document root. -->
! 
  	<!ELEMENT hibernate-mapping ( 
  		(map|set|list|bag|array|primitive-array)*, 
--- 19,27 ----
  	be referenced by later class and collection mappings in the same document. 
  	(They must be declared before they are used.)
! 	
  	-->
! 	
  	<!-- The document root. -->
! 	
  	<!ELEMENT hibernate-mapping ( 
  		(map|set|list|bag|array|primitive-array)*, 
***************
*** 29,37 ****
  		query*
  	)>
! 	<!ATTLIST hibernate-mapping schema CDATA #IMPLIED>  <!-- default: none -->
! 	<!ATTLIST hibernate-mapping default-cascade CDATA #IMPLIED>  <!-- none|save/update|all, default: none -->
! 
  	<!-- Root of an entity class hierarchy. Entities have their own tables. -->
! 
  	<!ELEMENT class ( 
  	  jcs-cache?,
--- 29,37 ----
  		query*
  	)>
! 	<!ATTLIST hibernate-mapping schema CDATA #IMPLIED>                            <!-- default: none -->
! 	<!ATTLIST hibernate-mapping default-cascade (none|save-update|all) "none">
! 	  
  	<!-- Root of an entity class hierarchy. Entities have their own tables. -->
! 	
  	<!ELEMENT class ( 
  	  jcs-cache?,
***************
*** 40,44 ****
  	  (version|timestamp)?,
  	  (property|many-to-one|one-to-one|collection|component|map|set|list|bag|array|primitive-array)*, 
! 	  subclass*,
  	  cache?
  	)>
--- 40,44 ----
  	  (version|timestamp)?,
  	  (property|many-to-one|one-to-one|collection|component|map|set|list|bag|array|primitive-array)*, 
! 	  ((subclass*)|(joined-subclass*)),
  	  cache?
  	)>
***************
*** 47,60 ****
  	  <!ATTLIST class schema CDATA #IMPLIED>          <!-- default: none -->
  	  <!ATTLIST class proxy CDATA #IMPLIED>           <!-- default: no proxy interface -->
! 	  <!ATTLIST class mutable CDATA #IMPLIED>         <!-- default: true -->
  	  <!ATTLIST class persister CDATA #IMPLIED>       <!-- default: cirrus.hibernate.persister.EntityPersister -->
! 
  	  <!ATTLIST class discriminator-value CDATA #IMPLIED>  <!-- default: unqualified class name | none -->
! 
  	<!-- Declares the id type, column and generation algorithm for an entity class.
  	If a name attribut is given, the id is exposed to the application through the 
  	named property of the class. If not, the id is only exposed to the application 
  	through Session.getID()-->
! 
  	<!ELEMENT id (column?, generator)>
  	  <!ATTLIST id name CDATA #IMPLIED>
--- 47,60 ----
  	  <!ATTLIST class schema CDATA #IMPLIED>          <!-- default: none -->
  	  <!ATTLIST class proxy CDATA #IMPLIED>           <!-- default: no proxy interface -->
! 	  <!ATTLIST class mutable (true|false) "true">
  	  <!ATTLIST class persister CDATA #IMPLIED>       <!-- default: cirrus.hibernate.persister.EntityPersister -->
! 	  
  	  <!ATTLIST class discriminator-value CDATA #IMPLIED>  <!-- default: unqualified class name | none -->
! 	
  	<!-- Declares the id type, column and generation algorithm for an entity class.
  	If a name attribut is given, the id is exposed to the application through the 
  	named property of the class. If not, the id is only exposed to the application 
  	through Session.getID()-->
! 	
  	<!ELEMENT id (column?, generator)>
  	  <!ATTLIST id name CDATA #IMPLIED>
***************
*** 62,99 ****
  	  <!ATTLIST id type CDATA #IMPLIED>
  	  <!ATTLIST id length CDATA #IMPLIED>
! 	  <!ATTLIST id unsaved-value CDATA #IMPLIED>  <!-- any|none|null|"value", default: any -->
! 
  	<!-- A composite key may be modelled by a java class with a property for each 
  	key column. The class must implement java.io.Serializable and reimplement equals() 
  	and hashCode(). -->
! 
! 	<!ELEMENT composite-id (property+)>
  	  <!ATTLIST composite-id class CDATA #IMPLIED>
  	  <!ATTLIST composite-id name CDATA #IMPLIED>
! 	  <!ATTLIST composite-id unsaved-value CDATA #IMPLIED>  <!-- any|none|null, default: any -->
! 
  	<!-- Polymorphic data requires a column holding a class discriminator value. This
  	value is not directly exposed to the application. -->
! 
  	<!ELEMENT discriminator (column?)>
  	  <!ATTLIST discriminator column CDATA #IMPLIED>   <!-- default: "class"|none -->
! 	  <!ATTLIST discriminator type CDATA #IMPLIED>     <!-- default: string -->
! 	  <!ATTLIST discriminator length CDATA #IMPLIED>   <!-- default: 100 -->
! 
  	<!-- Versioned data requires a column holding a version number. This is exposed to the
  	application through a property of the Java class. -->
! 
  	<!ELEMENT version EMPTY>
  	  <!ATTLIST version name CDATA #REQUIRED>
  	  <!ATTLIST version column CDATA #IMPLIED>
! 	  <!ATTLIST version type CDATA #IMPLIED>           <!-- default: integer -->
! 
  	<!ELEMENT timestamp EMPTY>
  	  <!ATTLIST timestamp name CDATA #REQUIRED>
  	  <!ATTLIST timestamp column CDATA #IMPLIED>
! 
  	<!-- Subclass declarations are nested beneath the root class declaration to achieve
  	polymorphic persistence. -->
! 
  	<!ELEMENT subclass ( 
  		(property|many-to-one|one-to-one|collection|component|map|set|list|bag|array|primitive-array)*, 
--- 62,99 ----
  	  <!ATTLIST id type CDATA #IMPLIED>
  	  <!ATTLIST id length CDATA #IMPLIED>
! 	  <!ATTLIST id unsaved-value CDATA "any">          <!-- any|none|null|"value" -->
! 	
  	<!-- A composite key may be modelled by a java class with a property for each 
  	key column. The class must implement java.io.Serializable and reimplement equals() 
  	and hashCode(). -->
! 	
! 	<!ELEMENT composite-id ( (key-property|key-many-to-one)+ )>
  	  <!ATTLIST composite-id class CDATA #IMPLIED>
  	  <!ATTLIST composite-id name CDATA #IMPLIED>
! 	  <!ATTLIST composite-id unsaved-value (any|none|null) "any">  <!-- default: any -->
! 	
  	<!-- Polymorphic data requires a column holding a class discriminator value. This
  	value is not directly exposed to the application. -->
! 	
  	<!ELEMENT discriminator (column?)>
  	  <!ATTLIST discriminator column CDATA #IMPLIED>   <!-- default: "class"|none -->
! 	  <!ATTLIST discriminator type CDATA "string">
! 	  <!ATTLIST discriminator length CDATA #IMPLIED>
! 	  
  	<!-- Versioned data requires a column holding a version number. This is exposed to the
  	application through a property of the Java class. -->
! 	
  	<!ELEMENT version EMPTY>
  	  <!ATTLIST version name CDATA #REQUIRED>
  	  <!ATTLIST version column CDATA #IMPLIED>
! 	  <!ATTLIST version type CDATA "integer">
! 	
  	<!ELEMENT timestamp EMPTY>
  	  <!ATTLIST timestamp name CDATA #REQUIRED>
  	  <!ATTLIST timestamp column CDATA #IMPLIED>
! 	
  	<!-- Subclass declarations are nested beneath the root class declaration to achieve
  	polymorphic persistence. -->
! 	
  	<!ELEMENT subclass ( 
  		(property|many-to-one|one-to-one|collection|component|map|set|list|bag|array|primitive-array)*, 
***************
*** 101,111 ****
  	)>
  	  <!ATTLIST subclass name CDATA #REQUIRED>
! 	  <!ATTLIST subclass proxy CDATA #IMPLIED>     <!-- default: no proxy interface -->
! 
  	  <!ATTLIST subclass discriminator-value CDATA #IMPLIED>  <!-- default: unqualified class name | none -->
! 
  	<!-- Property of an entity class or component, component-element, composite-id, etc. 
  	JavaBeans style properties are mapped to table columns. -->
! 
  	<!ELEMENT property (column*)>
  	  <!ATTLIST property name CDATA #REQUIRED>
--- 101,122 ----
  	)>
  	  <!ATTLIST subclass name CDATA #REQUIRED>
! 	  <!ATTLIST subclass proxy CDATA #IMPLIED>                <!-- default: no proxy interface -->
  	  <!ATTLIST subclass discriminator-value CDATA #IMPLIED>  <!-- default: unqualified class name | none -->
! 	
! 	<!-- Joined subclasses are used for the normalized table-per-subclass mapping strategy -->
! 	
! 	<!ELEMENT joined-subclass ( 
! 		key,
! 		(property|many-to-one|one-to-one|collection|component|map|set|list|bag|array|primitive-array)*, 
! 		joined-subclass*
! 	)>
! 	  <!ATTLIST joined-subclass name CDATA #REQUIRED>
! 	  <!ATTLIST joined-subclass proxy CDATA #IMPLIED>                <!-- default: no proxy interface -->
! 	  <!ATTLIST joined-subclass table CDATA #REQUIRED>
! 	  <!ATTLIST joined-subclass schema CDATA #IMPLIED>
! 	  
  	<!-- Property of an entity class or component, component-element, composite-id, etc. 
  	JavaBeans style properties are mapped to table columns. -->
! 	
  	<!ELEMENT property (column*)>
  	  <!ATTLIST property name CDATA #REQUIRED>
***************
*** 113,144 ****
  	  <!ATTLIST property column CDATA #IMPLIED>
  	  <!ATTLIST property length CDATA #IMPLIED>
! 	  <!ATTLIST property not-null CDATA #IMPLIED>
! 	  <!ATTLIST property unique CDATA #IMPLIED>
! 
  	<!-- Declares an association between two entities (Or from a component, component element,
  	etc. to an entity). -->
! 
  	<!ELEMENT many-to-one (column*)>
  	  <!ATTLIST many-to-one name CDATA #REQUIRED>
  	  <!ATTLIST many-to-one class CDATA #IMPLIED>
  	  <!ATTLIST many-to-one column CDATA #IMPLIED>
! 	  <!ATTLIST many-to-one length CDATA #IMPLIED>     <!-- DEPRECATED -->
! 	  <!ATTLIST many-to-one not-null CDATA #IMPLIED>   <!-- true|false, default: false -->
! 	  <!ATTLIST many-to-one unique CDATA #IMPLIED>     <!-- true|false, default: false -->
! 	  <!ATTLIST many-to-one cascade CDATA #IMPLIED>    <!-- none|all|save/update|delete, default: none -->
! 	  <!ATTLIST many-to-one outer-join CDATA #IMPLIED> <!-- true|false, default to hibernate.use_outer_join -->
! 
  	<!-- Declares a one-to-one association between two entities (Or from a component, 
  	component element, etc. to an entity). -->
! 
  	<!ELEMENT one-to-one EMPTY>
  	  <!ATTLIST one-to-one name CDATA #REQUIRED>
  	  <!ATTLIST one-to-one class CDATA #IMPLIED>
! 	  <!ATTLIST one-to-one cascade CDATA #IMPLIED>     <!-- none|all|save/update|delete, default: none -->
! 	  <!ATTLIST one-to-one outer-join CDATA #IMPLIED>  <!-- true|false, default to hibernate.use_outer_join -->
! 	  <!ATTLIST one-to-one constrained CDATA #IMPLIED> <!-- true|false, default: false -->
! 
  	<!-- Declared a property that holds instances of a toplevel collection role. -->
! 
  	<!ELEMENT collection (column*)>
  	  <!ATTLIST collection name CDATA #REQUIRED>
--- 124,170 ----
  	  <!ATTLIST property column CDATA #IMPLIED>
  	  <!ATTLIST property length CDATA #IMPLIED>
! 	  <!ATTLIST property not-null (true|false) "false">
! 	  <!ATTLIST property unique (true|false) "false">
! 	
  	<!-- Declares an association between two entities (Or from a component, component element,
  	etc. to an entity). -->
! 	
  	<!ELEMENT many-to-one (column*)>
  	  <!ATTLIST many-to-one name CDATA #REQUIRED>
  	  <!ATTLIST many-to-one class CDATA #IMPLIED>
  	  <!ATTLIST many-to-one column CDATA #IMPLIED>
! 	  <!ATTLIST many-to-one not-null (true|false) "false">
! 	  <!ATTLIST many-to-one unique (true|false) "false">
! 	  <!ATTLIST many-to-one cascade (none|all|save-update|delete) #IMPLIED>    <!-- default: none -->
! 	  <!ATTLIST many-to-one outer-join (true|false|auto) "auto">
! 	    
  	<!-- Declares a one-to-one association between two entities (Or from a component, 
  	component element, etc. to an entity). -->
! 	
  	<!ELEMENT one-to-one EMPTY>
  	  <!ATTLIST one-to-one name CDATA #REQUIRED>
  	  <!ATTLIST one-to-one class CDATA #IMPLIED>
! 	  <!ATTLIST one-to-one cascade (none|all|save-update|delete) #IMPLIED>     <!-- default: none -->
! 	  <!ATTLIST one-to-one outer-join (true|false|auto) "auto">
! 	  <!ATTLIST one-to-one constrained (true|false) "false">
! 	
! 	<!-- A property embedded in a composite identifier or map index (always not-null). -->
! 	
! 	<!ELEMENT key-property (column*)>
! 	  <!ATTLIST key-property name CDATA #REQUIRED>
! 	  <!ATTLIST key-property type CDATA #IMPLIED>
! 	  <!ATTLIST key-property column CDATA #IMPLIED>
! 	  <!ATTLIST key-property length CDATA #IMPLIED>
! 	
! 	<!-- A many-to-one association embedded in a composite identifier or map index 
! 	(always not-null, never cascade). -->
! 	
! 	<!ELEMENT key-many-to-one (column*)>
! 	  <!ATTLIST key-many-to-one name CDATA #REQUIRED>
! 	  <!ATTLIST key-many-to-one class CDATA #IMPLIED>
! 	  <!ATTLIST key-many-to-one column CDATA #IMPLIED>
! 	  
  	<!-- Declared a property that holds instances of a toplevel collection role. -->
! 	
  	<!ELEMENT collection (column*)>
  	  <!ATTLIST collection name CDATA #REQUIRED>
***************
*** 146,153 ****
  	  <!ATTLIST collection column CDATA #IMPLIED>
  	  <!ATTLIST collection length CDATA #IMPLIED>
! 	  <!ATTLIST collection not-null CDATA #IMPLIED> <!-- true|false, default: false -->
! 	  <!ATTLIST collection unique CDATA #IMPLIED>   <!-- true|false, default: false -->
! 	  <!ATTLIST collection cascade CDATA #IMPLIED>  <!-- none|all|save/update|delete, default: none -->
! 
  	<!-- A component is a user-defined class, persisted along with its containing entity
  	to the table of the entity class. JavaBeans style properties of the component are
--- 172,179 ----
  	  <!ATTLIST collection column CDATA #IMPLIED>
  	  <!ATTLIST collection length CDATA #IMPLIED>
! 	  <!ATTLIST collection not-null (true|false) "false">
! 	  <!ATTLIST collection unique (true|false) "false">
! 	  <!ATTLIST collection cascade (none|all|save-update|delete) #IMPLIED>  <!-- default: none -->
! 	  
  	<!-- A component is a user-defined class, persisted along with its containing entity
  	to the table of the entity class. JavaBeans style properties of the component are
***************
*** 155,165 ****
  	is mapped to null values in all columns and vice versa. Components do not support
  	shared reference semantics. -->
! 
! 	<!ELEMENT component ( 
  	  (property|many-to-one|one-to-one|collection|component|map|set|list|bag|array|primitive-array)*
  	)>
  	  <!ATTLIST component class CDATA #IMPLIED>
  	  <!ATTLIST component name CDATA #REQUIRED>
! 
  	<!-- Collection roles declared directly beneath the root element have their own key
  	and may be referenced by many collection or subcollection tags. Collection declarations
--- 181,198 ----
  	is mapped to null values in all columns and vice versa. Components do not support
  	shared reference semantics. -->
! 	
! 	<!ELEMENT component (
! 	  parent?,
  	  (property|many-to-one|one-to-one|collection|component|map|set|list|bag|array|primitive-array)*
  	)>
  	  <!ATTLIST component class CDATA #IMPLIED>
  	  <!ATTLIST component name CDATA #REQUIRED>
! 	
! 	<!-- The parent element maps a property of the component class as a pointer back to
! 	the owning entity. -->
! 	
! 	<!ELEMENT parent EMPTY>
! 	  <!ATTLIST parent name CDATA #REQUIRED>
! 	
  	<!-- Collection roles declared directly beneath the root element have their own key
  	and may be referenced by many collection or subcollection tags. Collection declarations
***************
*** 168,292 ****
  	the role may be an arbitrary string. For nested collections, it must be the name
  	of the property containing the collection. 
! 
  	Note that the cascade attribute is ignored for toplevel collections. -->
! 
  	<!ELEMENT map (
  		jcs-cache?,
! 		key, 
! 		index, 
  		(element|one-to-many|many-to-many|subcollection|composite-element)
  	)>
  	  <!ATTLIST map role CDATA #REQUIRED>
! 	  <!ATTLIST map table CDATA #IMPLIED>    <!-- default: rolename -->
! 	  <!ATTLIST map schema CDATA #IMPLIED>   <!-- default: none -->
! 	  <!ATTLIST map lazy CDATA #IMPLIED>     <!-- default: false -->
! 	  <!ATTLIST map sort CDATA #IMPLIED>     <!-- unsorted|natural, default: unsorted -->
! 	  <!ATTLIST map cascade CDATA #IMPLIED>  <!-- none|all|save/update|delete, default: none -->
! 	  <!ATTLIST map order-by CDATA #IMPLIED> <!-- default: none -->
! 
  	<!ELEMENT set (
  		jcs-cache?,
! 		key, 
  		(element|one-to-many|many-to-many|subcollection|composite-element)
  	)>
  	  <!ATTLIST set role CDATA #REQUIRED>
! 	  <!ATTLIST set table CDATA #IMPLIED>    <!-- default: rolename -->
! 	  <!ATTLIST set schema CDATA #IMPLIED>   <!-- default: none -->
! 	  <!ATTLIST set lazy CDATA #IMPLIED>     <!-- default: false -->
! 	  <!ATTLIST set sort CDATA #IMPLIED>     <!-- unsorted|natural, default: unsorted -->
! 	  <!ATTLIST set readonly CDATA #IMPLIED> <!-- true|false, default: false -->
! 	  <!ATTLIST set cascade CDATA #IMPLIED>  <!-- none|all|save/update|delete, default: none -->
! 	  <!ATTLIST set order-by CDATA #IMPLIED> <!-- default: none -->
! 
  	<!ELEMENT bag (
  		jcs-cache?,
! 		key, 
  		(element|one-to-many|many-to-many|subcollection|composite-element)
  	)>
  	  <!ATTLIST bag role CDATA #REQUIRED>
! 	  <!ATTLIST bag table CDATA #IMPLIED>    <!-- default: rolename -->
! 	  <!ATTLIST bag schema CDATA #IMPLIED>   <!-- default: none -->
! 	  <!ATTLIST bag lazy CDATA #IMPLIED>     <!-- default: false -->
! 	  <!ATTLIST bag readonly CDATA #IMPLIED> <!-- true|false, default: false -->
! 	  <!ATTLIST bag cascade CDATA #IMPLIED>  <!-- none|all|save/update|delete, default: none -->
! 	  <!ATTLIST bag order-by CDATA #IMPLIED> <!-- default: none -->
! 
  	<!ELEMENT list (
  		jcs-cache?,
! 		key, 
  		index, 
  		(element|one-to-many|many-to-many|subcollection|composite-element)
  	)>
  	  <!ATTLIST list role CDATA #REQUIRED>
! 	  <!ATTLIST list table CDATA #IMPLIED>   <!-- default: rolename -->
! 	  <!ATTLIST list schema CDATA #IMPLIED>  <!-- default: none -->
! 	  <!ATTLIST list lazy CDATA #IMPLIED>    <!-- default: false -->
! 	  <!ATTLIST list cascade CDATA #IMPLIED> <!-- none|all|save/update|delete, default: none -->
! 
  	<!ELEMENT array (
  		jcs-cache?,
! 		key, 
  		index, 
  		(element|one-to-many|many-to-many|subcollection|composite-element)
  	)>
  	  <!ATTLIST array role CDATA #REQUIRED>
! 	  <!ATTLIST array table CDATA #IMPLIED>         <!-- default: rolename -->
! 	  <!ATTLIST array schema CDATA #IMPLIED>        <!-- default: none -->
  	  <!ATTLIST array element-class CDATA #IMPLIED>
! 	  <!ATTLIST array cascade CDATA #IMPLIED>       <!-- none|all|save/update|delete, default: none -->
! 
  	<!ELEMENT primitive-array (jcs-cache?, key, index, element)>
  	  <!ATTLIST primitive-array role CDATA #REQUIRED>
! 	  <!ATTLIST primitive-array table CDATA #IMPLIED>  <!-- default: rolename -->
! 	  <!ATTLIST primitive-array schema CDATA #IMPLIED> <!-- default: none -->
! 
  	<!-- Declares the element type of a collection of basic type -->
! 
  	<!ELEMENT element (column*)>
  	  <!ATTLIST element column CDATA #IMPLIED>
  	  <!ATTLIST element type CDATA #REQUIRED>
  	  <!ATTLIST element length CDATA #IMPLIED>
! 	  <!ATTLIST element not-null CDATA #IMPLIED> <!-- true|false, default: false -->
! 	  <!ATTLIST element unique CDATA #IMPLIED>   <!-- true|false, default: false -->
! 
  	<!-- One to many association. This tag declares the entity-class
  	element type of a collection and specifies a one-to-many relational model -->
! 
  	<!ELEMENT one-to-many EMPTY>
  	  <!ATTLIST one-to-many class CDATA #REQUIRED>
  	  <!-- No column declaration attributes required in this case. The primary
  	  key column of the associated class is already mapped elsewhere.-->
! 
  	<!-- Many to many association. This tag declares the entity-class
  	element type of a collection and specifies a many-to-many relational model -->
! 
  	<!ELEMENT many-to-many (column*)>
  	  <!ATTLIST many-to-many class CDATA #REQUIRED>
  	  <!ATTLIST many-to-many column CDATA #IMPLIED>
! 	  <!ATTLIST many-to-many length CDATA #IMPLIED>    <!-- DEPRECATED -->
! 	  <!ATTLIST many-to-many not-null CDATA #IMPLIED>  <!-- true|false, default: false -->
! 	  <!ATTLIST many-to-many outer-join CDATA #IMPLIED> <!-- true|false, default to hibernate.use_outer_join -->
! 	  <!-- unique makes no sense here since it would mean a one-to-many -->
! 
  	<!-- This tag declares that the element type of a collection is a named
  	toplevel collection role. -->  
! 
  	<!ELEMENT subcollection (column*)>
  	  <!ATTLIST subcollection column CDATA #IMPLIED>
  	  <!ATTLIST subcollection role CDATA #REQUIRED>
  	  <!ATTLIST subcollection length CDATA #IMPLIED>
! 	  <!ATTLIST subcollection not-null CDATA #IMPLIED> <!-- true|false, default: false -->
! 	  <!ATTLIST subcollection unique CDATA #IMPLIED>   <!-- true|false, default: false -->
! 
  	<!-- A composite element allows a collection to hold instances of an arbitrary 
  	class, without the requirement of joining to an entity table. Composite elements
  	have component semantics - no shared references and ad hoc null value semantics. 
  	Composite elements may not hold nested collections. -->
! 
  	<!ELEMENT composite-element ( 
  	  (property|many-to-one|collection|nested-composite-element)* 
  	)>
  	  <!ATTLIST composite-element class CDATA #REQUIRED>
! 
  	<!ELEMENT nested-composite-element ( 
  	  (property|many-to-one|collection|nested-composite-element)* 
--- 201,324 ----
  	the role may be an arbitrary string. For nested collections, it must be the name
  	of the property containing the collection. 
! 	
  	Note that the cascade attribute is ignored for toplevel collections. -->
! 	
  	<!ELEMENT map (
  		jcs-cache?,
! 		(key|generated-key), 
! 		(index|composite-index|index-many-to-many), 
  		(element|one-to-many|many-to-many|subcollection|composite-element)
  	)>
  	  <!ATTLIST map role CDATA #REQUIRED>
! 	  <!ATTLIST map table CDATA #IMPLIED>                              <!-- default: rolename -->
! 	  <!ATTLIST map schema CDATA #IMPLIED>                             <!-- default: none -->
! 	  <!ATTLIST map lazy (true|false) "false">
! 	  <!ATTLIST map sort CDATA #IMPLIED>                               <!-- unsorted|natural|"comparator class", default: unsorted -->
! 	  <!ATTLIST map cascade (none|all|save-update|delete) #IMPLIED>    <!-- default: none -->
! 	  <!ATTLIST map order-by CDATA #IMPLIED>                           <!-- default: none -->
! 	
  	<!ELEMENT set (
  		jcs-cache?,
! 		(key|generated-key), 
  		(element|one-to-many|many-to-many|subcollection|composite-element)
  	)>
  	  <!ATTLIST set role CDATA #REQUIRED>
! 	  <!ATTLIST set table CDATA #IMPLIED>                              <!-- default: rolename -->
! 	  <!ATTLIST set schema CDATA #IMPLIED>                             <!-- default: none -->
! 	  <!ATTLIST set lazy (true|false) "false">
! 	  <!ATTLIST set sort CDATA "unsorted">                             <!-- unsorted|natural|"comparator class" -->
! 	  <!ATTLIST set readonly (true|false) "false">
! 	  <!ATTLIST set cascade (none|all|save-update|delete) #IMPLIED>    <!-- default: none -->
! 	  <!ATTLIST set order-by CDATA #IMPLIED>                           <!-- default: none -->
! 	
  	<!ELEMENT bag (
  		jcs-cache?,
! 		(key|generated-key), 
  		(element|one-to-many|many-to-many|subcollection|composite-element)
  	)>
  	  <!ATTLIST bag role CDATA #REQUIRED>
! 	  <!ATTLIST bag table CDATA #IMPLIED>                              <!-- default: rolename -->
! 	  <!ATTLIST bag schema CDATA #IMPLIED>                             <!-- default: none -->
! 	  <!ATTLIST bag lazy (true|false) "false">
! 	  <!ATTLIST bag readonly (true|false) "false">
! 	  <!ATTLIST bag cascade (none|all|save-update|delete) #IMPLIED>    <!-- default: none -->
! 	  <!ATTLIST bag order-by CDATA #IMPLIED>                           <!-- default: none -->
! 	
  	<!ELEMENT list (
  		jcs-cache?,
! 		(key|generated-key), 
  		index, 
  		(element|one-to-many|many-to-many|subcollection|composite-element)
  	)>
  	  <!ATTLIST list role CDATA #REQUIRED>
! 	  <!ATTLIST list table CDATA #IMPLIED>                             <!-- default: rolename -->
! 	  <!ATTLIST list schema CDATA #IMPLIED>                            <!-- default: none -->
! 	  <!ATTLIST list lazy (true|false) "false">
! 	  <!ATTLIST list cascade (none|all|save-update|delete) #IMPLIED>   <!-- default: none -->
! 	
  	<!ELEMENT array (
  		jcs-cache?,
! 		(key|generated-key), 
  		index, 
  		(element|one-to-many|many-to-many|subcollection|composite-element)
  	)>
  	  <!ATTLIST array role CDATA #REQUIRED>
! 	  <!ATTLIST array table CDATA #IMPLIED>                            <!-- default: rolename -->
! 	  <!ATTLIST array schema CDATA #IMPLIED>                           <!-- default: none -->
  	  <!ATTLIST array element-class CDATA #IMPLIED>
! 	  <!ATTLIST array cascade (none|all|save-update|delete) #IMPLIED>  <!-- default: none -->
! 	
  	<!ELEMENT primitive-array (jcs-cache?, key, index, element)>
  	  <!ATTLIST primitive-array role CDATA #REQUIRED>
! 	  <!ATTLIST primitive-array table CDATA #IMPLIED>                  <!-- default: rolename -->
! 	  <!ATTLIST primitive-array schema CDATA #IMPLIED>                 <!-- default: none -->
! 	
  	<!-- Declares the element type of a collection of basic type -->
! 	
  	<!ELEMENT element (column*)>
  	  <!ATTLIST element column CDATA #IMPLIED>
  	  <!ATTLIST element type CDATA #REQUIRED>
  	  <!ATTLIST element length CDATA #IMPLIED>
! 	  <!ATTLIST element not-null (true|false) "false">
! 	  <!ATTLIST element unique (true|false) "false">
! 	
  	<!-- One to many association. This tag declares the entity-class
  	element type of a collection and specifies a one-to-many relational model -->
! 	
  	<!ELEMENT one-to-many EMPTY>
  	  <!ATTLIST one-to-many class CDATA #REQUIRED>
  	  <!-- No column declaration attributes required in this case. The primary
  	  key column of the associated class is already mapped elsewhere.-->
! 	
  	<!-- Many to many association. This tag declares the entity-class
  	element type of a collection and specifies a many-to-many relational model -->
! 	
  	<!ELEMENT many-to-many (column*)>
  	  <!ATTLIST many-to-many class CDATA #REQUIRED>
  	  <!ATTLIST many-to-many column CDATA #IMPLIED>
! 	  <!ATTLIST many-to-many not-null (true|false) "false">
! 	  <!ATTLIST many-to-many outer-join (true|false|auto) "auto">
! 	  <!-- unique makes no sense here since it would make the association one-to-many -->
! 	
  	<!-- This tag declares that the element type of a collection is a named
  	toplevel collection role. -->  
! 	
  	<!ELEMENT subcollection (column*)>
  	  <!ATTLIST subcollection column CDATA #IMPLIED>
  	  <!ATTLIST subcollection role CDATA #REQUIRED>
  	  <!ATTLIST subcollection length CDATA #IMPLIED>
! 	  <!ATTLIST subcollection not-null (true|false) "false">
! 	  <!ATTLIST subcollection unique (true|false) "false">
! 	
  	<!-- A composite element allows a collection to hold instances of an arbitrary 
  	class, without the requirement of joining to an entity table. Composite elements
  	have component semantics - no shared references and ad hoc null value semantics. 
  	Composite elements may not hold nested collections. -->
! 	
  	<!ELEMENT composite-element ( 
  	  (property|many-to-one|collection|nested-composite-element)* 
  	)>
  	  <!ATTLIST composite-element class CDATA #REQUIRED>
! 	
  	<!ELEMENT nested-composite-element ( 
  	  (property|many-to-one|collection|nested-composite-element)* 
***************
*** 294,347 ****
  	  <!ATTLIST nested-composite-element class CDATA #REQUIRED>
  	  <!ATTLIST nested-composite-element name CDATA #REQUIRED>
! 
  	<!-- Declares the type, column name (and, in the case of toplevel collections, 
  	an id generation strategy) for the key of a collection table. These keys are
  	never exposed to the application. For toplevel collections, Hibernate makes
  	no guarantee of key stability of a particular collection instance. -->
! 
! 	<!ELEMENT key (generator?, column*)>
  	  <!ATTLIST key column CDATA #IMPLIED>
- 	  <!ATTLIST key type CDATA #IMPLIED>
  	  <!ATTLIST key length CDATA #IMPLIED>
! 
  	<!-- Declares the type and column mapping for a collection index (array or
  	list index, or key of a map). -->
! 
! 	<!ELEMENT index (column?)>
! 	  <!ATTLIST index column CDATA #REQUIRED>
! 	  <!ATTLIST index type CDATA #IMPLIED>
  	  <!ATTLIST index length CDATA #IMPLIED>
! 
  	<!-- Generators generate unique identifiers. The class attribute specifies a Java class
  	implementing an id generation algorithm. -->
! 
  	<!ELEMENT generator (param*)>
  	  <!ATTLIST generator class CDATA #REQUIRED>
  	<!ELEMENT param (#PCDATA)>
! 
  	<!-- The column element is an alternative to column attributes and required for 
  	mapping associations to classes with composite ids. -->
! 
  	<!ELEMENT column EMPTY>
  	  <!ATTLIST column name CDATA #REQUIRED>
! 	  <!ATTLIST column length CDATA #IMPLIED>     <!-- default: 255 -->
! 	  <!ATTLIST column not-null CDATA #IMPLIED>   <!-- true|false, default: false -->
! 	  <!ATTLIST column unique CDATA #IMPLIED>     <!-- true|false, default: false -->
! 	  <!ATTLIST column sql-type CDATA #IMPLIED>   <!-- override default column type for hibernate type -->
  	  <!ATTLIST column index CDATA #IMPLIED>
! 
  	<!-- The jcs-cache element enables caching of an entity class. -->
  	<!ELEMENT jcs-cache EMPTY>
! 	  <!ATTLIST jcs-cache usage CDATA #REQUIRED>       <!-- read-only | read-write -->
! 
! 	<!-- The cache element enables caching of an entity class. 
! 	semi-deprecated - use a jcs-cache. -->
! 	<!ELEMENT cache EMPTY>
! 	  <!ATTLIST cache timeout CDATA #IMPLIED>     <!-- default: never expire -->
! 	  <!ATTLIST cache impl-class CDATA #IMPLIED>  <!-- default: hashbelt -->
! 	  <!ATTLIST cache type CDATA #REQUIRED>       <!-- readonly | readwrite -->
! 
  	<!-- The query element declares a named Hibernate query string -->
! 
  	<!ELEMENT query (#PCDATA)>
  	  <!ATTLIST query name CDATA #REQUIRED>
--- 326,388 ----
  	  <!ATTLIST nested-composite-element class CDATA #REQUIRED>
  	  <!ATTLIST nested-composite-element name CDATA #REQUIRED>
! 	  
  	<!-- Declares the type, column name (and, in the case of toplevel collections, 
  	an id generation strategy) for the key of a collection table. These keys are
  	never exposed to the application. For toplevel collections, Hibernate makes
  	no guarantee of key stability of a particular collection instance. -->
! 	
! 	<!ELEMENT key (column*)>
  	  <!ATTLIST key column CDATA #IMPLIED>
  	  <!ATTLIST key length CDATA #IMPLIED>
! 	
! 	<!ELEMENT generated-key (generator, column*)>
! 	  <!ATTLIST generated-key column CDATA #IMPLIED>
! 	  <!ATTLIST generated-key type CDATA #REQUIRED>
! 	  <!ATTLIST generated-key length CDATA #IMPLIED>
! 	
  	<!-- Declares the type and column mapping for a collection index (array or
  	list index, or key of a map). -->
! 	
! 	<!ELEMENT index (column*)>
! 	  <!ATTLIST index column CDATA #IMPLIED>
! 	  <!ATTLIST index type CDATA #IMPLIED>      <!-- required for maps -->
  	  <!ATTLIST index length CDATA #IMPLIED>
! 	
! 	<!-- Many to many association mapped to the key of a map. ie. a map keyed
! 	on entities. -->
! 	
! 	<!ELEMENT index-many-to-many (column*)>
! 	  <!ATTLIST index-many-to-many class CDATA #REQUIRED>
! 	  <!ATTLIST index-many-to-many column CDATA #IMPLIED>
! 	
! 	<!-- Composite index of a map ie. a map keyed on components. -->
! 	
! 	<!ELEMENT composite-index ( (key-property|key-many-to-one)+ )>
! 	  <!ATTLIST composite-index class CDATA #REQUIRED>
! 	
  	<!-- Generators generate unique identifiers. The class attribute specifies a Java class
  	implementing an id generation algorithm. -->
! 	
  	<!ELEMENT generator (param*)>
  	  <!ATTLIST generator class CDATA #REQUIRED>
  	<!ELEMENT param (#PCDATA)>
! 	
  	<!-- The column element is an alternative to column attributes and required for 
  	mapping associations to classes with composite ids. -->
! 	
  	<!ELEMENT column EMPTY>
  	  <!ATTLIST column name CDATA #REQUIRED>
! 	  <!ATTLIST column length CDATA #IMPLIED>              <!-- default: 255 -->
! 	  <!ATTLIST column not-null (true|false) #IMPLIED>     <!-- default: false (except for id properties) -->
! 	  <!ATTLIST column unique (true|false) #IMPLIED>       <!-- default: false (except for id properties) -->
! 	  <!ATTLIST column sql-type CDATA #IMPLIED>            <!-- override default column type for hibernate type -->
  	  <!ATTLIST column index CDATA #IMPLIED>
! 	
  	<!-- The jcs-cache element enables caching of an entity class. -->
  	<!ELEMENT jcs-cache EMPTY>
! 	  <!ATTLIST jcs-cache usage (read-only|read-write) #REQUIRED>        
! 	
  	<!-- The query element declares a named Hibernate query string -->
! 	
  	<!ELEMENT query (#PCDATA)>
  	  <!ATTLIST query name CDATA #REQUIRED>

Index: dtd.html
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/doc/dtd.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** dtd.html	5 Nov 2002 08:03:59 -0000	1.21
--- dtd.html	11 Nov 2002 16:04:55 -0000	1.22
***************
*** 19,32 ****
  <pre>
  &lt;?xml version='1.0' encoding='utf-8'?&gt;
! </pre>
! <pre>
  &lt;!-- Hibernate Mapping DTD.
! </pre>
! <pre>
  &lt;!DOCTYPE hibernate-mapping PUBLIC 
!         &quot;-//Hibernate/Hibernate Mapping DTD//EN&quot;
!         &quot;http://hibernate.sourceforge.net/hibernate-mapping.dtd&quot;&gt;
! </pre>
! <pre>
  An instance of this XML document may contain mappings for an arbitrary 
  number of classes. The class mappings may contain associations to classes
--- 19,29 ----
  <pre>
  &lt;?xml version='1.0' encoding='utf-8'?&gt;
! 
  &lt;!-- Hibernate Mapping DTD.
! 
  &lt;!DOCTYPE hibernate-mapping PUBLIC 
!         &quot;-//Hibernate/Hibernate Mapping DTD 1.1//EN&quot;
!         &quot;http://hibernate.sourceforge.net/hibernate-mapping-1.1.dtd&quot;&gt;
! 
  An instance of this XML document may contain mappings for an arbitrary 
  number of classes. The class mappings may contain associations to classes
***************
*** 36,47 ****
  be referenced by later class and collection mappings in the same document. 
  (They must be declared before they are used.)
! </pre>
! <pre>
  --&gt;
! </pre>
! <pre>
  &lt;!-- The document root. --&gt;
! </pre>
! <pre>
  &lt;!ELEMENT hibernate-mapping ( 
          (map|set|list|bag|array|primitive-array)*, 
--- 33,41 ----
  be referenced by later class and collection mappings in the same document. 
  (They must be declared before they are used.)
! 
  --&gt;
! 
  &lt;!-- The document root. --&gt;
! 
  &lt;!ELEMENT hibernate-mapping ( 
          (map|set|list|bag|array|primitive-array)*, 
***************
*** 49,59 ****
          query*
  )&gt;
! &lt;!ATTLIST hibernate-mapping schema CDATA #IMPLIED&gt;  &lt;!-- default: none --&gt;
! &lt;!ATTLIST hibernate-mapping default-cascade CDATA #IMPLIED&gt;  &lt;!-- none|save/update|all, default: none --&gt;
! </pre>
! <pre>
  &lt;!-- Root of an entity class hierarchy. Entities have their own tables. --&gt;
! </pre>
! <pre>
  &lt;!ELEMENT class ( 
    jcs-cache?,
--- 43,51 ----
          query*
  )&gt;
! &lt;!ATTLIST hibernate-mapping schema CDATA #IMPLIED&gt;                            &lt;!-- default: none --&gt;
! &lt;!ATTLIST hibernate-mapping default-cascade (none|save-update|all) &quot;none&quot;&gt;
!   
  &lt;!-- Root of an entity class hierarchy. Entities have their own tables. --&gt;
! 
  &lt;!ELEMENT class ( 
    jcs-cache?,
***************
*** 62,66 ****
    (version|timestamp)?,
    (property|many-to-one|one-to-one|collection|component|map|set|list|bag|array|primitive-array)*, 
!   subclass*,
    cache?
  )&gt;
--- 54,58 ----
    (version|timestamp)?,
    (property|many-to-one|one-to-one|collection|component|map|set|list|bag|array|primitive-array)*, 
!   ((subclass*)|(joined-subclass*)),
    cache?
  )&gt;
***************
*** 69,85 ****
    &lt;!ATTLIST class schema CDATA #IMPLIED&gt;          &lt;!-- default: none --&gt;
    &lt;!ATTLIST class proxy CDATA #IMPLIED&gt;           &lt;!-- default: no proxy interface --&gt;
!   &lt;!ATTLIST class mutable CDATA #IMPLIED&gt;         &lt;!-- default: true --&gt;
    &lt;!ATTLIST class persister CDATA #IMPLIED&gt;       &lt;!-- default: cirrus.hibernate.persister.EntityPersister --&gt;
! </pre>
! <pre>
    &lt;!ATTLIST class discriminator-value CDATA #IMPLIED&gt;  &lt;!-- default: unqualified class name | none --&gt;
! </pre>
! <pre>
  &lt;!-- Declares the id type, column and generation algorithm for an entity class.
  If a name attribut is given, the id is exposed to the application through the 
  named property of the class. If not, the id is only exposed to the application 
  through Session.getID()--&gt;
! </pre>
! <pre>
  &lt;!ELEMENT id (column?, generator)&gt;
    &lt;!ATTLIST id name CDATA #IMPLIED&gt;
--- 61,74 ----
    &lt;!ATTLIST class schema CDATA #IMPLIED&gt;          &lt;!-- default: none --&gt;
    &lt;!ATTLIST class proxy CDATA #IMPLIED&gt;           &lt;!-- default: no proxy interface --&gt;
!   &lt;!ATTLIST class mutable (true|false) &quot;true&quot;&gt;
    &lt;!ATTLIST class persister CDATA #IMPLIED&gt;       &lt;!-- default: cirrus.hibernate.persister.EntityPersister --&gt;
!   
    &lt;!ATTLIST class discriminator-value CDATA #IMPLIED&gt;  &lt;!-- default: unqualified class name | none --&gt;
! 
  &lt;!-- Declares the id type, column and generation algorithm for an entity class.
  If a name attribut is given, the id is exposed to the application through the 
  named property of the class. If not, the id is only exposed to the application 
  through Session.getID()--&gt;
! 
  &lt;!ELEMENT id (column?, generator)&gt;
    &lt;!ATTLIST id name CDATA #IMPLIED&gt;
***************
*** 87,133 ****
    &lt;!ATTLIST id type CDATA #IMPLIED&gt;
    &lt;!ATTLIST id length CDATA #IMPLIED&gt;
!   &lt;!ATTLIST id unsaved-value CDATA #IMPLIED&gt;  &lt;!-- any|none|null|&quot;value&quot;, default: any --&gt;
! </pre>
! <pre>
  &lt;!-- A composite key may be modelled by a java class with a property for each 
  key column. The class must implement java.io.Serializable and reimplement equals() 
  and hashCode(). --&gt;
! </pre>
! <pre>
! &lt;!ELEMENT composite-id (property+)&gt;
    &lt;!ATTLIST composite-id class CDATA #IMPLIED&gt;
    &lt;!ATTLIST composite-id name CDATA #IMPLIED&gt;
!   &lt;!ATTLIST composite-id unsaved-value CDATA #IMPLIED&gt;  &lt;!-- any|none|null, default: any --&gt;
! </pre>
! <pre>
  &lt;!-- Polymorphic data requires a column holding a class discriminator value. This
  value is not directly exposed to the application. --&gt;
! </pre>
! <pre>
  &lt;!ELEMENT discriminator (column?)&gt;
    &lt;!ATTLIST discriminator column CDATA #IMPLIED&gt;   &lt;!-- default: &quot;class&quot;|none --&gt;
!   &lt;!ATTLIST discriminator type CDATA #IMPLIED&gt;     &lt;!-- default: string --&gt;
!   &lt;!ATTLIST discriminator length CDATA #IMPLIED&gt;   &lt;!-- default: 100 --&gt;
! </pre>
! <pre>
  &lt;!-- Versioned data requires a column holding a version number. This is exposed to the
  application through a property of the Java class. --&gt;
! </pre>
! <pre>
  &lt;!ELEMENT version EMPTY&gt;
    &lt;!ATTLIST version name CDATA #REQUIRED&gt;
    &lt;!ATTLIST version column CDATA #IMPLIED&gt;
!   &lt;!ATTLIST version type CDATA #IMPLIED&gt;           &lt;!-- default: integer --&gt;
! </pre>
! <pre>
  &lt;!ELEMENT timestamp EMPTY&gt;
    &lt;!ATTLIST timestamp name CDATA #REQUIRED&gt;
    &lt;!ATTLIST timestamp column CDATA #IMPLIED&gt;
! </pre>
! <pre>
  &lt;!-- Subclass declarations are nested beneath the root class declaration to achieve
  polymorphic persistence. --&gt;
! </pre>
! <pre>
  &lt;!ELEMENT subclass ( 
          (property|many-to-one|one-to-one|collection|component|map|set|list|bag|array|primitive-array)*, 
--- 76,113 ----
    &lt;!ATTLIST id type CDATA #IMPLIED&gt;
    &lt;!ATTLIST id length CDATA #IMPLIED&gt;
!   &lt;!ATTLIST id unsaved-value CDATA &quot;any&quot;&gt;          &lt;!-- any|none|null|&quot;value&quot; --&gt;
! 
  &lt;!-- A composite key may be modelled by a java class with a property for each 
  key column. The class must implement java.io.Serializable and reimplement equals() 
  and hashCode(). --&gt;
! 
! &lt;!ELEMENT composite-id ( (key-property|key-many-to-one)+ )&gt;
    &lt;!ATTLIST composite-id class CDATA #IMPLIED&gt;
    &lt;!ATTLIST composite-id name CDATA #IMPLIED&gt;
!   &lt;!ATTLIST composite-id unsaved-value (any|none|null) &quot;any&quot;&gt;  &lt;!-- default: any --&gt;
! 
  &lt;!-- Polymorphic data requires a column holding a class discriminator value. This
  value is not directly exposed to the application. --&gt;
! 
  &lt;!ELEMENT discriminator (column?)&gt;
    &lt;!ATTLIST discriminator column CDATA #IMPLIED&gt;   &lt;!-- default: &quot;class&quot;|none --&gt;
!   &lt;!ATTLIST discriminator type CDATA &quot;string&quot;&gt;
!   &lt;!ATTLIST discriminator length CDATA #IMPLIED&gt;
!   
  &lt;!-- Versioned data requires a column holding a version number. This is exposed to the
  application through a property of the Java class. --&gt;
! 
  &lt;!ELEMENT version EMPTY&gt;
    &lt;!ATTLIST version name CDATA #REQUIRED&gt;
    &lt;!ATTLIST version column CDATA #IMPLIED&gt;
!   &lt;!ATTLIST version type CDATA &quot;integer&quot;&gt;
! 
  &lt;!ELEMENT timestamp EMPTY&gt;
    &lt;!ATTLIST timestamp name CDATA #REQUIRED&gt;
    &lt;!ATTLIST timestamp column CDATA #IMPLIED&gt;
! 
  &lt;!-- Subclass declarations are nested beneath the root class declaration to achieve
  polymorphic persistence. --&gt;
! 
  &lt;!ELEMENT subclass ( 
          (property|many-to-one|one-to-one|collection|component|map|set|list|bag|array|primitive-array)*, 
***************
*** 135,148 ****
  )&gt;
    &lt;!ATTLIST subclass name CDATA #REQUIRED&gt;
!   &lt;!ATTLIST subclass proxy CDATA #IMPLIED&gt;     &lt;!-- default: no proxy interface --&gt;
! </pre>
! <pre>
    &lt;!ATTLIST subclass discriminator-value CDATA #IMPLIED&gt;  &lt;!-- default: unqualified class name | none --&gt;
! </pre>
! <pre>
  &lt;!-- Property of an entity class or component, component-element, composite-id, etc. 
  JavaBeans style properties are mapped to table columns. --&gt;
! </pre>
! <pre>
  &lt;!ELEMENT property (column*)&gt;
    &lt;!ATTLIST property name CDATA #REQUIRED&gt;
--- 115,136 ----
  )&gt;
    &lt;!ATTLIST subclass name CDATA #REQUIRED&gt;
!   &lt;!ATTLIST subclass proxy CDATA #IMPLIED&gt;                &lt;!-- default: no proxy interface --&gt;
    &lt;!ATTLIST subclass discriminator-value CDATA #IMPLIED&gt;  &lt;!-- default: unqualified class name | none --&gt;
! 
! &lt;!-- Joined subclasses are used for the normalized table-per-subclass mapping strategy --&gt;
! 
! &lt;!ELEMENT joined-subclass ( 
!         key,
!         (property|many-to-one|one-to-one|collection|component|map|set|list|bag|array|primitive-array)*, 
!         joined-subclass*
! )&gt;
!   &lt;!ATTLIST joined-subclass name CDATA #REQUIRED&gt;
!   &lt;!ATTLIST joined-subclass proxy CDATA #IMPLIED&gt;                &lt;!-- default: no proxy interface --&gt;
!   &lt;!ATTLIST joined-subclass table CDATA #REQUIRED&gt;
!   &lt;!ATTLIST joined-subclass schema CDATA #IMPLIED&gt;
!   
  &lt;!-- Property of an entity class or component, component-element, composite-id, etc. 
  JavaBeans style properties are mapped to table columns. --&gt;
! 
  &lt;!ELEMENT property (column*)&gt;
    &lt;!ATTLIST property name CDATA #REQUIRED&gt;
***************
*** 150,187 ****
    &lt;!ATTLIST property column CDATA #IMPLIED&gt;
    &lt;!ATTLIST property length CDATA #IMPLIED&gt;
!   &lt;!ATTLIST property not-null CDATA #IMPLIED&gt;
!   &lt;!ATTLIST property unique CDATA #IMPLIED&gt;
! </pre>
! <pre>
  &lt;!-- Declares an association between two entities (Or from a component, component element,
  etc. to an entity). --&gt;
! </pre>
! <pre>
  &lt;!ELEMENT many-to-one (column*)&gt;
    &lt;!ATTLIST many-to-one name CDATA #REQUIRED&gt;
    &lt;!ATTLIST many-to-one class CDATA #IMPLIED&gt;
    &lt;!ATTLIST many-to-one column CDATA #IMPLIED&gt;
!   &lt;!ATTLIST many-to-one length CDATA #IMPLIED&gt;     &lt;!-- DEPRECATED --&gt;
!   &lt;!ATTLIST many-to-one not-null CDATA #IMPLIED&gt;   &lt;!-- true|false, default: false --&gt;
!   &lt;!ATTLIST many-to-one unique CDATA #IMPLIED&gt;     &lt;!-- true|false, default: false --&gt;
!   &lt;!ATTLIST many-to-one cascade CDATA #IMPLIED&gt;    &lt;!-- none|all|save/update|delete, default: none --&gt;
!   &lt;!ATTLIST many-to-one outer-join CDATA #IMPLIED&gt; &lt;!-- true|false, default to hibernate.use_outer_join --&gt;
! </pre>
! <pre>
  &lt;!-- Declares a one-to-one association between two entities (Or from a component, 
  component element, etc. to an entity). --&gt;
! </pre>
! <pre>
  &lt;!ELEMENT one-to-one EMPTY&gt;
    &lt;!ATTLIST one-to-one name CDATA #REQUIRED&gt;
    &lt;!ATTLIST one-to-one class CDATA #IMPLIED&gt;
!   &lt;!ATTLIST one-to-one cascade CDATA #IMPLIED&gt;     &lt;!-- none|all|save/update|delete, default: none --&gt;
!   &lt;!ATTLIST one-to-one outer-join CDATA #IMPLIED&gt;  &lt;!-- true|false, default to hibernate.use_outer_join --&gt;
!   &lt;!ATTLIST one-to-one constrained CDATA #IMPLIED&gt; &lt;!-- true|false, default: false --&gt;
! </pre>
! <pre>
  &lt;!-- Declared a property that holds instances of a toplevel collection role. --&gt;
! </pre>
! <pre>
  &lt;!ELEMENT collection (column*)&gt;
    &lt;!ATTLIST collection name CDATA #REQUIRED&gt;
--- 138,184 ----
    &lt;!ATTLIST property column CDATA #IMPLIED&gt;
    &lt;!ATTLIST property length CDATA #IMPLIED&gt;
!   &lt;!ATTLIST property not-null (true|false) &quot;false&quot;&gt;
!   &lt;!ATTLIST property unique (true|false) &quot;false&quot;&gt;
! 
  &lt;!-- Declares an association between two entities (Or from a component, component element,
  etc. to an entity). --&gt;
! 
  &lt;!ELEMENT many-to-one (column*)&gt;
    &lt;!ATTLIST many-to-one name CDATA #REQUIRED&gt;
    &lt;!ATTLIST many-to-one class CDATA #IMPLIED&gt;
    &lt;!ATTLIST many-to-one column CDATA #IMPLIED&gt;
!   &lt;!ATTLIST many-to-one not-null (true|false) &quot;false&quot;&gt;
!   &lt;!ATTLIST many-to-one unique (true|false) &quot;false&quot;&gt;
!   &lt;!ATTLIST many-to-one cascade (none|all|save-update|delete) #IMPLIED&gt;    &lt;!-- default: none --&gt;
!   &lt;!ATTLIST many-to-one outer-join (true|false|auto) &quot;auto&quot;&gt;
!     
  &lt;!-- Declares a one-to-one association between two entities (Or from a component, 
  component element, etc. to an entity). --&gt;
! 
  &lt;!ELEMENT one-to-one EMPTY&gt;
    &lt;!ATTLIST one-to-one name CDATA #REQUIRED&gt;
    &lt;!ATTLIST one-to-one class CDATA #IMPLIED&gt;
!   &lt;!ATTLIST one-to-one cascade (none|all|save-update|delete) #IMPLIED&gt;     &lt;!-- default: none --&gt;
!   &lt;!ATTLIST one-to-one outer-join (true|false|auto) &quot;auto&quot;&gt;
!   &lt;!ATTLIST one-to-one constrained (true|false) &quot;false&quot;&gt;
! 
! &lt;!-- A property embedded in a composite identifier or map index (always not-null). --&gt;
! 
! &lt;!ELEMENT key-property (column*)&gt;
!   &lt;!ATTLIST key-property name CDATA #REQUIRED&gt;
!   &lt;!ATTLIST key-property type CDATA #IMPLIED&gt;
!   &lt;!ATTLIST key-property column CDATA #IMPLIED&gt;
!   &lt;!ATTLIST key-property length CDATA #IMPLIED&gt;
! 
! &lt;!-- A many-to-one association embedded in a composite identifier or map index 
! (always not-null, never cascade). --&gt;
! 
! &lt;!ELEMENT key-many-to-one (column*)&gt;
!   &lt;!ATTLIST key-many-to-one name CDATA #REQUIRED&gt;
!   &lt;!ATTLIST key-many-to-one class CDATA #IMPLIED&gt;
!   &lt;!ATTLIST key-many-to-one column CDATA #IMPLIED&gt;
!   
  &lt;!-- Declared a property that holds instances of a toplevel collection role. --&gt;
! 
  &lt;!ELEMENT collection (column*)&gt;
    &lt;!ATTLIST collection name CDATA #REQUIRED&gt;
***************
*** 189,197 ****
    &lt;!ATTLIST collection column CDATA #IMPLIED&gt;
    &lt;!ATTLIST collection length CDATA #IMPLIED&gt;
!   &lt;!ATTLIST collection not-null CDATA #IMPLIED&gt; &lt;!-- true|false, default: false --&gt;
!   &lt;!ATTLIST collection unique CDATA #IMPLIED&gt;   &lt;!-- true|false, default: false --&gt;
!   &lt;!ATTLIST collection cascade CDATA #IMPLIED&gt;  &lt;!-- none|all|save/update|delete, default: none --&gt;
! </pre>
! <pre>
  &lt;!-- A component is a user-defined class, persisted along with its containing entity
  to the table of the entity class. JavaBeans style properties of the component are
--- 186,193 ----
    &lt;!ATTLIST collection column CDATA #IMPLIED&gt;
    &lt;!ATTLIST collection length CDATA #IMPLIED&gt;
!   &lt;!ATTLIST collection not-null (true|false) &quot;false&quot;&gt;
!   &lt;!ATTLIST collection unique (true|false) &quot;false&quot;&gt;
!   &lt;!ATTLIST collection cascade (none|all|save-update|delete) #IMPLIED&gt;  &lt;!-- default: none --&gt;
!   
  &lt;!-- A component is a user-defined class, persisted along with its containing entity
  to the table of the entity class. JavaBeans style properties of the component are
***************
*** 199,211 ****
  is mapped to null values in all columns and vice versa. Components do not support
  shared reference semantics. --&gt;
! </pre>
! <pre>
! &lt;!ELEMENT component ( 
    (property|many-to-one|one-to-one|collection|component|map|set|list|bag|array|primitive-array)*
  )&gt;
    &lt;!ATTLIST component class CDATA #IMPLIED&gt;
    &lt;!ATTLIST component name CDATA #REQUIRED&gt;
! </pre>
! <pre>
  &lt;!-- Collection roles declared directly beneath the root element have their own key
  and may be referenced by many collection or subcollection tags. Collection declarations
--- 195,212 ----
  is mapped to null values in all columns and vice versa. Components do not support
  shared reference semantics. --&gt;
! 
! &lt;!ELEMENT component (
!   parent?,
    (property|many-to-one|one-to-one|collection|component|map|set|list|bag|array|primitive-array)*
  )&gt;
    &lt;!ATTLIST component class CDATA #IMPLIED&gt;
    &lt;!ATTLIST component name CDATA #REQUIRED&gt;
! 
! &lt;!-- The parent element maps a property of the component class as a pointer back to
! the owning entity. --&gt;
! 
! &lt;!ELEMENT parent EMPTY&gt;
!   &lt;!ATTLIST parent name CDATA #REQUIRED&gt;
! 
  &lt;!-- Collection roles declared directly beneath the root element have their own key
  and may be referenced by many collection or subcollection tags. Collection declarations
***************
*** 214,356 ****
  the role may be an arbitrary string. For nested collections, it must be the name
  of the property containing the collection. 
! </pre>
! <pre>
  Note that the cascade attribute is ignored for toplevel collections. --&gt;
! </pre>
! <pre>
  &lt;!ELEMENT map (
          jcs-cache?,
!         key, 
!         index, 
          (element|one-to-many|many-to-many|subcollection|composite-element)
  )&gt;
    &lt;!ATTLIST map role CDATA #REQUIRED&gt;
!   &lt;!ATTLIST map table CDATA #IMPLIED&gt;    &lt;!-- default: rolename --&gt;
!   &lt;!ATTLIST map schema CDATA #IMPLIED&gt;   &lt;!-- default: none --&gt;
!   &lt;!ATTLIST map lazy CDATA #IMPLIED&gt;     &lt;!-- default: false --&gt;
!   &lt;!ATTLIST map sort CDATA #IMPLIED&gt;     &lt;!-- unsorted|natural, default: unsorted --&gt;
!   &lt;!ATTLIST map cascade CDATA #IMPLIED&gt;  &lt;!-- none|all|save/update|delete, default: none --&gt;
!   &lt;!ATTLIST map order-by CDATA #IMPLIED&gt; &lt;!-- default: none --&gt;
! </pre>
! <pre>
  &lt;!ELEMENT set (
          jcs-cache?,
!         key, 
          (element|one-to-many|many-to-many|subcollection|composite-element)
  )&gt;
    &lt;!ATTLIST set role CDATA #REQUIRED&gt;
!   &lt;!ATTLIST set table CDATA #IMPLIED&gt;    &lt;!-- default: rolename --&gt;
!   &lt;!ATTLIST set schema CDATA #IMPLIED&gt;   &lt;!-- default: none --&gt;
!   &lt;!ATTLIST set lazy CDATA #IMPLIED&gt;     &lt;!-- default: false --&gt;
!   &lt;!ATTLIST set sort CDATA #IMPLIED&gt;     &lt;!-- unsorted|natural, default: unsorted --&gt;
!   &lt;!ATTLIST set readonly CDATA #IMPLIED&gt; &lt;!-- true|false, default: false --&gt;
!   &lt;!ATTLIST set cascade CDATA #IMPLIED&gt;  &lt;!-- none|all|save/update|delete, default: none --&gt;
!   &lt;!ATTLIST set order-by CDATA #IMPLIED&gt; &lt;!-- default: none --&gt;
! </pre>
! <pre>
  &lt;!ELEMENT bag (
          jcs-cache?,
!         key, 
          (element|one-to-many|many-to-many|subcollection|composite-element)
  )&gt;
    &lt;!ATTLIST bag role CDATA #REQUIRED&gt;
!   &lt;!ATTLIST bag table CDATA #IMPLIED&gt;    &lt;!-- default: rolename --&gt;
!   &lt;!ATTLIST bag schema CDATA #IMPLIED&gt;   &lt;!-- default: none --&gt;
!   &lt;!ATTLIST bag lazy CDATA #IMPLIED&gt;     &lt;!-- default: false --&gt;
!   &lt;!ATTLIST bag readonly CDATA #IMPLIED&gt; &lt;!-- true|false, default: false --&gt;
!   &lt;!ATTLIST bag cascade CDATA #IMPLIED&gt;  &lt;!-- none|all|save/update|delete, default: none --&gt;
!   &lt;!ATTLIST bag order-by CDATA #IMPLIED&gt; &lt;!-- default: none --&gt;
! </pre>
! <pre>
  &lt;!ELEMENT list (
          jcs-cache?,
!         key, 
          index, 
          (element|one-to-many|many-to-many|subcollection|composite-element)
  )&gt;
    &lt;!ATTLIST list role CDATA #REQUIRED&gt;
!   &lt;!ATTLIST list table CDATA #IMPLIED&gt;   &lt;!-- default: rolename --&gt;
!   &lt;!ATTLIST list schema CDATA #IMPLIED&gt;  &lt;!-- default: none --&gt;
!   &lt;!ATTLIST list lazy CDATA #IMPLIED&gt;    &lt;!-- default: false --&gt;
!   &lt;!ATTLIST list cascade CDATA #IMPLIED&gt; &lt;!-- none|all|save/update|delete, default: none --&gt;
! </pre>
! <pre>
  &lt;!ELEMENT array (
          jcs-cache?,
!         key, 
          index, 
          (element|one-to-many|many-to-many|subcollection|composite-element)
  )&gt;
    &lt;!ATTLIST array role CDATA #REQUIRED&gt;
!   &lt;!ATTLIST array table CDATA #IMPLIED&gt;         &lt;!-- default: rolename --&gt;
!   &lt;!ATTLIST array schema CDATA #IMPLIED&gt;        &lt;!-- default: none --&gt;
    &lt;!ATTLIST array element-class CDATA #IMPLIED&gt;
!   &lt;!ATTLIST array cascade CDATA #IMPLIED&gt;       &lt;!-- none|all|save/update|delete, default: none --&gt;
! </pre>
! <pre>
  &lt;!ELEMENT primitive-array (jcs-cache?, key, index, element)&gt;
    &lt;!ATTLIST primitive-array role CDATA #REQUIRED&gt;
!   &lt;!ATTLIST primitive-array table CDATA #IMPLIED&gt;  &lt;!-- default: rolename --&gt;
!   &lt;!ATTLIST primitive-array schema CDATA #IMPLIED&gt; &lt;!-- default: none --&gt;
! </pre>
! <pre>
  &lt;!-- Declares the element type of a collection of basic type --&gt;
! </pre>
! <pre>
  &lt;!ELEMENT element (column*)&gt;
    &lt;!ATTLIST element column CDATA #IMPLIED&gt;
    &lt;!ATTLIST element type CDATA #REQUIRED&gt;
    &lt;!ATTLIST element length CDATA #IMPLIED&gt;
!   &lt;!ATTLIST element not-null CDATA #IMPLIED&gt; &lt;!-- true|false, default: false --&gt;
!   &lt;!ATTLIST element unique CDATA #IMPLIED&gt;   &lt;!-- true|false, default: false --&gt;
! </pre>
! <pre>
  &lt;!-- One to many association. This tag declares the entity-class
  element type of a collection and specifies a one-to-many relational model --&gt;
! </pre>
! <pre>
  &lt;!ELEMENT one-to-many EMPTY&gt;
    &lt;!ATTLIST one-to-many class CDATA #REQUIRED&gt;
    &lt;!-- No column declaration attributes required in this case. The primary
    key column of the associated class is already mapped elsewhere.--&gt;
! </pre>
! <pre>
  &lt;!-- Many to many association. This tag declares the entity-class
  element type of a collection and specifies a many-to-many relational model --&gt;
! </pre>
! <pre>
  &lt;!ELEMENT many-to-many (column*)&gt;
    &lt;!ATTLIST many-to-many class CDATA #REQUIRED&gt;
    &lt;!ATTLIST many-to-many column CDATA #IMPLIED&gt;
!   &lt;!ATTLIST many-to-many length CDATA #IMPLIED&gt;    &lt;!-- DEPRECATED --&gt;
!   &lt;!ATTLIST many-to-many not-null CDATA #IMPLIED&gt;  &lt;!-- true|false, default: false --&gt;
!   &lt;!ATTLIST many-to-many outer-join CDATA #IMPLIED&gt; &lt;!-- true|false, default to hibernate.use_outer_join --&gt;
!   &lt;!-- unique makes no sense here since it would mean a one-to-many --&gt;
! </pre>
! <pre>
  &lt;!-- This tag declares that the element type of a collection is a named
  toplevel collection role. --&gt;  
! </pre>
! <pre>
  &lt;!ELEMENT subcollection (column*)&gt;
    &lt;!ATTLIST subcollection column CDATA #IMPLIED&gt;
    &lt;!ATTLIST subcollection role CDATA #REQUIRED&gt;
    &lt;!ATTLIST subcollection length CDATA #IMPLIED&gt;
!   &lt;!ATTLIST subcollection not-null CDATA #IMPLIED&gt; &lt;!-- true|false, default: false --&gt;
!   &lt;!ATTLIST subcollection unique CDATA #IMPLIED&gt;   &lt;!-- true|false, default: false --&gt;
! </pre>
! <pre>
  &lt;!-- A composite element allows a collection to hold instances of an arbitrary 
  class, without the requirement of joining to an entity table. Composite elements
  have component semantics - no shared references and ad hoc null value semantics. 
  Composite elements may not hold nested collections. --&gt;
! </pre>
! <pre>
  &lt;!ELEMENT composite-element ( 
    (property|many-to-one|collection|nested-composite-element)* 
  )&gt;
    &lt;!ATTLIST composite-element class CDATA #REQUIRED&gt;
! </pre>
! <pre>
  &lt;!ELEMENT nested-composite-element ( 
    (property|many-to-one|collection|nested-composite-element)* 
--- 215,338 ----
  the role may be an arbitrary string. For nested collections, it must be the name
  of the property containing the collection. 
! 
  Note that the cascade attribute is ignored for toplevel collections. --&gt;
! 
  &lt;!ELEMENT map (
          jcs-cache?,
!         (key|generated-key), 
!         (index|composite-index|index-many-to-many), 
          (element|one-to-many|many-to-many|subcollection|composite-element)
  )&gt;
    &lt;!ATTLIST map role CDATA #REQUIRED&gt;
!   &lt;!ATTLIST map table CDATA #IMPLIED&gt;                              &lt;!-- default: rolename --&gt;
!   &lt;!ATTLIST map schema CDATA #IMPLIED&gt;                             &lt;!-- default: none --&gt;
!   &lt;!ATTLIST map lazy (true|false) &quot;false&quot;&gt;
!   &lt;!ATTLIST map sort CDATA #IMPLIED&gt;                               &lt;!-- unsorted|natural|&quot;comparator class&quot;, default: unsorted --&gt;
!   &lt;!ATTLIST map cascade (none|all|save-update|delete) #IMPLIED&gt;    &lt;!-- default: none --&gt;
!   &lt;!ATTLIST map order-by CDATA #IMPLIED&gt;                           &lt;!-- default: non...
 
[truncated message content]