[Hibernate-commits] Hibernate/cirrus/hibernate hibernate-mapping-1.1.dtd,1.10,1.11

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

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

Modified Files:
	hibernate-mapping-1.1.dtd 
Log Message:
updates to hibernate-mapping-1.1.dtd and documentation

Index: hibernate-mapping-1.1.dtd
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/hibernate-mapping-1.1.dtd,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** hibernate-mapping-1.1.dtd	27 Oct 2002 18:30:56 -0000	1.10
--- hibernate-mapping-1.1.dtd	5 Nov 2002 13:40:53 -0000	1.11
***************
*** 102,106 ****
  
  <!ELEMENT joined-subclass ( 
! 	superclass-key,
  	(property|many-to-one|one-to-one|collection|component|map|set|list|bag|array|primitive-array)*, 
  	joined-subclass*
--- 102,106 ----
  
  <!ELEMENT joined-subclass ( 
! 	key,
  	(property|many-to-one|one-to-one|collection|component|map|set|list|bag|array|primitive-array)*, 
  	joined-subclass*
***************
*** 108,118 ****
    <!ATTLIST joined-subclass name CDATA #REQUIRED>
    <!ATTLIST joined-subclass proxy CDATA #IMPLIED>                <!-- default: no proxy interface -->
-   <!ATTLIST joined-subclass discriminator-value CDATA #IMPLIED>  <!-- default: unqualified class name | none -->
    <!ATTLIST joined-subclass table CDATA #REQUIRED>
    <!ATTLIST joined-subclass schema CDATA #IMPLIED>
- 
- <!ELEMENT superclass-key (column*)>
-   <!ATTLIST superclass-key column CDATA #IMPLIED>
-   <!ATTLIST superclass-key length CDATA #IMPLIED>
    
  <!-- Property of an entity class or component, component-element, composite-id, etc. 
--- 108,113 ----
***************
*** 206,210 ****
  <!ELEMENT map (
  	jcs-cache?,
! 	key, 
  	(index|composite-index|index-many-to-many), 
  	(element|one-to-many|many-to-many|subcollection|composite-element)
--- 201,205 ----
  <!ELEMENT map (
  	jcs-cache?,
! 	(key|generated-key), 
  	(index|composite-index|index-many-to-many), 
  	(element|one-to-many|many-to-many|subcollection|composite-element)
***************
*** 220,224 ****
  <!ELEMENT set (
  	jcs-cache?,
! 	key, 
  	(element|one-to-many|many-to-many|subcollection|composite-element)
  )>
--- 215,219 ----
  <!ELEMENT set (
  	jcs-cache?,
! 	(key|generated-key), 
  	(element|one-to-many|many-to-many|subcollection|composite-element)
  )>
***************
*** 234,238 ****
  <!ELEMENT bag (
  	jcs-cache?,
! 	key, 
  	(element|one-to-many|many-to-many|subcollection|composite-element)
  )>
--- 229,233 ----
  <!ELEMENT bag (
  	jcs-cache?,
! 	(key|generated-key), 
  	(element|one-to-many|many-to-many|subcollection|composite-element)
  )>
***************
*** 247,251 ****
  <!ELEMENT list (
  	jcs-cache?,
! 	key, 
  	index, 
  	(element|one-to-many|many-to-many|subcollection|composite-element)
--- 242,246 ----
  <!ELEMENT list (
  	jcs-cache?,
! 	(key|generated-key), 
  	index, 
  	(element|one-to-many|many-to-many|subcollection|composite-element)
***************
*** 259,263 ****
  <!ELEMENT array (
  	jcs-cache?,
! 	key, 
  	index, 
  	(element|one-to-many|many-to-many|subcollection|composite-element)
--- 254,258 ----
  <!ELEMENT array (
  	jcs-cache?,
! 	(key|generated-key), 
  	index, 
  	(element|one-to-many|many-to-many|subcollection|composite-element)
***************
*** 332,340 ****
  no guarantee of key stability of a particular collection instance. -->
  
! <!ELEMENT key (generator?, column*)>
    <!ATTLIST key column CDATA #IMPLIED>
-   <!ATTLIST key type CDATA #IMPLIED>        <!-- needed for toplevel collections only -->
    <!ATTLIST key length CDATA #IMPLIED>
!   
  <!-- Declares the type and column mapping for a collection index (array or
  list index, or key of a map). -->
--- 327,339 ----
  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). -->