You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by jr...@apache.org on 2009/03/27 21:58:11 UTC

svn commit: r759348 [3/4] - in /openjpa/trunk: ./ openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/ openjpa-persistence-jdbc/src/test/java/org/apach...

Modified: openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm_2_0-xsd.rsrc
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm_2_0-xsd.rsrc?rev=759348&r1=759347&r2=759348&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm_2_0-xsd.rsrc (original)
+++ openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/orm_2_0-xsd.rsrc Fri Mar 27 20:58:10 2009
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Java Persistence API object/relational mapping file schema -->
+    <!-- Java Persistence API object/relational mapping file schema -->
 <xsd:schema targetNamespace="http://java.sun.com/xml/ns/persistence/orm"
-    xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     elementFormDefault="qualified" attributeFormDefault="unqualified"
     version="2.0">
     <xsd:annotation>
@@ -11,8 +10,7 @@
         </xsd:documentation>
     </xsd:annotation>
     <xsd:annotation>
-        <xsd:documentation>
-            <![CDATA[
+        <xsd:documentation><![CDATA[
 This is the XML Schema for the persistence object/relational
 mapping file.
 The file may be named "META-INF/orm.xml" in the persistence
@@ -30,8 +28,7 @@
 version="2.0">
 ...
 </entity-mappings>
-]]>
-        </xsd:documentation>
+]]></xsd:documentation>
     </xsd:annotation>
     <xsd:complexType name="emptyType" />
     <xsd:simpleType name="versionType">
@@ -44,30 +41,32 @@
         <xsd:complexType>
             <xsd:annotation>
                 <xsd:documentation>
-                    The entity-mappings element is the root element of
-                    an mapping file. It contains the following four
-                    types of elements: 1. The persistence-unit-metadata
-                    element contains metadata for the entire persistence
-                    unit. It is undefined if this element occurs in
-                    multiple mapping files within the same persistence
-                    unit. 2. The package, schema, catalog and access
-                    elements apply to all of the entity,
-                    mapped-superclass and embeddable elements defined in
-                    the same file in which they occur. 3. The
-                    sequence-generator, table-generator, named-query,
+                    The entity-mappings element is the root element of an mapping
+                    file. It contains the following four types of elements:
+                    1. The persistence-unit-metadata element contains metadata
+                    for the entire persistence unit. It is undefined if this element
+                    occurs in multiple mapping files within the same
+                    persistence unit.
+                    2. The package, schema, catalog and access elements apply to all of
+                    the entity, mapped-superclass and embeddable
+                    elements defined in
+                    the same file in which they occur.
+                    3. The sequence-generator, table-generator, named-query,
                     named-native-query and sql-result-set-mapping
-                    elements are global to the persistence unit. It is
-                    undefined to have more than one sequence-generator
-                    or table-generator of the same name in the same or
-                    different mapping files in a persistence unit. It is
-                    also undefined to have more than one named-query,
-                    named-native-query, or result-set-mapping of the
-                    same name in the same or different mapping files in
-                    a persistence unit. 4. The entity, mapped-superclass
-                    and embeddable elements each define the mapping
-                    information for a managed persistent class. The
-                    mapping information contained in these elements may
-                    be complete or it may be partial.
+                    elements are global
+                    to the persistence unit. It is undefined to have more than one
+                    sequence-generator or table-generator of the same
+                    name in the same
+                    or different mapping files in a persistence unit. It is also
+                    undefined to have more than one named-query,
+                    named-native-query, or
+                    result-set-mapping of the same name in the same or different mapping
+                    files in a persistence unit.
+                    4. The entity, mapped-superclass and embeddable elements each define
+                    the mapping information for a managed persistent
+                    class. The mapping
+                    information contained in these elements may be complete or it may
+                    be partial.
                 </xsd:documentation>
             </xsd:annotation>
             <xsd:sequence>
@@ -83,23 +82,19 @@
                     minOccurs="0" />
                 <xsd:element name="access" type="orm:access-type"
                     minOccurs="0" />
-                <xsd:element name="sequence-generator"
-                    type="orm:sequence-generator" minOccurs="0"
-                    maxOccurs="unbounded" />
-                <xsd:element name="table-generator"
-                    type="orm:table-generator" minOccurs="0"
-                    maxOccurs="unbounded" />
+                <xsd:element name="sequence-generator" type="orm:sequence-generator"
+                    minOccurs="0" maxOccurs="unbounded" />
+                <xsd:element name="table-generator" type="orm:table-generator"
+                    minOccurs="0" maxOccurs="unbounded" />
                 <xsd:element name="named-query" type="orm:named-query"
                     minOccurs="0" maxOccurs="unbounded" />
-                <xsd:element name="named-native-query"
-                    type="orm:named-native-query" minOccurs="0"
-                    maxOccurs="unbounded" />
+                <xsd:element name="named-native-query" type="orm:named-native-query"
+                    minOccurs="0" maxOccurs="unbounded" />
                 <xsd:element name="sql-result-set-mapping"
                     type="orm:sql-result-set-mapping" minOccurs="0"
                     maxOccurs="unbounded" />
-                <xsd:element name="mapped-superclass"
-                    type="orm:mapped-superclass" minOccurs="0"
-                    maxOccurs="unbounded" />
+                <xsd:element name="mapped-superclass" type="orm:mapped-superclass"
+                    minOccurs="0" maxOccurs="unbounded" />
                 <xsd:element name="entity" type="orm:entity"
                     minOccurs="0" maxOccurs="unbounded" />
                 <xsd:element name="embeddable" type="orm:embeddable"
@@ -113,12 +108,11 @@
     <xsd:complexType name="persistence-unit-metadata">
         <xsd:annotation>
             <xsd:documentation>
-                Metadata that applies to the persistence unit and not
-                just to the mapping file in which it is contained. If
-                the xml-mapping-metadata-complete element is specified,
-                the complete set of mapping metadata for the persistence
-                unit is contained in the XML mapping files for the
-                persistence unit.
+                Metadata that applies to the persistence unit and not just to
+                the mapping file in which it is contained.
+                If the xml-mapping-metadata-complete element is specified,
+                the complete set of mapping metadata for the persistence unit
+                is contained in the XML mapping files for the persistence unit.
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
@@ -134,59 +128,67 @@
     <xsd:complexType name="persistence-unit-defaults">
         <xsd:annotation>
             <xsd:documentation>
-                These defaults are applied to the persistence unit as a
-                whole unless they are overridden by local annotation or
-                XML element settings. schema - Used as the schema for
-                all tables, secondary tables, collection tables,
-                sequence generators, and table generators that apply to
-                the persistence unit catalog - Used as the catalog for
-                all tables, secondary tables, collection tables,
-                sequence generators, and table generators that apply to
-                the persistence unit access - Used as the access type
-                for all managed classes in the persistence unit
-                cascade-persist - Adds cascade-persist to the set of
-                cascade options in all entity relationships of the
-                persistence unit entity-listeners - List of default
-                entity listeners to be invoked on each entity in the
-                persistence unit.
+                These defaults are applied to the persistence unit as a whole
+                unless they are overridden by local annotation or XML
+                element settings.
+                schema - Used as the schema for all tables, secondary tables,
+                collection tables, sequence generators, and table generators
+                that apply to the persistence unit
+                catalog - Used as the catalog for all tables, secondary tables,
+                collection tables, sequence generators, and table generators
+                that apply to the persistence unit
+                delimited-identifiers - Used to treat database identifiers as
+                delimited identifiers.
+                access - Used as the access type for all managed classes in
+                the persistence unit
+                cascade-persist - Adds cascade-persist to the set of cascade options
+                in all entity relationships of the persistence unit
+                entity-listeners - List of default entity listeners to be invoked
+                on each entity in the persistence unit.
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
             <xsd:element name="description" type="xsd:string"
                 minOccurs="0" />
-            <xsd:element name="schema" type="xsd:string" minOccurs="0" />
-            <xsd:element name="catalog" type="xsd:string" minOccurs="0" />
+            <xsd:element name="schema" type="xsd:string"
+                minOccurs="0" />
+            <xsd:element name="catalog" type="xsd:string"
+                minOccurs="0" />
+            <xsd:element name="delimited-identifiers" type="orm:emptyType"
+                minOccurs="0" />
             <xsd:element name="access" type="orm:access-type"
                 minOccurs="0" />
             <xsd:element name="cascade-persist" type="orm:emptyType"
                 minOccurs="0" />
-            <xsd:element name="entity-listeners"
-                type="orm:entity-listeners" minOccurs="0" />
+            <xsd:element name="entity-listeners" type="orm:entity-listeners"
+                minOccurs="0" />
         </xsd:sequence>
     </xsd:complexType>
     <!-- **************************************************** -->
     <xsd:complexType name="entity">
         <xsd:annotation>
             <xsd:documentation>
-                Defines the settings and mappings for an entity. Is
-                allowed to be sparsely populated and used in conjunction
-                with the annotations. Alternatively, the
-                metadata-complete attribute can be used to indicate that
-                no annotations on the entity class (and its fields or
-                properties) are to be processed. If this is the case
-                then the defaulting rules for the entity and its
-                subelements will be recursively applied. @Target(TYPE)
-                @Retention(RUNTIME) public @interface Entity { String
-                name() default ""; }
+                Defines the settings and mappings for an entity. Is allowed to be
+                sparsely populated and used in conjunction with the annotations.
+                Alternatively, the metadata-complete attribute can be
+                used to
+                indicate that no annotations on the entity class (and its fields
+                or properties) are to be processed. If this is the case then
+                the defaulting rules for the entity and its subelements will
+                be recursively applied.
+                @Target(TYPE) @Retention(RUNTIME)
+                public @interface Entity {
+                String name() default "";
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
             <xsd:element name="description" type="xsd:string"
                 minOccurs="0" />
-            <xsd:element name="table" type="orm:table" minOccurs="0" />
-            <xsd:element name="secondary-table"
-                type="orm:secondary-table" minOccurs="0"
-                maxOccurs="unbounded" />
+            <xsd:element name="table" type="orm:table"
+                minOccurs="0" />
+            <xsd:element name="secondary-table" type="orm:secondary-table"
+                minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="primary-key-join-column"
                 type="orm:primary-key-join-column" minOccurs="0"
                 maxOccurs="unbounded" />
@@ -194,28 +196,26 @@
                 minOccurs="0" />
             <xsd:element name="inheritance" type="orm:inheritance"
                 minOccurs="0" />
-            <xsd:element name="discriminator-value"
-                type="orm:discriminator-value" minOccurs="0" />
-            <xsd:element name="discriminator-column"
-                type="orm:discriminator-column" minOccurs="0" />
-            <xsd:element name="sequence-generator"
-                type="orm:sequence-generator" minOccurs="0" />
-            <xsd:element name="table-generator"
-                type="orm:table-generator" minOccurs="0" />
+            <xsd:element name="discriminator-value" type="orm:discriminator-value"
+                minOccurs="0" />
+            <xsd:element name="discriminator-column" type="orm:discriminator-column"
+                minOccurs="0" />
+            <xsd:element name="sequence-generator" type="orm:sequence-generator"
+                minOccurs="0" />
+            <xsd:element name="table-generator" type="orm:table-generator"
+                minOccurs="0" />
             <xsd:element name="named-query" type="orm:named-query"
                 minOccurs="0" maxOccurs="unbounded" />
-            <xsd:element name="named-native-query"
-                type="orm:named-native-query" minOccurs="0"
-                maxOccurs="unbounded" />
-            <xsd:element name="sql-result-set-mapping"
-                type="orm:sql-result-set-mapping" minOccurs="0"
-                maxOccurs="unbounded" />
+            <xsd:element name="named-native-query" type="orm:named-native-query"
+                minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="sql-result-set-mapping" type="orm:sql-result-set-mapping"
+                minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="exclude-default-listeners"
                 type="orm:emptyType" minOccurs="0" />
             <xsd:element name="exclude-superclass-listeners"
                 type="orm:emptyType" minOccurs="0" />
-            <xsd:element name="entity-listeners"
-                type="orm:entity-listeners" minOccurs="0" />
+            <xsd:element name="entity-listeners" type="orm:entity-listeners"
+                minOccurs="0" />
             <xsd:element name="pre-persist" type="orm:pre-persist"
                 minOccurs="0" />
             <xsd:element name="post-persist" type="orm:post-persist"
@@ -230,26 +230,25 @@
                 minOccurs="0" />
             <xsd:element name="post-load" type="orm:post-load"
                 minOccurs="0" />
-            <xsd:element name="attribute-override"
-                type="orm:attribute-override" minOccurs="0"
-                maxOccurs="unbounded" />
-            <xsd:element name="association-override"
-                type="orm:association-override" minOccurs="0"
-                maxOccurs="unbounded" />
+            <xsd:element name="attribute-override" type="orm:attribute-override"
+                minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="association-override" type="orm:association-override"
+                minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="attributes" type="orm:attributes"
                 minOccurs="0" />
         </xsd:sequence>
         <xsd:attribute name="name" type="xsd:string" />
         <xsd:attribute name="class" type="xsd:string" use="required" />
         <xsd:attribute name="access" type="orm:access-type" />
+        <xsd:attribute name="cacheable" type="xsd:boolean" />
         <xsd:attribute name="metadata-complete" type="xsd:boolean" />
     </xsd:complexType>
     <!-- **************************************************** -->
     <xsd:simpleType name="access-type">
         <xsd:annotation>
             <xsd:documentation>
-                This element determines how the persistence provider
-                accesses the state of an entity or embedded object.
+                This element determines how the persistence provider accesses the
+                state of an entity or embedded object.
             </xsd:documentation>
         </xsd:annotation>
         <xsd:restriction base="xsd:token">
@@ -262,9 +261,11 @@
         <xsd:annotation>
             <xsd:documentation>
                 @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-                public @interface AssociationOverride { String name();
-                JoinColumn[] joinColumns() default{}; JoinTable
-                joinTable() default @JoinTable; }
+                public @interface AssociationOverride {
+                String name();
+                JoinColumn[] joinColumns() default{};
+                JoinTable joinTable() default @JoinTable;
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
@@ -282,8 +283,10 @@
         <xsd:annotation>
             <xsd:documentation>
                 @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-                public @interface AttributeOverride { String name();
-                Column column(); }
+                public @interface AttributeOverride {
+                String name();
+                Column column();
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
@@ -297,27 +300,26 @@
     <xsd:complexType name="attributes">
         <xsd:annotation>
             <xsd:documentation>
-                This element contains the entity field or property
-                mappings. It may be sparsely populated to include only a
-                subset of the fields or properties. If metadata-complete
-                for the entity is true then the remainder of the
-                attributes will be defaulted according to the default
-                rules.
+                This element contains the entity field or property mappings.
+                It may be sparsely populated to include only a subset of the
+                fields or properties. If metadata-complete for the entity is true
+                then the remainder of the attributes will be defaulted according
+                to the default rules.
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
             <xsd:element name="description" type="xsd:string"
                 minOccurs="0" />
             <xsd:choice>
-                <xsd:element name="id" type="orm:id" minOccurs="0"
-                    maxOccurs="unbounded" />
+                <xsd:element name="id" type="orm:id"
+                    minOccurs="0" maxOccurs="unbounded" />
                 <xsd:element name="embedded-id" type="orm:embedded-id"
                     minOccurs="0" />
             </xsd:choice>
-            <xsd:element name="basic" type="orm:basic" minOccurs="0"
-                maxOccurs="unbounded" />
-            <xsd:element name="version" type="orm:version" minOccurs="0"
-                maxOccurs="unbounded" />
+            <xsd:element name="basic" type="orm:basic"
+                minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="version" type="orm:version"
+                minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="many-to-one" type="orm:many-to-one"
                 minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="one-to-many" type="orm:one-to-many"
@@ -326,9 +328,8 @@
                 minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="many-to-many" type="orm:many-to-many"
                 minOccurs="0" maxOccurs="unbounded" />
-            <xsd:element name="element-collection"
-                type="orm:element-collection" minOccurs="0"
-                maxOccurs="unbounded" />
+            <xsd:element name="element-collection" type="orm:element-collection"
+                minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="embedded" type="orm:embedded"
                 minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="transient" type="orm:transient"
@@ -339,15 +340,19 @@
     <xsd:complexType name="basic">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface Basic { FetchType fetch() default EAGER;
-                boolean optional() default true; }
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface Basic {
+                FetchType fetch() default EAGER;
+                boolean optional() default true;
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
-            <xsd:element name="column" type="orm:column" minOccurs="0" />
+            <xsd:element name="column" type="orm:column"
+                minOccurs="0" />
             <xsd:choice>
-                <xsd:element name="lob" type="orm:lob" minOccurs="0" />
+                <xsd:element name="lob" type="orm:lob"
+                    minOccurs="0" />
                 <xsd:element name="temporal" type="orm:temporal"
                     minOccurs="0" />
                 <xsd:element name="enumerated" type="orm:enumerated"
@@ -363,8 +368,7 @@
     <xsd:complexType name="cascade-type">
         <xsd:annotation>
             <xsd:documentation>
-                public enum CascadeType { ALL, PERSIST, MERGE, REMOVE,
-                REFRESH};
+                public enum CascadeType { ALL, PERSIST, MERGE, REMOVE, REFRESH};
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
@@ -384,19 +388,21 @@
     <xsd:complexType name="collection-table">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface CollectionTable { String name() default "";
-                String catalog() default ""; String schema() default "";
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface CollectionTable {
+                String name() default "";
+                String catalog() default "";
+                String schema() default "";
                 JoinColumn[] joinColumns() default {};
-                UniqueConstraint[] uniqueConstraints() default {}; }
+                UniqueConstraint[] uniqueConstraints() default {};
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
             <xsd:element name="join-column" type="orm:join-column"
                 minOccurs="0" maxOccurs="unbounded" />
-            <xsd:element name="unique-constraint"
-                type="orm:unique-constraint" minOccurs="0"
-                maxOccurs="unbounded" />
+            <xsd:element name="unique-constraint" type="orm:unique-constraint"
+                minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
         <xsd:attribute name="name" type="xsd:string" />
         <xsd:attribute name="catalog" type="xsd:string" />
@@ -406,14 +412,19 @@
     <xsd:complexType name="column">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface Column { String name() default ""; boolean
-                unique() default false; boolean nullable() default true;
-                boolean insertable() default true; boolean updatable()
-                default true; String columnDefinition() default "";
-                String table() default ""; int length() default 255; int
-                precision() default 0; // decimal precision int scale()
-                default 0; // decimal scale }
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface Column {
+                String name() default "";
+                boolean unique() default false;
+                boolean nullable() default true;
+                boolean insertable() default true;
+                boolean updatable() default true;
+                String columnDefinition() default "";
+                String table() default "";
+                int length() default 255;
+                int precision() default 0; // decimal precision
+                int scale() default 0; // decimal scale
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:attribute name="name" type="xsd:string" />
@@ -431,8 +442,10 @@
     <xsd:complexType name="column-result">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({}) @Retention(RUNTIME) public @interface
-                ColumnResult { String name(); }
+                @Target({}) @Retention(RUNTIME)
+                public @interface ColumnResult {
+                String name();
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:attribute name="name" type="xsd:string" use="required" />
@@ -441,16 +454,17 @@
     <xsd:complexType name="discriminator-column">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({TYPE}) @Retention(RUNTIME) public @interface
-                DiscriminatorColumn { String name() default "DTYPE";
+                @Target({TYPE}) @Retention(RUNTIME)
+                public @interface DiscriminatorColumn {
+                String name() default "DTYPE";
                 DiscriminatorType discriminatorType() default STRING;
-                String columnDefinition() default ""; int length()
-                default 31; }
+                String columnDefinition() default "";
+                int length() default 31;
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:attribute name="name" type="xsd:string" />
-        <xsd:attribute name="discriminator-type"
-            type="orm:discriminator-type" />
+        <xsd:attribute name="discriminator-type" type="orm:discriminator-type" />
         <xsd:attribute name="column-definition" type="xsd:string" />
         <xsd:attribute name="length" type="xsd:int" />
     </xsd:complexType>
@@ -471,8 +485,10 @@
     <xsd:simpleType name="discriminator-value">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({TYPE}) @Retention(RUNTIME) public @interface
-                DiscriminatorValue { String value(); }
+                @Target({TYPE}) @Retention(RUNTIME)
+                public @interface DiscriminatorValue {
+                String value();
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:restriction base="xsd:string" />
@@ -481,13 +497,14 @@
     <xsd:complexType name="element-collection">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface ElementCollection { Class targetClass()
-                default void.class; FetchType fetch() default LAZY; }
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface ElementCollection {
+                Class targetClass() default void.class;
+                FetchType fetch() default LAZY;
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
-            <xsd:element name="column" type="orm:column" minOccurs="0" />
             <xsd:choice>
                 <xsd:element name="order-by" type="orm:order-by"
                     minOccurs="0" />
@@ -498,8 +515,16 @@
                 <xsd:element name="map-key" type="orm:map-key"
                     minOccurs="0" />
                 <xsd:sequence>
-                    <xsd:element name="map-key-class"
-                        type="orm:map-key-class" minOccurs="0" />
+                    <xsd:element name="map-key-class" type="orm:map-key-class"
+                        minOccurs="0" />
+                    <xsd:choice>
+                        <xsd:element name="map-key-temporal"
+                            type="orm:temporal" minOccurs="0" />
+                        <xsd:element name="map-key-enumerated"
+                            type="orm:enumerated" minOccurs="0" />
+                        <xsd:element name="map-key-attribute-override"
+                            type="orm:attribute-override" minOccurs="0" />
+                    </xsd:choice>
                     <xsd:choice>
                         <xsd:element name="map-key-column"
                             type="orm:map-key-column" minOccurs="0" />
@@ -509,11 +534,33 @@
                     </xsd:choice>
                 </xsd:sequence>
             </xsd:choice>
-            <xsd:element name="collection-table"
-                type="orm:collection-table" minOccurs="0" />
+            <xsd:choice>
+                <xsd:sequence>
+                    <xsd:element name="column" type="orm:column"
+                        minOccurs="0" />
+                    <xsd:choice>
+                        <xsd:element name="temporal" type="orm:temporal"
+                            minOccurs="0" />
+                        <xsd:element name="enumerated" type="orm:enumerated"
+                            minOccurs="0" />
+                        <xsd:element name="lob" type="orm:lob"
+                            minOccurs="0" />
+                    </xsd:choice>
+                </xsd:sequence>
+                <xsd:sequence>
+                    <xsd:element name="attribute-override"
+                        type="orm:attribute-override" minOccurs="0"
+                        maxOccurs="unbounded" />
+                    <xsd:element name="association-override"
+                        type="orm:association-override" minOccurs="0"
+                        maxOccurs="unbounded" />
+                </xsd:sequence>
+            </xsd:choice>
+            <xsd:element name="collection-table" type="orm:collection-table"
+                minOccurs="0" />
         </xsd:sequence>
         <xsd:attribute name="name" type="xsd:string" use="required" />
-        <xsd:attribute name="target-entity" type="xsd:string" />
+        <xsd:attribute name="target-class" type="xsd:string" />
         <xsd:attribute name="fetch" type="orm:fetch-type" />
         <xsd:attribute name="access" type="orm:access-type" />
     </xsd:complexType>
@@ -521,21 +568,21 @@
     <xsd:complexType name="embeddable">
         <xsd:annotation>
             <xsd:documentation>
-                Defines the settings and mappings for embeddable
-                objects. Is allowed to be sparsely populated and used in
-                conjunction with the annotations. Alternatively, the
-                metadata-complete attribute can be used to indicate that
-                no annotations are to be processed in the class. If this
-                is the case then the defaulting rules will be
-                recursively applied. @Target({TYPE}) @Retention(RUNTIME)
+                Defines the settings and mappings for embeddable objects. Is
+                allowed to be sparsely populated and used in conjunction with
+                the annotations. Alternatively, the metadata-complete attribute
+                can be used to indicate that no annotations are to be processed
+                in the class. If this is the case then the defaulting rules will
+                be recursively applied.
+                @Target({TYPE}) @Retention(RUNTIME)
                 public @interface Embeddable {}
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
             <xsd:element name="description" type="xsd:string"
                 minOccurs="0" />
-            <xsd:element name="attributes"
-                type="orm:embeddable-attributes" minOccurs="0" />
+            <xsd:element name="attributes" type="orm:embeddable-attributes"
+                minOccurs="0" />
         </xsd:sequence>
         <xsd:attribute name="class" type="xsd:string" use="required" />
         <xsd:attribute name="access" type="orm:access-type" />
@@ -544,8 +591,8 @@
     <!-- **************************************************** -->
     <xsd:complexType name="embeddable-attributes">
         <xsd:sequence>
-            <xsd:element name="basic" type="orm:basic" minOccurs="0"
-                maxOccurs="unbounded" />
+            <xsd:element name="basic" type="orm:basic"
+                minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="many-to-one" type="orm:many-to-one"
                 minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="one-to-many" type="orm:one-to-many"
@@ -554,9 +601,8 @@
                 minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="many-to-many" type="orm:many-to-many"
                 minOccurs="0" maxOccurs="unbounded" />
-            <xsd:element name="element-collection"
-                type="orm:element-collection" minOccurs="0"
-                maxOccurs="unbounded" />
+            <xsd:element name="element-collection" type="orm:element-collection"
+                minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="embedded" type="orm:embedded"
                 minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="transient" type="orm:transient"
@@ -567,17 +613,15 @@
     <xsd:complexType name="embedded">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface Embedded {}
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface Embedded {}
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
-            <xsd:element name="attribute-override"
-                type="orm:attribute-override" minOccurs="0"
-                maxOccurs="unbounded" />
-            <xsd:element name="association-override"
-                type="orm:association-override" minOccurs="0"
-                maxOccurs="unbounded" />
+            <xsd:element name="attribute-override" type="orm:attribute-override"
+                minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="association-override" type="orm:association-override"
+                minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
         <xsd:attribute name="name" type="xsd:string" use="required" />
         <xsd:attribute name="access" type="orm:access-type" />
@@ -586,14 +630,13 @@
     <xsd:complexType name="embedded-id">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface EmbeddedId {}
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface EmbeddedId {}
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
-            <xsd:element name="attribute-override"
-                type="orm:attribute-override" minOccurs="0"
-                maxOccurs="unbounded" />
+            <xsd:element name="attribute-override" type="orm:attribute-override"
+                minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
         <xsd:attribute name="name" type="xsd:string" use="required" />
         <xsd:attribute name="access" type="orm:access-type" />
@@ -602,8 +645,8 @@
     <xsd:complexType name="entity-listener">
         <xsd:annotation>
             <xsd:documentation>
-                Defines an entity listener to be invoked at lifecycle
-                events for the entities that list this listener.
+                Defines an entity listener to be invoked at lifecycle events
+                for the entities that list this listener.
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
@@ -630,24 +673,27 @@
     <xsd:complexType name="entity-listeners">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({TYPE}) @Retention(RUNTIME) public @interface
-                EntityListeners { Class[] value(); }
+                @Target({TYPE}) @Retention(RUNTIME)
+                public @interface EntityListeners {
+                Class[] value();
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
-            <xsd:element name="entity-listener"
-                type="orm:entity-listener" minOccurs="0"
-                maxOccurs="unbounded" />
+            <xsd:element name="entity-listener" type="orm:entity-listener"
+                minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
     </xsd:complexType>
     <!-- **************************************************** -->
     <xsd:complexType name="entity-result">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({}) @Retention(RUNTIME) public @interface
-                EntityResult { Class entityClass(); FieldResult[]
-                fields() default {}; String discriminatorColumn()
-                default ""; }
+                @Target({}) @Retention(RUNTIME)
+                public @interface EntityResult {
+                Class entityClass();
+                FieldResult[] fields() default {};
+                String discriminatorColumn() default "";
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
@@ -662,7 +708,10 @@
     <xsd:simpleType name="enum-type">
         <xsd:annotation>
             <xsd:documentation>
-                public enum EnumType { ORDINAL, STRING }
+                public enum EnumType {
+                ORDINAL,
+                STRING
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:restriction base="xsd:token">
@@ -674,9 +723,10 @@
     <xsd:simpleType name="enumerated">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface Enumerated { EnumType value() default
-                ORDINAL; }
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface Enumerated {
+                EnumType value() default ORDINAL;
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:restriction base="orm:enum-type" />
@@ -697,20 +747,26 @@
     <xsd:complexType name="field-result">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({}) @Retention(RUNTIME) public @interface
-                FieldResult { String name(); String column(); }
+                @Target({}) @Retention(RUNTIME)
+                public @interface FieldResult {
+                String name();
+                String column();
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:attribute name="name" type="xsd:string" use="required" />
-        <xsd:attribute name="column" type="xsd:string" use="required" />
+        <xsd:attribute name="column" type="xsd:string"
+            use="required" />
     </xsd:complexType>
     <!-- **************************************************** -->
     <xsd:complexType name="generated-value">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface GeneratedValue { GenerationType strategy()
-                default AUTO; String generator() default ""; }
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface GeneratedValue {
+                GenerationType strategy() default AUTO;
+                String generator() default "";
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:attribute name="strategy" type="orm:generation-type" />
@@ -720,8 +776,7 @@
     <xsd:simpleType name="generation-type">
         <xsd:annotation>
             <xsd:documentation>
-                public enum GenerationType { TABLE, SEQUENCE, IDENTITY,
-                AUTO };
+                public enum GenerationType { TABLE, SEQUENCE, IDENTITY, AUTO };
             </xsd:documentation>
         </xsd:annotation>
         <xsd:restriction base="xsd:token">
@@ -735,20 +790,21 @@
     <xsd:complexType name="id">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface Id {}
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface Id {}
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
-            <xsd:element name="column" type="orm:column" minOccurs="0" />
-            <xsd:element name="generated-value"
-                type="orm:generated-value" minOccurs="0" />
+            <xsd:element name="column" type="orm:column"
+                minOccurs="0" />
+            <xsd:element name="generated-value" type="orm:generated-value"
+                minOccurs="0" />
             <xsd:element name="temporal" type="orm:temporal"
                 minOccurs="0" />
-            <xsd:element name="table-generator"
-                type="orm:table-generator" minOccurs="0" />
-            <xsd:element name="sequence-generator"
-                type="orm:sequence-generator" minOccurs="0" />
+            <xsd:element name="table-generator" type="orm:table-generator"
+                minOccurs="0" />
+            <xsd:element name="sequence-generator" type="orm:sequence-generator"
+                minOccurs="0" />
         </xsd:sequence>
         <xsd:attribute name="name" type="xsd:string" use="required" />
         <xsd:attribute name="access" type="orm:access-type" />
@@ -757,8 +813,10 @@
     <xsd:complexType name="id-class">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({TYPE}) @Retention(RUNTIME) public @interface
-                IdClass { Class value(); }
+                @Target({TYPE}) @Retention(RUNTIME)
+                public @interface IdClass {
+                Class value();
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:attribute name="class" type="xsd:string" use="required" />
@@ -767,9 +825,10 @@
     <xsd:complexType name="inheritance">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({TYPE}) @Retention(RUNTIME) public @interface
-                Inheritance { InheritanceType strategy() default
-                SINGLE_TABLE; }
+                @Target({TYPE}) @Retention(RUNTIME)
+                public @interface Inheritance {
+                InheritanceType strategy() default SINGLE_TABLE;
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:attribute name="strategy" type="orm:inheritance-type" />
@@ -778,8 +837,8 @@
     <xsd:simpleType name="inheritance-type">
         <xsd:annotation>
             <xsd:documentation>
-                public enum InheritanceType { SINGLE_TABLE, JOINED,
-                TABLE_PER_CLASS};
+                public enum InheritanceType
+                { SINGLE_TABLE, JOINED, TABLE_PER_CLASS};
             </xsd:documentation>
         </xsd:annotation>
         <xsd:restriction base="xsd:token">
@@ -792,13 +851,17 @@
     <xsd:complexType name="join-column">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface JoinColumn { String name() default ""; String
-                referencedColumnName() default ""; boolean unique()
-                default false; boolean nullable() default true; boolean
-                insertable() default true; boolean updatable() default
-                true; String columnDefinition() default ""; String
-                table() default ""; }
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface JoinColumn {
+                String name() default "";
+                String referencedColumnName() default "";
+                boolean unique() default false;
+                boolean nullable() default true;
+                boolean insertable() default true;
+                boolean updatable() default true;
+                String columnDefinition() default "";
+                String table() default "";
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:attribute name="name" type="xsd:string" />
@@ -814,23 +877,24 @@
     <xsd:complexType name="join-table">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface JoinTable { String name() default ""; String
-                catalog() default ""; String schema() default "";
-                JoinColumn[] joinColumns() default {}; JoinColumn[]
-                inverseJoinColumns() default {}; UniqueConstraint[]
-                uniqueConstraints() default {}; }
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface JoinTable {
+                String name() default "";
+                String catalog() default "";
+                String schema() default "";
+                JoinColumn[] joinColumns() default {};
+                JoinColumn[] inverseJoinColumns() default {};
+                UniqueConstraint[] uniqueConstraints() default {};
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
             <xsd:element name="join-column" type="orm:join-column"
                 minOccurs="0" maxOccurs="unbounded" />
-            <xsd:element name="inverse-join-column"
-                type="orm:join-column" minOccurs="0"
-                maxOccurs="unbounded" />
-            <xsd:element name="unique-constraint"
-                type="orm:unique-constraint" minOccurs="0"
-                maxOccurs="unbounded" />
+            <xsd:element name="inverse-join-column" type="orm:join-column"
+                minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="unique-constraint" type="orm:unique-constraint"
+                minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
         <xsd:attribute name="name" type="xsd:string" />
         <xsd:attribute name="catalog" type="xsd:string" />
@@ -840,20 +904,43 @@
     <xsd:complexType name="lob">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface Lob {}
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface Lob {}
             </xsd:documentation>
         </xsd:annotation>
     </xsd:complexType>
     <!-- **************************************************** -->
+    <xsd:simpleType name="lock-mode-type">
+        <xsd:annotation>
+            <xsd:documentation>
+                public enum LockModeType { READ, WRITE, OPTIMISTIC,
+                OPTIMISTIC_FORCE_INCREMENT, PESSIMISTIC_READ,
+                PESSIMISTIC_WRITE,
+                PESSIMISTIC_FORCE_INCREMENT, NONE};
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:token">
+            <xsd:enumeration value="READ" />
+            <xsd:enumeration value="WRITE" />
+            <xsd:enumeration value="OPTIMISTIC" />
+            <xsd:enumeration value="OPTIMISTIC_FORCE_INCREMENT" />
+            <xsd:enumeration value="PESSIMISTIC_READ" />
+            <xsd:enumeration value="PESSIMISTIC_WRITE" />
+            <xsd:enumeration value="PESSIMISTIC_FORCE_INCREMENT" />
+            <xsd:enumeration value="NONE" />
+        </xsd:restriction>
+    </xsd:simpleType>
+    <!-- **************************************************** -->
     <xsd:complexType name="many-to-many">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface ManyToMany { Class targetEntity() default
-                void.class; CascadeType[] cascade() default {};
-                FetchType fetch() default LAZY; String mappedBy()
-                default ""; }
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface ManyToMany {
+                Class targetEntity() default void.class;
+                CascadeType[] cascade() default {};
+                FetchType fetch() default LAZY;
+                String mappedBy() default "";
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
@@ -867,8 +954,16 @@
                 <xsd:element name="map-key" type="orm:map-key"
                     minOccurs="0" />
                 <xsd:sequence>
-                    <xsd:element name="map-key-class"
-                        type="orm:map-key-class" minOccurs="0" />
+                    <xsd:element name="map-key-class" type="orm:map-key-class"
+                        minOccurs="0" />
+                    <xsd:choice>
+                        <xsd:element name="map-key-temporal"
+                            type="orm:temporal" minOccurs="0" />
+                        <xsd:element name="map-key-enumerated"
+                            type="orm:enumerated" minOccurs="0" />
+                        <xsd:element name="map-key-attribute-override"
+                            type="orm:attribute-override" minOccurs="0" />
+                    </xsd:choice>
                     <xsd:choice>
                         <xsd:element name="map-key-column"
                             type="orm:map-key-column" minOccurs="0" />
@@ -893,11 +988,13 @@
     <xsd:complexType name="many-to-one">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface ManyToOne { Class targetEntity() default
-                void.class; CascadeType[] cascade() default {};
-                FetchType fetch() default EAGER; boolean optional()
-                default true; }
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface ManyToOne {
+                Class targetEntity() default void.class;
+                CascadeType[] cascade() default {};
+                FetchType fetch() default EAGER;
+                boolean optional() default true;
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
@@ -922,8 +1019,10 @@
     <xsd:complexType name="map-key">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface MapKey { String name() default ""; }
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface MapKey {
+                String name() default "";
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:attribute name="name" type="xsd:string" />
@@ -932,8 +1031,10 @@
     <xsd:complexType name="map-key-class">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface MapKeyClass { Class value(); }
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface MapKeyClass {
+                Class value();
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:attribute name="class" type="xsd:string" use="required" />
@@ -942,15 +1043,19 @@
     <xsd:complexType name="map-key-column">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface MapKeyColumn { String name() default "";
-                boolean unique() default false; boolean nullable()
-                default false; boolean insertable() default true;
-                boolean updatable() default true; String
-                columnDefinition() default ""; String table() default
-                ""; int length() default 255; int precision() default 0;
-                // decimal precision int scale() default 0; // decimal
-                scale }
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface MapKeyColumn {
+                String name() default "";
+                boolean unique() default false;
+                boolean nullable() default false;
+                boolean insertable() default true;
+                boolean updatable() default true;
+                String columnDefinition() default "";
+                String table() default "";
+                int length() default 255;
+                int precision() default 0; // decimal precision
+                int scale() default 0; // decimal scale
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:attribute name="name" type="xsd:string" />
@@ -968,13 +1073,17 @@
     <xsd:complexType name="map-key-join-column">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface MapKeyJoinColumn { String name() default "";
-                String referencedColumnName() default ""; boolean
-                unique() default false; boolean nullable() default
-                false; boolean insertable() default true; boolean
-                updatable() default true; String columnDefinition()
-                default ""; String table() default ""; }
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface MapKeyJoinColumn {
+                String name() default "";
+                String referencedColumnName() default "";
+                boolean unique() default false;
+                boolean nullable() default false;
+                boolean insertable() default true;
+                boolean updatable() default true;
+                String columnDefinition() default "";
+                String table() default "";
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:attribute name="name" type="xsd:string" />
@@ -990,14 +1099,14 @@
     <xsd:complexType name="mapped-superclass">
         <xsd:annotation>
             <xsd:documentation>
-                Defines the settings and mappings for a mapped
-                superclass. Is allowed to be sparsely populated and used
-                in conjunction with the annotations. Alternatively, the
-                metadata-complete attribute can be used to indicate that
-                no annotations are to be processed If this is the case
-                then the defaulting rules will be recursively applied.
-                @Target(TYPE) @Retention(RUNTIME) public @interface
-                MappedSuperclass{}
+                Defines the settings and mappings for a mapped superclass. Is
+                allowed to be sparsely populated and used in conjunction with
+                the annotations. Alternatively, the metadata-complete attribute
+                can be used to indicate that no annotations are to be processed
+                If this is the case then the defaulting rules will be recursively
+                applied.
+                @Target(TYPE) @Retention(RUNTIME)
+                public @interface MappedSuperclass{}
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
@@ -1009,8 +1118,8 @@
                 type="orm:emptyType" minOccurs="0" />
             <xsd:element name="exclude-superclass-listeners"
                 type="orm:emptyType" minOccurs="0" />
-            <xsd:element name="entity-listeners"
-                type="orm:entity-listeners" minOccurs="0" />
+            <xsd:element name="entity-listeners" type="orm:entity-listeners"
+                minOccurs="0" />
             <xsd:element name="pre-persist" type="orm:pre-persist"
                 minOccurs="0" />
             <xsd:element name="post-persist" type="orm:post-persist"
@@ -1036,19 +1145,22 @@
     <xsd:complexType name="named-native-query">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({TYPE}) @Retention(RUNTIME) public @interface
-                NamedNativeQuery { String name(); String query();
-                QueryHint[] hints() default {}; Class resultClass()
-                default void.class; String resultSetMapping() default
-                ""; //named SqlResultSetMapping }
+                @Target({TYPE}) @Retention(RUNTIME)
+                public @interface NamedNativeQuery {
+                String name();
+                String query();
+                QueryHint[] hints() default {};
+                Class resultClass() default void.class;
+                String resultSetMapping() default ""; //named SqlResultSetMapping
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
             <xsd:element name="description" type="xsd:string"
                 minOccurs="0" />
             <xsd:element name="query" type="xsd:string" />
-            <xsd:element name="hint" type="orm:query-hint" minOccurs="0"
-                maxOccurs="unbounded" />
+            <xsd:element name="hint" type="orm:query-hint"
+                minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
         <xsd:attribute name="name" type="xsd:string" use="required" />
         <xsd:attribute name="result-class" type="xsd:string" />
@@ -1058,17 +1170,23 @@
     <xsd:complexType name="named-query">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({TYPE}) @Retention(RUNTIME) public @interface
-                NamedQuery { String name(); String query(); QueryHint[]
-                hints() default {}; }
+                @Target({TYPE}) @Retention(RUNTIME)
+                public @interface NamedQuery {
+                String name();
+                String query();
+                LockModeType lockMode() default NONE;
+                QueryHint[] hints() default {};
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
             <xsd:element name="description" type="xsd:string"
                 minOccurs="0" />
             <xsd:element name="query" type="xsd:string" />
-            <xsd:element name="hint" type="orm:query-hint" minOccurs="0"
-                maxOccurs="unbounded" />
+            <xsd:element name="lock-mode" type="orm:lock-mode-type"
+                minOccurs="0" />
+            <xsd:element name="hint" type="orm:query-hint"
+                minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
         <xsd:attribute name="name" type="xsd:string" use="required" />
     </xsd:complexType>
@@ -1076,11 +1194,13 @@
     <xsd:complexType name="one-to-many">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface OneToMany { Class targetEntity() default
-                void.class; CascadeType[] cascade() default {};
-                FetchType fetch() default LAZY; String mappedBy()
-                default ""; }
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface OneToMany {
+                Class targetEntity() default void.class;
+                CascadeType[] cascade() default {};
+                FetchType fetch() default LAZY;
+                String mappedBy() default "";
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
@@ -1094,8 +1214,16 @@
                 <xsd:element name="map-key" type="orm:map-key"
                     minOccurs="0" />
                 <xsd:sequence>
-                    <xsd:element name="map-key-class"
-                        type="orm:map-key-class" minOccurs="0" />
+                    <xsd:element name="map-key-class" type="orm:map-key-class"
+                        minOccurs="0" />
+                    <xsd:choice>
+                        <xsd:element name="map-key-temporal"
+                            type="orm:temporal" minOccurs="0" />
+                        <xsd:element name="map-key-enumerated"
+                            type="orm:enumerated" minOccurs="0" />
+                        <xsd:element name="map-key-attribute-override"
+                            type="orm:attribute-override" minOccurs="0" />
+                    </xsd:choice>
                     <xsd:choice>
                         <xsd:element name="map-key-column"
                             type="orm:map-key-column" minOccurs="0" />
@@ -1125,12 +1253,15 @@
     <xsd:complexType name="one-to-one">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface OneToOne { Class targetEntity() default
-                void.class; CascadeType[] cascade() default {};
-                FetchType fetch() default EAGER; boolean optional()
-                default true; String mappedBy() default ""; boolean
-                orphanRemoval() default false; }
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface OneToOne {
+                Class targetEntity() default void.class;
+                CascadeType[] cascade() default {};
+                FetchType fetch() default EAGER;
+                boolean optional() default true;
+                String mappedBy() default "";
+                boolean orphanRemoval() default false;
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
@@ -1160,9 +1291,11 @@
     <xsd:simpleType name="order-by">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface OrderBy { String value() default ""; }
-            </xsd:documentation>
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface OrderBy {
+                String value() default "";
+                }
+</xsd:documentation>
         </xsd:annotation>
         <xsd:restriction base="xsd:string" />
     </xsd:simpleType>
@@ -1170,13 +1303,15 @@
     <xsd:complexType name="order-column">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface OrderColumn { String name() default "";
-                boolean nullable() default true; boolean insertable()
-                default true; boolean updatable() default true; String
-                columnDefinition() default ""; boolean contiguous()
-                default true; int base() default 0; String table()
-                default ""; }
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface OrderColumn {
+                String name() default "";
+                boolean nullable() default true;
+                boolean insertable() default true;
+                boolean updatable() default true;
+                String columnDefinition() default "";
+                String table() default "";
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:attribute name="name" type="xsd:string" />
@@ -1184,16 +1319,14 @@
         <xsd:attribute name="insertable" type="xsd:boolean" />
         <xsd:attribute name="updatable" type="xsd:boolean" />
         <xsd:attribute name="column-definition" type="xsd:string" />
-        <xsd:attribute name="contiguous" type="xsd:boolean" />
-        <xsd:attribute name="base" type="xsd:int" />
         <xsd:attribute name="table" type="xsd:string" />
     </xsd:complexType>
     <!-- **************************************************** -->
     <xsd:complexType name="post-load">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD}) @Retention(RUNTIME) public @interface
-                PostLoad {}
+                @Target({METHOD}) @Retention(RUNTIME)
+                public @interface PostLoad {}
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
@@ -1207,8 +1340,8 @@
     <xsd:complexType name="post-persist">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD}) @Retention(RUNTIME) public @interface
-                PostPersist {}
+                @Target({METHOD}) @Retention(RUNTIME)
+                public @interface PostPersist {}
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
@@ -1222,8 +1355,8 @@
     <xsd:complexType name="post-remove">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD}) @Retention(RUNTIME) public @interface
-                PostRemove {}
+                @Target({METHOD}) @Retention(RUNTIME)
+                public @interface PostRemove {}
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
@@ -1237,8 +1370,8 @@
     <xsd:complexType name="post-update">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD}) @Retention(RUNTIME) public @interface
-                PostUpdate {}
+                @Target({METHOD}) @Retention(RUNTIME)
+                public @interface PostUpdate {}
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
@@ -1252,8 +1385,8 @@
     <xsd:complexType name="pre-persist">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD}) @Retention(RUNTIME) public @interface
-                PrePersist {}
+                @Target({METHOD}) @Retention(RUNTIME)
+                public @interface PrePersist {}
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
@@ -1267,8 +1400,8 @@
     <xsd:complexType name="pre-remove">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD}) @Retention(RUNTIME) public @interface
-                PreRemove {}
+                @Target({METHOD}) @Retention(RUNTIME)
+                public @interface PreRemove {}
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
@@ -1282,8 +1415,8 @@
     <xsd:complexType name="pre-update">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD}) @Retention(RUNTIME) public @interface
-                PreUpdate {}
+                @Target({METHOD}) @Retention(RUNTIME)
+                public @interface PreUpdate {}
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
@@ -1298,9 +1431,11 @@
         <xsd:annotation>
             <xsd:documentation>
                 @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-                public @interface PrimaryKeyJoinColumn { String name()
-                default ""; String referencedColumnName() default "";
-                String columnDefinition() default ""; }
+                public @interface PrimaryKeyJoinColumn {
+                String name() default "";
+                String referencedColumnName() default "";
+                String columnDefinition() default "";
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:attribute name="name" type="xsd:string" />
@@ -1311,8 +1446,11 @@
     <xsd:complexType name="query-hint">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({}) @Retention(RUNTIME) public @interface
-                QueryHint { String name(); String value(); }
+                @Target({}) @Retention(RUNTIME)
+                public @interface QueryHint {
+                String name();
+                String value();
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
@@ -1326,20 +1464,22 @@
     <xsd:complexType name="secondary-table">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({TYPE}) @Retention(RUNTIME) public @interface
-                SecondaryTable { String name(); String catalog() default
-                ""; String schema() default ""; PrimaryKeyJoinColumn[]
-                pkJoinColumns() default {}; UniqueConstraint[]
-                uniqueConstraints() default {}; }
+                @Target({TYPE}) @Retention(RUNTIME)
+                public @interface SecondaryTable {
+                String name();
+                String catalog() default "";
+                String schema() default "";
+                PrimaryKeyJoinColumn[] pkJoinColumns() default {};
+                UniqueConstraint[] uniqueConstraints() default {};
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
             <xsd:element name="primary-key-join-column"
                 type="orm:primary-key-join-column" minOccurs="0"
                 maxOccurs="unbounded" />
-            <xsd:element name="unique-constraint"
-                type="orm:unique-constraint" minOccurs="0"
-                maxOccurs="unbounded" />
+            <xsd:element name="unique-constraint" type="orm:unique-constraint"
+                minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
         <xsd:attribute name="name" type="xsd:string" use="required" />
         <xsd:attribute name="catalog" type="xsd:string" />
@@ -1350,11 +1490,14 @@
         <xsd:annotation>
             <xsd:documentation>
                 @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-                public @interface SequenceGenerator { String name();
-                String sequenceName() default ""; String catalog()
-                default ""; String schema() default ""; int
-                initialValue() default 1; int allocationSize() default
-                50; }
+                public @interface SequenceGenerator {
+                String name();
+                String sequenceName() default "";
+                String catalog() default "";
+                String schema() default "";
+                int initialValue() default 1;
+                int allocationSize() default 50;
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
@@ -1372,10 +1515,12 @@
     <xsd:complexType name="sql-result-set-mapping">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({TYPE}) @Retention(RUNTIME) public @interface
-                SqlResultSetMapping { String name(); EntityResult[]
-                entities() default {}; ColumnResult[] columns() default
-                {}; }
+                @Target({TYPE}) @Retention(RUNTIME)
+                public @interface SqlResultSetMapping {
+                String name();
+                EntityResult[] entities() default {};
+                ColumnResult[] columns() default {};
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
@@ -1392,16 +1537,18 @@
     <xsd:complexType name="table">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({TYPE}) @Retention(RUNTIME) public @interface
-                Table { String name() default ""; String catalog()
-                default ""; String schema() default "";
-                UniqueConstraint[] uniqueConstraints() default {}; }
+                @Target({TYPE}) @Retention(RUNTIME)
+                public @interface Table {
+                String name() default "";
+                String catalog() default "";
+                String schema() default "";
+                UniqueConstraint[] uniqueConstraints() default {};
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
-            <xsd:element name="unique-constraint"
-                type="orm:unique-constraint" minOccurs="0"
-                maxOccurs="unbounded" />
+            <xsd:element name="unique-constraint" type="orm:unique-constraint"
+                minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
         <xsd:attribute name="name" type="xsd:string" />
         <xsd:attribute name="catalog" type="xsd:string" />
@@ -1412,21 +1559,25 @@
         <xsd:annotation>
             <xsd:documentation>
                 @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-                public @interface TableGenerator { String name(); String
-                table() default ""; String catalog() default ""; String
-                schema() default ""; String pkColumnName() default "";
-                String valueColumnName() default ""; String
-                pkColumnValue() default ""; int initialValue() default
-                0; int allocationSize() default 50; UniqueConstraint[]
-                uniqueConstraints() default {}; }
+                public @interface TableGenerator {
+                String name();
+                String table() default "";
+                String catalog() default "";
+                String schema() default "";
+                String pkColumnName() default "";
+                String valueColumnName() default "";
+                String pkColumnValue() default "";
+                int initialValue() default 0;
+                int allocationSize() default 50;
+                UniqueConstraint[] uniqueConstraints() default {};
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
             <xsd:element name="description" type="xsd:string"
                 minOccurs="0" />
-            <xsd:element name="unique-constraint"
-                type="orm:unique-constraint" minOccurs="0"
-                maxOccurs="unbounded" />
+            <xsd:element name="unique-constraint" type="orm:unique-constraint"
+                minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
         <xsd:attribute name="name" type="xsd:string" use="required" />
         <xsd:attribute name="table" type="xsd:string" />
@@ -1442,8 +1593,10 @@
     <xsd:simpleType name="temporal">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface Temporal { TemporalType value(); }
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface Temporal {
+                TemporalType value();
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:restriction base="orm:temporal-type" />
@@ -1452,8 +1605,11 @@
     <xsd:simpleType name="temporal-type">
         <xsd:annotation>
             <xsd:documentation>
-                public enum TemporalType { DATE, // java.sql.Date TIME,
-                // java.sql.Time TIMESTAMP // java.sql.Timestamp }
+                public enum TemporalType {
+                DATE, // java.sql.Date
+                TIME, // java.sql.Time
+                TIMESTAMP // java.sql.Timestamp
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:restriction base="xsd:token">
@@ -1466,8 +1622,8 @@
     <xsd:complexType name="transient">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface Transient {}
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface Transient {}
             </xsd:documentation>
         </xsd:annotation>
         <xsd:attribute name="name" type="xsd:string" use="required" />
@@ -1476,11 +1632,16 @@
     <xsd:complexType name="unique-constraint">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({}) @Retention(RUNTIME) public @interface
-                UniqueConstraint { String[] columnNames(); }
+                @Target({}) @Retention(RUNTIME)
+                public @interface UniqueConstraint {
+                String name() default "";
+                String[] columnNames();
+                }
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
+            <xsd:element name="name" type="xsd:string"
+                minOccurs="0" />
             <xsd:element name="column-name" type="xsd:string"
                 maxOccurs="unbounded" />
         </xsd:sequence>
@@ -1489,12 +1650,13 @@
     <xsd:complexType name="version">
         <xsd:annotation>
             <xsd:documentation>
-                @Target({METHOD, FIELD}) @Retention(RUNTIME) public
-                @interface Version {}
+                @Target({METHOD, FIELD}) @Retention(RUNTIME)
+                public @interface Version {}
             </xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
-            <xsd:element name="column" type="orm:column" minOccurs="0" />
+            <xsd:element name="column" type="orm:column"
+                minOccurs="0" />
             <xsd:element name="temporal" type="orm:temporal"
                 minOccurs="0" />
         </xsd:sequence>