Update of 
/cvsroot/xdoclet/xdoclet/modules/hibernate/src/xdoclet/modules/hibernate/resources
In directory 
sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11797/xdoclet/modules/hibernate/src/xdoclet/modules/hibernate/resources

Modified Files:
        hibernate-mapping_3_0.dtd 
Log Message:
XDT-1651: Added extra-lazy option for collections


Index: hibernate-mapping_3_0.dtd
===================================================================
RCS file: 
/cvsroot/xdoclet/xdoclet/modules/hibernate/src/xdoclet/modules/hibernate/resources/hibernate-mapping_3_0.dtd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** hibernate-mapping_3_0.dtd   6 Jun 2005 14:28:37 -0000       1.2
--- hibernate-mapping_3_0.dtd   14 Sep 2006 18:05:08 -0000      1.3
***************
*** 1,2 ****
--- 1,3 ----
+ <?xml version="1.0" encoding="utf-8"?>
  <!-- Hibernate Mapping DTD.
  
***************
*** 22,27 ****
        import*, 
        (class|subclass|joined-subclass|union-subclass)*,
!       (query|sql-query)*, 
!       filter-def*
  )>
        <!ATTLIST hibernate-mapping schema CDATA #IMPLIED>                      
                                                <!-- default: none -->
--- 23,30 ----
        import*, 
        (class|subclass|joined-subclass|union-subclass)*,
!       resultset*,
!       (query|sql-query)*,
!       filter-def*,
!       database-object*
  )>
        <!ATTLIST hibernate-mapping schema CDATA #IMPLIED>                      
                                                <!-- default: none -->
***************
*** 68,79 ****
        synchronize*,
        comment?,
        (id|composite-id),
        discriminator?,
        natural-id?,
        (version|timestamp)?,
!       
(property|many-to-one|one-to-one|component|dynamic-component|properties|any|map|set|list|bag|idbag|array|primitive-array|query-list)*,
        ((join*,subclass*)|joined-subclass*|union-subclass*),
        loader?,sql-insert?,sql-update?,sql-delete?,
!       filter*
  )>
        <!ATTLIST class entity-name CDATA #IMPLIED>
--- 71,85 ----
        synchronize*,
        comment?,
+       tuplizer*,
        (id|composite-id),
        discriminator?,
        natural-id?,
        (version|timestamp)?,
!       
(property|many-to-one|one-to-one|component|dynamic-component|properties|any|map|set|list|bag|idbag|array|primitive-array)*,
        ((join*,subclass*)|joined-subclass*|union-subclass*),
        loader?,sql-insert?,sql-update?,sql-delete?,
!       filter*,
!       resultset*,
!       (query|sql-query)*
  )>
        <!ATTLIST class entity-name CDATA #IMPLIED>
***************
*** 87,91 ****
        <!ATTLIST class discriminator-value CDATA #IMPLIED>                     
        <!-- default: unqualified class name | none -->
        <!ATTLIST class mutable (true|false) "true">
!       <!ATTLIST class abstract (true|false) "false">
        <!ATTLIST class polymorphism (implicit|explicit) "implicit">
        <!ATTLIST class where CDATA #IMPLIED>                                   
                <!-- default: none -->
--- 93,97 ----
        <!ATTLIST class discriminator-value CDATA #IMPLIED>                     
        <!-- default: unqualified class name | none -->
        <!ATTLIST class mutable (true|false) "true">
!       <!ATTLIST class abstract (true|false) #IMPLIED>
        <!ATTLIST class polymorphism (implicit|explicit) "implicit">
        <!ATTLIST class where CDATA #IMPLIED>                                   
                <!-- default: none -->
***************
*** 100,103 ****
--- 106,115 ----
        <!ATTLIST class node CDATA #IMPLIED>
  
+ <!--
+     TUPLIZER element; defines tuplizer to use for a component/entity for a 
given entity-mode
+ -->
+ <!ELEMENT tuplizer EMPTY>
+       <!ATTLIST tuplizer entity-mode (pojo|dom4j|dynamic-map) #IMPLIED>   
<!-- entity mode for which tuplizer is in effect -->
+       <!ATTLIST tuplizer class CDATA #REQUIRED>                           
<!-- the tuplizer class to use -->
  
  <!--
***************
*** 151,155 ****
  via Session.getIdentifier() -->
  
! <!ELEMENT id (meta*, column*, generator?)>
        <!ATTLIST id name CDATA #IMPLIED>
        <!ATTLIST id node CDATA #IMPLIED>
--- 163,167 ----
  via Session.getIdentifier() -->
  
! <!ELEMENT id (meta*,column*,type?,generator?)>
        <!ATTLIST id name CDATA #IMPLIED>
        <!ATTLIST id node CDATA #IMPLIED>
***************
*** 166,169 ****
--- 178,182 ----
  <!ELEMENT composite-id ( meta*, (key-property|key-many-to-one)+ )>
        <!ATTLIST composite-id class CDATA #IMPLIED>
+       <!ATTLIST composite-id mapped (true|false) "false">
        <!ATTLIST composite-id name CDATA #IMPLIED>
        <!ATTLIST composite-id node CDATA #IMPLIED>
***************
*** 186,190 ****
  application through a property of the Java class. -->
  
! <!ELEMENT version (meta*)>
        <!ATTLIST version name CDATA #REQUIRED>
        <!ATTLIST version node CDATA #IMPLIED>
--- 199,203 ----
  application through a property of the Java class. -->
  
! <!ELEMENT version (meta*,column*)>
        <!ATTLIST version name CDATA #REQUIRED>
        <!ATTLIST version node CDATA #IMPLIED>
***************
*** 193,196 ****
--- 206,211 ----
        <!ATTLIST version type CDATA "integer">
        <!ATTLIST version unsaved-value (null|negative|undefined) "undefined">
+       <!ATTLIST version generated (never|always) "never">
+       <!ATTLIST version insert (true|false) #IMPLIED>
  
  <!ELEMENT timestamp (meta*)>
***************
*** 200,203 ****
--- 215,220 ----
        <!ATTLIST timestamp access CDATA #IMPLIED>
        <!ATTLIST timestamp unsaved-value (null|undefined) "null">
+       <!ATTLIST timestamp source (vm|db) "vm">
+       <!ATTLIST timestamp generated (never|always) "never">
  
  
***************
*** 210,218 ****
  <!ELEMENT subclass (
        meta*,
        synchronize*,
!       
(property|many-to-one|one-to-one|component|dynamic-component|any|map|set|list|bag|idbag|array|primitive-array|query-list)*,
        join*, 
        subclass*,
!       loader?,sql-insert?,sql-update?,sql-delete?
  )>
        <!ATTLIST subclass entity-name CDATA #IMPLIED>
--- 227,238 ----
  <!ELEMENT subclass (
        meta*,
+       tuplizer*,
        synchronize*,
!       
(property|many-to-one|one-to-one|component|dynamic-component|any|map|set|list|bag|idbag|array|primitive-array)*,
        join*, 
        subclass*,
!       loader?,sql-insert?,sql-update?,sql-delete?,
!       resultset*,
!       (query|sql-query)*
  )>
        <!ATTLIST subclass entity-name CDATA #IMPLIED>
***************
*** 225,229 ****
        <!ATTLIST subclass extends CDATA #IMPLIED>                              
                        <!-- default: empty when a toplevel, otherwise the 
nearest class definition -->
        <!ATTLIST subclass lazy (true|false) #IMPLIED>
!       <!ATTLIST subclass abstract (true|false) "false">
        <!ATTLIST subclass persister CDATA #IMPLIED>
        <!ATTLIST subclass batch-size CDATA #IMPLIED>
--- 245,249 ----
        <!ATTLIST subclass extends CDATA #IMPLIED>                              
                        <!-- default: empty when a toplevel, otherwise the 
nearest class definition -->
        <!ATTLIST subclass lazy (true|false) #IMPLIED>
!       <!ATTLIST subclass abstract (true|false) #IMPLIED>
        <!ATTLIST subclass persister CDATA #IMPLIED>
        <!ATTLIST subclass batch-size CDATA #IMPLIED>
***************
*** 240,247 ****
        synchronize*,
        comment?,
        key,
!       
(property|many-to-one|one-to-one|component|dynamic-component|any|map|set|list|bag|idbag|array|primitive-array|query-list)*,
 
        joined-subclass*,
!       loader?,sql-insert?,sql-update?,sql-delete?
  )>
        <!ATTLIST joined-subclass entity-name CDATA #IMPLIED>
--- 260,270 ----
        synchronize*,
        comment?,
+       tuplizer*,
        key,
!       
(property|many-to-one|one-to-one|component|dynamic-component|properties|any|map|set|list|bag|idbag|array|primitive-array)*,
 
        joined-subclass*,
!       loader?,sql-insert?,sql-update?,sql-delete?,
!       resultset*,
!       (query|sql-query)*
  )>
        <!ATTLIST joined-subclass entity-name CDATA #IMPLIED>
***************
*** 257,261 ****
        <!ATTLIST joined-subclass extends CDATA #IMPLIED>                       
                <!-- default: none when toplevel, otherwise the nearest class 
definition -->
        <!ATTLIST joined-subclass lazy (true|false) #IMPLIED>
!       <!ATTLIST joined-subclass abstract (true|false) "false">
        <!ATTLIST joined-subclass persister CDATA #IMPLIED>
        <!ATTLIST joined-subclass check CDATA #IMPLIED>                         
                <!-- default: none -->
--- 280,284 ----
        <!ATTLIST joined-subclass extends CDATA #IMPLIED>                       
                <!-- default: none when toplevel, otherwise the nearest class 
definition -->
        <!ATTLIST joined-subclass lazy (true|false) #IMPLIED>
!       <!ATTLIST joined-subclass abstract (true|false) #IMPLIED>
        <!ATTLIST joined-subclass persister CDATA #IMPLIED>
        <!ATTLIST joined-subclass check CDATA #IMPLIED>                         
                <!-- default: none -->
***************
*** 273,279 ****
        synchronize*,
        comment?,
!       
(property|many-to-one|one-to-one|component|dynamic-component|any|map|set|list|bag|idbag|array|primitive-array|query-list)*,
        union-subclass*,
!       loader?,sql-insert?,sql-update?,sql-delete?
  )>
        <!ATTLIST union-subclass entity-name CDATA #IMPLIED>
--- 296,305 ----
        synchronize*,
        comment?,
!       tuplizer*,
!       
(property|many-to-one|one-to-one|component|dynamic-component|properties|any|map|set|list|bag|idbag|array|primitive-array)*,
        union-subclass*,
!       loader?,sql-insert?,sql-update?,sql-delete?,
!       resultset*,
!       (query|sql-query)*
  )>
        <!ATTLIST union-subclass entity-name CDATA #IMPLIED>
***************
*** 289,293 ****
        <!ATTLIST union-subclass extends CDATA #IMPLIED>                        
                <!-- default: none when toplevel, otherwise the nearest class 
definition -->
        <!ATTLIST union-subclass lazy (true|false) #IMPLIED>
!       <!ATTLIST union-subclass abstract (true|false) "false">
        <!ATTLIST union-subclass persister CDATA #IMPLIED>
        <!ATTLIST union-subclass check CDATA #IMPLIED>                          
                <!-- default: none -->
--- 315,319 ----
        <!ATTLIST union-subclass extends CDATA #IMPLIED>                        
                <!-- default: none when toplevel, otherwise the nearest class 
definition -->
        <!ATTLIST union-subclass lazy (true|false) #IMPLIED>
!       <!ATTLIST union-subclass abstract (true|false) #IMPLIED>
        <!ATTLIST union-subclass persister CDATA #IMPLIED>
        <!ATTLIST union-subclass check CDATA #IMPLIED>                          
                <!-- default: none -->
***************
*** 311,319 ****
        <!ATTLIST property unique-key CDATA #IMPLIED>
        <!ATTLIST property index CDATA #IMPLIED>                                
<!-- include the columns spanned by this property in an index -->
!       <!ATTLIST property update (true|false) "true">
!       <!ATTLIST property insert (true|false) "true">
        <!ATTLIST property optimistic-lock (true|false) "true"> <!-- only 
supported for properties of a class (not component) -->
        <!ATTLIST property formula CDATA #IMPLIED>
        <!ATTLIST property lazy (true|false) "false">
  
  <!-- Declares the type of the containing property (overrides an eventually 
existing type
--- 337,346 ----
        <!ATTLIST property unique-key CDATA #IMPLIED>
        <!ATTLIST property index CDATA #IMPLIED>                                
<!-- include the columns spanned by this property in an index -->
!       <!ATTLIST property update (true|false) #IMPLIED>
!       <!ATTLIST property insert (true|false) #IMPLIED>
        <!ATTLIST property optimistic-lock (true|false) "true"> <!-- only 
supported for properties of a class (not component) -->
        <!ATTLIST property formula CDATA #IMPLIED>
        <!ATTLIST property lazy (true|false) "false">
+       <!ATTLIST property generated (never|insert|always) "never">
  
  <!-- Declares the type of the containing property (overrides an eventually 
existing type
***************
*** 344,348 ****
        <!ATTLIST many-to-one property-ref CDATA #IMPLIED>
        <!ATTLIST many-to-one formula CDATA #IMPLIED>
!       <!ATTLIST many-to-one lazy (true|false|proxy) #IMPLIED>
        <!ATTLIST many-to-one not-found (exception|ignore) "exception">
        <!ATTLIST many-to-one node CDATA #IMPLIED>
--- 371,375 ----
        <!ATTLIST many-to-one property-ref CDATA #IMPLIED>
        <!ATTLIST many-to-one formula CDATA #IMPLIED>
!       <!ATTLIST many-to-one lazy (false|proxy|no-proxy) #IMPLIED>
        <!ATTLIST many-to-one not-found (exception|ignore) "exception">
        <!ATTLIST many-to-one node CDATA #IMPLIED>
***************
*** 364,368 ****
        <!ATTLIST one-to-one foreign-key CDATA #IMPLIED>
        <!ATTLIST one-to-one property-ref CDATA #IMPLIED>
!       <!ATTLIST one-to-one lazy (true|false|proxy) #IMPLIED>
        <!ATTLIST one-to-one node CDATA #IMPLIED>
        <!ATTLIST one-to-one embed-xml (true|false) "true">
--- 391,395 ----
        <!ATTLIST one-to-one foreign-key CDATA #IMPLIED>
        <!ATTLIST one-to-one property-ref CDATA #IMPLIED>
!       <!ATTLIST one-to-one lazy (false|proxy|no-proxy) #IMPLIED>
        <!ATTLIST one-to-one node CDATA #IMPLIED>
        <!ATTLIST one-to-one embed-xml (true|false) "true">
***************
*** 370,374 ****
  <!-- A property embedded in a composite identifier or map index (always 
not-null). -->
  
! <!ELEMENT key-property (meta*,column*)>
        <!ATTLIST key-property name CDATA #REQUIRED>
        <!ATTLIST key-property access CDATA #IMPLIED>
--- 397,401 ----
  <!-- A property embedded in a composite identifier or map index (always 
not-null). -->
  
! <!ELEMENT key-property (meta*,column*,type?)>
        <!ATTLIST key-property name CDATA #REQUIRED>
        <!ATTLIST key-property access CDATA #IMPLIED>
***************
*** 419,422 ****
--- 446,450 ----
  <!ELEMENT component (
        meta*,
+       tuplizer*,
        parent?,
        
(property|many-to-one|one-to-one|component|dynamic-component|any|map|set|list|bag|array|primitive-array)*
***************
*** 486,490 ****
        <!ATTLIST map subselect CDATA #IMPLIED>
        <!ATTLIST map catalog CDATA #IMPLIED>                                   
                                                                                
<!-- default: none -->
!       <!ATTLIST map lazy (true|false) #IMPLIED>
        <!ATTLIST map inverse (true|false) "false">
        <!ATTLIST map sort CDATA "unsorted">                                    
                                                                                
<!-- unsorted|natural|"comparator class", default: unsorted -->
--- 514,519 ----
        <!ATTLIST map subselect CDATA #IMPLIED>
        <!ATTLIST map catalog CDATA #IMPLIED>                                   
                                                                                
<!-- default: none -->
!       <!ATTLIST map lazy (true|false|extra) #IMPLIED>
!       <!ATTLIST map mutable (true|false) "true">
        <!ATTLIST map inverse (true|false) "false">
        <!ATTLIST map sort CDATA "unsorted">                                    
                                                                                
<!-- unsorted|natural|"comparator class", default: unsorted -->
***************
*** 519,525 ****
        <!ATTLIST set catalog CDATA #IMPLIED>                                   
                                                                                
<!-- default: none -->
        <!ATTLIST set subselect CDATA #IMPLIED>
!       <!ATTLIST set lazy (true|false) #IMPLIED>
        <!ATTLIST set sort CDATA "unsorted">                                    
                                                                                
<!-- unsorted|natural|"comparator class" -->
        <!ATTLIST set inverse (true|false) "false">
        <!ATTLIST set cascade CDATA #IMPLIED>
        <!ATTLIST set order-by CDATA #IMPLIED>                                  
                                                                                
<!-- default: none -->
--- 548,555 ----
        <!ATTLIST set catalog CDATA #IMPLIED>                                   
                                                                                
<!-- default: none -->
        <!ATTLIST set subselect CDATA #IMPLIED>
!       <!ATTLIST set lazy (true|false|extra) #IMPLIED>
        <!ATTLIST set sort CDATA "unsorted">                                    
                                                                                
<!-- unsorted|natural|"comparator class" -->
        <!ATTLIST set inverse (true|false) "false">
+       <!ATTLIST set mutable (true|false) "true">
        <!ATTLIST set cascade CDATA #IMPLIED>
        <!ATTLIST set order-by CDATA #IMPLIED>                                  
                                                                                
<!-- default: none -->
***************
*** 552,557 ****
        <!ATTLIST bag catalog CDATA #IMPLIED>                                   
                                                                                
<!-- default: none -->
        <!ATTLIST bag subselect CDATA #IMPLIED>
!       <!ATTLIST bag lazy (true|false) #IMPLIED>
        <!ATTLIST bag inverse (true|false) "false">
        <!ATTLIST bag cascade CDATA #IMPLIED>
        <!ATTLIST bag order-by CDATA #IMPLIED>                                  
                                                                                
<!-- default: none -->
--- 582,588 ----
        <!ATTLIST bag catalog CDATA #IMPLIED>                                   
                                                                                
<!-- default: none -->
        <!ATTLIST bag subselect CDATA #IMPLIED>
!       <!ATTLIST bag lazy (true|false|extra) #IMPLIED>
        <!ATTLIST bag inverse (true|false) "false">
+       <!ATTLIST bag mutable (true|false) "true">
        <!ATTLIST bag cascade CDATA #IMPLIED>
        <!ATTLIST bag order-by CDATA #IMPLIED>                                  
                                                                                
<!-- default: none -->
***************
*** 585,589 ****
        <!ATTLIST idbag catalog CDATA #IMPLIED>                                 
                                                                                
<!-- default: none -->
        <!ATTLIST idbag subselect CDATA #IMPLIED>
!       <!ATTLIST idbag lazy (true|false) #IMPLIED>
        <!ATTLIST idbag cascade CDATA #IMPLIED>
        <!ATTLIST idbag order-by CDATA #IMPLIED>                                
                                                                                
<!-- default: none -->
--- 616,621 ----
        <!ATTLIST idbag catalog CDATA #IMPLIED>                                 
                                                                                
<!-- default: none -->
        <!ATTLIST idbag subselect CDATA #IMPLIED>
!       <!ATTLIST idbag lazy (true|false|extra) #IMPLIED>
!       <!ATTLIST idbag mutable (true|false) "true">
        <!ATTLIST idbag cascade CDATA #IMPLIED>
        <!ATTLIST idbag order-by CDATA #IMPLIED>                                
                                                                                
<!-- default: none -->
***************
*** 617,622 ****
        <!ATTLIST list catalog CDATA #IMPLIED>                                  
                                                                                
<!-- default: none -->
        <!ATTLIST list subselect CDATA #IMPLIED>
!       <!ATTLIST list lazy (true|false) #IMPLIED>
        <!ATTLIST list inverse (true|false) "false">
        <!ATTLIST list cascade CDATA #IMPLIED>
        <!ATTLIST list where CDATA #IMPLIED>                                    
                                                                                
<!-- default: none -->
--- 649,655 ----
        <!ATTLIST list catalog CDATA #IMPLIED>                                  
                                                                                
<!-- default: none -->
        <!ATTLIST list subselect CDATA #IMPLIED>
!       <!ATTLIST list lazy (true|false|extra) #IMPLIED>
        <!ATTLIST list inverse (true|false) "false">
+       <!ATTLIST list mutable (true|false) "true">
        <!ATTLIST list cascade CDATA #IMPLIED>
        <!ATTLIST list where CDATA #IMPLIED>                                    
                                                                                
<!-- default: none -->
***************
*** 649,652 ****
--- 682,686 ----
        <!ATTLIST array subselect CDATA #IMPLIED>
        <!ATTLIST array inverse (true|false) "false">
+       <!ATTLIST array mutable (true|false) "true">
        <!ATTLIST array element-class CDATA #IMPLIED>
        <!ATTLIST array cascade CDATA #IMPLIED>
***************
*** 679,682 ****
--- 713,717 ----
        <!ATTLIST primitive-array catalog CDATA #IMPLIED>                       
                                        <!-- default: none -->
        <!ATTLIST primitive-array subselect CDATA #IMPLIED>
+       <!ATTLIST primitive-array mutable (true|false) "true">
        <!ATTLIST primitive-array where CDATA #IMPLIED>                         
                                        <!-- default: none -->
        <!ATTLIST primitive-array batch-size CDATA #IMPLIED>
***************
*** 732,735 ****
--- 767,771 ----
        <!ATTLIST many-to-many unique (true|false) "false">
        <!ATTLIST many-to-many where CDATA #IMPLIED>
+       <!ATTLIST many-to-many property-ref CDATA #IMPLIED>
  
  <!-- A composite element allows a collection to hold instances of an 
arbitrary 
***************
*** 847,851 ****
        <!ATTLIST column sql-type CDATA #IMPLIED>                               
        <!-- override default column type for hibernate type -->
        <!ATTLIST column index CDATA #IMPLIED>
!       <!ATTLIST column check CDATA #IMPLIED>                                  
        <!-- default: none -->
  
  <!-- The formula and subselect elements allow us to map derived properties 
and 
--- 883,888 ----
        <!ATTLIST column sql-type CDATA #IMPLIED>                               
        <!-- override default column type for hibernate type -->
        <!ATTLIST column index CDATA #IMPLIED>
!       <!ATTLIST column check CDATA #IMPLIED>                                  
        <!-- default: no check constraint -->
!       <!ATTLIST column default CDATA #IMPLIED>                    <!-- 
default: no default value -->
  
  <!-- The formula and subselect elements allow us to map derived properties 
and 
***************
*** 859,862 ****
--- 896,900 ----
        <!ATTLIST cache usage 
(read-only|read-write|nonstrict-read-write|transactional) #REQUIRED>            
                  
        <!ATTLIST cache region CDATA #IMPLIED>                                  
        <!-- default: class or collection role name -->
+       <!ATTLIST cache include (all|non-lazy) "all">
  
  <!-- The comment element allows definition of a database table or column 
comment. -->
***************
*** 871,874 ****
--- 909,915 ----
        <!ATTLIST query-list query-ref CDATA #REQUIRED>
  
+ <!-- The loader element allows specification of a named query to be used for 
fetching
+ an entity or collection -->
+ 
  <!ELEMENT loader EMPTY>
        <!ATTLIST loader query-ref CDATA #REQUIRED>
***************
*** 876,880 ****
  <!-- The query element declares a named Hibernate query string -->
  
! <!ELEMENT query (#PCDATA|representation)*>
        <!ATTLIST query name CDATA #REQUIRED>
        <!ATTLIST query flush-mode (auto|never|always) #IMPLIED>
--- 917,921 ----
  <!-- The query element declares a named Hibernate query string -->
  
! <!ELEMENT query (#PCDATA|query-param)*>
        <!ATTLIST query name CDATA #REQUIRED>
        <!ATTLIST query flush-mode (auto|never|always) #IMPLIED>
***************
*** 883,886 ****
--- 924,930 ----
        <!ATTLIST query fetch-size CDATA #IMPLIED>
        <!ATTLIST query timeout CDATA #IMPLIED>
+       <!ATTLIST query cache-mode (get|ignore|normal|put|refresh) #IMPLIED>
+       <!ATTLIST query read-only (true|false) #IMPLIED>
+       <!ATTLIST query comment CDATA #IMPLIED>
  
  <!ELEMENT representation EMPTY>
***************
*** 888,893 ****
  
  <!-- The sql-query element declares a named SQL query string -->
! <!ELEMENT sql-query 
(#PCDATA|return-scalar|return|return-join|load-collection|synchronize)*>
        <!ATTLIST sql-query name CDATA #REQUIRED>
        <!ATTLIST sql-query flush-mode (auto|never|always) #IMPLIED>
        <!ATTLIST sql-query cacheable (true|false) "false">
--- 932,939 ----
  
  <!-- The sql-query element declares a named SQL query string -->
! 
! <!ELEMENT sql-query 
(#PCDATA|return-scalar|return|return-join|load-collection|synchronize|query-param)*>
        <!ATTLIST sql-query name CDATA #REQUIRED>
+       <!ATTLIST sql-query resultset-ref CDATA #IMPLIED>
        <!ATTLIST sql-query flush-mode (auto|never|always) #IMPLIED>
        <!ATTLIST sql-query cacheable (true|false) "false">
***************
*** 895,899 ****
        <!ATTLIST sql-query fetch-size CDATA #IMPLIED>
        <!ATTLIST sql-query timeout CDATA #IMPLIED>
!       <!ATTLIST sql-query callable (true|false) "false"> 
  
  <!--
--- 941,959 ----
        <!ATTLIST sql-query fetch-size CDATA #IMPLIED>
        <!ATTLIST sql-query timeout CDATA #IMPLIED>
!       <!ATTLIST query cache-mode (get|ignore|normal|put|refresh) #IMPLIED>
!       <!ATTLIST query read-only (true|false) #IMPLIED>
!       <!ATTLIST query comment CDATA #IMPLIED>
!       <!ATTLIST sql-query callable (true|false) "false">
! 
! <!-- The query-param element is used only by tools that generate
! finder methods for named queries -->
! 
! <!ELEMENT query-param EMPTY>
!       <!ATTLIST query-param name CDATA #REQUIRED>
!       <!ATTLIST query-param type CDATA #REQUIRED>
! 
! <!-- The resultset element declares a named resultset mapping definition for 
SQL queries -->
! <!ELEMENT resultset (return-scalar|return|return-join|load-collection)*>
!       <!ATTLIST resultset name CDATA #REQUIRED>
  
  <!--
***************
*** 922,931 ****
        <!ATTLIST return-discriminator column CDATA #REQUIRED>
        
! <!ELEMENT return-join EMPTY> <!-- TODO: (return-property)* -->
        <!ATTLIST return-join alias CDATA #REQUIRED>
        <!ATTLIST return-join property CDATA #REQUIRED>
        <!ATTLIST return-join lock-mode 
(none|read|upgrade|upgrade-nowait|write) "read">
  
! <!ELEMENT load-collection EMPTY> <!-- TODO: (return-property)* -->
        <!ATTLIST load-collection alias CDATA #REQUIRED>
        <!ATTLIST load-collection role CDATA #REQUIRED>
--- 982,991 ----
        <!ATTLIST return-discriminator column CDATA #REQUIRED>
        
! <!ELEMENT return-join (return-property)*> 
        <!ATTLIST return-join alias CDATA #REQUIRED>
        <!ATTLIST return-join property CDATA #REQUIRED>
        <!ATTLIST return-join lock-mode 
(none|read|upgrade|upgrade-nowait|write) "read">
  
! <!ELEMENT load-collection (return-property)*> 
        <!ATTLIST load-collection alias CDATA #REQUIRED>
        <!ATTLIST load-collection role CDATA #REQUIRED>
***************
*** 951,952 ****
--- 1011,1041 ----
  <!ELEMENT sql-delete-all (#PCDATA)>
        <!ATTLIST sql-delete-all callable (true|false) "false">
+ 
+ <!--
+     Element for defining "auxiliary" database objects.  Must be one of two 
forms:
+ 
+     #1 :
+         <database-object>
+             <definition class="CustomClassExtendingAuxiliaryObject"/>
+         </database-object>
+ 
+     #2 :
+         <database-object>
+             <create>CREATE OR REPLACE ....</create>
+             <drop>DROP ....</drop>
+         </database-object>
+ -->
+ <!ELEMENT database-object ( (definition|(create,drop)), dialect-scope* )>
+ 
+ <!ELEMENT definition EMPTY>
+     <!ATTLIST definition class CDATA #REQUIRED>
+ 
+ <!ELEMENT create (#PCDATA)>
+ <!ELEMENT drop (#PCDATA)>
+ 
+ <!--
+     dialect-scope element allows scoping auxiliary-objects to a particular
+     Hibernate dialect implementation.
+ -->
+ <!ELEMENT dialect-scope (#PCDATA)>
+     <!ATTLIST dialect-scope name CDATA #REQUIRED>


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
xdoclet-devel mailing list
xdoclet-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel

Reply via email to