Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 11771 invoked from network); 31 May 2007 20:18:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 31 May 2007 20:18:35 -0000 Received: (qmail 52939 invoked by uid 500); 31 May 2007 20:18:39 -0000 Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jdo-dev@db.apache.org Delivered-To: mailing list jdo-commits@db.apache.org Received: (qmail 52913 invoked by uid 99); 31 May 2007 20:18:39 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 May 2007 13:18:39 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 May 2007 13:18:33 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 3B4C01A981A; Thu, 31 May 2007 13:18:13 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r543243 [1/2] - in /db/jdo/trunk/api20: src/java/javax/jdo/ src/schema/javax/jdo/ test/java/javax/jdo/schema/ test/java/javax/jdo/util/ test/schema/ Date: Thu, 31 May 2007 20:18:12 -0000 To: jdo-commits@db.apache.org From: mbo@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070531201813.3B4C01A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mbo Date: Thu May 31 13:18:10 2007 New Revision: 543243 URL: http://svn.apache.org/viewvc?view=rev&rev=543243 Log: JDO-472: Update JDO XSD files: - Loosen the restrictions on the placement of extension elements, meaning that the jdo implementation needs to do more checking. - Update the version entry in the XML Schema file to 2.1 and rename the xsd files accordingly: jdo_2_1.xsd, orm_2_1.xsd and jdoquery_2_1.xsd. Added: db/jdo/trunk/api20/src/schema/javax/jdo/jdo_2_1.xsd db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery_2_1.xsd db/jdo/trunk/api20/src/schema/javax/jdo/orm_2_1.xsd Modified: db/jdo/trunk/api20/src/java/javax/jdo/Constants.java db/jdo/trunk/api20/test/java/javax/jdo/schema/XMLTest.java db/jdo/trunk/api20/test/java/javax/jdo/util/XMLTestUtil.java db/jdo/trunk/api20/test/schema/Negative0-xsd.jdo db/jdo/trunk/api20/test/schema/Negative0-xsd.jdoquery db/jdo/trunk/api20/test/schema/Negative0-xsd.orm db/jdo/trunk/api20/test/schema/Positive0-xsd.jdo db/jdo/trunk/api20/test/schema/Positive0-xsd.jdoquery db/jdo/trunk/api20/test/schema/Positive0-xsd.orm db/jdo/trunk/api20/test/schema/Positive1-xsd.jdo db/jdo/trunk/api20/test/schema/Positive1-xsd.orm db/jdo/trunk/api20/test/schema/Positive15.1-xsd.orm db/jdo/trunk/api20/test/schema/Positive15.2.1-xsd.orm db/jdo/trunk/api20/test/schema/Positive15.2.2-xsd.orm db/jdo/trunk/api20/test/schema/Positive15.3.1-xsd.orm db/jdo/trunk/api20/test/schema/Positive15.3.2-xsd.orm db/jdo/trunk/api20/test/schema/Positive15.3.3-xsd.orm db/jdo/trunk/api20/test/schema/Positive15.3.4-xsd.orm db/jdo/trunk/api20/test/schema/Positive15.3.5-xsd.orm db/jdo/trunk/api20/test/schema/Positive15.3.6-xsd.orm db/jdo/trunk/api20/test/schema/Positive15.4-xsd.orm db/jdo/trunk/api20/test/schema/Positive15.5-xsd.orm db/jdo/trunk/api20/test/schema/Positive15.6-xsd.orm db/jdo/trunk/api20/test/schema/Positive15.8.1-xsd.orm db/jdo/trunk/api20/test/schema/Positive15.8.2-xsd.orm db/jdo/trunk/api20/test/schema/Positive15.8.3-xsd.orm db/jdo/trunk/api20/test/schema/Positive99-xsd.jdo db/jdo/trunk/api20/test/schema/Positive99-xsd.jdoquery db/jdo/trunk/api20/test/schema/Positive99-xsd.orm Modified: db/jdo/trunk/api20/src/java/javax/jdo/Constants.java URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/src/java/javax/jdo/Constants.java?view=diff&rev=543243&r1=543242&r2=543243 ============================================================================== --- db/jdo/trunk/api20/src/java/javax/jdo/Constants.java (original) +++ db/jdo/trunk/api20/src/java/javax/jdo/Constants.java Thu May 31 13:18:10 2007 @@ -766,7 +766,7 @@ * @since 2.1 */ static String JDO_XSD_RESOURCE - = "javax/jdo/jdo_2_0.xsd"; + = "javax/jdo/jdo_2_1.xsd"; /** * The name of the resource for the DTD of the standard JDO @@ -784,7 +784,7 @@ * @since 2.1 */ static String ORM_XSD_RESOURCE - = "javax/jdo/orm_2_0.xsd"; + = "javax/jdo/orm_2_1.xsd"; /** * The name of the resource for the DTD of the standard JDO query @@ -802,6 +802,6 @@ * @since 2.1 */ static String JDOQUERY_XSD_RESOURCE - = "javax/jdo/jdoquery_2_0.xsd"; + = "javax/jdo/jdoquery_2_1.xsd"; } Added: db/jdo/trunk/api20/src/schema/javax/jdo/jdo_2_1.xsd URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/src/schema/javax/jdo/jdo_2_1.xsd?view=auto&rev=543243 ============================================================================== --- db/jdo/trunk/api20/src/schema/javax/jdo/jdo_2_1.xsd (added) +++ db/jdo/trunk/api20/src/schema/javax/jdo/jdo_2_1.xsd Thu May 31 13:18:10 2007 @@ -0,0 +1,1240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Please note, + the following subelements must not occur more than once: + - datastore-identity + - primary-key + - inheritance + - version + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Please note, + the following subelements must not occur more than once: + - the choice of array, collection and map, + - join + - embedded + - key + - value + - order + - foreign-key + - index + - unique + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Please note, + the following subelements must not occur more than once: + - datastore-identity + - primary-key + - inheritance + - version + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Please note, + the following subelements must not occur more than once: + - primary-key + - foreign-key + - index + - unique + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Please note, + the following subelements must not occur more than once: + - index + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Please note, + the following subelements must not occur more than once: + - join + - discriminator + + + + + + + + + + + + + + + + Please note, + the following subelements must not occur more than once: + - index + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Please note, + the following subelements must not occur more than once: + - the choice of array, collection, and map + - join + - embedded + - key + - value + - order + - foreign-key + - index + - unique + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Please note, + the following subelements must not occur more than once: + - the choice of columns, fields and properties + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Please note, + the following subelements must not occur more than once: + - embedded + - foreign-key + - index + - unique + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Please note, + the following subelements must not occur more than once: + - embedded + - foreign-key + - index + - unique + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Please note, + the following subelements must not occur more than once: + - embedded + - foreign-key + - index + - unique + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Please note, + the following subelements must not occur more than once: + - index + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Please note, + the following subelements must not occur more than once: + - the choice of columns, fields or properties + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Please note, + the following subelements must not occur more than once: + - the choice of columns, fields or properties + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery_2_1.xsd URL: http://svn.apache.org/viewvc/db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery_2_1.xsd?view=auto&rev=543243 ============================================================================== --- db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery_2_1.xsd (added) +++ db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery_2_1.xsd Thu May 31 13:18:10 2007 @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +