db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject svn commit: r380324 [1/2] - in /db/jdo/trunk/api20: src/schema/javax/jdo/ test/java/javax/jdo/schema/ test/schema/
Date Fri, 24 Feb 2006 03:50:19 GMT
Author: clr
Date: Thu Feb 23 19:50:16 2006
New Revision: 380324

URL: http://svn.apache.org/viewcvs?rev=380324&view=rev
Log:
JDO-202 Added test cases for .orm and .jdoquery
Removed attribute serialized from element property in orm
Removed attribute primary-key from element field in orm
Fixed typo in jdoquery.xsd
Added test cases for Chapter 15 examples

Added:
    db/jdo/trunk/api20/test/schema/Negative0-dtd.jdoquery
    db/jdo/trunk/api20/test/schema/Negative0-dtd.orm
    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-dtd.jdoquery
    db/jdo/trunk/api20/test/schema/Positive0-dtd.orm
    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-dtd.orm
    db/jdo/trunk/api20/test/schema/Positive1-xsd.orm
    db/jdo/trunk/api20/test/schema/Positive15.1-dtd.orm
    db/jdo/trunk/api20/test/schema/Positive15.1-xsd.orm
    db/jdo/trunk/api20/test/schema/Positive15.2.1-dtd.orm
    db/jdo/trunk/api20/test/schema/Positive15.2.1-xsd.orm
    db/jdo/trunk/api20/test/schema/Positive15.2.2-dtd.orm
    db/jdo/trunk/api20/test/schema/Positive15.2.2-xsd.orm
    db/jdo/trunk/api20/test/schema/Positive15.3.1-dtd.orm
    db/jdo/trunk/api20/test/schema/Positive15.3.1-xsd.orm
    db/jdo/trunk/api20/test/schema/Positive15.3.2-dtd.orm
    db/jdo/trunk/api20/test/schema/Positive15.3.2-xsd.orm
    db/jdo/trunk/api20/test/schema/Positive15.3.3-dtd.orm
    db/jdo/trunk/api20/test/schema/Positive15.3.3-xsd.orm
    db/jdo/trunk/api20/test/schema/Positive15.3.4-dtd.orm
    db/jdo/trunk/api20/test/schema/Positive15.3.4-xsd.orm
    db/jdo/trunk/api20/test/schema/Positive15.3.5-dtd.orm
    db/jdo/trunk/api20/test/schema/Positive15.3.5-xsd.orm
    db/jdo/trunk/api20/test/schema/Positive15.3.6-dtd.orm
    db/jdo/trunk/api20/test/schema/Positive15.3.6-xsd.orm
    db/jdo/trunk/api20/test/schema/Positive15.4-dtd.orm
    db/jdo/trunk/api20/test/schema/Positive15.4-xsd.orm
    db/jdo/trunk/api20/test/schema/Positive15.5-dtd.orm
    db/jdo/trunk/api20/test/schema/Positive15.5-xsd.orm
    db/jdo/trunk/api20/test/schema/Positive15.6-dtd.orm
    db/jdo/trunk/api20/test/schema/Positive15.6-xsd.orm
    db/jdo/trunk/api20/test/schema/Positive15.8.1-dtd.orm
    db/jdo/trunk/api20/test/schema/Positive15.8.1-xsd.orm
    db/jdo/trunk/api20/test/schema/Positive15.8.2-dtd.orm
    db/jdo/trunk/api20/test/schema/Positive15.8.2-xsd.orm
    db/jdo/trunk/api20/test/schema/Positive15.8.3-dtd.orm
    db/jdo/trunk/api20/test/schema/Positive15.8.3-xsd.orm
    db/jdo/trunk/api20/test/schema/Positive99-dtd.jdoquery
    db/jdo/trunk/api20/test/schema/Positive99-dtd.orm
    db/jdo/trunk/api20/test/schema/Positive99-xsd.jdoquery
    db/jdo/trunk/api20/test/schema/Positive99-xsd.orm
Modified:
    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/java/javax/jdo/schema/XMLTest.java
    db/jdo/trunk/api20/test/schema/Positive1-dtd.jdo

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=380324&r1=380323&r2=380324&view=diff
==============================================================================
--- db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.xsd (original)
+++ db/jdo/trunk/api20/src/schema/javax/jdo/jdoquery.xsd Thu Feb 23 19:50:16 2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema  targetNamespace="http://java.sun.com/xml/ns/jdo/jdoquery"
-           xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+           xmlns="http://java.sun.com/xml/ns/jdo/jdoquery"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            version="1.0">
     <xs:element name="jdoquery">

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=380324&r1=380323&r2=380324&view=diff
==============================================================================
--- db/jdo/trunk/api20/src/schema/javax/jdo/orm.dtd (original)
+++ db/jdo/trunk/api20/src/schema/javax/jdo/orm.dtd Thu Feb 23 19:50:16 2006
@@ -23,7 +23,6 @@
 <!ATTLIST property name CDATA #REQUIRED>
 <!ATTLIST property value-strategy CDATA #IMPLIED>
 <!ATTLIST property sequence CDATA #IMPLIED>
-<!ATTLIST property serialized (true|false) #IMPLIED>
 <!ATTLIST property table CDATA #IMPLIED>
 <!ATTLIST property column CDATA #IMPLIED>
 <!ATTLIST property delete-action (restrict|cascade|null|default|none) #IMPLIED>
@@ -87,7 +86,6 @@
 <!ATTLIST field name CDATA #REQUIRED>
 <!ATTLIST field table CDATA #IMPLIED>
 <!ATTLIST field column CDATA #IMPLIED>
-<!ATTLIST field primary-key (true|false) 'false'>
 <!ATTLIST field value-strategy CDATA #IMPLIED>
 <!ATTLIST field delete-action (restrict|cascade|null|default|none) #IMPLIED>
 <!ATTLIST field indexed (true|false|unique) #IMPLIED>

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=380324&r1=380323&r2=380324&view=diff
==============================================================================
--- db/jdo/trunk/api20/src/schema/javax/jdo/orm.xsd (original)
+++ db/jdo/trunk/api20/src/schema/javax/jdo/orm.xsd Thu Feb 23 19:50:16 2006
@@ -87,14 +87,6 @@
         <xs:attribute name="name" use="required"/>
         <xs:attribute name="value-strategy"/>
         <xs:attribute name="sequence"/>
-        <xs:attribute name="serialized" default="true">
-            <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">
@@ -363,14 +355,6 @@
         <xs:attribute name="name" use="required"/>
         <xs:attribute name="table"/>
         <xs:attribute name="column"/>
-        <xs:attribute name="primary-key" 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="value-strategy"/>
         <xs:attribute name="delete-action">
             <xs:simpleType>

Modified: db/jdo/trunk/api20/test/java/javax/jdo/schema/XMLTest.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/java/javax/jdo/schema/XMLTest.java?rev=380324&r1=380323&r2=380324&view=diff
==============================================================================
--- db/jdo/trunk/api20/test/java/javax/jdo/schema/XMLTest.java (original)
+++ db/jdo/trunk/api20/test/java/javax/jdo/schema/XMLTest.java Thu Feb 23 19:50:16 2006
@@ -27,6 +27,8 @@
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.jdo.JDOFatalException;
 import javax.jdo.util.AbstractTest;
@@ -222,7 +224,8 @@
             } catch (SAXParseException ex) {
                 handler.error(ex);
             } catch (Exception ex) {
-                throw new JDOFatalException("Fatal error", ex);
+                throw new JDOFatalException("Fatal error processing " +
+                        file.getName(), ex);
             }
             String messages = handler.getMessages();
             if (valid && (messages != null)) {
@@ -332,18 +335,56 @@
     private static class JDOEntityResolver 
         implements EntityResolver {
 
-        private static final String RECOGNIZED_PUBLIC_ID = 
+        private static final String RECOGNIZED_JDO_PUBLIC_ID = 
             "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN";
-        private static final String RECOGNIZED_SYSTEM_ID = 
+        private static final String RECOGNIZED_JDO_SYSTEM_ID = 
             "file:/javax/jdo/jdo.dtd";
-
+        private static final String RECOGNIZED_JDO_SYSTEM_ID2 = 
+            "http://java.sun.com/dtd/jdo_2_0.dtd";
+        private static final String RECOGNIZED_ORM_PUBLIC_ID = 
+            "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN";
+        private static final String RECOGNIZED_ORM_SYSTEM_ID = 
+            "file:/javax/jdo/orm.dtd";
+        private static final String RECOGNIZED_ORM_SYSTEM_ID2 = 
+            "http://java.sun.com/dtd/orm_2_0.dtd";
+        private static final String RECOGNIZED_JDOQUERY_PUBLIC_ID = 
+            "-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 2.0//EN";
+        private static final String RECOGNIZED_JDOQUERY_SYSTEM_ID = 
+            "file:/javax/jdo/jdoquery.dtd";
+        private static final String RECOGNIZED_JDOQUERY_SYSTEM_ID2 = 
+            "http://java.sun.com/dtd/jdoquery_2_0.dtd";
+        private static final String JDO_DTD_FILENAME = 
+            "javax/jdo/jdo.dtd";
+        private static final String ORM_DTD_FILENAME = 
+            "javax/jdo/orm.dtd";
+        private static final String JDOQUERY_DTD_FILENAME = 
+            "javax/jdo/jdoquery.dtd";
+
+        static Map publicIds = new HashMap();
+        static Map systemIds = new HashMap();
+        static {
+            publicIds.put(RECOGNIZED_JDO_PUBLIC_ID, JDO_DTD_FILENAME);
+            publicIds.put(RECOGNIZED_ORM_PUBLIC_ID, ORM_DTD_FILENAME);
+            publicIds.put(RECOGNIZED_JDOQUERY_PUBLIC_ID, JDOQUERY_DTD_FILENAME);
+            systemIds.put(RECOGNIZED_JDO_SYSTEM_ID, JDO_DTD_FILENAME);
+            systemIds.put(RECOGNIZED_ORM_SYSTEM_ID, ORM_DTD_FILENAME);
+            systemIds.put(RECOGNIZED_JDOQUERY_SYSTEM_ID, JDOQUERY_DTD_FILENAME);
+            systemIds.put(RECOGNIZED_JDO_SYSTEM_ID2, JDO_DTD_FILENAME);
+            systemIds.put(RECOGNIZED_ORM_SYSTEM_ID2, ORM_DTD_FILENAME);
+            systemIds.put(RECOGNIZED_JDOQUERY_SYSTEM_ID2, JDOQUERY_DTD_FILENAME);
+        }
         public InputSource resolveEntity(String publicId, final String systemId)
             throws SAXException, IOException 
         {
             // check for recognized ids
-            if (((publicId != null) && RECOGNIZED_PUBLIC_ID.equals(publicId)) ||
-                ((publicId == null) && (systemId != null) && 
-                 RECOGNIZED_SYSTEM_ID.equals(systemId))) {
+            String filename = (String)publicIds.get(publicId);
+            if (filename == null) {
+                filename = (String)systemIds.get(systemId);
+            }
+            final String finalName = filename;
+            if (finalName == null) {
+                return null;
+            } else {
                 // Substitute the dtd with the one from javax.jdo.jdo.dtd,
                 // but only if the publicId is equal to RECOGNIZED_PUBLIC_ID
                 // or there is no publicID and the systemID is equal to
@@ -352,21 +393,21 @@
                         new PrivilegedAction () {
                             public Object run () {
                             return getClass().getClassLoader().
-                                getResourceAsStream("javax/jdo/jdo.dtd");
+                                getResourceAsStream(finalName);
                             }
                          }
                      );
                     if (stream == null) {
                         // TDB: error handling + I18N
-                        throw new JDOFatalException("Cannot load javax/jdo/jdo.dtd, " +
-                            "because the file does not exist in the jdo.jar file, " +
+                        throw new JDOFatalException("Cannot load " +
+                            finalName + 
+                            ", because the file does not exist in the jdo.jar file, " +
                             "or the JDOParser class is not granted permission to read this file.  " +
                             "The metadata .xml file contained PUBLIC=" + publicId +
                             " SYSTEM=" + systemId + ".");
                     }
                 return new InputSource(new InputStreamReader(stream));
             }
-            return null;
         }
     }
 }

Added: db/jdo/trunk/api20/test/schema/Negative0-dtd.jdoquery
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Negative0-dtd.jdoquery?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Negative0-dtd.jdoquery (added)
+++ db/jdo/trunk/api20/test/schema/Negative0-dtd.jdoquery Thu Feb 23 19:50:16 2006
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Negative test: empty jdoquery element --> 
+<!DOCTYPE jdo PUBLIC 
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 2.0//EN"
+        "http://java.sun.com/dtd/jdoquery_2_0.dtd">
+<jdoquery>
+</jdoquery>

Added: db/jdo/trunk/api20/test/schema/Negative0-dtd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Negative0-dtd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Negative0-dtd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Negative0-dtd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Negative test: empty orm element --> 
+<!DOCTYPE orm PUBLIC 
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN"
+        "http://java.sun.com/dtd/orm_2_0.dtd">
+<orm>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Negative0-xsd.jdoquery
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Negative0-xsd.jdoquery?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Negative0-xsd.jdoquery (added)
+++ db/jdo/trunk/api20/test/schema/Negative0-xsd.jdoquery Thu Feb 23 19:50:16 2006
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Negative test: empty jdoquery element --> 
+<jdoquery xmlns="http://java.sun.com/xml/ns/jdo/jdoquery"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdoquery 
+                         http://java.sun.com/xml/ns/jdo/jdoquery_2_0.xsd">
+
+</jdoquery>

Added: db/jdo/trunk/api20/test/schema/Negative0-xsd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Negative0-xsd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Negative0-xsd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Negative0-xsd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Negative test: empty orm element --> 
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+                         http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive0-dtd.jdoquery
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive0-dtd.jdoquery?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive0-dtd.jdoquery (added)
+++ db/jdo/trunk/api20/test/schema/Positive0-dtd.jdoquery Thu Feb 23 19:50:16 2006
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE jdoquery  PUBLIC 
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 2.0//EN"
+        "http://java.sun.com/dtd/jdoquery_2_0.dtd">
+<jdoquery>
+    <package name="simple">
+        <class name="TestClass">
+            <query
+                name="Simple">
+                SELECT * FROM TestClass
+            </query>
+        </class>
+    </package>
+</jdoquery>

Added: db/jdo/trunk/api20/test/schema/Positive0-dtd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive0-dtd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive0-dtd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive0-dtd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE orm PUBLIC 
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN"
+        "http://java.sun.com/schema/orm_2_0.dtd">
+<orm>
+    <package name="simple">
+        <class name="TestClass"/>
+    </package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive0-xsd.jdoquery
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive0-xsd.jdoquery?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive0-xsd.jdoquery (added)
+++ db/jdo/trunk/api20/test/schema/Positive0-xsd.jdoquery Thu Feb 23 19:50:16 2006
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<jdoquery xmlns="http://java.sun.com/xml/ns/jdo/jdoquery"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdoquery 
+                         http://java.sun.com/xml/ns/jdo/jdoquery_2_0.xsd">
+    <package name="simple">
+        <class name="TestClass">
+            <query
+                name="Simple">
+                SELECT * FROM TestClass
+            </query>
+        </class>
+    </package>
+</jdoquery>

Added: db/jdo/trunk/api20/test/schema/Positive0-xsd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive0-xsd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive0-xsd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive0-xsd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+                         http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
+    <package name="simple">
+        <class name="TestClass"/>
+    </package>
+</orm>

Modified: db/jdo/trunk/api20/test/schema/Positive1-dtd.jdo
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive1-dtd.jdo?rev=380324&r1=380323&r2=380324&view=diff
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive1-dtd.jdo (original)
+++ db/jdo/trunk/api20/test/schema/Positive1-dtd.jdo Thu Feb 23 19:50:16 2006
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE jdo PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN" "http://java.sun.com/dtd/jdo_2_0.dtd">
+<!DOCTYPE jdo PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN" 
+  "http://java.sun.com/dtd/jdo_2_0.dtd">
 <!--
 This file contains the schema information when an implementation
 has application identity.

Added: db/jdo/trunk/api20/test/schema/Positive1-dtd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive1-dtd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive1-dtd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive1-dtd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<!--
+This file contains the schema information when an implementation
+has application identity.
+-->
+<orm>
+    <package name="org.apache.jdo.tck.pc.company">
+
+        <class name="Address"/>
+
+        <class name="Company">
+            <field name="companyid"/>
+            <field name="address"/>
+            <field name="departments">
+            </field>
+        </class>
+
+        <class name="DentalInsurance"/>
+
+        <class name="Department">
+            <field name="deptid"/>
+            <field name="employees">
+            </field>
+            <field name="fundedEmps">
+            </field>
+        </class>
+
+        <class name="Employee">
+            <field name="reviewedProjects">
+            </field>
+            <field name="projects">
+            </field>
+            <field name="team">
+            </field>
+            <field name="hradvisees">
+            </field>
+        </class>
+
+        <class name="FullTimeEmployee"/>
+
+        <class name="Insurance">
+            <field name="insid"/>
+        </class>
+
+        <class name="MedicalInsurance"
+        />
+
+        <class name="PartTimeEmployee"/>
+
+        <class name="Person">
+            <field name="personid"/>
+            <field name="middlename"/>
+            <field name="address"/>
+            <field name="phoneNumbers">
+            </field>
+            <query name="validNotUnique">
+                SELECT firstname, lastname 
+                INTO org.apache.jdo.tck.query.result.classes.FullName 
+                FROM org.apache.jdo.tck.pc.company.Person
+            </query>
+            <query name="validUnique">
+                SELECT UNIQUE firstname, lastname 
+                INTO org.apache.jdo.tck.query.result.classes.FullName 
+                FROM org.apache.jdo.tck.pc.company.Person 
+                WHERE firstname == 'emp1First'
+            </query>
+            <query name="invalidUnique">
+                SELECT UNIQUE firstname, lastname 
+                INTO org.apache.jdo.tck.query.result.classes.FullName
+                FROM org.apache.jdo.tck.pc.company.Person
+            </query>
+            <query name="unmodifiable" unmodifiable="true">
+                SELECT firstname, lastname 
+                FROM org.apache.jdo.tck.pc.company.Person
+            </query>
+            <query name="packageJDO">
+                SELECT FROM org.apache.jdo.tck.pc.company.Person
+                WHERE personid > 1
+            </query>
+            <query name="changeQuery">
+                SELECT FROM org.apache.jdo.tck.pc.company.Person
+            </query>
+            <query name="invalidQuery">
+                SeLeCt FrOm org.apache.jdo.tck.pc.company.Person
+            </query>
+        </class>
+
+        <class name="Project">
+            <field name="projid"/>
+            <field name="reviewers">
+            </field>
+            <field name="members">
+            </field>
+        </class>
+    </package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive1-xsd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive1-xsd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive1-xsd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive1-xsd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+This file contains the schema information when an implementation
+has application identity.
+-->
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+                         http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
+    <package name="org.apache.jdo.tck.pc.company">
+
+        <class name="Address"/>
+
+        <class name="Company">
+            <field name="companyid"/>
+            <field name="address"/>
+            <field name="departments">
+            </field>
+        </class>
+
+        <class name="DentalInsurance"/>
+
+        <class name="Department">
+            <field name="deptid"/>
+            <field name="employees">
+            </field>
+            <field name="fundedEmps">
+            </field>
+        </class>
+
+        <class name="Employee">
+            <field name="reviewedProjects">
+            </field>
+            <field name="projects">
+            </field>
+            <field name="team">
+            </field>
+            <field name="hradvisees">
+            </field>
+        </class>
+
+        <class name="FullTimeEmployee"/>
+
+        <class name="Insurance">
+            <field name="insid"/>
+        </class>
+
+        <class name="MedicalInsurance"
+        />
+
+        <class name="PartTimeEmployee"/>
+
+        <class name="Person">
+            <field name="personid"/>
+            <field name="middlename"/>
+            <field name="address"/>
+            <field name="phoneNumbers">
+            </field>
+            <query name="validNotUnique">
+                SELECT firstname, lastname 
+                INTO org.apache.jdo.tck.query.result.classes.FullName 
+                FROM org.apache.jdo.tck.pc.company.Person
+            </query>
+            <query name="validUnique">
+                SELECT UNIQUE firstname, lastname 
+                INTO org.apache.jdo.tck.query.result.classes.FullName 
+                FROM org.apache.jdo.tck.pc.company.Person 
+                WHERE firstname == 'emp1First'
+            </query>
+            <query name="invalidUnique">
+                SELECT UNIQUE firstname, lastname 
+                INTO org.apache.jdo.tck.query.result.classes.FullName
+                FROM org.apache.jdo.tck.pc.company.Person
+            </query>
+            <query name="unmodifiable" unmodifiable="true">
+                SELECT firstname, lastname 
+                FROM org.apache.jdo.tck.pc.company.Person
+            </query>
+            <query name="packageJDO">
+                SELECT FROM org.apache.jdo.tck.pc.company.Person
+                WHERE personid > 1
+            </query>
+            <query name="changeQuery">
+                SELECT FROM org.apache.jdo.tck.pc.company.Person
+            </query>
+            <query name="invalidQuery">
+                SeLeCt FrOm org.apache.jdo.tck.pc.company.Person
+            </query>
+        </class>
+
+        <class name="Project">
+            <field name="projid"/>
+            <field name="reviewers">
+            </field>
+            <field name="members">
+            </field>
+        </class>
+    </package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.1-dtd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.1-dtd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.1-dtd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.1-dtd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE orm PUBLIC 
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN"
+        "http://java.sun.com/schema/orm_2_0.dtd">
+<orm>
+    <package name="com.xyz">
+        <class name="Address" table="ADDR">
+            <field name="street" column="STREET"/>
+            <field name="city" column="CITY"/>
+            <field name="state" column="STATE"/>
+            <field name="zip" column="ZIPCODE"/>
+            <field name="deliveryInstructions">
+					 <column name="DELIV_INS" jdbc-type="CLOB"/>
+            </field>
+        </class>
+    </package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.1-xsd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.1-xsd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.1-xsd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.1-xsd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+                         http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
+    <package name="com.xyz">
+        <class name="Address" table="ADDR">
+            <field name="street" column="STREET"/>
+            <field name="city" column="CITY"/>
+            <field name="state" column="STATE"/>
+            <field name="zip" column="ZIPCODE"/>
+            <field name="deliveryInstructions">
+					 <column name="DELIV_INS" jdbc-type="CLOB"/>
+            </field>
+        </class>
+    </package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.2.1-dtd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.2.1-dtd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.2.1-dtd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.2.1-dtd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE orm PUBLIC 
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN"
+        "http://java.sun.com/schema/orm_2_0.dtd">
+<orm>
+	<package name="com.xyz">
+		<class name="Address" table="ADDR">
+			<!-- shared join condition used by fields in DELIV -->
+			<join table="DELIV" column="ADDR_STREET"/>
+			<field name="street" column="STREET"/>
+			<field name="city" column="CITY"/>
+			<field name="state" column="STATE"/>
+			<field name="zip" column="ZIPCODE"/>
+			<field name="signatureRequired" table="DELIV"
+				column="SIG_REQUIRED"/>
+			<field name="deliveryInstructions" table="DELIV">
+				<column name="DELIV_INS" jdbc-type="CLOB"/>
+			</field>
+			<field name="mapJPG" table="MAPQUEST_INFO" 
+				column="MAPQUEST_IMAGE">
+			<!-- join condition defined for this field only -->
+				<join column="ADDR_STREET"/>
+			</field>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.2.1-xsd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.2.1-xsd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.2.1-xsd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.2.1-xsd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+                         http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
+	<package name="com.xyz">
+		<class name="Address" table="ADDR">
+			<!-- shared join condition used by fields in DELIV -->
+			<join table="DELIV" column="ADDR_STREET"/>
+			<field name="street" column="STREET"/>
+			<field name="city" column="CITY"/>
+			<field name="state" column="STATE"/>
+			<field name="zip" column="ZIPCODE"/>
+			<field name="signatureRequired" table="DELIV"
+				column="SIG_REQUIRED"/>
+			<field name="deliveryInstructions" table="DELIV">
+				<column name="DELIV_INS" jdbc-type="CLOB"/>
+			</field>
+			<field name="mapJPG" table="MAPQUEST_INFO" 
+				column="MAPQUEST_IMAGE">
+			<!-- join condition defined for this field only -->
+				<join column="ADDR_STREET"/>
+			</field>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.2.2-dtd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.2.2-dtd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.2.2-dtd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.2.2-dtd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE orm PUBLIC 
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN"
+        "http://java.sun.com/schema/orm_2_0.dtd">
+<orm>
+	<package name="com.xyz">
+		<class name="Address" table="ADDR">
+			<field name="street" column="STREET"/>
+			<field name="city" column="CITY"/>
+			<field name="state" column="STATE"/>
+			<field name="zip" column="ZIPCODE"/>
+			<!-- field type is Map<Date,String> -->
+			<field name="deliveryRecords" table="DELIV_RECORDS">
+				<join>
+					<column name="ADDR_STREET" target="STREET"/>
+					<column name="ADDR_ZIPCODE" target="ZIPCODE"/>
+				</join>
+				<key column="DELIV_DATE"/>
+				<value column="SIGNED_BY"/>
+			</field>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.2.2-xsd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.2.2-xsd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.2.2-xsd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.2.2-xsd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+                         http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
+	<package name="com.xyz">
+		<class name="Address" table="ADDR">
+			<field name="street" column="STREET"/>
+			<field name="city" column="CITY"/>
+			<field name="state" column="STATE"/>
+			<field name="zip" column="ZIPCODE"/>
+			<!-- field type is Map<Date,String> -->
+			<field name="deliveryRecords" table="DELIV_RECORDS">
+				<join>
+					<column name="ADDR_STREET" target="STREET"/>
+					<column name="ADDR_ZIPCODE" target="ZIPCODE"/>
+				</join>
+				<key column="DELIV_DATE"/>
+				<value column="SIGNED_BY"/>
+			</field>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.3.1-dtd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.3.1-dtd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.3.1-dtd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.3.1-dtd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE orm PUBLIC 
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN"
+        "http://java.sun.com/schema/orm_2_0.dtd">
+<orm>
+	<package name="com.xyz">
+		<class name="Employee" table="EMP">
+			<field name="ssn" column="SSN"/>
+			<!-- field type is Department -->
+			<field name="department" column="DEP_NAME"/>
+		</class>
+		<class name="Department" table="DEP">
+			<field name="name" column="NAME"/>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.3.1-xsd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.3.1-xsd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.3.1-xsd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.3.1-xsd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+                         http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
+	<package name="com.xyz">
+		<class name="Employee" table="EMP">
+			<field name="ssn" column="SSN"/>
+			<!-- field type is Department -->
+			<field name="department" column="DEP_NAME"/>
+		</class>
+		<class name="Department" table="DEP">
+			<field name="name" column="NAME"/>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.3.2-dtd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.3.2-dtd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.3.2-dtd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.3.2-dtd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE orm PUBLIC 
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN"
+        "http://java.sun.com/schema/orm_2_0.dtd">
+<orm>
+	<package name="com.xyz">
+		<class name="Department" table="DEP">
+ 			<field name="name" column="NAME"/>
+			<!-- field type is Collection<Employee> -->
+			<field name="employees">
+				<element column="DEP_NAME"/>
+			</field>
+		</class>
+		<class name="Employee" table="EMP">
+			<field name="ssn" column="SSN"/>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.3.2-xsd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.3.2-xsd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.3.2-xsd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.3.2-xsd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+                         http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
+	<package name="com.xyz">
+		<class name="Department" table="DEP">
+ 			<field name="name" column="NAME"/>
+			<!-- field type is Collection<Employee> -->
+			<field name="employees">
+				<element column="DEP_NAME"/>
+			</field>
+		</class>
+		<class name="Employee" table="EMP">
+			<field name="ssn" column="SSN"/>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.3.3-dtd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.3.3-dtd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.3.3-dtd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.3.3-dtd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE orm PUBLIC 
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN"
+        "http://java.sun.com/schema/orm_2_0.dtd">
+<orm>
+	<package name="com.xyz">
+		<class name="Employee" table="EMP">
+			<field name="ssn" column="SSN"/>
+			<field name="department" column="DEP_NAME"/>
+		</class>
+		<class name="Department" table="DEP">
+ 			<field name="name" column="NAME"/>
+			<field name="employees" mapped-by="department"/>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.3.3-xsd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.3.3-xsd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.3.3-xsd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.3.3-xsd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+                         http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
+	<package name="com.xyz">
+		<class name="Employee" table="EMP">
+			<field name="ssn" column="SSN"/>
+			<field name="department" column="DEP_NAME"/>
+		</class>
+		<class name="Department" table="DEP">
+ 			<field name="name" column="NAME"/>
+			<field name="employees" mapped-by="department"/>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.3.4-dtd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.3.4-dtd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.3.4-dtd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.3.4-dtd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE orm PUBLIC 
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN"
+        "http://java.sun.com/schema/orm_2_0.dtd">
+<orm>
+	<package name="com.xyz">
+		<class name="Employee" table="EMP">
+			<field name="ssn" column="SSN"/>
+			<field name="department">
+				<column name="DEP_NAME" target="NAME"/>
+				<column name="DEP_ID" target="ID"/>
+			</field>
+		</class>
+		<class name="Department" table="DEP">
+			<field name="name" column="NAME"/>
+			<field name="id" column="ID"/>
+			<field name="employees" mapped-by="department"/>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.3.4-xsd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.3.4-xsd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.3.4-xsd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.3.4-xsd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+                         http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
+	<package name="com.xyz">
+		<class name="Employee" table="EMP">
+			<field name="ssn" column="SSN"/>
+			<field name="department">
+				<column name="DEP_NAME" target="NAME"/>
+				<column name="DEP_ID" target="ID"/>
+			</field>
+		</class>
+		<class name="Department" table="DEP">
+			<field name="name" column="NAME"/>
+			<field name="id" column="ID"/>
+			<field name="employees" mapped-by="department"/>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.3.5-dtd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.3.5-dtd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.3.5-dtd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.3.5-dtd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE orm PUBLIC 
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN"
+        "http://java.sun.com/schema/orm_2_0.dtd">
+<orm>
+	<package name="com.xyz">
+		<class name="Employee" table="EMP">
+			<field name="ssn" column="SSN"/>
+			<!-- field type is Map<Department, String> -->
+			<field name="positions" table="EMP_POS">
+				<join column="EMP_SSN"/>
+				<key>
+					<column name="DEP_NAME" target="NAME"/>
+					<column name="DEP_ID" target="ID"/>
+				</key>
+				<value column="POS"/>
+			</field>
+		</class>
+		<class name="Department" table="DEP">
+			<field name="name" column="NAME"/>
+			<field name="id" column="ID"/>
+		</class>
+        </package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.3.5-xsd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.3.5-xsd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.3.5-xsd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.3.5-xsd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+                         http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
+	<package name="com.xyz">
+		<class name="Employee" table="EMP">
+			<field name="ssn" column="SSN"/>
+			<!-- field type is Map<Department, String> -->
+			<field name="positions" table="EMP_POS">
+				<join column="EMP_SSN"/>
+				<key>
+					<column name="DEP_NAME" target="NAME"/>
+					<column name="DEP_ID" target="ID"/>
+				</key>
+				<value column="POS"/>
+			</field>
+		</class>
+		<class name="Department" table="DEP">
+			<field name="name" column="NAME"/>
+			<field name="id" column="ID"/>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.3.6-dtd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.3.6-dtd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.3.6-dtd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.3.6-dtd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE orm PUBLIC 
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN"
+        "http://java.sun.com/schema/orm_2_0.dtd">
+<orm>
+	<package name="com.xyz">
+		<class name="Employee" table="EMP">
+			<field name="ssn" column="SSN"/>
+			<field name="dept" column="DEP"/>
+			<field name="role" column="ROLE"/>
+		</class>
+		<class name="Department" table="DEP">
+			<field name="name" column="NAME"/>
+			<field name="id" column="ID"/>
+			<!-- field type is Map<String, Employee> -->
+			<field name="roles" mapped-by="dept">
+				<key mapped-by="role"/>
+			</field>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.3.6-xsd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.3.6-xsd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.3.6-xsd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.3.6-xsd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+                         http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
+        <package name="com.xyz">
+                <class name="Employee" table="EMP">
+                        <field name="ssn" column="SSN"/>
+                        <field name="dept" column="DEP"/>
+                        <field name="role" column="ROLE"/>
+                </class>
+                <class name="Department" table="DEP">
+                        <field name="name" column="NAME"/>
+                        <field name="id" column="ID"/>
+                        <!-- field type is Map<String, Employee> -->
+                        <field name="roles" mapped-by="dept">
+                                <key mapped-by="role"/>
+                        </field>
+                </class>
+        </package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.4-dtd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.4-dtd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.4-dtd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.4-dtd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE orm PUBLIC 
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN"
+        "http://java.sun.com/schema/orm_2_0.dtd">
+<orm>
+	<package name="com.xyz">
+		<class name="Employee" table="EMP">
+			<field name="ssn" column="SSN"/>
+			<!-- field type is Address -->
+			<field name="businessAddress" column="BUSADDR_STREET"/>
+			<!-- field type is Address -->
+			<field name="primaryAddress">
+				<embedded null-indicator-column="PADDR_STREET">
+					<field name="street" column="PADDR_STREET"/>
+					<field name="city" column="PADDR_CITY"/>
+					<field name="state" column="PADDR_STATE"/>
+					<field name="zip" column="PADDR_ZIPCODE"/>
+				</embedded>
+			</field>
+			<!-- field type is List<Address> -->
+			<field name="secondaryAddresses" table="EMP_ADDRS">
+				<join column="EMP_SSN"/>
+				<element>
+					<embedded>
+						<field name="street" column="SADDR_STREET"/>
+						<field name="city" column="SADDR_CITY"/>
+						<field name="state" column="SADDR_STATE"/>
+						<field name="zip" column="SADDR_ZIPCODE"/>
+					</embedded>
+				</element>
+				<order column="IDX"/>
+			</field>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.4-xsd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.4-xsd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.4-xsd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.4-xsd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+                         http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
+	<package name="com.xyz">
+		<class name="Employee" table="EMP">
+			<field name="ssn" column="SSN"/>
+			<!-- field type is Address -->
+			<field name="businessAddress" column="BUSADDR_STREET"/>
+			<!-- field type is Address -->
+			<field name="primaryAddress">
+				<embedded null-indicator-column="PADDR_STREET">
+					<field name="street" column="PADDR_STREET"/>
+					<field name="city" column="PADDR_CITY"/>
+					<field name="state" column="PADDR_STATE"/>
+					<field name="zip" column="PADDR_ZIPCODE"/>
+				</embedded>
+			</field>
+			<!-- field type is List<Address> -->
+			<field name="secondaryAddresses" table="EMP_ADDRS">
+				<join column="EMP_SSN"/>
+				<element>
+					<embedded>
+						<field name="street" column="SADDR_STREET"/>
+						<field name="city" column="SADDR_CITY"/>
+						<field name="state" column="SADDR_STATE"/>
+						<field name="zip" column="SADDR_ZIPCODE"/>
+					</embedded>
+				</element>
+				<order column="IDX"/>
+			</field>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.5-dtd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.5-dtd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.5-dtd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.5-dtd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE orm PUBLIC 
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN"
+        "http://java.sun.com/schema/orm_2_0.dtd">
+<orm>
+	<package name="com.xyz">
+		<class name="Employee" table="EMP">
+			<field name="ssn" column="SSN"/>
+			<field name="department">
+				<column name="DEP_NAME" target="NAME"/>
+				<column name="DEP_ID" target="ID"/>
+				<foreign-key name="EMP_DEP_FK"/>
+			</field>
+		</class>
+		<class name="Department" table="DEP">
+			<field name="name" column="NAME"/>
+			<field name="id" column="ID"/>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.5-xsd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.5-xsd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.5-xsd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.5-xsd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+                         http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
+	<package name="com.xyz">
+		<class name="Employee" table="EMP">
+			<field name="ssn" column="SSN"/>
+			<field name="department">
+				<column name="DEP_NAME" target="NAME"/>
+				<column name="DEP_ID" target="ID"/>
+				<foreign-key name="EMP_DEP_FK"/>
+			</field>
+		</class>
+		<class name="Department" table="DEP">
+			<field name="name" column="NAME"/>
+			<field name="id" column="ID"/>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.6-dtd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.6-dtd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.6-dtd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.6-dtd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE orm PUBLIC 
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN"
+        "http://java.sun.com/schema/orm_2_0.dtd">
+<orm>
+	<package name="com.xyz">
+		<class name="Address" table="ADDR">
+			<index name="ADDR_CITYSTATE_IDX">
+				<column name="CITY"/>
+				<column name="STATE"/>
+			</index>
+			<field name="street" column="STREET"/>
+			<field name="city" column="CITY"/>
+			<field name="state" column="STATE"/>
+			<field name="zip" column="ZIPCODE">
+				<index name="ADDR_ZIP_IDX"/>
+			</field>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.6-xsd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.6-xsd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.6-xsd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.6-xsd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+                         http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
+	<package name="com.xyz">
+		<class name="Address" table="ADDR">
+			<index name="ADDR_CITYSTATE_IDX">
+				<column name="CITY"/>
+				<column name="STATE"/>
+			</index>
+			<field name="street" column="STREET"/>
+			<field name="city" column="CITY"/>
+			<field name="state" column="STATE"/>
+			<field name="zip" column="ZIPCODE">
+				<index name="ADDR_ZIP_IDX"/>
+			</field>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.8.1-dtd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.8.1-dtd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.8.1-dtd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.8.1-dtd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE orm PUBLIC 
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN"
+        "http://java.sun.com/schema/orm_2_0.dtd">
+<orm>
+	<package name="com.xyz">
+		<class name="Employee" table="EMP">
+			<inheritance strategy="new-table">
+				<discriminator value="E" column="TYPE"/>
+			</inheritance>
+			<version strategy="version-number" column="VERS"/>
+			<field name="ssn" column="SSN"/>
+		</class>
+		<class name="PartTimeEmployee">
+			<inheritance strategy="superclass-table">
+				<discriminator value="P"/>
+			</inheritance>
+			<field name="hourlyWage" column="WAGE"/>
+		</class>
+		<class name="FullTimeEmployee">
+			<inheritance strategy="superclass-table">
+				<discriminator value="F"/>
+			</inheritance>
+			<field name="salary" column="SALARY"/>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.8.1-xsd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.8.1-xsd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.8.1-xsd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.8.1-xsd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+                         http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
+	<package name="com.xyz">
+		<class name="Employee" table="EMP">
+			<inheritance strategy="new-table">
+				<discriminator value="E" column="TYPE"/>
+			</inheritance>
+			<version strategy="version-number" column="VERS"/>
+			<field name="ssn" column="SSN"/>
+		</class>
+		<class name="PartTimeEmployee">
+			<inheritance strategy="superclass-table">
+				<discriminator value="P"/>
+			</inheritance>
+			<field name="hourlyWage" column="WAGE"/>
+		</class>
+		<class name="FullTimeEmployee">
+			<inheritance strategy="superclass-table">
+				<discriminator value="F"/>
+			</inheritance>
+			<field name="salary" column="SALARY"/>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.8.2-dtd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.8.2-dtd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.8.2-dtd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.8.2-dtd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE orm PUBLIC 
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN"
+        "http://java.sun.com/schema/orm_2_0.dtd">
+<orm>
+	<package name="com.xyz">
+		<class name="Employee" table="EMP">
+			<inheritance strategy="new-table">
+				<discriminator strategy="class-name" column="JAVA_CLS"/>
+			</inheritance>
+			<version strategy="state-comparison"/>
+			<field name="ssn" column="SSN"/>
+		</class>
+		<class name="PartTimeEmployee" table="PART_EMP">
+			<inheritance strategy="new-table">
+				<join column="EMP_SSN"/>
+			</inheritance>
+			<field name="hourlyWage" column="WAGE"/>
+		</class>
+		<class name="FullTimeEmployee" table="FULL_EMP">
+			<inheritance strategy="new-table">
+				<join column="EMP_SSN"/>
+			</inheritance>
+			<field name="salary" column="SALARY"/>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.8.2-xsd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.8.2-xsd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.8.2-xsd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.8.2-xsd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+                         http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
+	<package name="com.xyz">
+		<class name="Employee" table="EMP">
+			<inheritance strategy="new-table">
+				<discriminator strategy="class-name" column="JAVA_CLS"/>
+			</inheritance>
+			<version strategy="state-comparison"/>
+			<field name="ssn" column="SSN"/>
+		</class>
+		<class name="PartTimeEmployee" table="PART_EMP">
+			<inheritance strategy="new-table">
+				<join column="EMP_SSN"/>
+			</inheritance>
+			<field name="hourlyWage" column="WAGE"/>
+		</class>
+		<class name="FullTimeEmployee" table="FULL_EMP">
+			<inheritance strategy="new-table">
+				<join column="EMP_SSN"/>
+			</inheritance>
+			<field name="salary" column="SALARY"/>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.8.3-dtd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.8.3-dtd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.8.3-dtd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.8.3-dtd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE orm PUBLIC 
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN"
+        "http://java.sun.com/schema/orm_2_0.dtd">
+<orm>
+	<package name="com.xyz">
+		<class name="Employee">
+			<inheritance strategy="subclass-table"/>
+		</class>
+		<class name="PartTimeEmployee" table="PART_EMP">
+			<inheritance strategy="new-table"/>
+			<field name="Employee.ssn" column="EMP_SSN"/>
+			<field name="hourlyWage" column="WAGE"/>
+		</class>
+		<class name="FullTimeEmployee" table="FULL_EMP">
+			<inheritance strategy="new-table"/>
+			<field name="Employee.ssn" column="EMP_SSN"/>
+			<field name="salary" column="SALARY"/>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive15.8.3-xsd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive15.8.3-xsd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive15.8.3-xsd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive15.8.3-xsd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+                         http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
+	<package name="com.xyz">
+		<class name="Employee">
+			<inheritance strategy="subclass-table"/>
+		</class>
+		<class name="PartTimeEmployee" table="PART_EMP">
+			<inheritance strategy="new-table"/>
+			<field name="Employee.ssn" column="EMP_SSN"/>
+			<field name="hourlyWage" column="WAGE"/>
+		</class>
+		<class name="FullTimeEmployee" table="FULL_EMP">
+			<inheritance strategy="new-table"/>
+			<field name="Employee.ssn" column="EMP_SSN"/>
+			<field name="salary" column="SALARY"/>
+		</class>
+	</package>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive99-dtd.jdoquery
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive99-dtd.jdoquery?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive99-dtd.jdoquery (added)
+++ db/jdo/trunk/api20/test/schema/Positive99-dtd.jdoquery Thu Feb 23 19:50:16 2006
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jdoquery SYSTEM "file:/javax/jdo/jdoquery.dtd">
+<jdoquery>
+  <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+  <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+  <package 
+    name="org.apache.jdo">
+    <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+    <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+    <interface 
+      name="Datastore">
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      <query
+        name="QUERY"
+        language="javax.jdo.JDOQL"
+        unmodifiable="true"
+        unique="true"
+        result-class="ResultClass">
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        SELECT name FROM Employee
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      </query>
+      <query
+        name="QUERY"/>
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+    </interface>
+    <class
+      name="ApplicationCapable">
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      <query
+        name="QUERY"/>
+      <query
+        name="QUERY"/>
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+    </class>
+  </package>
+  <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+  <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+</jdoquery>

Added: db/jdo/trunk/api20/test/schema/Positive99-dtd.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive99-dtd.orm?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive99-dtd.orm (added)
+++ db/jdo/trunk/api20/test/schema/Positive99-dtd.orm Thu Feb 23 19:50:16 2006
@@ -0,0 +1,337 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE orm SYSTEM "file:/javax/jdo/orm.dtd">
+<orm>
+  <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+  <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+  <package 
+    name="org.apache.jdo"
+    catalog="CATALOG"
+    schema="SCHEMA">
+    <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+    <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+    <interface 
+      name="Datastore" 
+      table="TABLE"       catalog="CATALOG"
+      schema="SCHEMA">
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      <datastore-identity
+        column="COLUMN"
+        strategy="anything"
+        sequence="SEQUENCE">
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        <column/>
+        <column/>        
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      </datastore-identity>
+      <primary-key/>
+      <inheritance
+        strategy="anything">
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        <join/>
+        <discriminator
+          column="COLUMN"
+          value="VALUE"
+          strategy="anything"
+          indexed="true">
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          <column/>
+          <column/>
+          <index/>        
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        </discriminator>
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      </inheritance>
+      <version
+        strategy="anything"
+        column="COLUMN"
+        indexed="true">
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        <column/>
+        <column/>
+        <index/>
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      </version>
+      <join/>
+      <foreign-key/>
+      <index/>
+      <unique/>
+      <property
+        name="property1"
+        value-strategy="valuestrategy"
+        sequence="sequence"
+        table="TABLE"
+        column="COLUMN"
+        delete-action="restrict"
+        indexed="true"
+        unique="true"
+        mapped-by="mappedby">
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        <join
+          table="JOINTABLE"
+          column="JOINCOLUMN"
+          outer="true"
+          delete-action="restrict"
+          indexed="true"
+          unique="true">
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          <primary-key
+            name="JOINPRIMARYKEY"
+            column="JOINPRIMARYKEYCOLUMN">
+            <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+            <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+            <column
+              name="PRIMARYKEYCOLUMN"
+              target="TARGET"
+              target-field="TARGETFIELD"
+              jdbc-type="JDBCTYPE"
+              sql-type="SQLTYPE"
+              length="17"
+              scale="12"
+              allows-null="true"
+              default-value="DEFAULTVALUE"
+              insert-value="INSERTVALUE">
+              <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+              <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+            </column>
+            <column/>
+            <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+            <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          </primary-key>
+          <column
+              allows-null="false"/>
+          <column/>
+          <foreign-key
+            table="TABLE"
+            deferred="true"
+            delete-action="cascade"
+            update-action="cascade"
+            unique="true"
+            name="foreignkey">
+            <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+            <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+            <column/>
+            <column/>
+            <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+            <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          </foreign-key>
+          <index
+            name="INDEXNAME"
+            table="TABLE"
+            unique="true">
+            <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+            <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+            <field name="name5"/>
+            <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+            <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          </index>  
+          <unique
+            name="UNIQUENAME"
+            table="TABLE"
+            deferred="true">
+            <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+            <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+            <property name="name11"/>
+            <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+            <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          </unique>  
+        </join>  
+        <embedded
+          owner-field="owner"
+          null-indicator-column="COLUMN"
+          null-indicator-value="NULL">
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          <field name="name13"/>
+          <field name="name14"/>
+          <property name="name15"/>
+          <property name="name16"/>          
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        </embedded>
+        <element
+          column="COLUMN"
+          table="TABLE"
+          delete-action="restrict"
+          update-action="restrict"
+          indexed="true"
+          unique="true"
+          mapped-by="otherfield">
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          <embedded/>
+          <column/>
+          <column/>
+          <foreign-key/>
+          <index/>
+          <unique/>
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        </element>
+        <key
+          column="COLUMN"
+          table="TABLE"
+          delete-action="restrict"
+          indexed="true"
+          unique="true"
+          mapped-by="anything">
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          <embedded/>
+          <column/>
+          <column/>
+          <foreign-key/>
+          <index/>
+          <unique/>
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        </key>  
+        <value
+          column="COLUMN"
+          table="TABLE"
+          delete-action="restrict"
+          indexed="true"
+          unique="true"
+          mapped-by="anything">
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          <embedded/>
+          <column/>
+          <column/>
+          <foreign-key/>
+          <index/>
+          <unique/>
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        </value>
+        <order
+          column="COLUMN"
+          mapped-by="anything">
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          <column/>
+          <column/>
+          <index/>
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+          <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        </order> 
+        <column/>
+        <column/>
+        <foreign-key/>
+        <index/>
+        <unique/>
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      </property>  
+      <property
+        name="property2"
+        delete-action="cascade"
+        indexed="false"
+        unique="false">
+      </property>  
+      <property
+        name="property3"
+        delete-action="null"
+        indexed="unique">
+      </property>
+      <property
+        name="property4"
+        delete-action="default"/>
+      <property
+        name="property5"
+        delete-action="none"/>
+      <query
+        name="QUERY"
+        language="javax.jdo.JDOQL"
+        unmodifiable="true"
+        unique="true"
+        result-class="ResultClass">
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        SELECT name FROM Employee
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      </query>
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+    </interface>
+    <interface
+      name="Interface2"
+      table="TABLE"/>
+    <class
+      name="ApplicationCapable"
+      table="TABLE"
+      catalog="CATALOG"
+      schema="SCHEMA">
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      <datastore-identity/>
+      <primary-key/>
+      <inheritance/>
+      <version/>
+      <join/>
+      <join/>
+      <foreign-key/>
+      <foreign-key/>
+      <index/>
+      <index/>
+      <unique/>
+      <unique/>
+      <column/>
+      <column/>
+      <field
+        name="name">
+        <extension vendor-name="sunw" key="index" value="btree"/>
+      </field>
+      <field 
+        name="salary"/>
+      <field 
+        name="dept">
+        <extension vendor-name="sunw" key="inverse" value="emps"/>
+      </field>
+      <field 
+        name="boss"/>
+      <property 
+        name="name25"/>
+      <property 
+        name="name26"/>
+      <query 
+        name="namedQuery1"/>
+      <query 
+        name="namedQuery2"/>
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+    </class>
+    <class
+        name="DatastoreAware"
+        catalog="CATALOG"
+        schema="SCHEMA"/>
+    <class
+        name="NondurableNonpersistent"/>
+    <sequence
+      name="sequence1"
+      datastore-sequence="SEQUENCE"
+      factory-class="FactoryClass"
+      strategy="nontransactional">
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+    </sequence>
+    <sequence
+      name="sequence2"
+      strategy="contiguous"/>
+    <sequence
+      name="sequence3"
+      strategy="noncontiguous"/>
+  </package>
+  <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+</orm>

Added: db/jdo/trunk/api20/test/schema/Positive99-xsd.jdoquery
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/api20/test/schema/Positive99-xsd.jdoquery?rev=380324&view=auto
==============================================================================
--- db/jdo/trunk/api20/test/schema/Positive99-xsd.jdoquery (added)
+++ db/jdo/trunk/api20/test/schema/Positive99-xsd.jdoquery Thu Feb 23 19:50:16 2006
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jdoquery SYSTEM "file:/javax/jdo/jdoquery.dtd">
+<jdoquery xmlns="http://java.sun.com/xml/ns/jdo/jdoquery"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdoquery 
+                         http://java.sun.com/xml/ns/jdo/jdoquery_2_0.xsd">
+  <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+  <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+  <package 
+    name="org.apache.jdo">
+    <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+    <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+    <interface 
+      name="Datastore">
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      <query
+        name="QUERY"
+        language="javax.jdo.JDOQL"
+        unmodifiable="true"
+        unique="true"
+        result-class="ResultClass">
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        SELECT name FROM Employee
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+        <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      </query>
+      <query
+        name="QUERY"/>
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+    </interface>
+    <class
+      name="ApplicationCapable">
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      <query
+        name="QUERY"/>
+      <query
+        name="QUERY"/>
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+      <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+    </class>
+  </package>
+  <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+  <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
+</jdoquery>



Mime
View raw message