[Hibernate-commits] Hibernate2/src/net/sf/hibernate hibernate-mapping-2.0.dtd,1.23,1.24

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

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

Modified Files:
	hibernate-mapping-2.0.dtd 
Log Message:
added idbag and made some cleanups to collection fwk

Index: hibernate-mapping-2.0.dtd
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/hibernate-mapping-2.0.dtd,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** hibernate-mapping-2.0.dtd	11 Apr 2003 07:15:51 -0000	1.23
--- hibernate-mapping-2.0.dtd	2 May 2003 09:21:57 -0000	1.24
***************
*** 38,42 ****
    discriminator?,
    (version|timestamp)?,
!   (property|many-to-one|one-to-one|component|dynabean|any|map|set|list|bag|array|primitive-array)*, 
    ((subclass*)|(joined-subclass*))
  )>
--- 38,42 ----
    discriminator?,
    (version|timestamp)?,
!   (property|many-to-one|one-to-one|component|dynabean|any|map|set|list|bag|idbag|array|primitive-array)*, 
    ((subclass*)|(joined-subclass*))
  )>
***************
*** 99,103 ****
  <!ELEMENT subclass ( 
  	meta*,
! 	(property|many-to-one|one-to-one|component|any|map|set|list|bag|array|primitive-array)*, 
  	subclass*
  )>
--- 99,103 ----
  <!ELEMENT subclass ( 
  	meta*,
! 	(property|many-to-one|one-to-one|component|any|map|set|list|bag|idbag|array|primitive-array)*, 
  	subclass*
  )>
***************
*** 113,117 ****
  	meta*,
  	key,
! 	(property|many-to-one|one-to-one|component|any|map|set|list|bag|array|primitive-array)*, 
  	joined-subclass*
  )>
--- 113,117 ----
  	meta*,
  	key,
! 	(property|many-to-one|one-to-one|component|any|map|set|list|bag|idbag|array|primitive-array)*, 
  	joined-subclass*
  )>
***************
*** 266,269 ****
--- 266,284 ----
    <!ATTLIST bag where CDATA #IMPLIED>                              <!-- default: none -->
  
+ <!ELEMENT idbag (
+ 	meta*,
+ 	jcs-cache?,
+ 	collection-id,
+ 	key, 
+ 	(element|many-to-many|composite-element|many-to-any)
+ )>
+   <!ATTLIST idbag name CDATA #REQUIRED>
+   <!ATTLIST idbag table CDATA #IMPLIED>                              <!-- default: name -->
+   <!ATTLIST idbag schema CDATA #IMPLIED>                             <!-- default: none -->
+   <!ATTLIST idbag lazy (true|false) "false">
+   <!ATTLIST idbag cascade (none|all|save-update|delete) #IMPLIED>    <!-- default: none -->
+   <!ATTLIST idbag order-by CDATA #IMPLIED>                           <!-- default: none -->
+   <!ATTLIST idbag where CDATA #IMPLIED>                              <!-- default: none -->
+ 
  <!ELEMENT list (
  	meta*,
***************
*** 324,328 ****
    <!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 -->
--- 339,342 ----
***************
*** 385,388 ****
--- 399,407 ----
    <!ATTLIST index-many-to-any meta-type CDATA #IMPLIED>       <!--- default: Hibernate.CLASS -->
  
+ <!ELEMENT collection-id (meta*, column*, generator)>
+   <!ATTLIST collection-id column CDATA #REQUIRED>
+   <!ATTLIST collection-id type CDATA #REQUIRED>
+   <!ATTLIST collection-id length CDATA #IMPLIED>
+   
  <!-- Generators generate unique identifiers. The class attribute specifies a Java class
  implementing an id generation algorithm. -->