nhibernate 1.2.1.4000 → 2.0.1.4000

Sign up to get free protection for your applications and to get access to all the features.
Files changed (176) hide show
  1. data/{lib/net-1.1 → docs}/Iesi.Collections.license.txt +0 -0
  2. data/{lib/net-1.1 → docs}/NHibernate.license.txt +0 -0
  3. data/docs/nhibernate-configuration.xsd +174 -50
  4. data/docs/nhibernate-mapping.xsd +135 -29
  5. data/docs/releasenotes.txt +307 -0
  6. data/lib/{net-2.0/Iesi.Collections.dll → Iesi.Collections.dll} +0 -0
  7. data/lib/{net-2.0/Iesi.Collections.xml → Iesi.Collections.xml} +0 -0
  8. data/lib/NHibernate.dll +0 -0
  9. data/lib/{net-2.0/NHibernate.xml → NHibernate.xml} +21695 -14960
  10. metadata +45 -176
  11. data/lib/net-1.1/Bamboo.Prevalence.Util.dll +0 -0
  12. data/lib/net-1.1/Bamboo.Prevalence.dll +0 -0
  13. data/lib/net-1.1/Bamboo.Prevalence.license.txt +0 -31
  14. data/lib/net-1.1/Castle.DynamicProxy.dll +0 -0
  15. data/lib/net-1.1/Castle.DynamicProxy.license.txt +0 -13
  16. data/lib/net-1.1/Castle.DynamicProxy.xml +0 -687
  17. data/lib/net-1.1/HashCodeProvider.dll +0 -0
  18. data/lib/net-1.1/HashCodeProvider.license.txt +0 -9
  19. data/lib/net-1.1/ICSharpCode.SharpZipLib.dll +0 -0
  20. data/lib/net-1.1/Iesi.Collections.Test.dll +0 -0
  21. data/lib/net-1.1/Iesi.Collections.Test.dll-results.xml +0 -125
  22. data/lib/net-1.1/Iesi.Collections.dll +0 -0
  23. data/lib/net-1.1/Iesi.Collections.xml +0 -927
  24. data/lib/net-1.1/Memcached.ClientLibrary.dll +0 -0
  25. data/lib/net-1.1/Memcached.ClientLibrary.license.txt +0 -504
  26. data/lib/net-1.1/NHibernate.Caches.MemCache.Tests.dll +0 -0
  27. data/lib/net-1.1/NHibernate.Caches.MemCache.Tests.dll.config +0 -38
  28. data/lib/net-1.1/NHibernate.Caches.MemCache.dll +0 -0
  29. data/lib/net-1.1/NHibernate.Caches.MemCache.xml +0 -57
  30. data/lib/net-1.1/NHibernate.Caches.Prevalence.Tests.dll +0 -0
  31. data/lib/net-1.1/NHibernate.Caches.Prevalence.Tests.dll-results.xml +0 -50
  32. data/lib/net-1.1/NHibernate.Caches.Prevalence.Tests.dll.config +0 -46
  33. data/lib/net-1.1/NHibernate.Caches.Prevalence.dll +0 -0
  34. data/lib/net-1.1/NHibernate.Caches.Prevalence.xml +0 -149
  35. data/lib/net-1.1/NHibernate.Caches.SysCache.Tests.dll +0 -0
  36. data/lib/net-1.1/NHibernate.Caches.SysCache.Tests.dll-results.xml +0 -62
  37. data/lib/net-1.1/NHibernate.Caches.SysCache.Tests.dll.config +0 -36
  38. data/lib/net-1.1/NHibernate.Caches.SysCache.dll +0 -0
  39. data/lib/net-1.1/NHibernate.Caches.SysCache.xml +0 -144
  40. data/lib/net-1.1/NHibernate.DomainModel.dll +0 -0
  41. data/lib/net-1.1/NHibernate.DomainModel.xml +0 -1298
  42. data/lib/net-1.1/NHibernate.Examples.dll +0 -0
  43. data/lib/net-1.1/NHibernate.Examples.dll.config +0 -80
  44. data/lib/net-1.1/NHibernate.JetDriver.dll +0 -0
  45. data/lib/net-1.1/NHibernate.JetDriver.xml +0 -220
  46. data/lib/net-1.1/NHibernate.Mapping.Attributes.Test.dll +0 -0
  47. data/lib/net-1.1/NHibernate.Mapping.Attributes.Test.dll-results.xml +0 -31
  48. data/lib/net-1.1/NHibernate.Mapping.Attributes.dll +0 -0
  49. data/lib/net-1.1/NHibernate.Mapping.Attributes.xml +0 -2796
  50. data/lib/net-1.1/NHibernate.Tasks.dll +0 -0
  51. data/lib/net-1.1/NHibernate.Tasks.xml +0 -107
  52. data/lib/net-1.1/NHibernate.Test.Performance.dll +0 -0
  53. data/lib/net-1.1/NHibernate.Test.Performance.dll.config +0 -196
  54. data/lib/net-1.1/NHibernate.Test.dll +0 -0
  55. data/lib/net-1.1/NHibernate.Test.dll-results.xml +0 -2629
  56. data/lib/net-1.1/NHibernate.Test.dll.config +0 -255
  57. data/lib/net-1.1/NHibernate.Tool.hbm2net.Console.exe +0 -0
  58. data/lib/net-1.1/NHibernate.Tool.hbm2net.Tests.dll +0 -0
  59. data/lib/net-1.1/NHibernate.Tool.hbm2net.Tests.dll-results.xml +0 -52
  60. data/lib/net-1.1/NHibernate.Tool.hbm2net.Tests.dll.config +0 -23
  61. data/lib/net-1.1/NHibernate.Tool.hbm2net.dll +0 -0
  62. data/lib/net-1.1/NHibernate.Tool.hbm2net.xml +0 -1058
  63. data/lib/net-1.1/NHibernate.UserTypes.Oracle.dll +0 -0
  64. data/lib/net-1.1/NHibernate.UserTypes.Oracle.xml +0 -23
  65. data/lib/net-1.1/NHibernate.UserTypes.SqlTypes.dll +0 -0
  66. data/lib/net-1.1/NHibernate.UserTypes.SqlTypes.xml +0 -21
  67. data/lib/net-1.1/NHibernate.UserTypes.Tests.dll +0 -0
  68. data/lib/net-1.1/NHibernate.UserTypes.Tests.dll-results.xml +0 -85
  69. data/lib/net-1.1/NHibernate.UserTypes.Tests.dll.config +0 -67
  70. data/lib/net-1.1/NHibernate.dll +0 -0
  71. data/lib/net-1.1/NHibernate.xml +0 -29071
  72. data/lib/net-1.1/NVelocity.dll +0 -0
  73. data/lib/net-1.1/NVelocity.license.txt +0 -234
  74. data/lib/net-1.1/Nullables.NHibernate.dll +0 -0
  75. data/lib/net-1.1/Nullables.NHibernate.xml +0 -155
  76. data/lib/net-1.1/Nullables.Tests.dll +0 -0
  77. data/lib/net-1.1/Nullables.Tests.dll-results.xml +0 -139
  78. data/lib/net-1.1/Nullables.Tests.dll.config +0 -67
  79. data/lib/net-1.1/Nullables.dll +0 -0
  80. data/lib/net-1.1/Nullables.xml +0 -90
  81. data/lib/net-1.1/hibernate.cfg.xml +0 -24
  82. data/lib/net-1.1/log.txt +0 -0
  83. data/lib/net-1.1/log4net.dll +0 -0
  84. data/lib/net-1.1/log4net.license.txt +0 -201
  85. data/lib/net-1.1/log4net.xml +0 -28655
  86. data/lib/net-1.1/nant/NAnt.Core.dll +0 -0
  87. data/lib/net-1.1/nant/NAnt.Core.license.txt +0 -340
  88. data/lib/net-1.1/nant/NAnt.Core.xml +0 -14881
  89. data/lib/net-1.1/nant/log4net.dll +0 -0
  90. data/lib/net-1.1/nmock.dll +0 -0
  91. data/lib/net-1.1/nmock.license.txt +0 -34
  92. data/lib/net-1.1/nunit.core.dll +0 -0
  93. data/lib/net-1.1/nunit.framework.dll +0 -0
  94. data/lib/net-1.1/nunit.framework.license.txt +0 -14
  95. data/lib/net-2.0/Bamboo.Prevalence.Util.dll +0 -0
  96. data/lib/net-2.0/Bamboo.Prevalence.dll +0 -0
  97. data/lib/net-2.0/Bamboo.Prevalence.license.txt +0 -31
  98. data/lib/net-2.0/Castle.DynamicProxy.dll +0 -0
  99. data/lib/net-2.0/Castle.DynamicProxy.license.txt +0 -13
  100. data/lib/net-2.0/Castle.DynamicProxy.xml +0 -687
  101. data/lib/net-2.0/ICSharpCode.SharpZipLib.dll +0 -0
  102. data/lib/net-2.0/Iesi.Collections.Test.dll +0 -0
  103. data/lib/net-2.0/Iesi.Collections.Test.dll-results.xml +0 -211
  104. data/lib/net-2.0/Iesi.Collections.license.txt +0 -9
  105. data/lib/net-2.0/Lucene.Net.dll +0 -0
  106. data/lib/net-2.0/Lucene.Net.xml +0 -6740
  107. data/lib/net-2.0/Memcached.ClientLibrary.dll +0 -0
  108. data/lib/net-2.0/Memcached.ClientLibrary.license.txt +0 -504
  109. data/lib/net-2.0/NHibernate.Caches.MemCache.Tests.dll +0 -0
  110. data/lib/net-2.0/NHibernate.Caches.MemCache.Tests.dll.config +0 -38
  111. data/lib/net-2.0/NHibernate.Caches.MemCache.dll +0 -0
  112. data/lib/net-2.0/NHibernate.Caches.MemCache.xml +0 -57
  113. data/lib/net-2.0/NHibernate.Caches.Prevalence.Tests.dll +0 -0
  114. data/lib/net-2.0/NHibernate.Caches.Prevalence.Tests.dll-results.xml +0 -50
  115. data/lib/net-2.0/NHibernate.Caches.Prevalence.Tests.dll.config +0 -46
  116. data/lib/net-2.0/NHibernate.Caches.Prevalence.dll +0 -0
  117. data/lib/net-2.0/NHibernate.Caches.Prevalence.xml +0 -149
  118. data/lib/net-2.0/NHibernate.Caches.SysCache.Tests.dll +0 -0
  119. data/lib/net-2.0/NHibernate.Caches.SysCache.Tests.dll-results.xml +0 -62
  120. data/lib/net-2.0/NHibernate.Caches.SysCache.Tests.dll.config +0 -36
  121. data/lib/net-2.0/NHibernate.Caches.SysCache.dll +0 -0
  122. data/lib/net-2.0/NHibernate.Caches.SysCache.xml +0 -144
  123. data/lib/net-2.0/NHibernate.Caches.SysCache2.dll +0 -0
  124. data/lib/net-2.0/NHibernate.Caches.SysCache2.xml +0 -805
  125. data/lib/net-2.0/NHibernate.DomainModel.dll +0 -0
  126. data/lib/net-2.0/NHibernate.DomainModel.xml +0 -1298
  127. data/lib/net-2.0/NHibernate.Examples.dll +0 -0
  128. data/lib/net-2.0/NHibernate.Examples.dll.config +0 -80
  129. data/lib/net-2.0/NHibernate.JetDriver.dll +0 -0
  130. data/lib/net-2.0/NHibernate.JetDriver.xml +0 -220
  131. data/lib/net-2.0/NHibernate.Mapping.Attributes.Test.dll +0 -0
  132. data/lib/net-2.0/NHibernate.Mapping.Attributes.Test.dll-results.xml +0 -31
  133. data/lib/net-2.0/NHibernate.Mapping.Attributes.dll +0 -0
  134. data/lib/net-2.0/NHibernate.Mapping.Attributes.xml +0 -2796
  135. data/lib/net-2.0/NHibernate.Tasks.dll +0 -0
  136. data/lib/net-2.0/NHibernate.Tasks.xml +0 -107
  137. data/lib/net-2.0/NHibernate.Test.Performance.dll +0 -0
  138. data/lib/net-2.0/NHibernate.Test.Performance.dll.config +0 -196
  139. data/lib/net-2.0/NHibernate.Test.dll +0 -0
  140. data/lib/net-2.0/NHibernate.Test.dll-results.xml +0 -2809
  141. data/lib/net-2.0/NHibernate.Test.dll.config +0 -255
  142. data/lib/net-2.0/NHibernate.Tool.hbm2net.Console.exe +0 -0
  143. data/lib/net-2.0/NHibernate.Tool.hbm2net.Tests.dll +0 -0
  144. data/lib/net-2.0/NHibernate.Tool.hbm2net.Tests.dll-results.xml +0 -52
  145. data/lib/net-2.0/NHibernate.Tool.hbm2net.Tests.dll.config +0 -23
  146. data/lib/net-2.0/NHibernate.Tool.hbm2net.dll +0 -0
  147. data/lib/net-2.0/NHibernate.Tool.hbm2net.xml +0 -1058
  148. data/lib/net-2.0/NHibernate.UserTypes.Oracle.dll +0 -0
  149. data/lib/net-2.0/NHibernate.UserTypes.Oracle.xml +0 -23
  150. data/lib/net-2.0/NHibernate.UserTypes.SqlTypes.dll +0 -0
  151. data/lib/net-2.0/NHibernate.UserTypes.SqlTypes.xml +0 -21
  152. data/lib/net-2.0/NHibernate.UserTypes.Tests.dll +0 -0
  153. data/lib/net-2.0/NHibernate.UserTypes.Tests.dll-results.xml +0 -85
  154. data/lib/net-2.0/NHibernate.UserTypes.Tests.dll.config +0 -67
  155. data/lib/net-2.0/NHibernate.dll +0 -0
  156. data/lib/net-2.0/NHibernate.license.txt +0 -460
  157. data/lib/net-2.0/NVelocity.dll +0 -0
  158. data/lib/net-2.0/NVelocity.license.txt +0 -234
  159. data/lib/net-2.0/Nullables.NHibernate.dll +0 -0
  160. data/lib/net-2.0/Nullables.NHibernate.xml +0 -155
  161. data/lib/net-2.0/Nullables.Tests.dll +0 -0
  162. data/lib/net-2.0/Nullables.Tests.dll-results.xml +0 -139
  163. data/lib/net-2.0/Nullables.Tests.dll.config +0 -67
  164. data/lib/net-2.0/Nullables.dll +0 -0
  165. data/lib/net-2.0/Nullables.xml +0 -90
  166. data/lib/net-2.0/hibernate.cfg.xml +0 -24
  167. data/lib/net-2.0/log.txt +0 -0
  168. data/lib/net-2.0/nant/NAnt.Core.dll +0 -0
  169. data/lib/net-2.0/nant/NAnt.Core.license.txt +0 -340
  170. data/lib/net-2.0/nant/NAnt.Core.xml +0 -14881
  171. data/lib/net-2.0/nant/log4net.dll +0 -0
  172. data/lib/net-2.0/nmock.dll +0 -0
  173. data/lib/net-2.0/nmock.license.txt +0 -34
  174. data/lib/net-2.0/nunit.core.dll +0 -0
  175. data/lib/net-2.0/nunit.framework.dll +0 -0
  176. data/lib/net-2.0/nunit.framework.license.txt +0 -14
@@ -1,47 +1,45 @@
1
- <xs:schema targetNamespace='urn:nhibernate-configuration-2.2' xmlns='urn:nhibernate-configuration-2.2'
2
- xmlns:xs='http://www.w3.org/2001/XMLSchema'>
1
+ <xs:schema targetNamespace="urn:nhibernate-configuration-2.2" xmlns="urn:nhibernate-configuration-2.2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:NS="urn:nhibernate-configuration-2.2">
3
2
  <xs:annotation>
4
3
  <xs:documentation>
5
- This schema was automatically generated by Syntext Dtd2Schema
6
- conversion tool (from file: hibernate-configuration-2.0.dtd)
7
- Copyright (C) 2002, 2003 Syntext Inc. See http://www.syntext.com for updates.
4
+ -- This schema was automatically generated by Syntext Dtd2Schema and changed for NH use --
5
+ -- conversion tool (from file: hibernate-configuration-3.0.dtd) --
6
+ -- Copyright (C) 2002, 2003 Syntext Inc. See http://www.syntext.com for updates. --
8
7
  </xs:documentation>
9
8
  </xs:annotation>
10
-
11
9
  <!-- Type definitions -->
12
- <xs:simpleType name='cacheUsage'>
13
- <xs:restriction base='xs:string'>
14
- <xs:enumeration value='read-only' />
15
- <xs:enumeration value='read-write' />
16
- <xs:enumeration value='nonstrict-read-write' />
17
- </xs:restriction>
18
- </xs:simpleType>
19
- <xs:complexType name="classCache">
20
- <xs:attribute name='class' use='required' />
21
- <xs:attribute name='region' />
22
- <xs:attribute name='usage' use='required' type="cacheUsage" />
23
- </xs:complexType>
24
- <xs:complexType name="collectionCache">
25
- <xs:attribute name='collection' use='required' />
26
- <xs:attribute name='region' />
27
- <xs:attribute name='usage' use='required' type="cacheUsage" />
28
- </xs:complexType>
29
-
30
- <xs:element name='hibernate-configuration'>
10
+ <xs:element name="hibernate-configuration">
11
+ <xs:complexType>
12
+ <xs:sequence>
13
+ <xs:element ref="bytecode-provider" minOccurs="0" maxOccurs="1" />
14
+ <xs:element ref="reflection-optimizer" maxOccurs="1" minOccurs="0" />
15
+ <xs:element ref="session-factory" minOccurs="0" maxOccurs="1" />
16
+ </xs:sequence>
17
+ </xs:complexType>
18
+ </xs:element>
19
+ <xs:element name="class-cache">
31
20
  <xs:complexType>
32
21
  <xs:sequence>
33
- <xs:element ref='session-factory' />
34
22
  </xs:sequence>
23
+ <xs:attribute name="class" type="xs:string" use="required" />
24
+ <xs:attributeGroup ref="cacheSpecification" />
25
+ <xs:attribute name="include">
26
+ <xs:simpleType>
27
+ <xs:restriction base="xs:string">
28
+ <xs:enumeration value="all" />
29
+ <xs:enumeration value="non-lazy" />
30
+ </xs:restriction>
31
+ </xs:simpleType>
32
+ </xs:attribute>
35
33
  </xs:complexType>
36
34
  </xs:element>
37
-
38
- <!-- Caches -->
39
- <xs:element name="jcs-class-cache" type="classCache" />
40
- <xs:element name="class-cache" type="classCache" />
41
- <xs:element name="jcs-collection-cache" type="collectionCache" />
42
- <xs:element name="collection-cache" type="collectionCache" />
43
-
44
- <xs:element name='mapping'>
35
+ <xs:element name="collection-cache">
36
+ <xs:complexType>
37
+ <xs:sequence />
38
+ <xs:attribute name="collection" type="xs:string" use="required" />
39
+ <xs:attributeGroup ref="cacheSpecification" />
40
+ </xs:complexType>
41
+ </xs:element>
42
+ <xs:element name="mapping">
45
43
  <xs:annotation>
46
44
  <xs:documentation>
47
45
  There are 3 possible combinations of mapping attributes
@@ -51,29 +49,155 @@
51
49
  </xs:documentation>
52
50
  </xs:annotation>
53
51
  <xs:complexType>
54
- <xs:attribute name='resource' />
55
- <xs:attribute name='file' />
56
- <xs:attribute name='assembly' />
52
+ <xs:attribute name="resource" />
53
+ <xs:attribute name="file" />
54
+ <xs:attribute name="assembly" />
57
55
  </xs:complexType>
58
56
  </xs:element>
59
- <xs:element name='property'>
60
- <xs:complexType mixed='true'>
61
- <xs:attribute name='name' use='required' />
57
+ <xs:element name="property">
58
+ <xs:complexType>
59
+ <xs:simpleContent>
60
+ <xs:extension base="xs:string">
61
+ <xs:attribute name="name" use="required">
62
+ <xs:simpleType>
63
+ <xs:restriction base="xs:string">
64
+ <xs:enumeration value="connection.provider" />
65
+ <xs:enumeration value="connection.driver_class" />
66
+ <xs:enumeration value="connection.connection_string" />
67
+ <xs:enumeration value="connection.isolation" />
68
+ <xs:enumeration value="connection.release_mode" />
69
+ <xs:enumeration value="connection.connection_string_name" />
70
+ <xs:enumeration value="dialect" />
71
+ <xs:enumeration value="default_schema" />
72
+ <xs:enumeration value="show_sql" />
73
+ <xs:enumeration value="max_fetch_depth" />
74
+ <xs:enumeration value="current_session_context_class" />
75
+ <xs:enumeration value="transaction.factory_class" />
76
+ <xs:enumeration value="cache.provider_class" />
77
+ <xs:enumeration value="cache.use_query_cache" />
78
+ <xs:enumeration value="cache.query_cache_factory" />
79
+ <xs:enumeration value="cache.use_second_level_cache" />
80
+ <xs:enumeration value="cache.region_prefix" />
81
+ <xs:enumeration value="cache.use_minimal_puts" />
82
+ <xs:enumeration value="query.substitutions" />
83
+ <xs:enumeration value="query.factory_class" />
84
+ <xs:enumeration value="query.imports" />
85
+ <xs:enumeration value="hbm2ddl.auto" />
86
+ <xs:enumeration value="sql_exception_converter" />
87
+ <xs:enumeration value="adonet.wrap_result_sets" />
88
+ <xs:enumeration value="prepare_sql" />
89
+ <xs:enumeration value="command_timeout" />
90
+ <xs:enumeration value="adonet.batch_size" />
91
+ <xs:enumeration value="use_proxy_validator" />
92
+ <xs:enumeration value="use_outer_join" />
93
+ <xs:enumeration value="xml.output_stylesheet" />
94
+ <xs:enumeration value="generate_statistics" />
95
+ <xs:enumeration value="query.startup_check" />
96
+ <xs:enumeration value="default_catalog" />
97
+ <xs:enumeration value="proxyfactory.factory_class" />
98
+ <xs:enumeration value="adonet.factory_class" />
99
+ <xs:enumeration value="default_batch_fetch_size" />
100
+ </xs:restriction>
101
+ </xs:simpleType>
102
+ </xs:attribute>
103
+ </xs:extension>
104
+ </xs:simpleContent>
62
105
  </xs:complexType>
63
106
  </xs:element>
64
- <xs:element name='session-factory'>
107
+ <xs:element name="session-factory">
65
108
  <xs:complexType>
66
109
  <xs:sequence>
67
- <xs:element ref='property' minOccurs='0' maxOccurs='unbounded' />
68
- <xs:element ref='mapping' minOccurs='0' maxOccurs='unbounded' />
69
- <xs:choice minOccurs='0' maxOccurs='unbounded'>
70
- <xs:element ref='jcs-class-cache' />
71
- <xs:element ref='class-cache' />
72
- <xs:element ref='jcs-collection-cache' />
73
- <xs:element ref='collection-cache' />
110
+ <xs:element ref="property" minOccurs="0" maxOccurs="unbounded" />
111
+ <xs:element ref="mapping" minOccurs="0" maxOccurs="unbounded" />
112
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
113
+ <xs:element ref="class-cache" />
114
+ <xs:element ref="collection-cache" />
74
115
  </xs:choice>
116
+ <xs:element ref="event" minOccurs="0" maxOccurs="unbounded" />
117
+ <xs:element ref="listener" minOccurs="0" maxOccurs="unbounded" />
75
118
  </xs:sequence>
76
- <xs:attribute name='name' />
119
+ <xs:attribute name="name" use="optional" />
120
+ </xs:complexType>
121
+ </xs:element>
122
+ <xs:attributeGroup name="cacheSpecification">
123
+ <xs:attribute name="region" type="xs:string" use="optional" />
124
+ <xs:attribute name="usage" use="required">
125
+ <xs:simpleType>
126
+ <xs:restriction base="xs:string">
127
+ <xs:enumeration value="read-only" />
128
+ <xs:enumeration value="read-write" />
129
+ <xs:enumeration value="nonstrict-read-write" />
130
+ <xs:enumeration value="transactional" />
131
+ </xs:restriction>
132
+ </xs:simpleType>
133
+ </xs:attribute>
134
+ </xs:attributeGroup>
135
+ <xs:element name="event">
136
+ <xs:complexType>
137
+ <xs:sequence>
138
+ <xs:element ref="listener" minOccurs="1" maxOccurs="unbounded" />
139
+ </xs:sequence>
140
+ <xs:attribute name="type" type="listenerType" use="required" />
141
+ </xs:complexType>
142
+ </xs:element>
143
+ <xs:element name="listener">
144
+ <xs:complexType>
145
+ <xs:sequence />
146
+ <xs:attribute name="class" type="xs:string" use="required" />
147
+ <xs:attribute name="type" type="listenerType" use="optional" />
148
+ </xs:complexType>
149
+ </xs:element>
150
+ <xs:simpleType name="listenerType">
151
+ <xs:restriction base="xs:string">
152
+ <xs:enumeration value="auto-flush" />
153
+ <xs:enumeration value="merge" />
154
+ <xs:enumeration value="create" />
155
+ <xs:enumeration value="create-onflush" />
156
+ <xs:enumeration value="delete" />
157
+ <xs:enumeration value="dirty-check" />
158
+ <xs:enumeration value="evict" />
159
+ <xs:enumeration value="flush" />
160
+ <xs:enumeration value="flush-entity" />
161
+ <xs:enumeration value="load" />
162
+ <xs:enumeration value="load-collection" />
163
+ <xs:enumeration value="lock" />
164
+ <xs:enumeration value="refresh" />
165
+ <xs:enumeration value="replicate" />
166
+ <xs:enumeration value="save-update" />
167
+ <xs:enumeration value="save" />
168
+ <xs:enumeration value="pre-update" />
169
+ <xs:enumeration value="update" />
170
+ <xs:enumeration value="pre-load" />
171
+ <xs:enumeration value="pre-delete" />
172
+ <xs:enumeration value="pre-insert" />
173
+ <xs:enumeration value="post-load" />
174
+ <xs:enumeration value="post-insert" />
175
+ <xs:enumeration value="post-update" />
176
+ <xs:enumeration value="post-delete" />
177
+ <xs:enumeration value="post-commit-update" />
178
+ <xs:enumeration value="post-commit-insert" />
179
+ <xs:enumeration value="post-commit-delete" />
180
+ </xs:restriction>
181
+ </xs:simpleType>
182
+ <xs:element name="bytecode-provider">
183
+ <xs:complexType>
184
+ <xs:sequence>
185
+ </xs:sequence>
186
+ <xs:attribute name="type" default="lcg">
187
+ <xs:simpleType>
188
+ <xs:restriction base="xs:string">
189
+ <xs:enumeration value="codedom" />
190
+ <xs:enumeration value="lcg" />
191
+ <xs:enumeration value="null" />
192
+ </xs:restriction>
193
+ </xs:simpleType>
194
+ </xs:attribute>
195
+ </xs:complexType>
196
+ </xs:element>
197
+ <xs:element name="reflection-optimizer">
198
+ <xs:complexType>
199
+ <xs:sequence />
200
+ <xs:attribute name="use" type="xs:boolean" />
77
201
  </xs:complexType>
78
202
  </xs:element>
79
- </xs:schema>
203
+ </xs:schema>
@@ -37,19 +37,7 @@
37
37
  <xs:enumeration value="auto" />
38
38
  <xs:enumeration value="never" />
39
39
  <!-- <xs:enumeration value="always" /> - not implemented yet -->
40
- </xs:restriction>
41
- </xs:simpleType>
42
- <xs:simpleType name="cascadeStyle">
43
- <xs:annotation>
44
- <xs:documentation>Rule as to how to operate on child objects (for more information, read topics about "persistence by reachability" or "transparent/transitive/cascading persistence")</xs:documentation>
45
- </xs:annotation>
46
- <xs:restriction base="xs:string">
47
- <xs:enumeration value="all" />
48
- <xs:enumeration value="all-delete-orphan" />
49
- <xs:enumeration value="none" />
50
- <xs:enumeration value="save-update" />
51
- <xs:enumeration value="delete" />
52
- <xs:enumeration value="delete-orphan" />
40
+ <xs:enumeration value="always" />
53
41
  </xs:restriction>
54
42
  </xs:simpleType>
55
43
  <xs:simpleType name="optimisticLockMode">
@@ -88,7 +76,6 @@
88
76
  <xs:enumeration value="always" />
89
77
  </xs:restriction>
90
78
  </xs:simpleType>
91
-
92
79
  <!--
93
80
  This is the same as laziness for now, but H3.2 allows lazy="no-proxy"
94
81
  in some elements but not in others, so separate types are used.
@@ -114,6 +101,7 @@
114
101
  <xs:attribute name="dynamic-update" type="xs:boolean" use="optional" default="false" />
115
102
  <xs:attribute name="dynamic-insert" type="xs:boolean" use="optional" default="false" />
116
103
  <xs:attribute name="select-before-update" type="xs:boolean" use="optional" default="false" />
104
+ <xs:attribute name="abstract" type="xs:boolean" />
117
105
  </xs:attributeGroup>
118
106
  <xs:attributeGroup name="baseCollectionAttributes">
119
107
  <xs:attribute name="name" type="xs:string" use="required" />
@@ -127,7 +115,7 @@
127
115
  </xs:attribute>
128
116
  <xs:attribute name="outer-join" type="outerJoinStrategy" use="optional" />
129
117
  <xs:attribute name="fetch" type="collectionFetchMode" use="optional" />
130
- <xs:attribute name="cascade" type="cascadeStyle" use="optional" />
118
+ <xs:attribute name="cascade" type="xs:string" use="optional" />
131
119
  <xs:attribute name="where" type="xs:string" use="optional" />
132
120
  <xs:attribute name="inverse" type="xs:boolean" use="optional" default="false" />
133
121
  <xs:attribute name="persister" type="xs:string" use="optional" />
@@ -234,6 +222,7 @@
234
222
  <xs:element ref="class" />
235
223
  <xs:element ref="subclass" />
236
224
  <xs:element ref="joined-subclass" />
225
+ <xs:element ref="union-subclass" />
237
226
  </xs:choice>
238
227
  <xs:element ref="resultset" minOccurs="0" maxOccurs="unbounded" />
239
228
  <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -243,12 +232,8 @@
243
232
  <xs:element ref="filter-def" minOccurs="0" maxOccurs="unbounded" />
244
233
  <xs:element ref="database-object" minOccurs="0" maxOccurs="unbounded" />
245
234
  </xs:sequence>
246
- <xs:attribute name="schema" type="xs:string" use="optional">
247
- <xs:annotation>
248
- <xs:documentation>defaults to none used</xs:documentation>
249
- </xs:annotation>
250
- </xs:attribute>
251
- <xs:attribute name="default-cascade" type="cascadeStyle" use="optional" default="none" />
235
+ <xs:attribute name="schema" type="xs:string" use="optional" />
236
+ <xs:attribute name="default-cascade" type="xs:string" use="optional" default="none" />
252
237
  <xs:attribute name="default-access" type="xs:string" use="optional" default="property">
253
238
  <xs:annotation>
254
239
  <xs:documentation>Default property access setting</xs:documentation>
@@ -367,8 +352,12 @@
367
352
  <xs:element ref="primitive-array" />
368
353
  </xs:choice>
369
354
  <xs:choice>
370
- <xs:element ref="subclass" minOccurs="0" maxOccurs="unbounded" />
355
+ <xs:sequence>
356
+ <xs:element ref="join" minOccurs="0" maxOccurs="unbounded" />
357
+ <xs:element ref="subclass" minOccurs="0" maxOccurs="unbounded" />
358
+ </xs:sequence>
371
359
  <xs:element ref="joined-subclass" minOccurs="0" maxOccurs="unbounded" />
360
+ <xs:element ref="union-subclass" minOccurs="0" maxOccurs="unbounded" />
372
361
  </xs:choice>
373
362
  <xs:group ref="classCustomSQL" />
374
363
  <xs:element ref="filter" minOccurs="0" maxOccurs="unbounded" />
@@ -517,6 +506,7 @@
517
506
  <xs:element ref="array" />
518
507
  <xs:element ref="primitive-array" />
519
508
  </xs:choice>
509
+ <xs:element ref="join" minOccurs="0" maxOccurs="unbounded" />
520
510
  <xs:element ref="subclass" minOccurs="0" maxOccurs="unbounded" />
521
511
  <xs:group ref="classCustomSQL" />
522
512
  </xs:sequence>
@@ -574,6 +564,30 @@
574
564
  <xs:attribute name="check" type="xs:string" use="optional" />
575
565
  </xs:complexType>
576
566
  </xs:element>
567
+ <xs:element name="join">
568
+ <xs:complexType>
569
+ <xs:sequence>
570
+ <xs:element ref="key" />
571
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
572
+ <xs:element ref="property" />
573
+ <xs:element ref="many-to-one" />
574
+ <xs:element ref="component" />
575
+ <xs:element ref="dynamic-component" />
576
+ <xs:element ref="any" />
577
+ </xs:choice>
578
+ </xs:sequence>
579
+ <xs:attribute name="table" type="xs:string">
580
+ </xs:attribute>
581
+ <xs:attribute name="schema" type="xs:string" use="optional">
582
+ <xs:annotation>
583
+ <xs:documentation>default: no value</xs:documentation>
584
+ </xs:annotation>
585
+ </xs:attribute>
586
+ <xs:attribute name="fetch" type="fetchMode" use="optional" />
587
+ <xs:attribute name="inverse" type="xs:boolean" use="optional" default="false" />
588
+ <xs:attribute name="optional" type="xs:boolean" use="optional" default="false" />
589
+ </xs:complexType>
590
+ </xs:element>
577
591
  <xs:element name="property">
578
592
  <xs:annotation>
579
593
  <xs:documentation>Property of an entity class or component, component-element, composite-id, etc. Class Properties (get_ and set_ methods) are mapped to table columns</xs:documentation>
@@ -635,7 +649,7 @@
635
649
  <xs:attribute name="access" type="xs:string" />
636
650
  <xs:attribute name="insert" type="xs:boolean" />
637
651
  <xs:attribute name="update" type="xs:boolean" />
638
- <xs:attribute name="cascade" type="cascadeStyle" default="none" />
652
+ <xs:attribute name="cascade" type="xs:string" default="none" />
639
653
  <xs:attribute name="index" type="xs:string" use="optional" />
640
654
  <xs:attribute name="unique-key" type="xs:string" use="optional" />
641
655
  </xs:complexType>
@@ -663,7 +677,7 @@
663
677
  <xs:attribute name="table" type="xs:string" />
664
678
  <xs:attribute name="schema" type="xs:string" />
665
679
  <xs:attribute name="element-class" type="xs:string" />
666
- <xs:attribute name="cascade" type="cascadeStyle" />
680
+ <xs:attribute name="cascade" type="xs:string" />
667
681
  <xs:attribute name="where" type="xs:string" />
668
682
  <xs:attribute name="optimistic-lock" type="xs:boolean" use="optional" />
669
683
  </xs:complexType>
@@ -826,6 +840,15 @@
826
840
  <xs:attribute name="length" type="xs:positiveInteger" use="optional" />
827
841
  </xs:complexType>
828
842
  </xs:element>
843
+ <xs:element name="list-index">
844
+ <xs:complexType>
845
+ <xs:sequence>
846
+ <xs:element ref="column" minOccurs="0" maxOccurs="unbounded" />
847
+ </xs:sequence>
848
+ <xs:attribute name="column" type="xs:string" />
849
+ <xs:attribute name="base" type="xs:positiveInteger" use="optional" />
850
+ </xs:complexType>
851
+ </xs:element>
829
852
  <xs:element name="index-many-to-any">
830
853
  <xs:complexType>
831
854
  <xs:sequence>
@@ -853,6 +876,8 @@
853
876
  </xs:sequence>
854
877
  <xs:attribute name="column" type="xs:string" />
855
878
  <xs:attribute name="foreign-key" type="xs:string" use="optional" />
879
+ <xs:attribute name="property-ref" type="xs:string" use="optional" />
880
+ <xs:attribute name="on-delete" type="ondelete" />
856
881
  </xs:complexType>
857
882
  </xs:element>
858
883
  <xs:element name="key-many-to-one">
@@ -866,6 +891,7 @@
866
891
  <xs:attribute name="column" type="xs:string" />
867
892
  <xs:attribute name="foreign-key" type="xs:string" use="optional" />
868
893
  <xs:attribute name="lazy" type="restrictedLaziness" use="optional" />
894
+ <xs:attribute name="not-found" type="notFoundMode" use="optional" />
869
895
  </xs:complexType>
870
896
  </xs:element>
871
897
  <xs:element name="key-property">
@@ -921,7 +947,7 @@
921
947
  <xs:attribute name="unique" type="xs:boolean" default="false" />
922
948
  <xs:attribute name="unique-key" type="xs:string" />
923
949
  <xs:attribute name="index" type="xs:string" />
924
- <xs:attribute name="cascade" type="cascadeStyle" />
950
+ <xs:attribute name="cascade" type="xs:string" />
925
951
  <xs:attribute name="outer-join" type="outerJoinStrategy" use="optional" />
926
952
  <xs:attribute name="fetch" type="fetchMode" use="optional" />
927
953
  <xs:attribute name="update" type="xs:boolean" />
@@ -967,7 +993,7 @@
967
993
  <xs:attribute name="name" type="xs:string" use="required" />
968
994
  <xs:attribute name="access" type="xs:string" />
969
995
  <xs:attribute name="class" type="xs:string" />
970
- <xs:attribute name="cascade" type="cascadeStyle" />
996
+ <xs:attribute name="cascade" type="xs:string" />
971
997
  <xs:attribute name="outer-join" type="outerJoinStrategy" use="optional" />
972
998
  <xs:attribute name="fetch" type="fetchMode" use="optional" />
973
999
  <xs:attribute name="constrained" type="xs:boolean" default="false" />
@@ -1007,8 +1033,17 @@
1007
1033
  </xs:element>
1008
1034
  <xs:element name="query">
1009
1035
  <xs:complexType mixed="true">
1036
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
1037
+ <xs:element ref="query-param" />
1038
+ </xs:choice>
1010
1039
  <xs:attribute name="name" type="xs:string" use="required" />
1011
1040
  <xs:attribute name="flush-mode" type="flushMode" use="optional" />
1041
+ <xs:attribute name="cache-mode" type="cacheMode" />
1042
+ <xs:attribute name="cacheable" type="xs:boolean" />
1043
+ <xs:attribute name="cache-region" type="xs:string" />
1044
+ <xs:attribute name="fetch-size" type="xs:int" />
1045
+ <xs:attribute name="timeout" type="xs:int" />
1046
+ <xs:attribute name="read-only" type="xs:boolean" />
1012
1047
  </xs:complexType>
1013
1048
  </xs:element>
1014
1049
  <xs:element name="return">
@@ -1080,11 +1115,18 @@
1080
1115
  <xs:element ref="return-join" />
1081
1116
  <xs:element ref="load-collection" />
1082
1117
  <xs:element ref="synchronize" />
1118
+ <xs:element ref="query-param" />
1083
1119
  </xs:choice>
1084
1120
  <xs:attribute name="name" type="xs:string" use="required" />
1085
- <!-- <xs:attribute name="callable" type="xs:boolean" use="optional" default="false" /> -->
1086
1121
  <xs:attribute name="resultset-ref" type="xs:string" use="optional" />
1087
1122
  <xs:attribute name="flush-mode" type="flushMode" use="optional" />
1123
+ <xs:attribute name="cache-mode" type="cacheMode" />
1124
+ <xs:attribute name="callable" type="xs:boolean" />
1125
+ <xs:attribute name="read-only" type="xs:boolean" />
1126
+ <xs:attribute name="timeout" type="xs:int" />
1127
+ <xs:attribute name="fetch-size" type="xs:int" />
1128
+ <xs:attribute name="cache-region" type="xs:string" />
1129
+ <xs:attribute name="cacheable" type="xs:boolean" />
1088
1130
  </xs:complexType>
1089
1131
  </xs:element>
1090
1132
  <xs:element name="list">
@@ -1096,7 +1138,10 @@
1096
1138
  <xs:element ref="cache" />
1097
1139
  </xs:choice>
1098
1140
  <xs:element ref="key" />
1099
- <xs:element ref="index" />
1141
+ <xs:choice>
1142
+ <xs:element ref="index" />
1143
+ <xs:element ref="list-index" />
1144
+ </xs:choice>
1100
1145
  <xs:choice>
1101
1146
  <xs:element ref="element" />
1102
1147
  <xs:element ref="one-to-many" />
@@ -1194,4 +1239,65 @@
1194
1239
  <xs:attribute name="name" type="xs:string" use="required" />
1195
1240
  </xs:complexType>
1196
1241
  </xs:element>
1197
- </xs:schema>
1242
+ <xs:simpleType name="cacheMode">
1243
+ <xs:restriction base="xs:string">
1244
+ <xs:enumeration value="get" />
1245
+ <xs:enumeration value="ignore" />
1246
+ <xs:enumeration value="normal" />
1247
+ <xs:enumeration value="put" />
1248
+ <xs:enumeration value="refresh" />
1249
+ </xs:restriction>
1250
+ </xs:simpleType>
1251
+ <xs:element name="union-subclass">
1252
+ <xs:annotation>
1253
+ <xs:documentation>A subclass in a table-per-concrete-class mapping</xs:documentation>
1254
+ </xs:annotation>
1255
+ <xs:complexType>
1256
+ <xs:sequence>
1257
+ <xs:element ref="meta" minOccurs="0" maxOccurs="unbounded" />
1258
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
1259
+ <xs:element ref="property" />
1260
+ <xs:element ref="many-to-one" />
1261
+ <xs:element ref="one-to-one" />
1262
+ <xs:element ref="component" />
1263
+ <xs:element ref="dynamic-component" />
1264
+ <xs:element ref="any" />
1265
+ <xs:element ref="map" />
1266
+ <xs:element ref="set" />
1267
+ <xs:element ref="list" />
1268
+ <xs:element ref="bag" />
1269
+ <xs:element ref="idbag" />
1270
+ <xs:element ref="array" />
1271
+ <xs:element ref="primitive-array" />
1272
+ </xs:choice>
1273
+ <xs:element ref="union-subclass" minOccurs="0" maxOccurs="unbounded" />
1274
+ <xs:group ref="classCustomSQL" />
1275
+ </xs:sequence>
1276
+ <xs:attributeGroup ref="baseClassAttributes" />
1277
+ <xs:attribute name="extends" type="xs:string" use="optional">
1278
+ <xs:annotation>
1279
+ <xs:documentation>Name of the root class. Required if the subclass is declared outside the declaration of its root class</xs:documentation>
1280
+ </xs:annotation>
1281
+ </xs:attribute>
1282
+ <xs:attribute name="schema" type="xs:string" use="optional" />
1283
+ <xs:attribute name="table" type="xs:string" use="optional">
1284
+ <xs:annotation>
1285
+ <xs:documentation>default: unqualified classname</xs:documentation>
1286
+ </xs:annotation>
1287
+ </xs:attribute>
1288
+ <xs:attribute name="check" type="xs:string" use="optional" />
1289
+ </xs:complexType>
1290
+ </xs:element>
1291
+ <xs:element name="query-param">
1292
+ <xs:complexType>
1293
+ <xs:attribute name="name" type="xs:string" use="required" />
1294
+ <xs:attribute name="type" type="xs:string" use="required" />
1295
+ </xs:complexType>
1296
+ </xs:element>
1297
+ <xs:simpleType name="ondelete">
1298
+ <xs:restriction base="xs:string">
1299
+ <xs:enumeration value="cascade" />
1300
+ <xs:enumeration value="noaction" />
1301
+ </xs:restriction>
1302
+ </xs:simpleType>
1303
+ </xs:schema>