You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mc...@apache.org on 2005/09/12 22:18:23 UTC
svn commit: r280410 - in /incubator/jdo/trunk/api20/src/dtd/javax/jdo:
jdo.dtd jdo.xsd orm.dtd
Author: mcaisse
Date: Mon Sep 12 13:18:21 2005
New Revision: 280410
URL: http://svn.apache.org/viewcvs?rev=280410&view=rev
Log:
dtd, xsd updates: JDO-123, 124
Modified:
incubator/jdo/trunk/api20/src/dtd/javax/jdo/jdo.dtd
incubator/jdo/trunk/api20/src/dtd/javax/jdo/jdo.xsd
incubator/jdo/trunk/api20/src/dtd/javax/jdo/orm.dtd
Modified: incubator/jdo/trunk/api20/src/dtd/javax/jdo/jdo.dtd
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/api20/src/dtd/javax/jdo/jdo.dtd?rev=280410&r1=280409&r2=280410&view=diff
==============================================================================
--- incubator/jdo/trunk/api20/src/dtd/javax/jdo/jdo.dtd (original)
+++ incubator/jdo/trunk/api20/src/dtd/javax/jdo/jdo.dtd Mon Sep 12 13:18:21 2005
@@ -1,19 +1,25 @@
-<!-- The following document headers belong in the user's .jdo file
<?xml version="1.0" encoding="UTF-8"?>
+<!-- The DOCTYPE should be as follows for metadata documents.
<!DOCTYPE jdo
PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN"
"http://java.sun.com/dtd/jdo_2_0.dtd">
-->
<!ELEMENT jdo (extension*, (package|query)+, extension*)>
+<!ATTLIST jdo catalog CDATA #IMPLIED>
+<!ATTLIST jdo schema CDATA #IMPLIED>
<!ELEMENT package (extension*, (interface|class|sequence)+, extension*)>
<!ATTLIST package name CDATA ''>
-<!ELEMENT interface (extension*, datastore-identity?, inheritance?, version?, join*, foreign-key*, index*, unique*, property*, query*, fetch-group*, extension*)>
+<!ATTLIST package catalog CDATA #IMPLIED>
+<!ATTLIST package schema CDATA #IMPLIED>
+<!ELEMENT interface (extension*, datastore-identity?, primary-key?, inheritance?, version?, join*, foreign-key*, index*, unique*, property*, query*, fetch-group*, extension*)>
<!ATTLIST interface name CDATA #REQUIRED>
<!ATTLIST interface table CDATA #IMPLIED>
<!ATTLIST interface identity-type (datastore|application|nondurable) #IMPLIED>
<!ATTLIST interface objectid-class CDATA #IMPLIED>
<!ATTLIST interface requires-extent (true|false) 'true'>
<!ATTLIST interface detachable (true|false) 'false'>
+<!ATTLIST interface catalog CDATA #IMPLIED>
+<!ATTLIST interface schema CDATA #IMPLIED>
<!ELEMENT property (extension*, (array|collection|map)?, join?, embedded?, element?, key?, value?, order?, column*, foreign-key?, index?, unique?, extension*)>
<!ATTLIST property name CDATA #REQUIRED>
@@ -36,7 +42,7 @@
<!ATTLIST property fetch-depth CDATA #IMPLIED>
<!ATTLIST property field-name CDATA #IMPLIED>
-<!ELEMENT class (extension*, implements*, datastore-identity?, inheritance?, version?, join*, foreign-key*, index*, unique*, field*, query*, fetch-group*, extension*)>
+<!ELEMENT class (extension*, implements*, datastore-identity?, primary-key?, inheritance?, version?, join*, foreign-key*, index*, unique*, column*, field*, property*, query*, fetch-group*, extension*)>
<!ATTLIST class name CDATA #REQUIRED>
<!ATTLIST class identity-type (application|datastore|nondurable) #IMPLIED>
<!ATTLIST class objectid-class CDATA #IMPLIED>
@@ -46,8 +52,14 @@
<!ATTLIST class detachable (true|false) 'false'>
<!ATTLIST class embedded-only (true|false) #IMPLIED>
<!ATTLIST class persistence-modifier (persistence-capable|persistence-aware|non-persistent) #IMPLIED>
+<!ATTLIST class catalog CDATA #IMPLIED>
+<!ATTLIST class schema CDATA #IMPLIED>
-<!ELEMENT join (extension*, column*, foreign-key?, index?, unique?, extension*)>
+<!ELEMENT primary-key (extension*, column*, extension*)>
+<!ATTLIST primary-key name CDATA #IMPLIED>
+<!ATTLIST primary-key column CDATA #IMPLIED>
+
+<!ELEMENT join (extension*, primary-key?, column*, foreign-key?, index?, unique?, extension*)>
<!ATTLIST join table CDATA #IMPLIED>
<!ATTLIST join column CDATA #IMPLIED>
<!ATTLIST join outer (true|false) 'false'>
@@ -87,6 +99,7 @@
<!ATTLIST column scale CDATA #IMPLIED>
<!ATTLIST column allows-null CDATA #IMPLIED>
<!ATTLIST column default-value CDATA #IMPLIED>
+<!ATTLIST column insert-value CDATA #IMPLIED>
<!ELEMENT field (extension*, (array|collection|map)?, join?, embedded?, element?, key?, value?, order?, column*, foreign-key?, index?, unique?, extension*)>
<!ATTLIST field name CDATA #REQUIRED>
@@ -104,7 +117,6 @@
<!ATTLIST field indexed (true|false|unique) #IMPLIED>
<!ATTLIST field unique (true|false) #IMPLIED>
<!ATTLIST field sequence CDATA #IMPLIED>
-<!ATTLIST field foreign-key CDATA #IMPLIED>
<!ATTLIST field load-fetch-group CDATA #IMPLIED>
<!ATTLIST field fetch-depth CDATA #IMPLIED>
<!ATTLIST field mapped-by CDATA #IMPLIED>
@@ -121,39 +133,42 @@
<!ATTLIST collection element-type CDATA #IMPLIED>
<!ATTLIST collection embedded-element (true|false) #IMPLIED>
<!ATTLIST collection dependent-element (true|false) #IMPLIED>
+<!ATTLIST collection serialized-element (true|false) #IMPLIED>
<!ELEMENT map (extension)*>
<!ATTLIST map key-type CDATA #IMPLIED>
<!ATTLIST map embedded-key (true|false) #IMPLIED>
<!ATTLIST map dependent-key (true|false) #IMPLIED>
+<!ATTLIST map serialized-key (true|false) #IMPLIED>
<!ATTLIST map value-type CDATA #IMPLIED>
<!ATTLIST map embedded-value (true|false) #IMPLIED>
<!ATTLIST map dependent-value (true|false) #IMPLIED>
+<!ATTLIST map serialized-value (true|false) #IMPLIED>
<!ELEMENT key (extension*, embedded?, column*, foreign-key?, index?, unique?, extension*)>
<!ATTLIST key column CDATA #IMPLIED>
<!ATTLIST key table CDATA #IMPLIED>
-<!ATTLIST key serialized (true|false) #IMPLIED>
<!ATTLIST key delete-action (restrict|cascade|null|default|none) #IMPLIED>
<!ATTLIST key indexed (true|false|unique) #IMPLIED>
<!ATTLIST key unique (true|false) #IMPLIED>
+<!ATTLIST key mapped-by CDATA #IMPLIED>
<!ELEMENT value (extension*, embedded?, column*, foreign-key?, index?, unique?, extension*)>
-<!ATTLIST value serialized (true|false) #IMPLIED>
<!ATTLIST value table CDATA #IMPLIED>
<!ATTLIST value column CDATA #IMPLIED>
<!ATTLIST value delete-action (restrict|cascade|null|default|none) #IMPLIED>
<!ATTLIST value indexed (true|false|unique) #IMPLIED>
<!ATTLIST value unique (true|false) #IMPLIED>
+<!ATTLIST value mapped-by CDATA #IMPLIED>
<!ELEMENT array (extension*)>
<!ATTLIST array embedded-element (true|false) #IMPLIED>
<!ATTLIST array dependent-element (true|false) #IMPLIED>
+<!ATTLIST array serialized-element (true|false) #IMPLIED>
<!ELEMENT element (extension*, embedded?, column*, foreign-key?, index?, unique?, extension*)>
<!ATTLIST element column CDATA #IMPLIED>
<!ATTLIST element table CDATA #IMPLIED>
-<!ATTLIST element serialized (true|false) #IMPLIED>
<!ATTLIST element delete-action (restrict|cascade|null|default|none) #IMPLIED>
<!ATTLIST element update-action CDATA #IMPLIED>
<!ATTLIST element indexed (true|false|unique) #IMPLIED>
@@ -162,6 +177,7 @@
<!ELEMENT order (extension*, column*, index?, extension*)>
<!ATTLIST order column CDATA #IMPLIED>
<!ATTLIST order indexed (true|false|unique) #IMPLIED>
+<!ATTLIST order mapped-by CDATA #IMPLIED>
<!ELEMENT fetch-group (fetch-group|field)*>
<!ATTLIST fetch-group name CDATA #REQUIRED>
@@ -187,6 +203,8 @@
<!ATTLIST query name CDATA #IMPLIED>
<!ATTLIST query language CDATA #IMPLIED>
<!ATTLIST query unmodifiable (true|false) 'false'>
+<!ATTLIST query unique (true|false) 'false'>
+<!ATTLIST query result-class CDATA #IMPLIED>
<!ELEMENT unique (extension*, (column|field|property)*, extension*)>
<!ATTLIST unique name CDATA #IMPLIED>
Modified: incubator/jdo/trunk/api20/src/dtd/javax/jdo/jdo.xsd
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/api20/src/dtd/javax/jdo/jdo.xsd?rev=280410&r1=280409&r2=280410&view=diff
==============================================================================
--- incubator/jdo/trunk/api20/src/dtd/javax/jdo/jdo.xsd (original)
+++ incubator/jdo/trunk/api20/src/dtd/javax/jdo/jdo.xsd Mon Sep 12 13:18:21 2005
@@ -10,7 +10,12 @@
</xs:choice>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="extension"/>
</xs:sequence>
+ <xs:attributeGroup ref="attlist.jdo"/>
</xs:complexType>
+ <xs:attributeGroup name="attlist.jdo">
+ <xs:attribute name="catalog"/>
+ <xs:attribute name="schema"/>
+ </xs:attributeGroup>
</xs:element>
<xs:element name="package">
<xs:complexType>
@@ -28,12 +33,15 @@
</xs:element>
<xs:attributeGroup name="attlist.package">
<xs:attribute name="name" default=""/>
+ <xs:attribute name="catalog"/>
+ <xs:attribute name="schema"/>
</xs:attributeGroup>
<xs:element name="interface">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="extension"/>
<xs:element minOccurs="0" ref="datastore-identity"/>
+ <xs:element minOccurs="0" ref="primary-key"/>
<xs:element minOccurs="0" ref="inheritance"/>
<xs:element minOccurs="0" ref="version"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="join"/>
@@ -77,6 +85,8 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="catalog"/>
+ <xs:attribute name="schema"/>
</xs:attributeGroup>
<xs:element name="property">
<xs:complexType>
@@ -197,6 +207,7 @@
<xs:element minOccurs="0" maxOccurs="unbounded" ref="extension"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="implements"/>
<xs:element minOccurs="0" ref="datastore-identity"/>
+ <xs:element minOccurs="0" ref="primary-key"/>
<xs:element minOccurs="0" ref="inheritance"/>
<xs:element minOccurs="0" ref="version"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="join"/>
@@ -258,11 +269,28 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="catalog"/>
+ <xs:attribute name="schema"/>
+ </xs:attributeGroup>
+ <xs:element name="primary-key">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="extension"/>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="column"/>
+ <xs:element minOccurs="0" maxOccurs="unbounded" ref="extension"/>
+ </xs:sequence>
+ <xs:attributeGroup ref="attlist.primary-key"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:attributeGroup name="attlist.primary-key">
+ <xs:attribute name="name"/>
+ <xs:attribute name="column"/>
</xs:attributeGroup>
<xs:element name="join">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="extension"/>
+ <xs:element minOccurs="0" ref="primary-key"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="column"/>
<xs:element minOccurs="0" ref="foreign-key"/>
<xs:element minOccurs="0" ref="index"/>
@@ -421,6 +449,7 @@
<xs:attribute name="scale"/>
<xs:attribute name="allows-null"/>
<xs:attribute name="default-value"/>
+ <xs:attribute name="insert-value"/>
</xs:attributeGroup>
<xs:element name="field">
<xs:complexType>
@@ -438,7 +467,6 @@
<xs:element minOccurs="0" ref="value"/>
<xs:element minOccurs="0" ref="order"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="column"/>
- <xs:element minOccurs="0" ref="foreign-key"/>
<xs:element minOccurs="0" ref="index"/>
<xs:element minOccurs="0" ref="unique"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="extension"/>
@@ -623,6 +651,14 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="serialized-element">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true"/>
+ <xs:enumeration value="false"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
</xs:attributeGroup>
<xs:element name="map">
<xs:complexType>
@@ -650,6 +686,14 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="serialized-key">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true"/>
+ <xs:enumeration value="false"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
<xs:attribute name="value-type"/>
<xs:attribute name="embedded-value">
<xs:simpleType>
@@ -667,6 +711,14 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="serialized-value">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true"/>
+ <xs:enumeration value="false"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
</xs:attributeGroup>
<xs:element name="key">
<xs:complexType>
@@ -685,14 +737,6 @@
<xs:attributeGroup name="attlist.key">
<xs:attribute name="column"/>
<xs:attribute name="table"/>
- <xs:attribute name="serialized">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
<xs:attribute name="delete-action">
<xs:simpleType>
<xs:restriction base="xs:token">
@@ -721,6 +765,7 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="mapped-by"/>
</xs:attributeGroup>
<xs:element name="value">
<xs:complexType>
@@ -737,14 +782,6 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.value">
- <xs:attribute name="serialized">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
<xs:attribute name="table"/>
<xs:attribute name="column"/>
<xs:attribute name="delete-action">
@@ -775,6 +812,7 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="mapped-by"/>
</xs:attributeGroup>
<xs:element name="array">
<xs:complexType>
@@ -801,6 +839,14 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="serialized-element">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true"/>
+ <xs:enumeration value="false"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
</xs:attributeGroup>
<xs:element name="element">
<xs:complexType>
@@ -819,14 +865,6 @@
<xs:attributeGroup name="attlist.element">
<xs:attribute name="column"/>
<xs:attribute name="table"/>
- <xs:attribute name="serialized">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
<xs:attribute name="delete-action">
<xs:simpleType>
<xs:restriction base="xs:token">
@@ -856,6 +894,7 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="mapped-by"/>
</xs:attributeGroup>
<xs:element name="order">
<xs:complexType>
@@ -982,6 +1021,15 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="unique" default="false">
+ <xs:simpleType>
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="true"/>
+ <xs:enumeration value="false"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="result-class"/>
</xs:attributeGroup>
<xs:element name="unique">
<xs:complexType>
Modified: incubator/jdo/trunk/api20/src/dtd/javax/jdo/orm.dtd
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/api20/src/dtd/javax/jdo/orm.dtd?rev=280410&r1=280409&r2=280410&view=diff
==============================================================================
--- incubator/jdo/trunk/api20/src/dtd/javax/jdo/orm.dtd (original)
+++ incubator/jdo/trunk/api20/src/dtd/javax/jdo/orm.dtd Mon Sep 12 13:18:21 2005
@@ -1,26 +1,38 @@
-<!-- The following document headers belong in the user's .orm file
<?xml version="1.0" encoding="UTF-8"?>
+<!-- The DOCTYPE should be as follows for metadata documents.
<!DOCTYPE orm
PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN"
"http://java.sun.com/dtd/orm_2_0.dtd">
-->
<!ELEMENT orm (extension*, (package|query)+, extension*)>
+<!ATTLIST orm catalog CDATA #IMPLIED>
+<!ATTLIST orm schema CDATA #IMPLIED>
<!ELEMENT package (extension*, (interface|class|sequence)+, extension*)>
<!ATTLIST package name CDATA ''>
+<!ATTLIST package catalog CDATA #IMPLIED>
+<!ATTLIST package schema CDATA #IMPLIED>
-<!ELEMENT interface (extension*, datastore-identity?, inheritance?, version?, join*, foreign-key*, index*, unique*, property*, query*, extension*)>
+<!ELEMENT interface (extension*, datastore-identity?, primary-key?, inheritance?, version?, join*, foreign-key*, index*, unique*, property*, query*, extension*)>
<!ATTLIST interface name CDATA #REQUIRED>
<!ATTLIST interface table #CDATA #IMPLIED>
+<!ATTLIST interface catalog CDATA #IMPLIED>
+<!ATTLIST interface schema CDATA #IMPLIED>
-<!ELEMENT property (join?, element?, key?, value?, order?, column)? , extension*)>
+<!ELEMENT property (extension*, (join?, element?, key?, value?, order?, column)? , extension*)>
<!ATTLIST property name CDATA #REQUIRED>
<!ATTLIST property column CDATA #IMPLIED>
-<!ELEMENT class (extension*, datastore-identity?, inheritance?, version?, join*, foreign-key*, index*, unique*, field*, query*, extension*)>
+<!ELEMENT class (extension*, datastore-identity?, primary-key?, inheritance?, version?, join*, foreign-key*, index*, unique*, column*, field*, query*, extension*)>
<!ATTLIST class name CDATA #REQUIRED>
<!ATTLIST class table CDATA #IMPLIED>
+<!ATTLIST class catalog CDATA #IMPLIED>
+<!ATTLIST class schema CDATA #IMPLIED>
-<!ELEMENT join (extension*, column*, foreign-key?, index?, unique?, extension*)>
+<!ELEMENT primary-key (extension*, column*, extension*)>
+<!ATTLIST primary-key name CDATA #IMPLIED>
+<!ATTLIST primary-key column CDATA #IMPLIED>
+
+<!ELEMENT join (extension*, primary-key?, column*, foreign-key?, index?, unique?, extension*)>
<!ATTLIST join table CDATA #IMPLIED>
<!ATTLIST join column CDATA #IMPLIED>
<!ATTLIST join outer (true|false) 'false'>
@@ -60,6 +72,7 @@
<!ATTLIST column scale CDATA #IMPLIED>
<!ATTLIST column allows-null CDATA #IMPLIED>
<!ATTLIST column default-value CDATA #IMPLIED>
+<!ATTLIST column insert-value CDATA #IMPLIED>
<!ELEMENT property (extension*, join?, embedded?, element?, key?, value?, order?, column*, foreign-key?, index?, unique?, extension*)>
<!ATTLIST property name CDATA #REQUIRED>
@@ -81,7 +94,6 @@
<!ATTLIST field delete-action (restrict|cascade|null|default|none) #IMPLIED>
<!ATTLIST field indexed (true|false|unique) #IMPLIED>
<!ATTLIST field unique (true|false) #IMPLIED>
-<!ATTLIST field foreign-key CDATA #IMPLIED>
<!ATTLIST field mapped-by CDATA #IMPLIED>
<!ATTLIST field value-strategy CDATA #IMPLIED>
<!ATTLIST field sequence CDATA #IMPLIED>
@@ -97,23 +109,22 @@
<!ELEMENT key (column*, index?, embedded?, foreign-key?, extension*)>
<!ATTLIST key column CDATA #IMPLIED>
<!ATTLIST key table CDATA #IMPLIED>
-<!ATTLIST key serialized (true|false) #IMPLIED>
<!ATTLIST key delete-action (restrict|cascade|null|default|none) #IMPLIED>
<!ATTLIST key indexed (true|false|unique) #IMPLIED>
<!ATTLIST key unique (true|false) #IMPLIED>
+<!ATTLIST key mapped-by CDATA #IMPLIED>
<!ELEMENT value (extension*, embedded?, column*, foreign-key?, index?, unique?, extension*)>
<!ATTLIST value column CDATA #IMPLIED>
<!ATTLIST value table CDATA #IMPLIED>
-<!ATTLIST value serialized (true|false) #IMPLIED>
<!ATTLIST value delete-action (restrict|cascade|null|default|none) #IMPLIED>
<!ATTLIST value indexed (true|false|unique) #IMPLIED>
<!ATTLIST value unique (true|false) #IMPLIED>
+<!ATTLIST value mapped-by CDATA #IMPLIED>
<!ELEMENT element (extension*, embedded?, column*, foreign-key?, index?, unique?, extension*)>
<!ATTLIST element column CDATA #IMPLIED>
<!ATTLIST element table CDATA #IMPLIED>
-<!ATTLIST element serialized (true|false) #IMPLIED>
<!ATTLIST element delete-action (restrict|cascade|null|default|none) #IMPLIED>
<!ATTLIST element indexed (true|false|unique) #IMPLIED>
<!ATTLIST element unique (true|false) #IMPLIED>
@@ -121,6 +132,7 @@
<!ELEMENT order (extension*, column*, index?, extension*)>
<!ATTLIST order column CDATA #IMPLIED>
<!ATTLIST order indexed (true|false|unique) #IMPLIED>
+<!ATTLIST order mapped-by CDATA #IMPLIED>
<!ELEMENT embedded (extension*, field*, extension*)>
<!ATTLIST embedded null-indicator-column CDATA #IMPLIED>
@@ -147,9 +159,10 @@
<!ATTLIST query name CDATA #IMPLIED>
<!ATTLIST query language CDATA #IMPLIED>
<!ATTLIST query unmodifiable (true|false) 'false'>
+<!ATTLIST query unique (true|false) 'false'>
+<!ATTLIST query result-class CDATA #IMPLIED>
<!ELEMENT extension ANY>
<!ATTLIST extension vendor-name CDATA #REQUIRED>
<!ATTLIST extension key CDATA #IMPLIED>
<!ATTLIST extension value CDATA #IMPLIED>
-