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

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

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

Modified Files:
	hibernate-mapping-2.0.dtd 
Log Message:
applied Max Andersen's patch for <meta>attributes in hbm2java

Index: hibernate-mapping-2.0.dtd
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/hibernate-mapping-2.0.dtd,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** hibernate-mapping-2.0.dtd	13 Jan 2003 08:57:43 -0000	1.6
--- hibernate-mapping-2.0.dtd	16 Jan 2003 20:52:38 -0000	1.7
***************
*** 19,23 ****
  <!-- The document root. -->
  
! <!ELEMENT hibernate-mapping (class*, query*)>
    <!ATTLIST hibernate-mapping schema CDATA #IMPLIED>                            <!-- default: none -->
    <!ATTLIST hibernate-mapping default-cascade (none|save-update|all) "none">
--- 19,23 ----
  <!-- The document root. -->
  
! <!ELEMENT hibernate-mapping (meta*, class*, query*)>
    <!ATTLIST hibernate-mapping schema CDATA #IMPLIED>                            <!-- default: none -->
    <!ATTLIST hibernate-mapping default-cascade (none|save-update|all) "none">
***************
*** 26,29 ****
--- 26,30 ----
  
  <!ELEMENT class ( 
+   meta*,
    jcs-cache?,
    (id|composite-id),
***************
*** 47,51 ****
  through Session.getID()-->
  
! <!ELEMENT id (column*, generator)>
    <!ATTLIST id name CDATA #IMPLIED>
    <!ATTLIST id column CDATA #IMPLIED>
--- 48,52 ----
  through Session.getID()-->
  
! <!ELEMENT id (meta*, column*, generator)>
    <!ATTLIST id name CDATA #IMPLIED>
    <!ATTLIST id column CDATA #IMPLIED>
***************
*** 87,90 ****
--- 88,92 ----
  
  <!ELEMENT subclass ( 
+ 	meta*,
  	(property|many-to-one|one-to-one|component|map|set|list|bag|array|primitive-array)*, 
  	subclass*
***************
*** 97,100 ****
--- 99,103 ----
  
  <!ELEMENT joined-subclass ( 
+ 	meta*,
  	key,
  	(property|many-to-one|one-to-one|component|map|set|list|bag|array|primitive-array)*, 
***************
*** 109,113 ****
  JavaBeans style properties are mapped to table columns. -->
  
! <!ELEMENT property (column*)>
    <!ATTLIST property name CDATA #REQUIRED>
    <!ATTLIST property type CDATA #IMPLIED>
--- 112,116 ----
  JavaBeans style properties are mapped to table columns. -->
  
! <!ELEMENT property (meta*,column*)>
    <!ATTLIST property name CDATA #REQUIRED>
    <!ATTLIST property type CDATA #IMPLIED>
***************
*** 120,124 ****
  etc. to an entity). -->
  
! <!ELEMENT many-to-one (column*)>
    <!ATTLIST many-to-one name CDATA #REQUIRED>
    <!ATTLIST many-to-one class CDATA #IMPLIED>
--- 123,127 ----
  etc. to an entity). -->
  
! <!ELEMENT many-to-one (meta*,column*)>
    <!ATTLIST many-to-one name CDATA #REQUIRED>
    <!ATTLIST many-to-one class CDATA #IMPLIED>
***************
*** 132,136 ****
  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>
--- 135,139 ----
  component element, etc. to an entity). -->
  
! <!ELEMENT one-to-one (meta*)>
    <!ATTLIST one-to-one name CDATA #REQUIRED>
    <!ATTLIST one-to-one class CDATA #IMPLIED>
***************
*** 178,181 ****
--- 181,185 ----
  
  <!ELEMENT map (
+ 	meta*,
  	jcs-cache?,
  	key, 
***************
*** 193,196 ****
--- 197,201 ----
  
  <!ELEMENT set (
+ 	meta*,
  	jcs-cache?,
  	key, 
***************
*** 207,210 ****
--- 212,216 ----
  
  <!ELEMENT bag (
+ 	meta*,
  	jcs-cache?,
  	key, 
***************
*** 220,223 ****
--- 226,230 ----
  
  <!ELEMENT list (
+ 	meta*,
  	jcs-cache?,
  	key, 
***************
*** 233,236 ****
--- 240,244 ----
  
  <!ELEMENT array (
+ 	meta*,
  	jcs-cache?,
  	key, 
***************
*** 244,248 ****
    <!ATTLIST array cascade (none|all|save-update|delete) #IMPLIED>  <!-- default: none -->
  
! <!ELEMENT primitive-array (jcs-cache?, key, index, element)>
    <!ATTLIST primitive-array name CDATA #REQUIRED>
    <!ATTLIST primitive-array table CDATA #IMPLIED>                  <!-- default: name -->
--- 252,256 ----
    <!ATTLIST array cascade (none|all|save-update|delete) #IMPLIED>  <!-- default: none -->
  
! <!ELEMENT primitive-array (meta*, jcs-cache?, key, index, element)>
    <!ATTLIST primitive-array name CDATA #REQUIRED>
    <!ATTLIST primitive-array table CDATA #IMPLIED>                  <!-- default: name -->
***************
*** 269,273 ****
  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>
--- 277,281 ----
  element type of a collection and specifies a many-to-many relational model -->
  
! <!ELEMENT many-to-many (meta*,column*)>
    <!ATTLIST many-to-many class CDATA #REQUIRED>
    <!ATTLIST many-to-many column CDATA #IMPLIED>
***************
*** 349,350 ****
--- 357,366 ----
  <!ELEMENT query (#PCDATA)>
    <!ATTLIST query name CDATA #REQUIRED>
+ 
+ <!-- The meta element is used to assign meta-level attributes to a class or property.
+  Is currently used by codegenerator as a placeholder for values that is not directly
+  related to OR mappings. -->
+ 
+ <!ELEMENT meta (#PCDATA)>
+   <!ATTLIST meta attribute CDATA #REQUIRED>
+  
\ No newline at end of file