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 mb...@apache.org on 2006/02/22 19:52:18 UTC
svn commit: r379839 - in /db/jdo/trunk/api20: src/schema/javax/jdo/
test/schema/
Author: mbo
Date: Wed Feb 22 10:52:15 2006
New Revision: 379839
URL: http://svn.apache.org/viewcvs?rev=379839&view=rev
Log:
JDO-202 fixed named query metadata
Modified:
db/jdo/trunk/api20/src/schema/javax/jdo/jdo.dtd
db/jdo/trunk/api20/src/schema/javax/jdo/jdo.xsd
db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.dtd
db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.xsd
db/jdo/trunk/api20/src/schema/javax/jdo/orm.dtd
db/jdo/trunk/api20/src/schema/javax/jdo/orm.xsd
db/jdo/trunk/api20/test/schema/Positive99-dtd.jdo
db/jdo/trunk/api20/test/schema/Positive99-xsd.jdo
Modified: db/jdo/trunk/api20/src/schema/javax/jdo/jdo.dtd
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/src/schema/javax/jdo/jdo.dtd?rev=379839&r1=379838&r2=379839&view=diff
==============================================================================
--- db/jdo/trunk/api20/src/schema/javax/jdo/jdo.dtd (original)
+++ db/jdo/trunk/api20/src/schema/javax/jdo/jdo.dtd Wed Feb 22 10:52:15 2006
@@ -207,10 +207,10 @@
<!ATTLIST index unique (true|false) 'false'>
<!ELEMENT query (#PCDATA|extension)*>
-<!ATTLIST query name CDATA #IMPLIED>
+<!ATTLIST query name CDATA #REQUIRED>
<!ATTLIST query language CDATA #IMPLIED>
<!ATTLIST query unmodifiable (true|false) 'false'>
-<!ATTLIST query unique (true|false) 'false'>
+<!ATTLIST query unique (true|false) #IMPLIED>
<!ATTLIST query result-class CDATA #IMPLIED>
<!ELEMENT unique (extension*, (column* | field* | property*), extension*)>
Modified: db/jdo/trunk/api20/src/schema/javax/jdo/jdo.xsd
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/src/schema/javax/jdo/jdo.xsd?rev=379839&r1=379838&r2=379839&view=diff
==============================================================================
--- db/jdo/trunk/api20/src/schema/javax/jdo/jdo.xsd (original)
+++ db/jdo/trunk/api20/src/schema/javax/jdo/jdo.xsd Wed Feb 22 10:52:15 2006
@@ -1072,7 +1072,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.query">
- <xs:attribute name="name"/>
+ <xs:attribute name="name" use="required"/>
<xs:attribute name="language"/>
<xs:attribute name="unmodifiable" default="false">
<xs:simpleType>
@@ -1082,7 +1082,7 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="unique" default="false">
+ <xs:attribute name="unique">
<xs:simpleType>
<xs:restriction base="xs:token">
<xs:enumeration value="true"/>
Modified: db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.dtd
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.dtd?rev=379839&r1=379838&r2=379839&view=diff
==============================================================================
--- db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.dtd (original)
+++ db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.dtd Wed Feb 22 10:52:15 2006
@@ -4,11 +4,10 @@
PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 2.0//EN"
"http://java.sun.com/dtd/jdoquery_2_0.dtd">
-->
-
<!ELEMENT jdoquery (extension*, (package|query)+, (extension)*)>
<!ELEMENT package (extension*, (interface|class)+, (extension)*)>
-<!ATTLIST package name CDATA #REQUIRED>
+<!ATTLIST package name CDATA ''>
<!ELEMENT interface (extension*, query+, extension*)>
<!ATTLIST interface name CDATA #REQUIRED>
@@ -16,12 +15,12 @@
<!ELEMENT class (extension*, query+, extension*)>
<!ATTLIST class name CDATA #REQUIRED>
-<!ELEMENT query (#PCDATA | extension)*>
+<!ELEMENT query (#PCDATA|extension)*>
<!ATTLIST query name CDATA #REQUIRED>
<!ATTLIST query language CDATA #IMPLIED>
-<!ATTLIST query result-class CDATA #IMPLIED>
-<!ATTLIST query unique CDATA #IMPLIED>
<!ATTLIST query unmodifiable (true|false) 'false'>
+<!ATTLIST query unique (true|false) #IMPLIED>
+<!ATTLIST query result-class CDATA #IMPLIED>
<!ELEMENT extension ANY>
<!ATTLIST extension vendor-name CDATA #REQUIRED>
Modified: db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.xsd
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.xsd?rev=379839&r1=379838&r2=379839&view=diff
==============================================================================
--- db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.xsd (original)
+++ db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.xsd Wed Feb 22 10:52:15 2006
@@ -4,7 +4,7 @@
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="extension"/>
- <xs:choice minOccurs="1" maxOccurs="unbounded">
+ <xs:choice maxOccurs="unbounded">
<xs:element ref="package"/>
<xs:element ref="query"/>
</xs:choice>
@@ -16,7 +16,7 @@
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="extension"/>
- <xs:choice minOccurs="1" maxOccurs="unbounded">
+ <xs:choice maxOccurs="unbounded">
<xs:element ref="interface"/>
<xs:element ref="class"/>
</xs:choice>
@@ -26,13 +26,13 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.package">
- <xs:attribute name="name" use="required"/>
+ <xs:attribute name="name" default=""/>
</xs:attributeGroup>
<xs:element name="interface">
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="extension"/>
- <xs:element minOccurs="1" maxOccurs="unbounded" ref="query"/>
+ <xs:element maxOccurs="unbounded" ref="query"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="extension"/>
</xs:sequence>
<xs:attributeGroup ref="attlist.interface"/>
@@ -45,7 +45,7 @@
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="extension"/>
- <xs:element minOccurs="1" maxOccurs="unbounded" ref="query"/>
+ <xs:element maxOccurs="unbounded" ref="query"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="extension"/>
</xs:sequence>
<xs:attributeGroup ref="attlist.class"/>
@@ -65,7 +65,6 @@
<xs:attributeGroup name="attlist.query">
<xs:attribute name="name" use="required"/>
<xs:attribute name="language"/>
- <xs:attribute name="result-class"/>
<xs:attribute name="unique">
<xs:simpleType>
<xs:restriction base="xs:token">
@@ -82,6 +81,7 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
+ <xs:attribute name="result-class"/>
</xs:attributeGroup>
<xs:element name="extension">
<xs:complexType>
Modified: db/jdo/trunk/api20/src/schema/javax/jdo/orm.dtd
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/src/schema/javax/jdo/orm.dtd?rev=379839&r1=379838&r2=379839&view=diff
==============================================================================
--- db/jdo/trunk/api20/src/schema/javax/jdo/orm.dtd (original)
+++ db/jdo/trunk/api20/src/schema/javax/jdo/orm.dtd Wed Feb 22 10:52:15 2006
@@ -151,10 +151,10 @@
<!ATTLIST index unique (true|false) 'false'>
<!ELEMENT query (#PCDATA|extension)*>
-<!ATTLIST query name CDATA #IMPLIED>
+<!ATTLIST query name CDATA #REQUIRED>
<!ATTLIST query language CDATA #IMPLIED>
<!ATTLIST query unmodifiable (true|false) 'false'>
-<!ATTLIST query unique (true|false) 'false'>
+<!ATTLIST query unique (true|false) #IMPLIED>
<!ATTLIST query result-class CDATA #IMPLIED>
<!ELEMENT unique (extension*, (column* | field* | property*), extension*)>
Modified: db/jdo/trunk/api20/src/schema/javax/jdo/orm.xsd
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/src/schema/javax/jdo/orm.xsd?rev=379839&r1=379838&r2=379839&view=diff
==============================================================================
--- db/jdo/trunk/api20/src/schema/javax/jdo/orm.xsd (original)
+++ db/jdo/trunk/api20/src/schema/javax/jdo/orm.xsd Wed Feb 22 10:52:15 2006
@@ -720,7 +720,7 @@
</xs:complexType>
</xs:element>
<xs:attributeGroup name="attlist.query">
- <xs:attribute name="name"/>
+ <xs:attribute name="name" use="required"/>
<xs:attribute name="language"/>
<xs:attribute name="unmodifiable" default="false">
<xs:simpleType>
@@ -730,7 +730,7 @@
</xs:restriction>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="unique" default="false">
+ <xs:attribute name="unique">
<xs:simpleType>
<xs:restriction base="xs:token">
<xs:enumeration value="true"/>
Modified: db/jdo/trunk/api20/test/schema/Positive99-dtd.jdo
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive99-dtd.jdo?rev=379839&r1=379838&r2=379839&view=diff
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive99-dtd.jdo (original)
+++ db/jdo/trunk/api20/test/schema/Positive99-dtd.jdo Wed Feb 22 10:52:15 2006
@@ -391,8 +391,8 @@
<field name="boss"/>
<property name="name25"/>
<property name="name26"/>
- <query/>
- <query/>
+ <query name="namedQuery1"/>
+ <query name="namedQuery2"/>
<fetch-group name="FetchGroup2"/>
<extension vendor-name="SUNW" key="KEY" value="VALUE"/>
<extension vendor-name="SUNW" key="KEY" value="VALUE"/>
Modified: db/jdo/trunk/api20/test/schema/Positive99-xsd.jdo
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive99-xsd.jdo?rev=379839&r1=379838&r2=379839&view=diff
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive99-xsd.jdo (original)
+++ db/jdo/trunk/api20/test/schema/Positive99-xsd.jdo Wed Feb 22 10:52:15 2006
@@ -391,8 +391,8 @@
<field name="boss"/>
<property name="name25"/>
<property name="name26"/>
- <query/>
- <query/>
+ <query name="namedQuery1"/>
+ <query name="namedQuery2"/>
<fetch-group name="FetchGroup2"/>
<extension vendor-name="SUNW" key="KEY" value="VALUE"/>
<extension vendor-name="SUNW" key="KEY" value="VALUE"/>