Return-Path: 
 <jdo-commits-return-1280-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org>
Delivered-To: apmail-db-jdo-commits-archive@www.apache.org
Received: (qmail 46715 invoked from network); 18 Feb 2006 20:18:32 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 18 Feb 2006 20:18:32 -0000
Received: (qmail 97446 invoked by uid 500); 18 Feb 2006 20:18:32 -0000
Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jdo-commits-help@db.apache.org>
List-Unsubscribe: <mailto:jdo-commits-unsubscribe@db.apache.org>
List-Post: <mailto:jdo-commits@db.apache.org>
List-Id: <jdo-commits.db.apache.org>
Reply-To: jdo-dev@db.apache.org
Delivered-To: mailing list jdo-commits@db.apache.org
Received: (qmail 97435 invoked by uid 99); 18 Feb 2006 20:18:31 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 18 Feb 2006 12:18:31 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Sat, 18 Feb 2006 12:18:31 -0800
Received: (qmail 40779 invoked by uid 65534); 18 Feb 2006 20:18:10 -0000
Message-ID: <20060218201810.40774.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r378770 - /db/jdo/trunk/api20/src/dtd/javax/jdo/jdo.xsd
Date: Sat, 18 Feb 2006 20:18:10 -0000
To: jdo-commits@db.apache.org
From: mbo@apache.org
X-Mailer: svnmailer-1.0.6
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: mbo
Date: Sat Feb 18 12:18:04 2006
New Revision: 378770

URL: http://svn.apache.org/viewcvs?rev=378770&view=rev
Log:
JDO-202: fixed jdo.xsd and changed property attribues, class subelements, field attribues, array attributes, order attributes, fetch-group subelements, and embedded subelements.

Modified:
    db/jdo/trunk/api20/src/dtd/javax/jdo/jdo.xsd

Modified: db/jdo/trunk/api20/src/dtd/javax/jdo/jdo.xsd
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/src/dtd/javax/jdo/jdo.xsd?rev=378770&r1=378769&r2=378770&view=diff
==============================================================================
--- db/jdo/trunk/api20/src/dtd/javax/jdo/jdo.xsd (original)
+++ db/jdo/trunk/api20/src/dtd/javax/jdo/jdo.xsd Sat Feb 18 12:18:04 2006
@@ -122,6 +122,15 @@
     </xs:element>
     <xs:attributeGroup name="attlist.property">
         <xs:attribute name="name" use="required"/>
+        <xs:attribute name="persistence-modifier">
+            <xs:simpleType>
+                <xs:restriction base="xs:token">
+                    <xs:enumeration value="persistent"/>
+                    <xs:enumeration value="transactional"/>
+                    <xs:enumeration value="none"/>
+                </xs:restriction>
+            </xs:simpleType>
+        </xs:attribute>
         <xs:attribute name="default-fetch-group">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -222,7 +231,9 @@
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="foreign-key"/>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="index"/>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="unique"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="column"/>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="field"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="property"/>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="query"/>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="fetch-group"/>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="extension"/>
@@ -574,7 +585,6 @@
             </xs:simpleType>
         </xs:attribute>
         <xs:attribute name="sequence"/>
-        <xs:attribute name="foreign-key"/>
         <xs:attribute name="load-fetch-group"/>
         <xs:attribute name="recursion-depth"/>
         <xs:attribute name="mapped-by"/>
@@ -831,6 +841,7 @@
         </xs:complexType>
     </xs:element>
     <xs:attributeGroup name="attlist.array">
+        <xs:attribute name="element-type"/>
         <xs:attribute name="embedded-element">
             <xs:simpleType>
                 <xs:restriction base="xs:token">
@@ -926,13 +937,19 @@
                 </xs:restriction>
             </xs:simpleType>
         </xs:attribute>
+        <xs:attribute name="mapped-by"/>
     </xs:attributeGroup>
     <xs:element name="fetch-group">
         <xs:complexType>
-            <xs:choice minOccurs="0" maxOccurs="unbounded">
-                <xs:element ref="fetch-group"/>
-                <xs:element ref="field"/>
-            </xs:choice>
+            <xs:sequence>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="extension"/>
+                <xs:choice minOccurs="0" maxOccurs="unbounded">
+                    <xs:element ref="fetch-group"/>
+                    <xs:element ref="field"/>
+                    <xs:element ref="property"/>
+                </xs:choice>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="extension"/>
+            </xs:sequence>
             <xs:attributeGroup ref="attlist.fetch-group"/>
         </xs:complexType>
     </xs:element>
@@ -951,7 +968,10 @@
         <xs:complexType>
             <xs:sequence>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="extension"/>
-                <xs:element minOccurs="0" maxOccurs="unbounded" ref="field"/>
+                <xs:choice minOccurs="0" maxOccurs="unbounded">
+                    <xs:element ref="field"/>
+                    <xs:element ref="property"/>
+                </xs:choice>
                 <xs:element minOccurs="0" maxOccurs="unbounded" ref="extension"/>
             </xs:sequence>
             <xs:attributeGroup ref="attlist.embedded"/>