Index: maven.xml
===================================================================
--- maven.xml	(revision 375166)
+++ maven.xml	(working copy)
@@ -326,7 +326,8 @@
                 omitXmlDeclaration="true">
             ${PMFProps}
             ### Properties below added by maven goal doRuntck.jdori
-            javax.jdo.option.Mapping=${jdo.tck.database}${jdo.tck.mapping}
+            <!-- javax.jdo.option.Mapping=${jdo.tck.database}${jdo.tck.mapping}-->
+            javax.jdo.option.Mapping=standard${jdo.tck.mapping}
             javax.jdo.mapping.Schema=${schemaname}
         </j:file>
         
@@ -385,7 +386,8 @@
                 omitXmlDeclaration="true">
             ${PMFProps}
             ### Properties below added by maven goal doRuntck.jdori
-            javax.jdo.option.Mapping=${jdo.tck.database}${jdo.tck.mapping}
+            <!-- javax.jdo.option.Mapping=${jdo.tck.database}${jdo.tck.mapping} -->
+            javax.jdo.option.Mapping=standard${jdo.tck.mapping}
             javax.jdo.mapping.Schema=${schemaname}
         </j:file>
         
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package-derby8.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package-derby8.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package-derby8.orm	(working copy)
@@ -1,47 +0,0 @@
-<?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 datastore identity.
--->
-<orm>
-    <package name="org.apache.jdo.tck.pc.shoppingcart">
-
-        <class name="Cart" table="CARTS">
-            <datastore-identity strategy="increment" column="DATASTORE_ID"/>
-            <version strategy="version-number" column="VERSION"/>
-
-            <field name="id" column="CART_ID"/>
-            <field name="customerId" column="CUSTOMER_ID"/>
-            <field name="entries" mapped-by="cart"/>
-        </class>
-
-        <class name="CartEntry" table="CART_ENTRIES">
-            <datastore-identity strategy="increment" column="DATASTORE_ID"/>
-            <version strategy="version-number" column="VERSION"/>
-
-            <field name="id" column="ID"/>
-            <field name="quantity" column="QUANTITY"/>
-            <field name="product" column="SKU" foreign-key="true"/>
-            <field name="cart" column="CART_ID" foreign-key="true"/>
-        </class>
-
-        <class name="Product" table="PRODUCTS">
-            <datastore-identity strategy="uuid-hex" column="DATASTORE_ID"/>
-            <version strategy="version-number" column="VERSION"/>
-
-            <field name="sku" column="SKU"/>
-            <field name="description" column="DESCRIPTION"/>
-        </class>
-
-        <class name="Undetachable" table="UNDETACHABLES">
-            <datastore-identity strategy="increment" column="DATASTORE_ID"/>
-            <version strategy="version-number" column="VERSION"/>
-
-            <field name="id" column="ID"/>
-            <field name="foo" column="FOO"/>
-            <field name="bar" column="BAR"/>
-        </class>
-
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-derby.orm	(working copy)
@@ -1,49 +0,0 @@
-<?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.dtd">
-<orm>
-    <package name="org.apache.jdo.tck.pc.instancecallbacks">
-        <class name="InstanceCallbackNonPersistFdsClass" table="ICNonPersistFds">
-            <datastore-identity strategy="identity">
-                <column name="DATASTORE_IDENTITY"/>
-            </datastore-identity>
-            <field name="keyValue" column="ICKEY"/>
-            <field name="d" column="D"/>
-            <field name="s" column="S"/>
-            <field name="floatValue">
-                <column name="FLOATVAL"/>
-            </field>
-            <field name="intValue">
-                <column name="INTVAL"/>
-            </field>
-        </class>
-
-        <class name="InstanceCallbackClass" table="InstanceCallbacks">
-            <datastore-identity strategy="identity">
-                <column name="DATASTORE_IDENTITY"/>
-            </datastore-identity>
-            <field name="keyValue" column="ICKEY"/>
-            <field name="name" column="NAME"/>
-            <field name="timeStamp">
-                <column name="TIMEDATE"/>
-            </field>
-            <field name="nextObj">
-                <column name="NEXTOBJ"/>
-            </field>
-            <field name="children">
-                <element column="CHILD"/>
-            </field>
-            <field name="intValue">
-                <column name="INTVAL"/>
-            </field>
-            <field name="doubleValue">
-                <column name="DOUBLEVAL"/>
-            </field>
-            <field name="childToDelete">
-                <column name="CHILD2DEL"/>
-            </field>
-            <field name="charValue">
-                <column name="CHARVAL"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/query/package-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/query/package-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/query/package-derby.orm	(working copy)
@@ -1,21 +0,0 @@
-<?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 datastore identity.
--->
-<orm>
-    <package name="org.apache.jdo.tck.pc.query">
-
-        <class name="JDOQLKeywordsAsFieldNames" table="JDOQLKeywordsAsFieldNames">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="select" column="ID"/>
-        </class>
-
-        <class name="NoExtent" table="NoExtent">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="id" column="ID"/>
-        </class>
-
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm	(working copy)
@@ -1,167 +0,0 @@
-<?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 datastore identity.
--->
-<orm>
-    <package name="org.apache.jdo.tck.pc.company">
-
-        <class name="Company" table="companies">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="companyid" column="ID"/>
-            <field name="name" column="NAME">
-              <column name="NAME" sql-type="VARCHAR"/>
-            </field>
-            <field name="founded" column="FOUNDEDDATE"/>
-            <field name="address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid">
-                      <column name="ADDRID" allows-null="true"/>
-                    </field>
-                    <field name="street">
-                      <column name="STREET" allows-null="true"/>
-                    </field>
-                    <field name="city">
-                      <column name="CITY" allows-null="true"/>
-                    </field>
-                    <field name="state">
-                      <column name="STATE" allows-null="true"/>
-                    </field>
-                    <field name="zipcode">
-                      <column name="ZIPCODE" allows-null="true"/>
-                    </field>
-                    <field name="country">
-                      <column name="COUNTRY" allows-null="true"/>
-                    </field>
-                </embedded>
-            </field>
-            <field name="departments" mapped-by="company"/>
-        </class>
-
-        <class name="Department" table="departments">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="deptid" column="ID"/>
-            <field name="name" column="NAME"/>
-            <field name="company" column="COMPANYID" foreign-key="true"/>
-            <field name="employees" mapped-by="department"/>
-            <field name="fundedEmps" mapped-by="fundingDept"/>
-            <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
-        </class>
-
-        <class name="PartTimeEmployee">
-            <inheritance strategy="superclass-table"/>
-            <field name="wage" column="WAGE"/>
-        </class>
-
-        <class name="FullTimeEmployee">
-            <inheritance strategy="superclass-table"/>
-            <field name="salary" column="SALARY"/>
-        </class>
-
-        <class name="Employee">
-            <inheritance strategy="superclass-table"/>
-            <field name="hiredate" column="HIREDATE"/>
-            <field name="weeklyhours" column="WEEKLYHOURS"/>
-            <field name="dentalInsurance" mapped-by="employee"/>
-            <field name="medicalInsurance" mapped-by="employee"/>
-            <field name="department" column="DEPARTMENT">
-                        <foreign-key/>
-            </field>
-            <field name="fundingDept" column="FUNDINGDEPT">
-                        <foreign-key/>
-            </field>
-            <field name="manager" column="MANAGER">
-                        <foreign-key/>
-            </field>
-            <field name="mentor" column="MENTOR">
-                        <foreign-key/>
-            </field>
-            <field name="protege" mapped-by="mentor"/>
-            <field name="hradvisor" column="HRADVISOR">
-                        <foreign-key/>
-            </field>
-            <field name="reviewedProjects" mapped-by="reviewers">
-                <element>
-                    <foreign-key name="PR_PROJ_FK"/>
-                </element>
-            </field>
-            <field name="projects" mapped-by="members"/>
-            <field name="team" mapped-by="manager"/>
-            <field name="hradvisees" mapped-by="hradvisor"/>
-        </class>
-
-        <class name="Person" table="persons">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <inheritance strategy="new-table">
-                <discriminator strategy="class-name" column="DISCRIMINATOR"/>
-            </inheritance>
-            <field name="personid" column="PERSONID"/>
-            <field name="firstname" column="FIRSTNAME"/>
-            <field name="lastname" column="LASTNAME"/>
-            <field name="middlename">
-              <column name="MIDDLENAME" allows-null="true"/>
-            </field>
-            <field name="address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
-                </embedded>
-            </field>
-            <field name="phoneNumbers" table="employee_phoneno_type" >
-                <join column="EMPID"/>
-                <key column="TYPE"/>
-                <value column="PHONENO"/>
-            </field>
-            <query name="packageORM">
-                SELECT FROM org.apache.jdo.tck.pc.company.Person
-                WHERE personid > 2
-            </query>
-        </class>
-
-        <class name="Insurance" table="insuranceplans">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <inheritance strategy="new-table">
-                <discriminator strategy="class-name" column="DISCRIMINATOR"/>
-            </inheritance>
-            <field name="insid" column="INSID"/>
-            <field name="carrier" column="CARRIER"/>
-            <field name="employee" column="EMPLOYEE">
-                 <foreign-key/>
-            </field>
-        </class>
-
-        <class name="DentalInsurance">
-            <inheritance strategy="superclass-table"/>
-            <field name="lifetimeOrthoBenefit" column="LIFETIME_ORTHO_BENEFIT"/>
-        </class>
-
-        <class name="MedicalInsurance">
-            <inheritance strategy="superclass-table"/>
-            <field name="planType" column="PLANTYPE"/>
-        </class>
-
-        <class name="Project" table="projects">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="projid" column="PROJID"/>
-            <field name="name" column="NAME"/>
-            <field name="budget">
-               <column name="BUDGET" jdbc-type="DECIMAL" length="11" scale="2"/>
-            </field>
-            <field name="reviewers" table="project_reviewer">
-                <join column="PROJID"/>
-                <element column="REVIEWER">
-                    <foreign-key name="PR_REV_FK"/>
-                </element>
-            </field>
-            <field name="members" table="project_member">
-                <join column="PROJID"/>
-                <element column="MEMBER"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby1.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby1.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby1.orm	(working copy)
@@ -1,158 +0,0 @@
-<?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 datastore identity.
-
-Inheritance mapping: 
-Separate table for each class in the inheritance hierarchy.
-Each table contains columns for the declared fields.
-Inheritance strategy: new-table for all classes.
--->
-<orm>
-    <package name="org.apache.jdo.tck.pc.company">
-
-        <class name="Company" table="companies">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="companyid" column="ID"/>
-            <field name="name" column="NAME"/>
-            <field name="founded" column="FOUNDEDDATE"/>
-            <field name="address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
-                </embedded>
-            </field>
-            <field name="departments" mapped-by="company"/>
-        </class>
-
-        <class name="Department" table="departments">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="deptid" column="ID"/>
-            <field name="name" column="NAME"/>
-            <field name="company" column="COMPANYID" foreign-key="true"/>
-            <field name="employees" mapped-by="department"/>
-            <field name="fundedEmps" mapped-by="fundingDept"/>
-            <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
-        </class>
-
-        <class name="PartTimeEmployee" table="parttimeemployees">
-            <inheritance strategy="new-table">
-                <join column="DATASTORE_IDENTITY"/>
-            </inheritance>
-            <field name="wage" column="WAGE"/>
-        </class>
-
-        <class name="FullTimeEmployee" table="fulltimeemployees">
-            <inheritance strategy="new-table">
-                <join column="DATASTORE_IDENTITY"/>
-            </inheritance>
-            <field name="salary" column="SALARY"/>
-        </class>
-
-        <class name="Employee" table="employees">
-            <inheritance strategy="new-table">
-                <join column="DATASTORE_IDENTITY"/>
-            </inheritance>
-            <field name="hiredate" column="HIREDATE"/>
-            <field name="weeklyhours" column="WEEKLYHOURS"/>
-            <field name="dentalInsurance" mapped-by="employee"/>
-            <field name="medicalInsurance" mapped-by="employee"/>
-            <field name="department" column="DEPARTMENT">
-                        <foreign-key/>
-            </field>
-            <field name="fundingDept" column="FUNDINGDEPT">
-                        <foreign-key/>
-            </field>
-            <field name="manager" column="MANAGER">
-                        <foreign-key/>
-            </field>
-            <field name="mentor" column="MENTOR">
-                        <foreign-key/>
-            </field>
-            <field name="protege" mapped-by="mentor"/>
-            <field name="hradvisor" column="HRADVISOR">
-                        <foreign-key/>
-            </field>
-            <field name="reviewedProjects" mapped-by="reviewers">
-                <element>
-                    <foreign-key name="PR_PROJ_FK"/>
-                </element>
-            </field>
-            <field name="projects" mapped-by="members"/>
-            <field name="team" mapped-by="manager"/>
-            <field name="hradvisees" mapped-by="hradvisor"/>
-        </class>
-
-        <class name="Person" table="persons">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <inheritance strategy="new-table"/>
-            <field name="personid" column="PERSONID"/>
-            <field name="firstname" column="FIRSTNAME"/>
-            <field name="lastname" column="LASTNAME"/>
-            <field name="middlename" column="MIDDLENAME"/>
-            <field name="address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
-                </embedded>
-            </field>
-            <field name="phoneNumbers" table="employee_phoneno_type" >
-                <join column="EMPID"/>
-                <key column="TYPE"/>
-                <value column="PHONENO"/>
-            </field>
-        </class>
-
-        <class name="Insurance" table="insuranceplans">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <inheritance strategy="new-table"/>
-            <field name="insid" column="INSID"/>
-            <field name="carrier" column="CARRIER"/>
-            <field name="employee" column="EMPLOYEE">
-                 <foreign-key/>
-            </field>
-        </class>
-
-        <class name="DentalInsurance" table="dentalinsurance">
-            <inheritance strategy="new-table">
-                <join column="DATASTORE_IDENTITY"/>
-            </inheritance>
-            <field name="lifetimeOrthoBenefit" column="LIFETIME_ORTHO_BENEFIT"/>
-        </class>
-
-        <class name="MedicalInsurance" table="medicalinsurance">
-            <inheritance strategy="new-table">
-                <join column="DATASTORE_IDENTITY"/>
-            </inheritance>
-            <field name="planType" column="PLANTYPE"/>
-        </class>
-
-        <class name="Project" table="projects">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="projid" column="PROJID"/>
-            <field name="name" column="NAME"/>
-            <field name="budget">
-               <column name="BUDGET" jdbc-type="DECIMAL" length="11" scale="2"/>
-            </field>
-            <field name="reviewers" table="project_reviewer">
-                <join column="PROJID"/>
-                <element column="REVIEWER">
-                    <foreign-key name="PR_REV_FK"/>
-                </element>
-            </field>
-            <field name="members" table="project_member">
-                <join column="PROJID"/>
-                <element column="MEMBER"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby2.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby2.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby2.orm	(working copy)
@@ -1,242 +0,0 @@
-<?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 datastore identity.
-
-Inheritance mapping: 
-Separate table for each class in the inheritance hierarchy.
-No tables for abstract classes.
-Each table contains columns for all fields.
-Managers, mentors, hradvisors, and employees of the month 
-are fulltime employees.
-Only fulltime employees can have insurances, can be project members,
-and can be project reviewers.
-Separate phone number type tables for persons, fulltime employees,
-and parttime employees.
-Inheritance strategy: 
-    Employee, Insurance: subclass-table.
-    all other classes:   new-table.
--->
-<orm>
-    <package name="org.apache.jdo.tck.pc.company">
-
-        <class name="Company" table="companies">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="companyid" column="ID"/>
-            <field name="name" column="NAME"/>
-            <field name="founded" column="FOUNDEDDATE"/>
-            <field name="address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
-                </embedded>
-            </field>
-            <field name="departments" mapped-by="company"/>
-        </class>
-
-        <class name="Department" table="departments">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="deptid" column="ID"/>
-            <field name="name" column="NAME"/>
-            <field name="company" column="COMPANYID" foreign-key="true"/>
-            <field name="employees" mapped-by="department"/>
-            <field name="fundedEmps" mapped-by="fundingDept"/>
-            <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
-        </class>
-
-        <class name="PartTimeEmployee" table="parttimeemployees">
-            <datastore-identity strategy="sequence" column="DATASTORE_IDENTITY"
-                sequence="org.apache.jdo.tck.pc.PersonSequence"/>
-            <inheritance strategy="new-table"/>
-            <field name="Person.personid" column="PERSONID"/>
-            <field name="Person.firstname" column="FIRSTNAME"/>
-            <field name="Person.lastname" column="LASTNAME"/>
-            <field name="Person.middlename" column="MIDDLENAME"/>
-            <field name="Person.address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
-                </embedded>
-            </field>
-            <field name="Person.phoneNumbers" table="parttime_employee_phoneno_type" >
-                <join column="EMPID"/>
-                <key column="TYPE"/>
-                <value column="PHONENO"/>
-            </field>
-            <field name="Employee.hiredate" column="HIREDATE"/>
-            <field name="Employee.weeklyhours" column="WEEKLYHOURS"/>
-            <field name="Employee.dentalInsurance" mapped-by="employee"/>
-            <field name="Employee.medicalInsurance" mapped-by="employee"/>
-            <field name="Employee.department" column="DEPARTMENT">
-                        <foreign-key/>
-            </field>
-            <field name="Employee.fundingDept" column="FUNDINGDEPT">
-                        <foreign-key/>
-            </field>
-            <field name="Employee.manager" column="MANAGER">
-                        <foreign-key/>
-            </field>
-            <field name="Employee.mentor" column="MENTOR">
-                        <foreign-key/>
-            </field>
-            <field name="Employee.protege" mapped-by="mentor"/>
-            <field name="Employee.hradvisor" column="HRADVISOR">
-                        <foreign-key/>
-            </field>
-            <field name="Employee.reviewedProjects" mapped-by="reviewers">
-                <element>
-                    <foreign-key name="PR_PROJ_FK"/>
-                </element>
-            </field>
-            <field name="Employee.projects" mapped-by="members"/>
-            <field name="Employee.team" mapped-by="manager"/>
-            <field name="Employee.hradvisees" mapped-by="hradvisor"/>
-            <field name="wage" column="WAGE"/>
-        </class>
-
-        <class name="FullTimeEmployee" table="fulltimeemployees">
-            <datastore-identity strategy="sequence" column="DATASTORE_IDENTITY"
-                sequence="org.apache.jdo.tck.pc.PersonSequence"/>
-            <inheritance strategy="new-table"/>
-            <field name="Person.personid" column="PERSONID"/>
-            <field name="Person.firstname" column="FIRSTNAME"/>
-            <field name="Person.lastname" column="LASTNAME"/>
-            <field name="Person.middlename" column="MIDDLENAME"/>
-            <field name="Person.address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
-                </embedded>
-            </field>
-            <field name="Person.phoneNumbers" table="fulltime_employee_phoneno_type" >
-                <join column="EMPID"/>
-                <key column="TYPE"/>
-                <value column="PHONENO"/>
-            </field>
-            <field name="Employee.hiredate" column="HIREDATE"/>
-            <field name="Employee.weeklyhours" column="WEEKLYHOURS"/>
-            <field name="Employee.dentalInsurance" mapped-by="employee"/>
-            <field name="Employee.medicalInsurance" mapped-by="employee"/>
-            <field name="Employee.department" column="DEPARTMENT">
-                        <foreign-key/>
-            </field>
-            <field name="Employee.fundingDept" column="FUNDINGDEPT">
-                        <foreign-key/>
-            </field>
-            <field name="Employee.manager" column="MANAGER">
-                        <foreign-key/>
-            </field>
-            <field name="Employee.mentor" column="MENTOR">
-                        <foreign-key/>
-            </field>
-            <field name="Employee.protege" mapped-by="mentor"/>
-            <field name="Employee.hradvisor" column="HRADVISOR">
-                        <foreign-key/>
-            </field>
-            <field name="Employee.reviewedProjects" mapped-by="reviewers">
-                <element>
-                    <foreign-key name="PR_PROJ_FK"/>
-                </element>
-            </field>
-            <field name="Employee.projects" mapped-by="members"/>
-            <field name="Employee.team" mapped-by="manager"/>
-            <field name="Employee.hradvisees" mapped-by="hradvisor"/>
-            <field name="salary" column="SALARY"/>
-        </class>
-
-        <class name="Employee">
-            <inheritance strategy="subclass-table"/>
-        </class>
-
-        <class name="Person" table="persons">
-            <datastore-identity strategy="sequence" column="DATASTORE_IDENTITY"
-                sequence="org.apache.jdo.tck.pc.PersonSequence"/>
-            <inheritance strategy="new-table"/>
-            <field name="personid" column="PERSONID"/>
-            <field name="firstname" column="FIRSTNAME"/>
-            <field name="lastname" column="LASTNAME"/>
-            <field name="middlename" column="MIDDLENAME"/>
-            <field name="address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
-                </embedded>
-            </field>
-            <field name="phoneNumbers" table="employee_phoneno_type" >
-                <join column="EMPID"/>
-                <key column="TYPE"/>
-                <value column="PHONENO"/>
-            </field>
-        </class>
-
-        <class name="Insurance">
-            <inheritance strategy="subclass-table"/>
-        </class>
-
-        <class name="DentalInsurance" table="dentalinsurance">
-            <datastore-identity strategy="sequence" column="DATASTORE_IDENTITY"
-                sequence="org.apache.jdo.tck.pc.InsuranceSequence"/>
-            <inheritance strategy="new-table"/>
-            <field name="Insurance.insid" column="INSID"/>
-            <field name="Insurance.carrier" column="CARRIER"/>
-            <field name="Insurance.employee" column="EMPLOYEE">
-                 <foreign-key/>
-            </field>
-            <field name="lifetimeOrthoBenefit" column="LIFETIME_ORTHO_BENEFIT"/>
-        </class>
-
-        <class name="MedicalInsurance" table="medicalinsurance">
-            <datastore-identity strategy="sequence" column="DATASTORE_IDENTITY"
-                sequence="org.apache.jdo.tck.pc.InsuranceSequence"/>
-            <inheritance strategy="new-table"/>
-            <field name="Insurance.insid" column="INSID"/>
-            <field name="Insurance.carrier" column="CARRIER"/>
-            <field name="Insurance.employee" column="EMPLOYEE">
-                 <foreign-key/>
-            </field>
-            <field name="planType" column="PLANTYPE"/>
-        </class>
-
-        <class name="Project" table="projects">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="projid" column="PROJID"/>
-            <field name="name" column="NAME"/>
-            <field name="budget">
-               <column name="BUDGET" jdbc-type="DECIMAL" length="11" scale="2"/>
-            </field>
-            <field name="reviewers" table="project_reviewer">
-                <join column="PROJID"/>
-                <element column="REVIEWER">
-                    <foreign-key name="PR_REV_FK"/>
-                </element>
-            </field>
-            <field name="members" table="project_member">
-                <join column="PROJID"/>
-                <element column="MEMBER"/>
-            </field>
-        </class>
-
-        <sequence name="org.apache.jdo.tck.pc.PersonSequence" 
-            strategy="nontransactional"/>
-
-        <sequence name="org.apache.jdo.tck.pc.InsuranceSequence" 
-            strategy="nontransactional"/>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby3.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby3.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby3.orm	(working copy)
@@ -1,154 +0,0 @@
-<?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 datastore identity.
-
-Inheritance mapping: 
-Person has inheritance strategy "new-table".
-Employee has inheritance strategy "subclass-table".
-PartTimeEmployee and FullTimeEmployee has inheritance strategy "new-table".
-Insurance has inheritance strategy "subclass-table".
-MedicalInsurance and DentalInsurance have inheritance strategy "new-table".
--->
-<orm>
-    <package name="org.apache.jdo.tck.pc.company">
-
-        <class name="Company" table="companies">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="companyid" column="ID"/>
-            <field name="name" column="NAME"/>
-            <field name="founded" column="FOUNDEDDATE"/>
-            <field name="address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
-                </embedded>
-            </field>
-            <field name="departments" mapped-by="company"/>
-        </class>
-
-        <class name="Department" table="departments">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="deptid" column="ID"/>
-            <field name="name" column="NAME"/>
-            <field name="company" column="COMPANYID" foreign-key="true"/>
-            <field name="employees" mapped-by="department"/>
-            <field name="fundedEmps" mapped-by="fundingDept"/>
-            <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
-        </class>
-
-        <class name="PartTimeEmployee" table="parttimeemployees">
-            <inheritance strategy="new-table">
-                <join column="DATASTORE_IDENTITY"/>
-            </inheritance>
-            <field name="wage" column="WAGE"/>
-        </class>
-
-        <class name="FullTimeEmployee" table="fulltimeemployees">
-            <inheritance strategy="new-table">
-                <join column="DATASTORE_IDENTITY"/>
-            </inheritance>
-            <field name="salary" column="SALARY"/>
-        </class>
-
-        <class name="Employee">
-            <inheritance strategy="subclass-table"/>
-            <field name="hiredate" column="HIREDATE"/>
-            <field name="weeklyhours" column="WEEKLYHOURS"/>
-            <field name="dentalInsurance" mapped-by="employee"/>
-            <field name="medicalInsurance" mapped-by="employee"/>
-            <field name="department" column="DEPARTMENT">
-                        <foreign-key/>
-            </field>
-            <field name="fundingDept" column="FUNDINGDEPT">
-                        <foreign-key/>
-            </field>
-            <field name="manager" column="MANAGER">
-                        <foreign-key/>
-            </field>
-            <field name="mentor" column="MENTOR">
-                        <foreign-key/>
-            </field>
-            <field name="protege" mapped-by="mentor"/>
-            <field name="hradvisor" column="HRADVISOR">
-                        <foreign-key/>
-            </field>
-            <field name="reviewedProjects" mapped-by="reviewers">
-                <element>
-                    <foreign-key name="PR_PROJ_FK"/>
-                </element>
-            </field>
-            <field name="projects" mapped-by="members"/>
-            <field name="team" mapped-by="manager"/>
-            <field name="hradvisees" mapped-by="hradvisor"/>
-        </class>
-
-        <class name="Person" table="persons">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <inheritance strategy="new-table"/>
-            <field name="personid" column="PERSONID"/>
-            <field name="firstname" column="FIRSTNAME"/>
-            <field name="lastname" column="LASTNAME"/>
-            <field name="middlename" column="MIDDLENAME"/>
-            <field name="address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
-                </embedded>
-            </field>
-            <field name="phoneNumbers" table="employee_phoneno_type" >
-                <join column="EMPID"/>
-                <key column="TYPE"/>
-                <value column="PHONENO"/>
-            </field>
-        </class>
-
-        <class name="Insurance" table="insuranceplans">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <inheritance strategy="subclass-table"/>
-            <field name="insid" column="INSID"/>
-            <field name="carrier" column="CARRIER"/>
-            <field name="employee" column="EMPLOYEE">
-                 <foreign-key/>
-            </field>
-        </class>
-
-        <class name="DentalInsurance" table="dentalinsurance">
-            <inheritance strategy="new-table"/>
-            <field name="lifetimeOrthoBenefit" column="LIFETIME_ORTHO_BENEFIT"/>
-        </class>
-
-        <class name="MedicalInsurance" table="medicalinsurance">
-            <inheritance strategy="new-table"/>
-            <field name="planType" column="PLANTYPE"/>
-        </class>
-
-        <class name="Project" table="projects">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="projid" column="PROJID"/>
-            <field name="name" column="NAME"/>
-            <field name="budget">
-               <column name="BUDGET" jdbc-type="DECIMAL" length="11" scale="2"/>
-            </field>
-            <field name="reviewers" table="project_reviewer">
-                <join column="PROJID"/>
-                <element column="REVIEWER">
-                    <foreign-key name="PR_REV_FK"/>
-                </element>
-            </field>
-            <field name="members" table="project_member">
-                <join column="PROJID"/>
-                <element column="MEMBER"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby4.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby4.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby4.orm	(working copy)
@@ -1,155 +0,0 @@
-<?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 datastore identity.
-
-Inheritance mapping: 
-Person, Employee, and Insurance have inheritance strategy "new-table". 
-PartTimeEmployee, FullTimeEmployee, MedicalInsurance, and DentalInsurance
-have inheritance strategy "superclass-table".
--->
-<orm>
-    <package name="org.apache.jdo.tck.pc.company">
-
-        <class name="Company" table="companies">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="companyid" column="ID"/>
-            <field name="name" column="NAME"/>
-            <field name="founded" column="FOUNDEDDATE"/>
-            <field name="address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
-                </embedded>
-            </field>
-            <field name="departments" mapped-by="company"/>
-        </class>
-
-        <class name="Department" table="departments">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="deptid" column="ID"/>
-            <field name="name" column="NAME"/>
-            <field name="company" column="COMPANYID" foreign-key="true"/>
-            <field name="employees" mapped-by="department"/>
-            <field name="fundedEmps" mapped-by="fundingDept"/>
-            <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
-        </class>
-
-        <class name="PartTimeEmployee">
-            <inheritance strategy="superclass-table"/>
-            <field name="wage" column="WAGE"/>
-        </class>
-
-        <class name="FullTimeEmployee">
-            <inheritance strategy="superclass-table"/>
-            <field name="salary" column="SALARY"/>
-        </class>
-
-        <class name="Employee" table="employees">
-            <inheritance strategy="new-table">
-                <join column="DATASTORE_IDENTITY"/>
-                <discriminator strategy="class-name" column="DISCRIMINATOR"
-                    indexed="true"/>
-            </inheritance>
-            <field name="hiredate" column="HIREDATE"/>
-            <field name="weeklyhours" column="WEEKLYHOURS"/>
-            <field name="dentalInsurance" mapped-by="employee"/>
-            <field name="medicalInsurance" mapped-by="employee"/>
-            <field name="department" column="DEPARTMENT">
-                        <foreign-key/>
-            </field>
-            <field name="fundingDept" column="FUNDINGDEPT">
-                        <foreign-key/>
-            </field>
-            <field name="manager" column="MANAGER">
-                        <foreign-key/>
-            </field>
-            <field name="mentor" column="MENTOR">
-                        <foreign-key/>
-            </field>
-            <field name="protege" mapped-by="mentor"/>
-            <field name="hradvisor" column="HRADVISOR">
-                        <foreign-key/>
-            </field>
-            <field name="reviewedProjects" mapped-by="reviewers">
-                <element>
-                    <foreign-key name="PR_PROJ_FK"/>
-                </element>
-            </field>
-            <field name="projects" mapped-by="members"/>
-            <field name="team" mapped-by="manager"/>
-            <field name="hradvisees" mapped-by="hradvisor"/>
-        </class>
-
-        <class name="Person" table="persons">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <inheritance strategy="new-table"/>
-            <field name="personid" column="PERSONID"/>
-            <field name="firstname" column="FIRSTNAME"/>
-            <field name="lastname" column="LASTNAME"/>
-            <field name="middlename" column="MIDDLENAME"/>
-            <field name="address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
-                </embedded>
-            </field>
-            <field name="phoneNumbers" table="employee_phoneno_type" >
-                <join column="EMPID"/>
-                <key column="TYPE"/>
-                <value column="PHONENO"/>
-            </field>
-        </class>
-
-        <class name="Insurance" table="insuranceplans">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <inheritance strategy="new-table">
-                <discriminator strategy="class-name" column="DISCRIMINATOR"
-                    indexed="true"/>
-            </inheritance>
-            <field name="insid" column="INSID"/>
-            <field name="carrier" column="CARRIER"/>
-            <field name="employee" column="EMPLOYEE">
-                 <foreign-key/>
-            </field>
-        </class>
-
-        <class name="DentalInsurance">
-            <inheritance strategy="superclass-table"/>
-            <field name="lifetimeOrthoBenefit" column="LIFETIME_ORTHO_BENEFIT"/>
-        </class>
-
-        <class name="MedicalInsurance">
-            <inheritance strategy="superclass-table"/>
-            <field name="planType" column="PLANTYPE"/>
-        </class>
-
-        <class name="Project" table="projects">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="projid" column="PROJID"/>
-            <field name="name" column="NAME"/>
-            <field name="budget">
-               <column name="BUDGET" jdbc-type="DECIMAL" length="11" scale="2"/>
-            </field>
-            <field name="reviewers" table="project_reviewer">
-                <join column="PROJID"/>
-                <element column="REVIEWER">
-                    <foreign-key name="PR_REV_FK"/>
-                </element>
-            </field>
-            <field name="members" table="project_member">
-                <join column="PROJID"/>
-                <element column="MEMBER"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm	(working copy)
@@ -1,589 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="HashMapStringKeyCollections"
-               table="HASHMAPSTRINGKEY_COLLECTIONS">
-            <datastore-identity strategy="identity"
-                                column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="HashMapOfString_Object0" table="HASHMAP_STR_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="HashMapOfString_Object1" table="HASHMAP_STR_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="HashMapOfString_Object2" table="HASHMAP_STR_OBJECT2">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="HashMapOfString_SimpleClass3"
-                   table="HASHMAP_STR_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="HashMapOfString_SimpleClass4"
-                   table="HASHMAP_STR_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="HashMapOfString_SimpleClass5"
-                   table="HASHMAP_STR_SIMPLE_CLASS5">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="HashMapOfString_SimpleInterface6"
-                   table="HASHMAP_STR_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="HashMapOfString_SimpleInterface7"
-                   table="HASHMAP_STR_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="HashMapOfString_SimpleInterface8"
-                   table="HASHMAP_STR_SIMPLE_INTERFACE8">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="HashMapOfString_String9"
-                   table="HASHMAP_STR_STRING9">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_String10"
-                   table="HASHMAP_STR_STRING10">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_String11"
-                   table="HASHMAP_STR_STRING11">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Date12"
-                   table="HASHMAP_STR_DATE12">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Date13"
-                   table="HASHMAP_STR_DATE13">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Date14"
-                   table="HASHMAP_STR_DATE14">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Locale15"
-                   table="HASHMAP_STR_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Locale16"
-                   table="HASHMAP_STR_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Locale17"
-                   table="HASHMAP_STR_LOCALE17">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigDecimal18"
-                   table="HASHMAP_STR_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigDecimal19"
-                   table="HASHMAP_STR_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigDecimal20"
-                   table="HASHMAP_STR_BIG_DECIMAL20">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigInteger21"
-                   table="HASHMAP_STR_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigInteger22"
-                   table="HASHMAP_STR_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigInteger23"
-                   table="HASHMAP_STR_BIG_INTEGER23">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Byte24"
-                   table="HASHMAP_STR_BYTE24">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Byte25"
-                   table="HASHMAP_STR_BYTE25">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Byte26"
-                   table="HASHMAP_STR_BYTE26">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Double27"
-                   table="HASHMAP_STR_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Double28"
-                   table="HASHMAP_STR_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Double29"
-                   table="HASHMAP_STR_DOUBLE29">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Float30"
-                   table="HASHMAP_STR_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Float31"
-                   table="HASHMAP_STR_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Float32"
-                   table="HASHMAP_STR_FLOAT32">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Integer33"
-                   table="HASHMAP_STR_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Integer34"
-                   table="HASHMAP_STR_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Integer35"
-                   table="HASHMAP_STR_INTEGER35">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Long36"
-                   table="HASHMAP_STR_LONG36">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Long37"
-                   table="HASHMAP_STR_LONG37">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Long38"
-                   table="HASHMAP_STR_LONG38">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Short39"
-                   table="HASHMAP_STR_SHORT39">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Short40"
-                   table="HASHMAP_STR_SHORT40">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Short41"
-                   table="HASHMAP_STR_SHORT41">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Object42"
-                   table="HASHMAP_STR_OBJECT42">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashMapOfString_Object43" table="HASHMAP_STR_OBJECT43">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashMapOfString_SimpleClass45"
-                   table="HASHMAP_STR_SIMPLE_CLASS45">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashMapOfString_SimpleClass46"
-                   table="HASHMAP_STR_SIMPLE_CLASS46">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashMapOfString_SimpleInterface48"
-                   table="HASHMAP_STR_SIMPLE_INTERFACE48">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashMapOfString_SimpleInterface49"
-                   table="HASHMAP_STR_SIMPLE_INTERFACE49">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashMapOfString_String51"
-                   table="HASHMAP_STR_STRING51">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_String52"
-                   table="HASHMAP_STR_STRING52">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Date54"
-                   table="HASHMAP_STR_DATE54">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Date55"
-                   table="HASHMAP_STR_DATE55">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Locale57"
-                   table="HASHMAP_STR_LOCALE57">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Locale58"
-                   table="HASHMAP_STR_LOCALE58">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigDecimal60"
-                   table="HASHMAP_STR_BIG_DECIMAL60">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigDecimal61"
-                   table="HASHMAP_STR_BIG_DECIMAL61">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigInteger63"
-                   table="HASHMAP_STR_BIG_INTEGER63">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigInteger64"
-                   table="HASHMAP_STR_BIG_INTEGER64">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Byte66"
-                   table="HASHMAP_STR_BYTE66">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Byte67"
-                   table="HASHMAP_STR_BYTE67">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Double69"
-                   table="HASHMAP_STR_DOUBLE69">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Double70"
-                   table="HASHMAP_STR_DOUBLE70">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Float72"
-                   table="HASHMAP_STR_FLOAT72">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Float73"
-                   table="HASHMAP_STR_FLOAT73">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Integer75"
-                   table="HASHMAP_STR_INTEGER75">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Integer76"
-                   table="HASHMAP_STR_INTEGER76">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Long78"
-                   table="HASHMAP_STR_LONG78">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Long79"
-                   table="HASHMAP_STR_LONG79">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Short81"
-                   table="HASHMAP_STR_SHORT81">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Short82"
-                   table="HASHMAP_STR_SHORT82">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Object84" table="HASHMAP_STR_OBJECT84">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Object86"
-                   column="HASHMAP_STR_OBJECT86">
-            </field>
-            <field name="HashMapOfString_SimpleClass87"
-                   table="HASHMAP_STR_SIMPLE_CLASS87">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_SimpleClass89"
-                   column="HASHMAP_STR_SIMPLECLASS89">
-            </field>
-            <field name="HashMapOfString_SimpleInterface90"
-                   table="HASHMAP_STR_SIMPLE_INTERFACE90">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_SimpleInterface92"
-                   column="HASHMAP_STR_SIMPLEINTERFACE92">
-            </field>
-            <field name="HashMapOfString_String93"
-                   table="HASHMAP_STR_STRING93">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_String95"
-                   column="HASHMAP_STR_STRING95">
-            </field>
-            <field name="HashMapOfString_Date96"
-                   table="HASHMAP_STR_DATE96">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Date98"
-                   column="HASHMAP_STR_DATE98">
-            </field>
-            <field name="HashMapOfString_Locale99"
-                   table="HASHMAP_STR_LOCALE99">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Locale101"
-                   column="HASHMAP_STR_LOCALE101">
-            </field>
-            <field name="HashMapOfString_BigDecimal102"
-                   table="HASHMAP_STR_BIG_DECIMAL102">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigDecimal104"
-                   column="HASHMAP_STR_BIGDECIMAL104">
-            </field>
-            <field name="HashMapOfString_BigInteger105"
-                   table="HASHMAP_STR_BIG_INTEGER105">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigInteger107"
-                   column="HASHMAP_STR_BIGINTEGER107">
-            </field>
-            <field name="HashMapOfString_Byte108"
-                   table="HASHMAP_STR_BYTE108">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Byte110"
-                   column="HASHMAP_STR_BYTE110">
-            </field>
-            <field name="HashMapOfString_Double111" 
-                   table="HASHMAP_STR_DOUBLE111">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Double113"
-                   column="HASHMAP_STR_DOUBLE113">
-            </field>
-            <field name="HashMapOfString_Float114"
-                   table="HASHMAP_STR_FLOAT114">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Float116"
-                   column="HASHMAP_STR_FLOAT116">
-            </field>
-            <field name="HashMapOfString_Integer117"
-                   table="HASHMAP_STR_INTEGER117">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Integer119"
-                   column="HASHMAP_STR_INTEGER119">
-            </field>
-            <field name="HashMapOfString_Long120"
-                    table="HASHMAP_STR_LONG120">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Long122"
-                   column="HASHMAP_STR_LONG122">
-            </field>
-            <field name="HashMapOfString_Short123"
-                   table="HASHMAP_STR_SHORT123">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Short125"
-                   column="HASHMAP_STR_SHORT125">
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-derby.orm	(working copy)
@@ -1,82 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfPrimitivechar" table="FIELDSOFPRIMITIVECHAR">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="char0" column="CHAR0"/>
-            <field name="char1" column="CHAR1"/>
-            <field name="char102" column="CHAR102"/>
-            <field name="char103" column="CHAR103"/>
-            <field name="char104" column="CHAR104"/>
-            <field name="char108" column="CHAR108"/>
-            <field name="char109" column="CHAR109"/>
-            <field name="char11" column="CHAR11"/>
-            <field name="char110" column="CHAR110"/>
-            <field name="char112" column="CHAR112"/>
-            <field name="char113" column="CHAR113"/>
-            <field name="char114" column="CHAR114"/>
-            <field name="char119" column="CHAR119"/>
-            <field name="char12" column="CHAR12"/>
-            <field name="char120" column="CHAR120"/>
-            <field name="char121" column="CHAR121"/>
-            <field name="char124" column="CHAR124"/>
-            <field name="char125" column="CHAR125"/>
-            <field name="char126" column="CHAR126"/>
-            <field name="char128" column="CHAR128"/>
-            <field name="char129" column="CHAR129"/>
-            <field name="char13" column="CHAR13"/>
-            <field name="char130" column="CHAR130"/>
-            <field name="char138" column="CHAR138"/>
-            <field name="char139" column="CHAR139"/>
-            <field name="char140" column="CHAR140"/>
-            <field name="char16" column="CHAR16"/>
-            <field name="char17" column="CHAR17"/>
-            <field name="char18" column="CHAR18"/>
-            <field name="char2" column="CHAR2"/>
-            <field name="char20" column="CHAR20"/>
-            <field name="char21" column="CHAR21"/>
-            <field name="char22" column="CHAR22"/>
-            <field name="char30" column="CHAR30"/>
-            <field name="char31" column="CHAR31"/>
-            <field name="char32" column="CHAR32"/>
-            <field name="char36" column="CHAR36"/>
-            <field name="char37" column="CHAR37"/>
-            <field name="char38" column="CHAR38"/>
-            <field name="char4" column="CHAR4"/>
-            <field name="char40" column="CHAR40"/>
-            <field name="char41" column="CHAR41"/>
-            <field name="char42" column="CHAR42"/>
-            <field name="char47" column="CHAR47"/>
-            <field name="char48" column="CHAR48"/>
-            <field name="char49" column="CHAR49"/>
-            <field name="char5" column="CHAR5"/>
-            <field name="char52" column="CHAR52"/>
-            <field name="char53" column="CHAR53"/>
-            <field name="char54" column="CHAR54"/>
-            <field name="char56" column="CHAR56"/>
-            <field name="char57" column="CHAR57"/>
-            <field name="char58" column="CHAR58"/>
-            <field name="char6" column="CHAR6"/>
-            <field name="char66" column="CHAR66"/>
-            <field name="char67" column="CHAR67"/>
-            <field name="char68" column="CHAR68"/>
-            <field name="char72" column="CHAR72"/>
-            <field name="char73" column="CHAR73"/>
-            <field name="char74" column="CHAR74"/>
-            <field name="char76" column="CHAR76"/>
-            <field name="char77" column="CHAR77"/>
-            <field name="char78" column="CHAR78"/>
-            <field name="char83" column="CHAR83"/>
-            <field name="char84" column="CHAR84"/>
-            <field name="char85" column="CHAR85"/>
-            <field name="char88" column="CHAR88"/>
-            <field name="char89" column="CHAR89"/>
-            <field name="char90" column="CHAR90"/>
-            <field name="char92" column="CHAR92"/>
-            <field name="char93" column="CHAR93"/>
-            <field name="char94" column="CHAR94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-derby.orm	(working copy)
@@ -1,81 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfDouble" table="FIELDSOFDOUBLE">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="Double1" column="DOUBLE1"/>
-            <field name="Double102" column="DOUBLE102"/>
-            <field name="Double103" column="DOUBLE103"/>
-            <field name="Double104" column="DOUBLE104"/>
-            <field name="Double108" column="DOUBLE108"/>
-            <field name="Double109" column="DOUBLE109"/>
-            <field name="Double11" column="DOUBLE11"/>
-            <field name="Double110" column="DOUBLE110"/>
-            <field name="Double112" column="DOUBLE112"/>
-            <field name="Double113" column="DOUBLE113"/>
-            <field name="Double114" column="DOUBLE114"/>
-            <field name="Double119" column="DOUBLE119"/>
-            <field name="Double12" column="DOUBLE12"/>
-            <field name="Double120" column="DOUBLE120"/>
-            <field name="Double121" column="DOUBLE121"/>
-            <field name="Double124" column="DOUBLE124"/>
-            <field name="Double125" column="DOUBLE125"/>
-            <field name="Double126" column="DOUBLE126"/>
-            <field name="Double128" column="DOUBLE128"/>
-            <field name="Double129" column="DOUBLE129"/>
-            <field name="Double13" column="DOUBLE13"/>
-            <field name="Double130" column="DOUBLE130"/>
-            <field name="Double138" column="DOUBLE138"/>
-            <field name="Double139" column="DOUBLE139"/>
-            <field name="Double140" column="DOUBLE140"/>
-            <field name="Double16" column="DOUBLE16"/>
-            <field name="Double17" column="DOUBLE17"/>
-            <field name="Double18" column="DOUBLE18"/>
-            <field name="Double2" column="DOUBLE2"/>
-            <field name="Double20" column="DOUBLE20"/>
-            <field name="Double21" column="DOUBLE21"/>
-            <field name="Double22" column="DOUBLE22"/>
-            <field name="Double30" column="DOUBLE30"/>
-            <field name="Double31" column="DOUBLE31"/>
-            <field name="Double32" column="DOUBLE32"/>
-            <field name="Double36" column="DOUBLE36"/>
-            <field name="Double37" column="DOUBLE37"/>
-            <field name="Double38" column="DOUBLE38"/>
-            <field name="Double4" column="DOUBLE4"/>
-            <field name="Double40" column="DOUBLE40"/>
-            <field name="Double41" column="DOUBLE41"/>
-            <field name="Double42" column="DOUBLE42"/>
-            <field name="Double47" column="DOUBLE47"/>
-            <field name="Double48" column="DOUBLE48"/>
-            <field name="Double49" column="DOUBLE49"/>
-            <field name="Double5" column="DOUBLE5"/>
-            <field name="Double52" column="DOUBLE52"/>
-            <field name="Double53" column="DOUBLE53"/>
-            <field name="Double54" column="DOUBLE54"/>
-            <field name="Double56" column="DOUBLE56"/>
-            <field name="Double57" column="DOUBLE57"/>
-            <field name="Double58" column="DOUBLE58"/>
-            <field name="Double6" column="DOUBLE6"/>
-            <field name="Double66" column="DOUBLE66"/>
-            <field name="Double67" column="DOUBLE67"/>
-            <field name="Double68" column="DOUBLE68"/>
-            <field name="Double72" column="DOUBLE72"/>
-            <field name="Double73" column="DOUBLE73"/>
-            <field name="Double74" column="DOUBLE74"/>
-            <field name="Double76" column="DOUBLE76"/>
-            <field name="Double77" column="DOUBLE77"/>
-            <field name="Double78" column="DOUBLE78"/>
-            <field name="Double83" column="DOUBLE83"/>
-            <field name="Double84" column="DOUBLE84"/>
-            <field name="Double85" column="DOUBLE85"/>
-            <field name="Double88" column="DOUBLE88"/>
-            <field name="Double89" column="DOUBLE89"/>
-            <field name="Double90" column="DOUBLE90"/>
-            <field name="Double92" column="DOUBLE92"/>
-            <field name="Double93" column="DOUBLE93"/>
-            <field name="Double94" column="DOUBLE94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-derby.orm	(working copy)
@@ -1,177 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfSimpleInterface" table="FIELDSOFSIMPLEINTERFACE">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="SimpleInterface1" column="SIMPLEINTERFACE1">
-            </field>
-            <field name="SimpleInterface102" column="SIMPLEINTERFACE102">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface103" column="SIMPLEINTERFACE103">
-            </field>
-            <field name="SimpleInterface104" column="SIMPLEINTERFACE104">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface109" column="SIMPLEINTERFACE109">
-            </field>
-            <field name="SimpleInterface11" column="SIMPLEINTERFACE11">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface110" column="SIMPLEINTERFACE110">
-            </field>
-            <field name="SimpleInterface112" column="SIMPLEINTERFACE112">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface113" column="SIMPLEINTERFACE113">
-            </field>
-            <field name="SimpleInterface114" column="SIMPLEINTERFACE114">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface119" column="SIMPLEINTERFACE119">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface12" column="SIMPLEINTERFACE12">
-            </field>
-            <field name="SimpleInterface120" column="SIMPLEINTERFACE120">
-            </field>
-            <field name="SimpleInterface121" column="SIMPLEINTERFACE121">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface125" column="SIMPLEINTERFACE125">
-            </field>
-            <field name="SimpleInterface126" column="SIMPLEINTERFACE126">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface128" column="SIMPLEINTERFACE128">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface129" column="SIMPLEINTERFACE129">
-            </field>
-            <field name="SimpleInterface13" column="SIMPLEINTERFACE13">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface130" column="SIMPLEINTERFACE130">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface138" column="SIMPLEINTERFACE138">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface139" column="SIMPLEINTERFACE139">
-            </field>
-            <field name="SimpleInterface140" column="SIMPLEINTERFACE140">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface17" column="SIMPLEINTERFACE17">
-            </field>
-            <field name="SimpleInterface18" column="SIMPLEINTERFACE18">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface2" column="SIMPLEINTERFACE2">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface20" column="SIMPLEINTERFACE20">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface21" column="SIMPLEINTERFACE21">
-            </field>
-            <field name="SimpleInterface22" column="SIMPLEINTERFACE22">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface30" column="SIMPLEINTERFACE30">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface31" column="SIMPLEINTERFACE31">
-            </field>
-            <field name="SimpleInterface32" column="SIMPLEINTERFACE32">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface37" column="SIMPLEINTERFACE37">
-            </field>
-            <field name="SimpleInterface38" column="SIMPLEINTERFACE38">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface4" column="SIMPLEINTERFACE4">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface40" column="SIMPLEINTERFACE40">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface41" column="SIMPLEINTERFACE41">
-            </field>
-            <field name="SimpleInterface42" column="SIMPLEINTERFACE42">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface47" column="SIMPLEINTERFACE47">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface48" column="SIMPLEINTERFACE48">
-            </field>
-            <field name="SimpleInterface49" column="SIMPLEINTERFACE49">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface5" column="SIMPLEINTERFACE5">
-            </field>
-            <field name="SimpleInterface53" column="SIMPLEINTERFACE53">
-            </field>
-            <field name="SimpleInterface54" column="SIMPLEINTERFACE54">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface56" column="SIMPLEINTERFACE56">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface57" column="SIMPLEINTERFACE57">
-            </field>
-            <field name="SimpleInterface58" column="SIMPLEINTERFACE58">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface6" column="SIMPLEINTERFACE6">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface66" column="SIMPLEINTERFACE66">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface67" column="SIMPLEINTERFACE67">
-            </field>
-            <field name="SimpleInterface68" column="SIMPLEINTERFACE68">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface73" column="SIMPLEINTERFACE73">
-            </field>
-            <field name="SimpleInterface74" column="SIMPLEINTERFACE74">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface76" column="SIMPLEINTERFACE76">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface77" column="SIMPLEINTERFACE77">
-            </field>
-            <field name="SimpleInterface78" column="SIMPLEINTERFACE78">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface83" column="SIMPLEINTERFACE83">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface84" column="SIMPLEINTERFACE84">
-            </field>
-            <field name="SimpleInterface85" column="SIMPLEINTERFACE85">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface89" column="SIMPLEINTERFACE89">
-            </field>
-            <field name="SimpleInterface90" column="SIMPLEINTERFACE90">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface92" column="SIMPLEINTERFACE92">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface93" column="SIMPLEINTERFACE93">
-            </field>
-            <field name="SimpleInterface94" column="SIMPLEINTERFACE94">
-                <foreign-key/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-derby.orm	(working copy)
@@ -1,81 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfBoolean" table="FIELDSOFBOOLEAN">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="Boolean1" column="BOOLEAN1"/>
-            <field name="Boolean102" column="BOOLEAN102"/>
-            <field name="Boolean103" column="BOOLEAN103"/>
-            <field name="Boolean104" column="BOOLEAN104"/>
-            <field name="Boolean108" column="BOOLEAN108"/>
-            <field name="Boolean109" column="BOOLEAN109"/>
-            <field name="Boolean11" column="BOOLEAN11"/>
-            <field name="Boolean110" column="BOOLEAN110"/>
-            <field name="Boolean112" column="BOOLEAN112"/>
-            <field name="Boolean113" column="BOOLEAN113"/>
-            <field name="Boolean114" column="BOOLEAN114"/>
-            <field name="Boolean119" column="BOOLEAN119"/>
-            <field name="Boolean12" column="BOOLEAN12"/>
-            <field name="Boolean120" column="BOOLEAN120"/>
-            <field name="Boolean121" column="BOOLEAN121"/>
-            <field name="Boolean124" column="BOOLEAN124"/>
-            <field name="Boolean125" column="BOOLEAN125"/>
-            <field name="Boolean126" column="BOOLEAN126"/>
-            <field name="Boolean128" column="BOOLEAN128"/>
-            <field name="Boolean129" column="BOOLEAN129"/>
-            <field name="Boolean13" column="BOOLEAN13"/>
-            <field name="Boolean130" column="BOOLEAN130"/>
-            <field name="Boolean138" column="BOOLEAN138"/>
-            <field name="Boolean139" column="BOOLEAN139"/>
-            <field name="Boolean140" column="BOOLEAN140"/>
-            <field name="Boolean16" column="BOOLEAN16"/>
-            <field name="Boolean17" column="BOOLEAN17"/>
-            <field name="Boolean18" column="BOOLEAN18"/>
-            <field name="Boolean2" column="BOOLEAN2"/>
-            <field name="Boolean20" column="BOOLEAN20"/>
-            <field name="Boolean21" column="BOOLEAN21"/>
-            <field name="Boolean22" column="BOOLEAN22"/>
-            <field name="Boolean30" column="BOOLEAN30"/>
-            <field name="Boolean31" column="BOOLEAN31"/>
-            <field name="Boolean32" column="BOOLEAN32"/>
-            <field name="Boolean36" column="BOOLEAN36"/>
-            <field name="Boolean37" column="BOOLEAN37"/>
-            <field name="Boolean38" column="BOOLEAN38"/>
-            <field name="Boolean4" column="BOOLEAN4"/>
-            <field name="Boolean40" column="BOOLEAN40"/>
-            <field name="Boolean41" column="BOOLEAN41"/>
-            <field name="Boolean42" column="BOOLEAN42"/>
-            <field name="Boolean47" column="BOOLEAN47"/>
-            <field name="Boolean48" column="BOOLEAN48"/>
-            <field name="Boolean49" column="BOOLEAN49"/>
-            <field name="Boolean5" column="BOOLEAN5"/>
-            <field name="Boolean52" column="BOOLEAN52"/>
-            <field name="Boolean53" column="BOOLEAN53"/>
-            <field name="Boolean54" column="BOOLEAN54"/>
-            <field name="Boolean56" column="BOOLEAN56"/>
-            <field name="Boolean57" column="BOOLEAN57"/>
-            <field name="Boolean58" column="BOOLEAN58"/>
-            <field name="Boolean6" column="BOOLEAN6"/>
-            <field name="Boolean66" column="BOOLEAN66"/>
-            <field name="Boolean67" column="BOOLEAN67"/>
-            <field name="Boolean68" column="BOOLEAN68"/>
-            <field name="Boolean72" column="BOOLEAN72"/>
-            <field name="Boolean73" column="BOOLEAN73"/>
-            <field name="Boolean74" column="BOOLEAN74"/>
-            <field name="Boolean76" column="BOOLEAN76"/>
-            <field name="Boolean77" column="BOOLEAN77"/>
-            <field name="Boolean78" column="BOOLEAN78"/>
-            <field name="Boolean83" column="BOOLEAN83"/>
-            <field name="Boolean84" column="BOOLEAN84"/>
-            <field name="Boolean85" column="BOOLEAN85"/>
-            <field name="Boolean88" column="BOOLEAN88"/>
-            <field name="Boolean89" column="BOOLEAN89"/>
-            <field name="Boolean90" column="BOOLEAN90"/>
-            <field name="Boolean92" column="BOOLEAN92"/>
-            <field name="Boolean93" column="BOOLEAN93"/>
-            <field name="Boolean94" column="BOOLEAN94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-derby.orm	(working copy)
@@ -1,81 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfBigInteger" table="FIELDSOFBIGINTEGER">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="BigInteger1" column="BIG_INTEGER1"/>
-            <field name="BigInteger102" column="BIG_INTEGER102"/>
-            <field name="BigInteger103" column="BIG_INTEGER103"/>
-            <field name="BigInteger104" column="BIG_INTEGER104"/>
-            <field name="BigInteger108" column="BIG_INTEGER108"/>
-            <field name="BigInteger109" column="BIG_INTEGER109"/>
-            <field name="BigInteger11" column="BIG_INTEGER11"/>
-            <field name="BigInteger110" column="BIG_INTEGER110"/>
-            <field name="BigInteger112" column="BIG_INTEGER112"/>
-            <field name="BigInteger113" column="BIG_INTEGER113"/>
-            <field name="BigInteger114" column="BIG_INTEGER114"/>
-            <field name="BigInteger119" column="BIG_INTEGER119"/>
-            <field name="BigInteger12" column="BIG_INTEGER12"/>
-            <field name="BigInteger120" column="BIG_INTEGER120"/>
-            <field name="BigInteger121" column="BIG_INTEGER121"/>
-            <field name="BigInteger124" column="BIG_INTEGER124"/>
-            <field name="BigInteger125" column="BIG_INTEGER125"/>
-            <field name="BigInteger126" column="BIG_INTEGER126"/>
-            <field name="BigInteger128" column="BIG_INTEGER128"/>
-            <field name="BigInteger129" column="BIG_INTEGER129"/>
-            <field name="BigInteger13" column="BIG_INTEGER13"/>
-            <field name="BigInteger130" column="BIG_INTEGER130"/>
-            <field name="BigInteger138" column="BIG_INTEGER138"/>
-            <field name="BigInteger139" column="BIG_INTEGER139"/>
-            <field name="BigInteger140" column="BIG_INTEGER140"/>
-            <field name="BigInteger16" column="BIG_INTEGER16"/>
-            <field name="BigInteger17" column="BIG_INTEGER17"/>
-            <field name="BigInteger18" column="BIG_INTEGER18"/>
-            <field name="BigInteger2" column="BIG_INTEGER2"/>
-            <field name="BigInteger20" column="BIG_INTEGER20"/>
-            <field name="BigInteger21" column="BIG_INTEGER21"/>
-            <field name="BigInteger22" column="BIG_INTEGER22"/>
-            <field name="BigInteger30" column="BIG_INTEGER30"/>
-            <field name="BigInteger31" column="BIG_INTEGER31"/>
-            <field name="BigInteger32" column="BIG_INTEGER32"/>
-            <field name="BigInteger36" column="BIG_INTEGER36"/>
-            <field name="BigInteger37" column="BIG_INTEGER37"/>
-            <field name="BigInteger38" column="BIG_INTEGER38"/>
-            <field name="BigInteger4" column="BIG_INTEGER4"/>
-            <field name="BigInteger40" column="BIG_INTEGER40"/>
-            <field name="BigInteger41" column="BIG_INTEGER41"/>
-            <field name="BigInteger42" column="BIG_INTEGER42"/>
-            <field name="BigInteger47" column="BIG_INTEGER47"/>
-            <field name="BigInteger48" column="BIG_INTEGER48"/>
-            <field name="BigInteger49" column="BIG_INTEGER49"/>
-            <field name="BigInteger5" column="BIG_INTEGER5"/>
-            <field name="BigInteger52" column="BIG_INTEGER52"/>
-            <field name="BigInteger53" column="BIG_INTEGER53"/>
-            <field name="BigInteger54" column="BIG_INTEGER54"/>
-            <field name="BigInteger56" column="BIG_INTEGER56"/>
-            <field name="BigInteger57" column="BIG_INTEGER57"/>
-            <field name="BigInteger58" column="BIG_INTEGER58"/>
-            <field name="BigInteger6" column="BIG_INTEGER6"/>
-            <field name="BigInteger66" column="BIG_INTEGER66"/>
-            <field name="BigInteger67" column="BIG_INTEGER67"/>
-            <field name="BigInteger68" column="BIG_INTEGER68"/>
-            <field name="BigInteger72" column="BIG_INTEGER72"/>
-            <field name="BigInteger73" column="BIG_INTEGER73"/>
-            <field name="BigInteger74" column="BIG_INTEGER74"/>
-            <field name="BigInteger76" column="BIG_INTEGER76"/>
-            <field name="BigInteger77" column="BIG_INTEGER77"/>
-            <field name="BigInteger78" column="BIG_INTEGER78"/>
-            <field name="BigInteger83" column="BIG_INTEGER83"/>
-            <field name="BigInteger84" column="BIG_INTEGER84"/>
-            <field name="BigInteger85" column="BIG_INTEGER85"/>
-            <field name="BigInteger88" column="BIG_INTEGER88"/>
-            <field name="BigInteger89" column="BIG_INTEGER89"/>
-            <field name="BigInteger90" column="BIG_INTEGER90"/>
-            <field name="BigInteger92" column="BIG_INTEGER92"/>
-            <field name="BigInteger93" column="BIG_INTEGER93"/>
-            <field name="BigInteger94" column="BIG_INTEGER94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm	(working copy)
@@ -1,346 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfSimpleClass" table="FIELDSOFSIMPLECLASS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="SimpleClass0" column="SIMPLECLASS0">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass1">
-                <embedded>
-                    <field name="id" column="ID1"/>
-                    <field name="intField" column="INTFIELD1"/>
-                    <field name="stringField" column="STRINGFIELD1"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass102" column="SIMPLECLASS102">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass103">
-                <embedded>
-                    <field name="id" column="ID103"/>
-                    <field name="intField" column="INTFIELD103"/>
-                    <field name="stringField" column="STRINGFIELD103"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass104" column="SIMPLECLASS104">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass108" column="SIMPLECLASS108">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass109" column="SIMPLECLASS109">
-                <embedded>
-                    <field name="id" column="ID109"/>
-                    <field name="intField" column="INTFIELD109"/>
-                    <field name="stringField" column="STRINGFIELD109"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass11" column="SIMPLECLASS11">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass110" column="SIMPLECLASS110">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass112" column="SIMPLECLASS112">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass113">
-                <embedded>
-                    <field name="id" column="ID113"/>
-                    <field name="intField" column="INTFIELD113"/>
-                    <field name="stringField" column="STRINGFIELD113"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass114" column="SIMPLECLASS114">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass119" column="SIMPLECLASS119">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass12">
-                <embedded>
-                    <field name="id" column="ID12"/>
-                    <field name="intField" column="INTFIELD12"/>
-                    <field name="stringField" column="STRINGFIELD12"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass120">
-                <embedded>
-                    <field name="id" column="ID120"/>
-                    <field name="intField" column="INTFIELD120"/>
-                    <field name="stringField" column="STRINGFIELD120"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass121" column="SIMPLECLASS121">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass124" column="SIMPLECLASS124">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass125" column="SIMPLECLASS125">
-                <embedded>
-                    <field name="id" column="ID125"/>
-                    <field name="intField" column="INTFIELD125"/>
-                    <field name="stringField" column="STRINGFIELD125"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass126" column="SIMPLECLASS126">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass128" column="SIMPLECLASS128">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass129">
-                <embedded>
-                    <field name="id" column="ID129"/>
-                    <field name="intField" column="INTFIELD129"/>
-                    <field name="stringField" column="STRINGFIELD129"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass13" column="SIMPLECLASS13">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass130" column="SIMPLECLASS130">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass138" column="SIMPLECLASS138">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass139">
-                <embedded>
-                    <field name="id" column="ID139"/>
-                    <field name="intField" column="INTFIELD139"/>
-                    <field name="stringField" column="STRINGFIELD139"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass140" column="SIMPLECLASS140">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass16" column="SIMPLECLASS16">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass17" column="SIMPLECLASS17">
-                <embedded>
-                    <field name="id" column="ID17"/>
-                    <field name="intField" column="INTFIELD17"/>
-                    <field name="stringField" column="STRINGFIELD17"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass18" column="SIMPLECLASS18">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass2" column="SIMPLECLASS2">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass20" column="SIMPLECLASS20">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass21">
-                <embedded>
-                    <field name="id" column="ID21"/>
-                    <field name="intField" column="INTFIELD21"/>
-                    <field name="stringField" column="STRINGFIELD21"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass22" column="SIMPLECLASS22">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass30" column="SIMPLECLASS30">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass31">
-                <embedded>
-                    <field name="id" column="ID31"/>
-                    <field name="intField" column="INTFIELD31"/>
-                    <field name="stringField" column="STRINGFIELD31"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass32" column="SIMPLECLASS32">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass36" column="SIMPLECLASS36">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass37" column="SIMPLECLASS37">
-                <embedded>
-                    <field name="id" column="ID37"/>
-                    <field name="intField" column="INTFIELD37"/>
-                    <field name="stringField" column="STRINGFIELD37"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass38" column="SIMPLECLASS38">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass4" column="SIMPLECLASS4">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass40" column="SIMPLECLASS40">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass41">
-                <embedded>
-                    <field name="id" column="ID41"/>
-                    <field name="intField" column="INTFIELD41"/>
-                    <field name="stringField" column="STRINGFIELD41"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass42" column="SIMPLECLASS42">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass47" column="SIMPLECLASS47">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass48">
-                <embedded>
-                    <field name="id" column="ID48"/>
-                    <field name="intField" column="INTFIELD48"/>
-                    <field name="stringField" column="STRINGFIELD48"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass49" column="SIMPLECLASS49">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass5">
-                <embedded>
-                    <field name="id" column="ID5"/>
-                    <field name="intField" column="INTFIELD5"/>
-                    <field name="stringField" column="STRINGFIELD5"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass52" column="SIMPLECLASS52">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass53" column="SIMPLECLASS53">
-                <embedded>
-                    <field name="id" column="ID53"/>
-                    <field name="intField" column="INTFIELD53"/>
-                    <field name="stringField" column="STRINGFIELD53"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass54" column="SIMPLECLASS54">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass56" column="SIMPLECLASS56">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass57">
-                <embedded>
-                    <field name="id" column="ID57"/>
-                    <field name="intField" column="INTFIELD57"/>
-                    <field name="stringField" column="STRINGFIELD57"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass58" column="SIMPLECLASS58">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass6" column="SIMPLECLASS6">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass66" column="SIMPLECLASS66">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass67">
-                <embedded>
-                    <field name="id" column="ID67"/>
-                    <field name="intField" column="INTFIELD67"/>
-                    <field name="stringField" column="STRINGFIELD67"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass68" column="SIMPLECLASS68">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass72" column="SIMPLECLASS72">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass73" column="SIMPLECLASS73">
-                <embedded>
-                    <field name="id" column="ID73"/>
-                    <field name="intField" column="INTFIELD73"/>
-                    <field name="stringField" column="STRINGFIELD73"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass74" column="SIMPLECLASS74">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass76" column="SIMPLECLASS76">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass77">
-                <embedded>
-                    <field name="id" column="ID77"/>
-                    <field name="intField" column="INTFIELD77"/>
-                    <field name="stringField" column="STRINGFIELD77"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass78" column="SIMPLECLASS78">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass83" column="SIMPLECLASS83">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass84">
-                <embedded>
-                    <field name="id" column="ID84"/>
-                    <field name="intField" column="INTFIELD84"/>
-                    <field name="stringField" column="STRINGFIELD84"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass85" column="SIMPLECLASS85">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass88" column="SIMPLECLASS88">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass89" column="SIMPLECLASS89">
-                <embedded>
-                    <field name="id" column="ID89"/>
-                    <field name="intField" column="INTFIELD89"/>
-                    <field name="stringField" column="STRINGFIELD89"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass90" column="SIMPLECLASS90">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass92" column="SIMPLECLASS92">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass93">
-                <embedded>
-                    <field name="id" column="ID93"/>
-                    <field name="intField" column="INTFIELD93"/>
-                    <field name="stringField" column="STRINGFIELD93"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass94" column="SIMPLECLASS94">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass144" column="SIMPLECLASS144"/>
-            <field name="SimpleClass145" column="SIMPLECLASS145"/>
-            <field name="SimpleClass146" column="SIMPLECLASS146"/>
-            <field name="SimpleClass147" column="SIMPLECLASS147"/>
-            <field name="SimpleClass148" column="SIMPLECLASS148"/>
-            <field name="SimpleClass149" column="SIMPLECLASS149"/>
-            <field name="SimpleClass150" column="SIMPLECLASS150"/>
-            <field name="SimpleClass151" column="SIMPLECLASS151"/>
-            <field name="SimpleClass152" column="SIMPLECLASS152"/>
-            <field name="SimpleClass153" column="SIMPLECLASS153"/>
-            <field name="SimpleClass154" column="SIMPLECLASS154"/>
-            <field name="SimpleClass155" column="SIMPLECLASS155"/>
-            <field name="SimpleClass156" column="SIMPLECLASS156"/>
-            <field name="SimpleClass157" column="SIMPLECLASS157"/>
-            <field name="SimpleClass158" column="SIMPLECLASS158"/>
-            <field name="SimpleClass159" column="SIMPLECLASS159"/>
-            <field name="SimpleClass160" column="SIMPLECLASS160"/>
-            <field name="SimpleClass161" column="SIMPLECLASS161"/>
-            <field name="SimpleClass162" column="SIMPLECLASS162"/>
-            <field name="SimpleClass163" column="SIMPLECLASS163"/>
-            <field name="SimpleClass164" column="SIMPLECLASS164"/>
-            <field name="SimpleClass165" column="SIMPLECLASS165"/>
-            <field name="SimpleClass166" column="SIMPLECLASS166"/>
-            <field name="SimpleClass167" column="SIMPLECLASS167"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm	(working copy)
@@ -1,589 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="TreeMapStringKeyCollections"
-               table="TREEMAPSTRINGKEY_COLLECTIONS">
-            <datastore-identity strategy="identity"
-                                column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="TreeMapOfString_Object0" table="TREEMAP_STR_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="TreeMapOfString_Object1" table="TREEMAP_STR_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="TreeMapOfString_Object2" table="TREEMAP_STR_OBJECT2">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="TreeMapOfString_SimpleClass3"
-                   table="TREEMAP_STR_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="TreeMapOfString_SimpleClass4"
-                   table="TREEMAP_STR_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="TreeMapOfString_SimpleClass5"
-                   table="TREEMAP_STR_SIMPLE_CLASS5">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="TreeMapOfString_SimpleInterface6"
-                   table="TREEMAP_STR_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="TreeMapOfString_SimpleInterface7"
-                   table="TREEMAP_STR_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="TreeMapOfString_SimpleInterface8"
-                   table="TREEMAP_STR_SIMPLE_INTERFACE8">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="TreeMapOfString_String9"
-                   table="TREEMAP_STR_STRING9">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_String10"
-                   table="TREEMAP_STR_STRING10">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_String11"
-                   table="TREEMAP_STR_STRING11">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Date12"
-                   table="TREEMAP_STR_DATE12">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Date13"
-                   table="TREEMAP_STR_DATE13">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Date14"
-                   table="TREEMAP_STR_DATE14">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Locale15"
-                   table="TREEMAP_STR_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Locale16"
-                   table="TREEMAP_STR_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Locale17"
-                   table="TREEMAP_STR_LOCALE17">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigDecimal18"
-                   table="TREEMAP_STR_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigDecimal19"
-                   table="TREEMAP_STR_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigDecimal20"
-                   table="TREEMAP_STR_BIG_DECIMAL20">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigInteger21"
-                   table="TREEMAP_STR_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigInteger22"
-                   table="TREEMAP_STR_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigInteger23"
-                   table="TREEMAP_STR_BIG_INTEGER23">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Byte24"
-                   table="TREEMAP_STR_BYTE24">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Byte25"
-                   table="TREEMAP_STR_BYTE25">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Byte26"
-                   table="TREEMAP_STR_BYTE26">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Double27"
-                   table="TREEMAP_STR_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Double28"
-                   table="TREEMAP_STR_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Double29"
-                   table="TREEMAP_STR_DOUBLE29">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Float30"
-                   table="TREEMAP_STR_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Float31"
-                   table="TREEMAP_STR_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Float32"
-                   table="TREEMAP_STR_FLOAT32">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Integer33"
-                   table="TREEMAP_STR_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Integer34"
-                   table="TREEMAP_STR_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Integer35"
-                   table="TREEMAP_STR_INTEGER35">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Long36"
-                   table="TREEMAP_STR_LONG36">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Long37"
-                   table="TREEMAP_STR_LONG37">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Long38"
-                   table="TREEMAP_STR_LONG38">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Short39"
-                   table="TREEMAP_STR_SHORT39">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Short40"
-                   table="TREEMAP_STR_SHORT40">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Short41"
-                   table="TREEMAP_STR_SHORT41">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Object42"
-                   table="TREEMAP_STR_OBJECT42">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="TreeMapOfString_Object43" table="TREEMAP_STR_OBJECT43">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="TreeMapOfString_SimpleClass45"
-                   table="TREEMAP_STR_SIMPLE_CLASS45">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="TreeMapOfString_SimpleClass46"
-                   table="TREEMAP_STR_SIMPLE_CLASS46">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="TreeMapOfString_SimpleInterface48"
-                   table="TREEMAP_STR_SIMPLE_INTERFACE48">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="TreeMapOfString_SimpleInterface49"
-                   table="TREEMAP_STR_SIMPLE_INTERFACE49">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="TreeMapOfString_String51"
-                   table="TREEMAP_STR_STRING51">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_String52"
-                   table="TREEMAP_STR_STRING52">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Date54"
-                   table="TREEMAP_STR_DATE54">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Date55"
-                   table="TREEMAP_STR_DATE55">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Locale57"
-                   table="TREEMAP_STR_LOCALE57">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Locale58"
-                   table="TREEMAP_STR_LOCALE58">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigDecimal60"
-                   table="TREEMAP_STR_BIG_DECIMAL60">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigDecimal61"
-                   table="TREEMAP_STR_BIG_DECIMAL61">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigInteger63"
-                   table="TREEMAP_STR_BIG_INTEGER63">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigInteger64"
-                   table="TREEMAP_STR_BIG_INTEGER64">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Byte66"
-                   table="TREEMAP_STR_BYTE66">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Byte67"
-                   table="TREEMAP_STR_BYTE67">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Double69"
-                   table="TREEMAP_STR_DOUBLE69">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Double70"
-                   table="TREEMAP_STR_DOUBLE70">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Float72"
-                   table="TREEMAP_STR_FLOAT72">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Float73"
-                   table="TREEMAP_STR_FLOAT73">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Integer75"
-                   table="TREEMAP_STR_INTEGER75">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Integer76"
-                   table="TREEMAP_STR_INTEGER76">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Long78"
-                   table="TREEMAP_STR_LONG78">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Long79"
-                   table="TREEMAP_STR_LONG79">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Short81"
-                   table="TREEMAP_STR_SHORT81">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Short82"
-                   table="TREEMAP_STR_SHORT82">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Object84" table="TREEMAP_STR_OBJECT84">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Object86"
-                   column="TREEMAP_STR_OBJECT86">
-            </field>
-            <field name="TreeMapOfString_SimpleClass87"
-                   table="TREEMAP_STR_SIMPLE_CLASS87">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_SimpleClass89"
-                   column="TREEMAP_STR_SIMPLECLASS89">
-            </field>
-            <field name="TreeMapOfString_SimpleInterface90"
-                   table="TREEMAP_STR_SIMPLE_INTERFACE90">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_SimpleInterface92"
-                   column="TREEMAP_STR_SIMPLEINTERFACE92">
-            </field>
-            <field name="TreeMapOfString_String93"
-                   table="TREEMAP_STR_STRING93">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_String95"
-                   column="TREEMAP_STR_STRING95">
-            </field>
-            <field name="TreeMapOfString_Date96"
-                   table="TREEMAP_STR_DATE96">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Date98"
-                   column="TREEMAP_STR_DATE98">
-            </field>
-            <field name="TreeMapOfString_Locale99"
-                   table="TREEMAP_STR_LOCALE99">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Locale101"
-                   column="TREEMAP_STR_LOCALE101">
-            </field>
-            <field name="TreeMapOfString_BigDecimal102"
-                   table="TREEMAP_STR_BIG_DECIMAL102">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigDecimal104"
-                   column="TREEMAP_STR_BIGDECIMAL104">
-            </field>
-            <field name="TreeMapOfString_BigInteger105"
-                   table="TREEMAP_STR_BIG_INTEGER105">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigInteger107"
-                   column="TREEMAP_STR_BIGINTEGER107">
-            </field>
-            <field name="TreeMapOfString_Byte108"
-                   table="TREEMAP_STR_BYTE108">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Byte110"
-                   column="TREEMAP_STR_BYTE110">
-            </field>
-            <field name="TreeMapOfString_Double111" 
-                   table="TREEMAP_STR_DOUBLE111">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Double113"
-                   column="TREEMAP_STR_DOUBLE113">
-            </field>
-            <field name="TreeMapOfString_Float114"
-                   table="TREEMAP_STR_FLOAT114">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Float116"
-                   column="TREEMAP_STR_FLOAT116">
-            </field>
-            <field name="TreeMapOfString_Integer117"
-                   table="TREEMAP_STR_INTEGER117">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Integer119"
-                   column="TREEMAP_STR_INTEGER119">
-            </field>
-            <field name="TreeMapOfString_Long120"
-                    table="TREEMAP_STR_LONG120">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Long122"
-                   column="TREEMAP_STR_LONG122">
-            </field>
-            <field name="TreeMapOfString_Short123"
-                   table="TREEMAP_STR_SHORT123">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Short125"
-                   column="TREEMAP_STR_SHORT125">
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-derby.orm	(working copy)
@@ -1,82 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfPrimitiveint" table="FIELDSOFPRIMITIVEINT">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="int0" column="INT0"/>
-            <field name="int1" column="INT1"/>
-            <field name="int102" column="INT102"/>
-            <field name="int103" column="INT103"/>
-            <field name="int104" column="INT104"/>
-            <field name="int108" column="INT108"/>
-            <field name="int109" column="INT109"/>
-            <field name="int11" column="INT11"/>
-            <field name="int110" column="INT110"/>
-            <field name="int112" column="INT112"/>
-            <field name="int113" column="INT113"/>
-            <field name="int114" column="INT114"/>
-            <field name="int119" column="INT119"/>
-            <field name="int12" column="INT12"/>
-            <field name="int120" column="INT120"/>
-            <field name="int121" column="INT121"/>
-            <field name="int124" column="INT124"/>
-            <field name="int125" column="INT125"/>
-            <field name="int126" column="INT126"/>
-            <field name="int128" column="INT128"/>
-            <field name="int129" column="INT129"/>
-            <field name="int13" column="INT13"/>
-            <field name="int130" column="INT130"/>
-            <field name="int138" column="INT138"/>
-            <field name="int139" column="INT139"/>
-            <field name="int140" column="INT140"/>
-            <field name="int16" column="INT16"/>
-            <field name="int17" column="INT17"/>
-            <field name="int18" column="INT18"/>
-            <field name="int2" column="INT2"/>
-            <field name="int20" column="INT20"/>
-            <field name="int21" column="INT21"/>
-            <field name="int22" column="INT22"/>
-            <field name="int30" column="INT30"/>
-            <field name="int31" column="INT31"/>
-            <field name="int32" column="INT32"/>
-            <field name="int36" column="INT36"/>
-            <field name="int37" column="INT37"/>
-            <field name="int38" column="INT38"/>
-            <field name="int4" column="INT4"/>
-            <field name="int40" column="INT40"/>
-            <field name="int41" column="INT41"/>
-            <field name="int42" column="INT42"/>
-            <field name="int47" column="INT47"/>
-            <field name="int48" column="INT48"/>
-            <field name="int49" column="INT49"/>
-            <field name="int5" column="INT5"/>
-            <field name="int52" column="INT52"/>
-            <field name="int53" column="INT53"/>
-            <field name="int54" column="INT54"/>
-            <field name="int56" column="INT56"/>
-            <field name="int57" column="INT57"/>
-            <field name="int58" column="INT58"/>
-            <field name="int6" column="INT6"/>
-            <field name="int66" column="INT66"/>
-            <field name="int67" column="INT67"/>
-            <field name="int68" column="INT68"/>
-            <field name="int72" column="INT72"/>
-            <field name="int73" column="INT73"/>
-            <field name="int74" column="INT74"/>
-            <field name="int76" column="INT76"/>
-            <field name="int77" column="INT77"/>
-            <field name="int78" column="INT78"/>
-            <field name="int83" column="INT83"/>
-            <field name="int84" column="INT84"/>
-            <field name="int85" column="INT85"/>
-            <field name="int88" column="INT88"/>
-            <field name="int89" column="INT89"/>
-            <field name="int90" column="INT90"/>
-            <field name="int92" column="INT92"/>
-            <field name="int93" column="INT93"/>
-            <field name="int94" column="INT94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm	(working copy)
@@ -1,555 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="MapStringValueCollections"
-               table="MAPSTRINGVALUE_COLLECTIONS">
-            <datastore-identity strategy="identity"
-                                column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="MapOfObject_String0" table="MAP_OBJECT0_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfObject_String1" table="MAP_OBJECT1_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfObject_String2" table="MAP_OBJECT2_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfObject_String3" table="MAP_OBJECT3_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfObject_String4" table="MAP_OBJECT4_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfObject_String6" table="MAP_OBJECT4_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfObject_String8" column="MAP_OBJECT8_STR">
-            </field>
-            <field name="MapOfSimpleClass_String9"
-                   table="MAP_SIMPLE_CLASS9_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleClass_String10"
-                   table="MAP_SIMPLE_CLASS10_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleClass_String11"
-                   table="MAP_SIMPLE_CLASS11_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleClass_String12"
-                   table="MAP_SIMPLE_CLASS12_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleClass_String13"
-                   table="MAP_SIMPLE_CLASS13_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleClass_String15"
-                   table="MAP_SIMPLE_CLASS15_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleClass_String17"
-                   column="MAP_SIMPLE_CLASS17_STR">
-            </field>
-            <field name="MapOfSimpleInterface_String18"
-                   table="MAP_SIMPLE_INTERFACE18_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleInterface_String19"
-                   table="MAP_SIMPLE_INTERFACE19_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleInterface_String20"
-                   table="MAP_SIMPLE_INTERFACE20_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleInterface_String21"
-                   table="MAP_SIMPLE_INTERFACE21_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleInterface_String22"
-                   table="MAP_SIMPLE_INTERFACE22_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleInterface_String24"
-                   table="MAP_SIMPLE_INTERFACE24_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleInterface_String26"
-                   column="MAP_SIMPLE_INTERFACE26_STR">
-            </field>
-            <field name="MapOfString_String27" table="MAP_STRING27_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_String28" table="MAP_STRING28_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_String29" table="MAP_STRING29_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_String30" table="MAP_STRING30_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_String31" table="MAP_STRING31_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_String33" table="MAP_STRING33_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_String35" column="MAP_STRING35_STR">
-            </field>
-            <field name="MapOfDate_String36" table="MAP_DATE36_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDate_String37" table="MAP_DATE37_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDate_String38" table="MAP_DATE38_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDate_String39" table="MAP_DATE39_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDate_String40" table="MAP_DATE40_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDate_String42" table="MAP_DATE42_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDate_String44" column="MAP_DATE44_STR">
-            </field>
-            <field name="MapOfBigDecimal_String45"
-                   table="MAP_BIG_DECIMAL45_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigDecimal_String46"
-                   table="MAP_BIG_DECIMAL46_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigDecimal_String47"
-                   table="MAP_BIG_DECIMAL47_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigDecimal_String48"
-                   table="MAP_BIG_DECIMAL48_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigDecimal_String49"
-                   table="MAP_BIG_DECIMAL49_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigDecimal_String51"
-                   table="MAP_BIG_DECIMAL51_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigDecimal_String53"
-                   column="MAP_BIG_DECIMAL53_STR">
-            </field>
-            <field name="MapOfBigInteger_String54"
-                   table="MAP_BIG_INTEGER54_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigInteger_String55"
-                   table="MAP_BIG_INTEGER55_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigInteger_String56"
-                   table="MAP_BIG_INTEGER56_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigInteger_String57"
-                   table="MAP_BIG_INTEGER57_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigInteger_String58"
-                   table="MAP_BIG_INTEGER58_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigInteger_String60"
-                   table="MAP_BIG_INTEGER60_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigInteger_String62"
-                   column="MAP_BIG_INTEGER62_STR">
-            </field>
-            <field name="MapOfByte_String63" table="MAP_BYTE63_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfByte_String64" table="MAP_BYTE64_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfByte_String65" table="MAP_BYTE65_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfByte_String66" table="MAP_BYTE66_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfByte_String67" table="MAP_BYTE67_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfByte_String69" table="MAP_BYTE69_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfByte_String71" column="MAP_BYTE71_STR">
-            </field>
-            <field name="MapOfDouble_String72" table="MAP_DOUBLE72_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDouble_String73" table="MAP_DOUBLE73_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDouble_String74" table="MAP_DOUBLE74_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDouble_String75" table="MAP_DOUBLE75_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDouble_String76" table="MAP_DOUBLE76_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDouble_String78" table="MAP_DOUBLE78_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDouble_String80" column="MAP_DOUBLE80_STR">
-            </field>
-            <field name="MapOfFloat_String81" table="MAP_FLOAT81_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfFloat_String82" table="MAP_FLOAT82_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfFloat_String83" table="MAP_FLOAT83_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfFloat_String84" table="MAP_FLOAT84_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfFloat_String85" table="MAP_FLOAT85_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfFloat_String87" table="MAP_FLOAT87_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfFloat_String89" column="MAP_FLOAT89_STR">
-            </field>
-            <field name="MapOfInteger_String90" table="MAP_INTEGER90_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfInteger_String91" table="MAP_INTEGER91_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfInteger_String92" table="MAP_INTEGER92_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfInteger_String93" table="MAP_INTEGER93_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfInteger_String94" table="MAP_INTEGER94_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfInteger_String96" table="MAP_INTEGER96_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfInteger_String98" column="MAP_INTEGER98_STR">
-            </field>
-            <field name="MapOfLong_String99" table="MAP_LONG99_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfLong_String100" table="MAP_LONG100_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfLong_String101" table="MAP_LONG101_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfLong_String102" table="MAP_LONG102_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfLong_String103" table="MAP_LONG103_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfLong_String105" table="MAP_LONG105_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfLong_String107" column="MAP_LONG107_STR">
-            </field>
-            <field name="MapOfShort_String108" table="MAP_SHORT108_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfShort_String109" table="MAP_SHORT109_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfShort_String110" table="MAP_SHORT110_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfShort_String111" table="MAP_SHORT111_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfShort_String112" table="MAP_SHORT112_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfShort_String114" table="MAP_SHORT114_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfShort_String116" column="MAP_SHORT116_STR">
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-derby.orm	(working copy)
@@ -1,226 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfCharacter" table="FIELDSOFCHARACTER">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="Character0">
-                <column name="CHARACTER0" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character1">
-                <column name="CHARACTER1" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character102">
-                <column name="CHARACTER102" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character103">
-                <column name="CHARACTER103" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character104">
-                <column name="CHARACTER104" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character108">
-                <column name="CHARACTER108" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character109">
-                <column name="CHARACTER109" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character11">
-                <column name="CHARACTER11" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character110">
-                <column name="CHARACTER110" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character112">
-                <column name="CHARACTER112" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character113">
-                <column name="CHARACTER113" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character114">
-                <column name="CHARACTER114" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character119">
-                <column name="CHARACTER119" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character12">
-                <column name="CHARACTER12" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character120">
-                <column name="CHARACTER120" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character121">
-                <column name="CHARACTER121" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character124">
-                <column name="CHARACTER124" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character125">
-                <column name="CHARACTER125" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character126">
-                <column name="CHARACTER126" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character128">
-                <column name="CHARACTER128" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character129">
-                <column name="CHARACTER129" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character13">
-                <column name="CHARACTER13" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character130">
-                <column name="CHARACTER130" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character138">
-                <column name="CHARACTER138" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character139">
-                <column name="CHARACTER139" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character140">
-                <column name="CHARACTER140" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character16">
-                <column name="CHARACTER16" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character17">
-                <column name="CHARACTER17" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character18">
-                <column name="CHARACTER18" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character2">
-                <column name="CHARACTER2" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character20">
-                <column name="CHARACTER20" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character21">
-                <column name="CHARACTER21" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character22">
-                <column name="CHARACTER22" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character30">
-                <column name="CHARACTER30" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character31">
-                <column name="CHARACTER31" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character32">
-                <column name="CHARACTER32" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character36">
-                <column name="CHARACTER36" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character37">
-                <column name="CHARACTER37" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character38">
-                <column name="CHARACTER38" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character4">
-                <column name="CHARACTER4" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character40">
-                <column name="CHARACTER40" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character41">
-                <column name="CHARACTER41" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character42">
-                <column name="CHARACTER42" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character47">
-                <column name="CHARACTER47" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character48">
-                <column name="CHARACTER48" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character49">
-                <column name="CHARACTER49" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character5">
-                <column name="CHARACTER5" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character52">
-                <column name="CHARACTER52" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character53">
-                <column name="CHARACTER53" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character54">
-                <column name="CHARACTER54" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character56">
-                <column name="CHARACTER56" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character57">
-                <column name="CHARACTER57" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character58">
-                <column name="CHARACTER58" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character6">
-                <column name="CHARACTER6" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character66">
-                <column name="CHARACTER66" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character67">
-                <column name="CHARACTER67" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character68">
-                <column name="CHARACTER68" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character72">
-                <column name="CHARACTER72" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character73">
-                <column name="CHARACTER73" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character74">
-                <column name="CHARACTER74" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character76">
-                <column name="CHARACTER76" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character77">
-                <column name="CHARACTER77" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character78">
-                <column name="CHARACTER78" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character83">
-                <column name="CHARACTER83" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character84">
-                <column name="CHARACTER84" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character85">
-                <column name="CHARACTER85" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character88">
-                <column name="CHARACTER88" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character89">
-                <column name="CHARACTER89" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character90">
-                <column name="CHARACTER90" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character92">
-                <column name="CHARACTER92" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character93">
-                <column name="CHARACTER93" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character94">
-                <column name="CHARACTER94" jdbc-type="INTEGER"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-derby.orm	(working copy)
@@ -1,82 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfInteger" table="FIELDSOFINTEGER">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="Integer0" column="INTEGER0"/>
-            <field name="Integer1" column="INTEGER1"/>
-            <field name="Integer102" column="INTEGER102"/>
-            <field name="Integer103" column="INTEGER103"/>
-            <field name="Integer104" column="INTEGER104"/>
-            <field name="Integer108" column="INTEGER108"/>
-            <field name="Integer109" column="INTEGER109"/>
-            <field name="Integer11" column="INTEGER11"/>
-            <field name="Integer110" column="INTEGER110"/>
-            <field name="Integer112" column="INTEGER112"/>
-            <field name="Integer113" column="INTEGER113"/>
-            <field name="Integer114" column="INTEGER114"/>
-            <field name="Integer119" column="INTEGER119"/>
-            <field name="Integer12" column="INTEGER12"/>
-            <field name="Integer120" column="INTEGER120"/>
-            <field name="Integer121" column="INTEGER121"/>
-            <field name="Integer124" column="INTEGER124"/>
-            <field name="Integer125" column="INTEGER125"/>
-            <field name="Integer126" column="INTEGER126"/>
-            <field name="Integer128" column="INTEGER128"/>
-            <field name="Integer129" column="INTEGER129"/>
-            <field name="Integer13" column="INTEGER13"/>
-            <field name="Integer130" column="INTEGER130"/>
-            <field name="Integer138" column="INTEGER138"/>
-            <field name="Integer139" column="INTEGER139"/>
-            <field name="Integer140" column="INTEGER140"/>
-            <field name="Integer16" column="INTEGER16"/>
-            <field name="Integer17" column="INTEGER17"/>
-            <field name="Integer18" column="INTEGER18"/>
-            <field name="Integer2" column="INTEGER2"/>
-            <field name="Integer20" column="INTEGER20"/>
-            <field name="Integer21" column="INTEGER21"/>
-            <field name="Integer22" column="INTEGER22"/>
-            <field name="Integer30" column="INTEGER30"/>
-            <field name="Integer31" column="INTEGER31"/>
-            <field name="Integer32" column="INTEGER32"/>
-            <field name="Integer36" column="INTEGER36"/>
-            <field name="Integer37" column="INTEGER37"/>
-            <field name="Integer38" column="INTEGER38"/>
-            <field name="Integer4" column="INTEGER4"/>
-            <field name="Integer40" column="INTEGER40"/>
-            <field name="Integer41" column="INTEGER41"/>
-            <field name="Integer42" column="INTEGER42"/>
-            <field name="Integer47" column="INTEGER47"/>
-            <field name="Integer48" column="INTEGER48"/>
-            <field name="Integer49" column="INTEGER49"/>
-            <field name="Integer5" column="INTEGER5"/>
-            <field name="Integer52" column="INTEGER52"/>
-            <field name="Integer53" column="INTEGER53"/>
-            <field name="Integer54" column="INTEGER54"/>
-            <field name="Integer56" column="INTEGER56"/>
-            <field name="Integer57" column="INTEGER57"/>
-            <field name="Integer58" column="INTEGER58"/>
-            <field name="Integer6" column="INTEGER6"/>
-            <field name="Integer66" column="INTEGER66"/>
-            <field name="Integer67" column="INTEGER67"/>
-            <field name="Integer68" column="INTEGER68"/>
-            <field name="Integer72" column="INTEGER72"/>
-            <field name="Integer73" column="INTEGER73"/>
-            <field name="Integer74" column="INTEGER74"/>
-            <field name="Integer76" column="INTEGER76"/>
-            <field name="Integer77" column="INTEGER77"/>
-            <field name="Integer78" column="INTEGER78"/>
-            <field name="Integer83" column="INTEGER83"/>
-            <field name="Integer84" column="INTEGER84"/>
-            <field name="Integer85" column="INTEGER85"/>
-            <field name="Integer88" column="INTEGER88"/>
-            <field name="Integer89" column="INTEGER89"/>
-            <field name="Integer90" column="INTEGER90"/>
-            <field name="Integer92" column="INTEGER92"/>
-            <field name="Integer93" column="INTEGER93"/>
-            <field name="Integer94" column="INTEGER94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm	(working copy)
@@ -1,198 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="ArrayListCollections" table="ARRAYLIST_COLLECTIONS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="ArrayListOfObject0" table="ARRAYLIST_OF_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfObject1" table="ARRAYLIST_OF_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfObject2" table="ARRAYLIST_OF_OBJECT2">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfSimpleClass3" table="ARRAYLIST_OF_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfSimpleClass4" table="ARRAYLIST_OF_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfSimpleClass5" table="ARRAYLIST_OF_SIMPLE_CLASS5">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfSimpleInterface6" table="ARRAYLIST_OF_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfSimpleInterface7" table="ARRAYLIST_OF_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfSimpleInterface8" table="ARRAYLIST_OF_SIMPLE_INTERFACE8">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfString9" table="ARRAYLIST_OF_STRING9">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfString10" column="ARRAYLIST_OF_STRING10"
-                   >
-            </field>
-            <field name="ArrayListOfString11" table="ARRAYLIST_OF_STRING11">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfDate12" table="ARRAYLIST_OF_DATE12">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfDate13" column="ARRAYLIST_OF_DATE13"
-                   >
-            </field>
-            <field name="ArrayListOfDate14" table="ARRAYLIST_OF_DATE14">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfLocale15" table="ARRAYLIST_OF_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfLocale16" column="ARRAYLIST_OF_LOCALE16"
-                   >
-            </field>
-            <field name="ArrayListOfLocale17" table="ARRAYLIST_OF_LOCALE17">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfBigDecimal18" table="ARRAYLIST_OF_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfBigDecimal19" column="ARRAYLIST_OF_BIG_DECIMAL19"
-                   >
-            </field>
-            <field name="ArrayListOfBigDecimal20" table="ARRAYLIST_OF_BIG_DECIMAL20">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfBigInteger21" table="ARRAYLIST_OF_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfBigInteger22" column="ARRAYLIST_OF_BIG_INTEGER22"
-                   >
-            </field>
-            <field name="ArrayListOfBigInteger23" table="ARRAYLIST_OF_BIG_INTEGER23">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfByte24" table="ARRAYLIST_OF_BYTE24">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfByte25" column="ARRAYLIST_OF_BYTE25"
-                   >
-            </field>
-            <field name="ArrayListOfByte26" table="ARRAYLIST_OF_BYTE26">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfDouble27" table="ARRAYLIST_OF_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfDouble28" column="ARRAYLIST_OF_DOUBLE28"
-                   >
-            </field>
-            <field name="ArrayListOfDouble29" table="ARRAYLIST_OF_DOUBLE29">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfFloat30" table="ARRAYLIST_OF_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfFloat31" column="ARRAYLIST_OF_FLOAT31"
-                   >
-            </field>
-            <field name="ArrayListOfFloat32" table="ARRAYLIST_OF_FLOAT32">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfInteger33" table="ARRAYLIST_OF_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfInteger34" column="ARRAYLIST_OF_INTEGER34"
-                   >
-            </field>
-            <field name="ArrayListOfInteger35" table="ARRAYLIST_OF_INTEGER35">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfLong36" table="ARRAYLIST_OF_LONG36">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfLong37" column="ARRAYLIST_OF_LONG37"
-                   >
-            </field>
-            <field name="ArrayListOfLong38" table="ARRAYLIST_OF_LONG38">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfShort39" table="ARRAYLIST_OF_SHORT39">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfShort40" column="ARRAYLIST_OF_SHORT40"
-                   >
-            </field>
-            <field name="ArrayListOfShort41" table="ARRAYLIST_OF_SHORT41">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="INDEX"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-derby.orm	(working copy)
@@ -1,82 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfLong" table="FIELDSOFLONG">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="Long0" column="LONG0"/>
-            <field name="Long1" column="LONG1"/>
-            <field name="Long102" column="LONG102"/>
-            <field name="Long103" column="LONG103"/>
-            <field name="Long104" column="LONG104"/>
-            <field name="Long108" column="LONG108"/>
-            <field name="Long109" column="LONG109"/>
-            <field name="Long11" column="LONG11"/>
-            <field name="Long110" column="LONG110"/>
-            <field name="Long112" column="LONG112"/>
-            <field name="Long113" column="LONG113"/>
-            <field name="Long114" column="LONG114"/>
-            <field name="Long119" column="LONG119"/>
-            <field name="Long12" column="LONG12"/>
-            <field name="Long120" column="LONG120"/>
-            <field name="Long121" column="LONG121"/>
-            <field name="Long124" column="LONG124"/>
-            <field name="Long125" column="LONG125"/>
-            <field name="Long126" column="LONG126"/>
-            <field name="Long128" column="LONG128"/>
-            <field name="Long129" column="LONG129"/>
-            <field name="Long13" column="LONG13"/>
-            <field name="Long130" column="LONG130"/>
-            <field name="Long138" column="LONG138"/>
-            <field name="Long139" column="LONG139"/>
-            <field name="Long140" column="LONG140"/>
-            <field name="Long16" column="LONG16"/>
-            <field name="Long17" column="LONG17"/>
-            <field name="Long18" column="LONG18"/>
-            <field name="Long2" column="LONG2"/>
-            <field name="Long20" column="LONG20"/>
-            <field name="Long21" column="LONG21"/>
-            <field name="Long22" column="LONG22"/>
-            <field name="Long30" column="LONG30"/>
-            <field name="Long31" column="LONG31"/>
-            <field name="Long32" column="LONG32"/>
-            <field name="Long36" column="LONG36"/>
-            <field name="Long37" column="LONG37"/>
-            <field name="Long38" column="LONG38"/>
-            <field name="Long4" column="LONG4"/>
-            <field name="Long40" column="LONG40"/>
-            <field name="Long41" column="LONG41"/>
-            <field name="Long42" column="LONG42"/>
-            <field name="Long47" column="LONG47"/>
-            <field name="Long48" column="LONG48"/>
-            <field name="Long49" column="LONG49"/>
-            <field name="Long5" column="LONG5"/>
-            <field name="Long52" column="LONG52"/>
-            <field name="Long53" column="LONG53"/>
-            <field name="Long54" column="LONG54"/>
-            <field name="Long56" column="LONG56"/>
-            <field name="Long57" column="LONG57"/>
-            <field name="Long58" column="LONG58"/>
-            <field name="Long6" column="LONG6"/>
-            <field name="Long66" column="LONG66"/>
-            <field name="Long67" column="LONG67"/>
-            <field name="Long68" column="LONG68"/>
-            <field name="Long72" column="LONG72"/>
-            <field name="Long73" column="LONG73"/>
-            <field name="Long74" column="LONG74"/>
-            <field name="Long76" column="LONG76"/>
-            <field name="Long77" column="LONG77"/>
-            <field name="Long78" column="LONG78"/>
-            <field name="Long83" column="LONG83"/>
-            <field name="Long84" column="LONG84"/>
-            <field name="Long85" column="LONG85"/>
-            <field name="Long88" column="LONG88"/>
-            <field name="Long89" column="LONG89"/>
-            <field name="Long90" column="LONG90"/>
-            <field name="Long92" column="LONG92"/>
-            <field name="Long93" column="LONG93"/>
-            <field name="Long94" column="LONG94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-derby.orm	(working copy)
@@ -1,82 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-           <class name="FieldsOfShort" table="FIELDSOFSHORT">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="Short0" column="SHORT0"/>
-            <field name="Short1" column="SHORT1"/>
-            <field name="Short102" column="SHORT102"/>
-            <field name="Short103" column="SHORT103"/>
-            <field name="Short104" column="SHORT104"/>
-            <field name="Short108" column="SHORT108"/>
-            <field name="Short109" column="SHORT109"/>
-            <field name="Short11" column="SHORT11"/>
-            <field name="Short110" column="SHORT110"/>
-            <field name="Short112" column="SHORT112"/>
-            <field name="Short113" column="SHORT113"/>
-            <field name="Short114" column="SHORT114"/>
-            <field name="Short119" column="SHORT119"/>
-            <field name="Short12" column="SHORT12"/>
-            <field name="Short120" column="SHORT120"/>
-            <field name="Short121" column="SHORT121"/>
-            <field name="Short124" column="SHORT124"/>
-            <field name="Short125" column="SHORT125"/>
-            <field name="Short126" column="SHORT126"/>
-            <field name="Short128" column="SHORT128"/>
-            <field name="Short129" column="SHORT129"/>
-            <field name="Short13" column="SHORT13"/>
-            <field name="Short130" column="SHORT130"/>
-            <field name="Short138" column="SHORT138"/>
-            <field name="Short139" column="SHORT139"/>
-            <field name="Short140" column="SHORT140"/>
-            <field name="Short16" column="SHORT16"/>
-            <field name="Short17" column="SHORT17"/>
-            <field name="Short18" column="SHORT18"/>
-            <field name="Short2" column="SHORT2"/>
-            <field name="Short20" column="SHORT20"/>
-            <field name="Short21" column="SHORT21"/>
-            <field name="Short22" column="SHORT22"/>
-            <field name="Short30" column="SHORT30"/>
-            <field name="Short31" column="SHORT31"/>
-            <field name="Short32" column="SHORT32"/>
-            <field name="Short36" column="SHORT36"/>
-            <field name="Short37" column="SHORT37"/>
-            <field name="Short38" column="SHORT38"/>
-            <field name="Short4" column="SHORT4"/>
-            <field name="Short40" column="SHORT40"/>
-            <field name="Short41" column="SHORT41"/>
-            <field name="Short42" column="SHORT42"/>
-            <field name="Short47" column="SHORT47"/>
-            <field name="Short48" column="SHORT48"/>
-            <field name="Short49" column="SHORT49"/>
-            <field name="Short5" column="SHORT5"/>
-            <field name="Short52" column="SHORT52"/>
-            <field name="Short53" column="SHORT53"/>
-            <field name="Short54" column="SHORT54"/>
-            <field name="Short56" column="SHORT56"/>
-            <field name="Short57" column="SHORT57"/>
-            <field name="Short58" column="SHORT58"/>
-            <field name="Short6" column="SHORT6"/>
-            <field name="Short66" column="SHORT66"/>
-            <field name="Short67" column="SHORT67"/>
-            <field name="Short68" column="SHORT68"/>
-            <field name="Short72" column="SHORT72"/>
-            <field name="Short73" column="SHORT73"/>
-            <field name="Short74" column="SHORT74"/>
-            <field name="Short76" column="SHORT76"/>
-            <field name="Short77" column="SHORT77"/>
-            <field name="Short78" column="SHORT78"/>
-            <field name="Short83" column="SHORT83"/>
-            <field name="Short84" column="SHORT84"/>
-            <field name="Short85" column="SHORT85"/>
-            <field name="Short88" column="SHORT88"/>
-            <field name="Short89" column="SHORT89"/>
-            <field name="Short90" column="SHORT90"/>
-            <field name="Short92" column="SHORT92"/>
-            <field name="Short93" column="SHORT93"/>
-            <field name="Short94" column="SHORT94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm	(working copy)
@@ -1,618 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="HashtableStringValueCollections"
-               table="HASHTBLSTRINGVALUE_COLLECTIONS">
-            <datastore-identity strategy="identity"
-                                column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="HashtableOfObject_String0"
-                   table="HASHTBL_OBJECT0_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfObject_String1"
-                   table="HASHTBL_OBJECT1_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfObject_String2"
-                   table="HASHTBL_OBJECT2_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfObject_String3"
-                   table="HASHTBL_OBJECT3_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfObject_String4"
-                   table="HASHTBL_OBJECT4_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfObject_String6"
-                   table="HASHTBL_OBJECT6_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfObject_String8"
-                   column="HASHTBL_OBJECT8_STR">
-            </field>
-            <field name="HashtableOfSimpleClass_String9"
-                   table="HASHTBL_SIMPLE_CLASS9_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleClass_String10"
-                   table="HASHTBL_SIMPLE_CLASS10_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleClass_String11"
-                   table="HASHTBL_SIMPLE_CLASS11_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleClass_String12"
-                   table="HASHTBL_SIMPLE_CLASS12_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleClass_String13"
-                   table="HASHTBL_SIMPLE_CLASS13_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleClass_String15"
-                   table="HASHTBL_SIMPLE_CLASS15_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleClass_String17"
-                   column="HASHTBL_SIMPLE_CLASS17_STR">
-            </field>
-            <field name="HashtableOfSimpleInterface_String18"
-                   table="HASHTBL_SIMPLE_INTERFACE18_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleInterface_String19"
-                   table="HASHTBL_SIMPLE_INTERFACE19_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleInterface_String20"
-                   table="HASHTBL_SIMPLE_INTERFACE20_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleInterface_String21"
-                   table="HASHTBL_SIMPLE_INTERFACE21_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleInterface_String22"
-                   table="HASHTBL_SIMPLE_INTERFACE22_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleInterface_String24"
-                   table="HASHTBL_SIMPLE_INTERFACE24_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleInterface_String26"
-                   column="HASHTBL_SIMPLE_INTERFACE26_STR">
-            </field>
-            <field name="HashtableOfString_String27"
-                   table="HASHTBL_STRING27_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_String28"
-                   table="HASHTBL_STRING28_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_String29"
-                   table="HASHTBL_STRING29_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_String30"
-                   table="HASHTBL_STRING30_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_String31"
-                   table="HASHTBL_STRING31_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_String33"
-                   table="HASHTBL_STRING33_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_String35"
-                   column="HASHTBL_STRING35_STR">
-            </field>
-            <field name="HashtableOfDate_String36"
-                   table="HASHTBL_DATE36_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDate_String37"
-                   table="HASHTBL_DATE37_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDate_String38"
-                   table="HASHTBL_DATE38_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDate_String39"
-                   table="HASHTBL_DATE39_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDate_String40"
-                   table="HASHTBL_DATE40_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDate_String42"
-                   table="HASHTBL_DATE42_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDate_String44"
-                   column="HASHTBL_DATE44_STR">
-            </field>
-            <field name="HashtableOfBigDecimal_String45"
-                   table="HASHTBL_BIG_DECIMAL45_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigDecimal_String46"
-                   table="HASHTBL_BIG_DECIMAL46_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigDecimal_String47"
-                   table="HASHTBL_BIG_DECIMAL47_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigDecimal_String48"
-                   table="HASHTBL_BIG_DECIMAL48_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigDecimal_String49"
-                   table="HASHTBL_BIG_DECIMAL49_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigDecimal_String51"
-                   table="HASHTBL_BIG_DECIMAL51_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigDecimal_String53"
-                   column="HASHTBL_BIG_DECIMAL53_STR">
-            </field>
-            <field name="HashtableOfBigInteger_String54"
-                   table="HASHTBL_BIG_INTEGER54_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigInteger_String55"
-                   table="HASHTBL_BIG_INTEGER55_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigInteger_String56"
-                   table="HASHTBL_BIG_INTEGER56_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigInteger_String57"
-                   table="HASHTBL_BIG_INTEGER57_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigInteger_String58"
-                   table="HASHTBL_BIG_INTEGER58_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigInteger_String60"
-                   table="HASHTBL_BIG_INTEGER60_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigInteger_String62"
-                   column="HASHTBL_BIG_INTEGER62_STR">
-            </field>
-            <field name="HashtableOfByte_String63"
-                   table="HASHTBL_BYTE63_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfByte_String64"
-                   table="HASHTBL_BYTE64_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfByte_String65"
-                   table="HASHTBL_BYTE65_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfByte_String66"
-                   table="HASHTBL_BYTE66_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfByte_String67"
-                   table="HASHTBL_BYTE67_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfByte_String69"
-                   table="HASHTBL_BYTE69_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfByte_String71"
-                   column="HASHTBL_BYTE71_STR">
-            </field>
-            <field name="HashtableOfDouble_String72"
-                   table="HASHTBL_DOUBLE72_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDouble_String73"
-                   table="HASHTBL_DOUBLE73_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDouble_String74"
-                   table="HASHTBL_DOUBLE74_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDouble_String75"
-                   table="HASHTBL_DOUBLE75_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDouble_String76"
-                   table="HASHTBL_DOUBLE76_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDouble_String78"
-                   table="HASHTBL_DOUBLE78_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDouble_String80"
-                   column="HASHTBL_DOUBLE80_STR">
-            </field>
-            <field name="HashtableOfFloat_String81"
-                   table="HASHTBL_FLOAT81_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfFloat_String82"
-                   table="HASHTBL_FLOAT82_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfFloat_String83"
-                   table="HASHTBL_FLOAT83_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfFloat_String84"
-                   table="HASHTBL_FLOAT84_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfFloat_String85"
-                   table="HASHTBL_FLOAT85_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfFloat_String87"
-                   table="HASHTBL_FLOAT87_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfFloat_String89"
-                   column="HASHTBL_FLOAT89_STR">
-            </field>
-            <field name="HashtableOfInteger_String90"
-                   table="HASHTBL_INTEGER90_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfInteger_String91"
-                   table="HASHTBL_INTEGER91_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfInteger_String92"
-                   table="HASHTBL_INTEGER92_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfInteger_String93"
-                   table="HASHTBL_INTEGER93_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfInteger_String94"
-                   table="HASHTBL_INTEGER94_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfInteger_String96"
-                   table="HASHTBL_INTEGER96_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfInteger_String98"
-                   column="HASHTBL_INTEGER98_STR">
-            </field>
-            <field name="HashtableOfLong_String99"
-                   table="HASHTBL_LONG99_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfLong_String100"
-                   table="HASHTBL_LONG100_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfLong_String101"
-                   table="HASHTBL_LONG101_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfLong_String102"
-                   table="HASHTBL_LONG102_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfLong_String103"
-                   table="HASHTBL_LONG103_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfLong_String105"
-                   table="HASHTBL_LONG105_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfLong_String107"
-                   column="HASHTBL_LONG107_STR">
-            </field>
-            <field name="HashtableOfShort_String108"
-                   table="HASHTBL_SHORT108_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfShort_String109"
-                   table="HASHTBL_SHORT109_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfShort_String110"
-                   table="HASHTBL_SHORT110_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfShort_String111"
-                   table="HASHTBL_SHORT111_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfShort_String112"
-                   table="HASHTBL_SHORT112_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfShort_String114"
-                   table="HASHTBL_SHORT114_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfShort_String116"
-                   column="HASHTBL_SHORT116_STR">
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-derby.orm	(working copy)
@@ -1,83 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfByte" table="FieldsOfByte">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="Byte0" column="BYTE0"/>
-            <field name="Byte1" column="BYTE1"/>
-            <field name="Byte2" column="BYTE2"/>
-            <field name="Byte4" column="BYTE4"/>
-            <field name="Byte5" column="BYTE5"/>
-            <field name="Byte6" column="BYTE6"/>
-            <field name="Byte11" column="BYTE11"/>
-            <field name="Byte12" column="BYTE12"/>
-            <field name="Byte13" column="BYTE13"/>
-            <field name="Byte16" column="BYTE16"/>
-            <field name="Byte17" column="BYTE17"/>
-            <field name="Byte18" column="BYTE18"/>
-            <field name="Byte20" column="BYTE20"/>
-            <field name="Byte21" column="BYTE21"/>
-            <field name="Byte22" column="BYTE22"/>
-            <field name="Byte30" column="BYTE30"/>
-            <field name="Byte31" column="BYTE31"/>
-            <field name="Byte32" column="BYTE32"/>
-            <field name="Byte36" column="BYTE36"/>
-            <field name="Byte37" column="BYTE37"/>
-            <field name="Byte38" column="BYTE38"/>
-            <field name="Byte40" column="BYTE40"/>
-            <field name="Byte41" column="BYTE41"/>
-            <field name="Byte42" column="BYTE42"/>
-            <field name="Byte43" column="BYTE43"/>
-            <field name="Byte47" column="BYTE47"/>
-            <field name="Byte48" column="BYTE48"/>
-            <field name="Byte49" column="BYTE49"/>
-            <field name="Byte52" column="BYTE52"/>
-            <field name="Byte53" column="BYTE53"/>
-            <field name="Byte54" column="BYTE54"/>
-            <field name="Byte56" column="BYTE56"/>
-            <field name="Byte57" column="BYTE57"/>
-            <field name="Byte58" column="BYTE58"/>
-            <field name="Byte66" column="BYTE66"/>
-            <field name="Byte67" column="BYTE67"/>
-            <field name="Byte68" column="BYTE68"/>
-            <field name="Byte72" column="BYTE72"/>
-            <field name="Byte73" column="BYTE73"/>
-            <field name="Byte74" column="BYTE74"/>
-            <field name="Byte76" column="BYTE76"/>
-            <field name="Byte77" column="BYTE77"/>
-            <field name="Byte78" column="BYTE78"/>
-            <field name="Byte83" column="BYTE83"/>
-            <field name="Byte84" column="BYTE84"/>
-            <field name="Byte85" column="BYTE85"/>
-            <field name="Byte88" column="BYTE88"/>
-            <field name="Byte89" column="BYTE89"/>
-            <field name="Byte90" column="BYTE90"/>
-            <field name="Byte92" column="BYTE92"/>
-            <field name="Byte93" column="BYTE93"/>
-            <field name="Byte94" column="BYTE94"/>
-            <field name="Byte102" column="BYTE102"/>
-            <field name="Byte103" column="BYTE103"/>
-            <field name="Byte104" column="BYTE104"/>
-            <field name="Byte108" column="BYTE108"/>
-            <field name="Byte109" column="BYTE109"/>
-            <field name="Byte110" column="BYTE110"/>
-            <field name="Byte112" column="BYTE112"/>
-            <field name="Byte113" column="BYTE113"/>
-            <field name="Byte114" column="BYTE114"/>
-            <field name="Byte119" column="BYTE119"/>
-            <field name="Byte120" column="BYTE120"/>
-            <field name="Byte121" column="BYTE121"/>
-            <field name="Byte124" column="BYTE124"/>
-            <field name="Byte125" column="BYTE125"/>
-            <field name="Byte126" column="BYTE126"/>
-            <field name="Byte128" column="BYTE128"/>
-            <field name="Byte129" column="BYTE129"/>
-            <field name="Byte130" column="BYTE130"/>
-            <field name="Byte138" column="BYTE138"/>
-            <field name="Byte139" column="BYTE139"/>
-            <field name="Byte140" column="BYTE140"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-derby.orm	(working copy)
@@ -1,82 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfPrimitiveboolean" table="FIELDSOFPRIMITIVEBOOLEAN">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="boolean0" column="BOOLEAN0"/>
-            <field name="boolean1" column="BOOLEAN1"/>
-            <field name="boolean102" column="BOOLEAN102"/>
-            <field name="boolean103" column="BOOLEAN103"/>
-            <field name="boolean104" column="BOOLEAN104"/>
-            <field name="boolean108" column="BOOLEAN108"/>
-            <field name="boolean109" column="BOOLEAN109"/>
-            <field name="boolean11" column="BOOLEAN11"/>
-            <field name="boolean110" column="BOOLEAN110"/>
-            <field name="boolean112" column="BOOLEAN112"/>
-            <field name="boolean113" column="BOOLEAN113"/>
-            <field name="boolean114" column="BOOLEAN114"/>
-            <field name="boolean119" column="BOOLEAN119"/>
-            <field name="boolean12" column="BOOLEAN12"/>
-            <field name="boolean120" column="BOOLEAN120"/>
-            <field name="boolean121" column="BOOLEAN121"/>
-            <field name="boolean124" column="BOOLEAN124"/>
-            <field name="boolean125" column="BOOLEAN125"/>
-            <field name="boolean126" column="BOOLEAN126"/>
-            <field name="boolean128" column="BOOLEAN128"/>
-            <field name="boolean129" column="BOOLEAN129"/>
-            <field name="boolean13" column="BOOLEAN13"/>
-            <field name="boolean130" column="BOOLEAN130"/>
-            <field name="boolean138" column="BOOLEAN138"/>
-            <field name="boolean139" column="BOOLEAN139"/>
-            <field name="boolean140" column="BOOLEAN140"/>
-            <field name="boolean16" column="BOOLEAN16"/>
-            <field name="boolean17" column="BOOLEAN17"/>
-            <field name="boolean18" column="BOOLEAN18"/>
-            <field name="boolean2" column="BOOLEAN2"/>
-            <field name="boolean20" column="BOOLEAN20"/>
-            <field name="boolean21" column="BOOLEAN21"/>
-            <field name="boolean22" column="BOOLEAN22"/>
-            <field name="boolean30" column="BOOLEAN30"/>
-            <field name="boolean31" column="BOOLEAN31"/>
-            <field name="boolean32" column="BOOLEAN32"/>
-            <field name="boolean36" column="BOOLEAN36"/>
-            <field name="boolean37" column="BOOLEAN37"/>
-            <field name="boolean38" column="BOOLEAN38"/>
-            <field name="boolean4" column="BOOLEAN4"/>
-            <field name="boolean40" column="BOOLEAN40"/>
-            <field name="boolean41" column="BOOLEAN41"/>
-            <field name="boolean42" column="BOOLEAN42"/>
-            <field name="boolean47" column="BOOLEAN47"/>
-            <field name="boolean48" column="BOOLEAN48"/>
-            <field name="boolean49" column="BOOLEAN49"/>
-            <field name="boolean5" column="BOOLEAN5"/>
-            <field name="boolean52" column="BOOLEAN52"/>
-            <field name="boolean53" column="BOOLEAN53"/>
-            <field name="boolean54" column="BOOLEAN54"/>
-            <field name="boolean56" column="BOOLEAN56"/>
-            <field name="boolean57" column="BOOLEAN57"/>
-            <field name="boolean58" column="BOOLEAN58"/>
-            <field name="boolean6" column="BOOLEAN6"/>
-            <field name="boolean66" column="BOOLEAN66"/>
-            <field name="boolean67" column="BOOLEAN67"/>
-            <field name="boolean68" column="BOOLEAN68"/>
-            <field name="boolean72" column="BOOLEAN72"/>
-            <field name="boolean73" column="BOOLEAN73"/>
-            <field name="boolean74" column="BOOLEAN74"/>
-            <field name="boolean76" column="BOOLEAN76"/>
-            <field name="boolean77" column="BOOLEAN77"/>
-            <field name="boolean78" column="BOOLEAN78"/>
-            <field name="boolean83" column="BOOLEAN83"/>
-            <field name="boolean84" column="BOOLEAN84"/>
-            <field name="boolean85" column="BOOLEAN85"/>
-            <field name="boolean88" column="BOOLEAN88"/>
-            <field name="boolean89" column="BOOLEAN89"/>
-            <field name="boolean90" column="BOOLEAN90"/>
-            <field name="boolean92" column="BOOLEAN92"/>
-            <field name="boolean93" column="BOOLEAN93"/>
-            <field name="boolean94" column="BOOLEAN94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm	(working copy)
@@ -1,228 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="SetCollections" table="SET_COLLECTIONS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="SetOfObject0"
-                   table="SET_OF_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-            </field>
-            <field name="SetOfObject1"
-                   table="SET_OF_OBJECT1">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-            </field>
-            <field name="SetOfObject2"
-                   column="SET_OF_OBJECT2">
-            </field>
-            <field name="SetOfSimpleClass3"
-                   table="SET_OF_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-            </field>
-            <field name="SetOfSimpleClass4"
-                   table="SET_OF_SIMPLE_CLASS4">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-            </field>
-            <field name="SetOfSimpleClass5"
-                   column="SET_OF_SIMPLE_CLASS5">
-            </field>
-            <field name="SetOfSimpleClass42"
-                   column="SET_OF_SIMPLE_CLASS42">
-            </field>
-            <field name="SetOfSimpleInterface6"
-                   table="SET_OF_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-            </field>
-            <field name="SetOfSimpleInterface7"
-                   table="SET_OF_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-            </field>
-            <field name="SetOfSimpleInterface8"
-                   column="SET_OF_SIMPLE_INTERFACE8">
-            </field>
-            <field name="SetOfString9"
-                   table="SET_OF_STRING9">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-            </field>
-            <field name="SetOfString11"
-                   column="SET_OF_STRING11">
-            </field>
-            <field name="SetOfString10"
-                   table="SET_OF_STRING10">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-            </field>
-            <field name="SetOfDate12"
-                   table="SET_OF_DATE12">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-            </field>
-            <field name="SetOfDate14"
-                   column="SET_OF_DATE14">
-            </field>
-            <field name="SetOfDate13"
-                   table="SET_OF_DATE13">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-            </field>
-            <field name="SetOfLocale15"
-                   table="SET_OF_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-            </field>
-            <field name="SetOfLocale17"
-                   column="SET_OF_LOCALE17">
-            </field>
-            <field name="SetOfLocale16"
-                   table="SET_OF_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-            </field>
-            <field name="SetOfBigDecimal18"
-                   table="SET_OF_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-            </field>
-            <field name="SetOfBigDecimal20"
-                   column="SET_OF_BIG_DECIMAL20">
-            </field>
-            <field name="SetOfBigDecimal19"
-                   table="SET_OF_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-            </field>
-            <field name="SetOfBigInteger21"
-                   table="SET_OF_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-            </field>
-            <field name="SetOfBigInteger23"
-                   column="SET_OF_BIG_INTEGER23">
-            </field>
-            <field name="SetOfBigInteger22"
-                   table="SET_OF_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-            </field>
-            <field name="SetOfByte24"
-                   table="SET_OF_BYTE24">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-            </field>
-            <field name="SetOfByte26"
-                   column="SET_OF_BYTE26">
-            </field>
-            <field name="SetOfByte25"
-                   table="SET_OF_BYTE25">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-            </field>
-            <field name="SetOfDouble27"
-                   table="SET_OF_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-            </field>
-            <field name="SetOfDouble29"
-                   column="SET_OF_DOUBLE29">
-            </field>
-            <field name="SetOfDouble28"
-                   table="SET_OF_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-            </field>
-            <field name="SetOfFloat30"
-                   table="SET_OF_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-            </field>
-            <field name="SetOfFloat32"
-                   column="SET_OF_FLOAT32">
-            </field>
-            <field name="SetOfFloat31"
-                   table="SET_OF_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-            </field>
-            <field name="SetOfInteger33"
-                   table="SET_OF_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-            </field>
-            <field name="SetOfInteger35"
-                   column="SET_OF_INTEGER35">
-            </field>
-            <field name="SetOfInteger34"
-                   table="SET_OF_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-            </field>
-            <field name="SetOfLong36"
-                   table="SET_OF_LONG36">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-            </field>
-            <field name="SetOfLong38"
-                   column="SET_OF_LONG38">
-            </field>
-            <field name="SetOfLong37"
-                   table="SET_OF_LONG37">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-            </field>
-            <field name="SetOfShort39"
-                   table="SET_OF_SHORT39">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-            </field>
-            <field name="SetOfShort41"
-                   column="SET_OF_SHORT41">
-            </field>
-            <field name="SetOfShort40"
-                   table="SET_OF_SHORT40">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm	(working copy)
@@ -1,250 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="LinkedListCollections" table="LINKEDLIST_COLLECTIONS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="LinkedListOfObject0"
-                   table="LINKEDLIST_OF_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfObject1"
-                   table="LINKEDLIST_OF_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfObject2"
-                   table="LINKEDLIST_OF_OBJECT2">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfSimpleClass3"
-                   table="LINKEDLIST_OF_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfSimpleClass4"
-                   table="LINKEDLIST_OF_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfSimpleClass5"
-                   table="LINKEDLIST_OF_SIMPLE_CLASS5">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfSimpleClass42"
-                   column="LINKEDLIST_OF_SIMPLE_CLASS42">
-            </field>
-            <field name="LinkedListOfSimpleInterface6"
-                   table="LINKEDLIST_OF_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfSimpleInterface7"
-                   table="LINKEDLIST_OF_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfSimpleInterface8"
-                   table="LINKEDLIST_OF_SIMPLE_INTERFACE8">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfString9"
-                   table="LINKEDLIST_OF_STRING9">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfString11"
-                   column="LINKEDLIST_OF_STRING11">
-            </field>
-            <field name="LinkedListOfString10"
-                   table="LINKEDLIST_OF_STRING10">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfDate12"
-                   table="LINKEDLIST_OF_DATE12">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfDate14"
-                   column="LINKEDLIST_OF_DATE14">
-            </field>
-            <field name="LinkedListOfDate13"
-                   table="LINKEDLIST_OF_DATE13">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfLocale15"
-                   table="LINKEDLIST_OF_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfLocale17"
-                   column="LINKEDLIST_OF_LOCALE17">
-            </field>
-            <field name="LinkedListOfLocale16"
-                   table="LINKEDLIST_OF_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfBigDecimal18"
-                   table="LINKEDLIST_OF_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfBigDecimal20"
-                   column="LINKEDLIST_OF_BIG_DECIMAL20">
-            </field>
-            <field name="LinkedListOfBigDecimal19"
-                   table="LINKEDLIST_OF_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfBigInteger21"
-                   table="LINKEDLIST_OF_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfBigInteger23"
-                   column="LINKEDLIST_OF_BIG_INTEGER23">
-            </field>
-            <field name="LinkedListOfBigInteger22"
-                   table="LINKEDLIST_OF_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfByte24"
-                   table="LINKEDLIST_OF_BYTE24">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfByte26"
-                   column="LINKEDLIST_OF_BYTE26">
-            </field>
-            <field name="LinkedListOfByte25"
-                   table="LINKEDLIST_OF_BYTE25">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfDouble27"
-                   table="LINKEDLIST_OF_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfDouble29"
-                   column="LINKEDLIST_OF_DOUBLE29">
-            </field>
-            <field name="LinkedListOfDouble28"
-                   table="LINKEDLIST_OF_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfFloat30"
-                   table="LINKEDLIST_OF_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfFloat32"
-                   column="LINKEDLIST_OF_FLOAT32">
-            </field>
-            <field name="LinkedListOfFloat31"
-                   table="LINKEDLIST_OF_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfInteger33"
-                   table="LINKEDLIST_OF_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfInteger35"
-                   column="LINKEDLIST_OF_INTEGER35">
-            </field>
-            <field name="LinkedListOfInteger34"
-                   table="LINKEDLIST_OF_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfLong36"
-                   table="LINKEDLIST_OF_LONG36">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfLong38"
-                   column="LINKEDLIST_OF_LONG38">
-            </field>
-            <field name="LinkedListOfLong37"
-                   table="LINKEDLIST_OF_LONG37">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfShort39"
-                   table="LINKEDLIST_OF_SHORT39">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfShort41"
-                   column="LINKEDLIST_OF_SHORT41">
-            </field>
-            <field name="LinkedListOfShort40"
-                   table="LINKEDLIST_OF_SHORT40">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm	(working copy)
@@ -1,250 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="VectorCollections" table="VECTOR_COLLECTIONS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="VectorOfObject0"
-                   table="VECTOR_OF_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfObject1"
-                   table="VECTOR_OF_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfObject2"
-                   table="VECTOR_OF_OBJECT2">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfSimpleClass3"
-                   table="VECTOR_OF_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfSimpleClass4"
-                   table="VECTOR_OF_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfSimpleClass5"
-                   table="VECTOR_OF_SIMPLE_CLASS5">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfSimpleClass42"
-                   column="VECTOR_OF_SIMPLE_CLASS42">
-            </field>
-            <field name="VectorOfSimpleInterface6"
-                   table="VECTOR_OF_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfSimpleInterface7"
-                   table="VECTOR_OF_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfSimpleInterface8"
-                   table="VECTOR_OF_SIMPLE_INTERFACE8">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfString9"
-                   table="VECTOR_OF_STRING9">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfString11"
-                   column="VECTOR_OF_STRING11">
-            </field>
-            <field name="VectorOfString10"
-                   table="VECTOR_OF_STRING10">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfDate12"
-                   table="VECTOR_OF_DATE12">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfDate14"
-                   column="VECTOR_OF_DATE14">
-            </field>
-            <field name="VectorOfDate13"
-                   table="VECTOR_OF_DATE13">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfLocale15"
-                   table="VECTOR_OF_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfLocale17"
-                   column="VECTOR_OF_LOCALE17">
-            </field>
-            <field name="VectorOfLocale16"
-                   table="VECTOR_OF_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfBigDecimal18"
-                   table="VECTOR_OF_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfBigDecimal20"
-                   column="VECTOR_OF_BIG_DECIMAL20">
-            </field>
-            <field name="VectorOfBigDecimal19"
-                   table="VECTOR_OF_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfBigInteger21"
-                   table="VECTOR_OF_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfBigInteger23"
-                   column="VECTOR_OF_BIG_INTEGER23">
-            </field>
-            <field name="VectorOfBigInteger22"
-                   table="VECTOR_OF_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfByte24"
-                   table="VECTOR_OF_BYTE24">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfByte26"
-                   column="VECTOR_OF_BYTE26">
-            </field>
-            <field name="VectorOfByte25"
-                   table="VECTOR_OF_BYTE25">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfDouble27"
-                   table="VECTOR_OF_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfDouble29"
-                   column="VECTOR_OF_DOUBLE29">
-            </field>
-            <field name="VectorOfDouble28"
-                   table="VECTOR_OF_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfFloat30"
-                   table="VECTOR_OF_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfFloat32"
-                   column="VECTOR_OF_FLOAT32">
-            </field>
-            <field name="VectorOfFloat31"
-                   table="VECTOR_OF_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfInteger33"
-                   table="VECTOR_OF_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfInteger35"
-                   column="VECTOR_OF_INTEGER35">
-            </field>
-            <field name="VectorOfInteger34"
-                   table="VECTOR_OF_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfLong36"
-                   table="VECTOR_OF_LONG36">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfLong38"
-                   column="VECTOR_OF_LONG38">
-            </field>
-            <field name="VectorOfLong37"
-                   table="VECTOR_OF_LONG37">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfShort39"
-                   table="VECTOR_OF_SHORT39">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfShort41"
-                   column="VECTOR_OF_SHORT41">
-            </field>
-            <field name="VectorOfShort40"
-                   table="VECTOR_OF_SHORT40">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm	(working copy)
@@ -1,562 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="HashMapStringValueCollections"
-               table="HASHMAPSTRINGVALUE_COLLECTIONS">
-            <datastore-identity strategy="identity"
-                                column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="HashMapOfObject_String0" table="HASHMAP_OBJECT0_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfObject_String1" table="HASHMAP_OBJECT1_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfObject_String2" table="HASHMAP_OBJECT2_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfObject_String3" table="HASHMAP_OBJECT3_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfObject_String4" table="HASHMAP_OBJECT4_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfObject_String6" table="HASHMAP_OBJECT6_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfObject_String8" column="HASHMAP_OBJECT8_STR">
-            </field>
-            <field name="HashMapOfSimpleClass_String9"
-                   table="HASHMAP_SIMPLE_CLASS9_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleClass_String10"
-                   table="HASHMAP_SIMPLE_CLASS10_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleClass_String11"
-                   table="HASHMAP_SIMPLE_CLASS11_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleClass_String12"
-                   table="HASHMAP_SIMPLE_CLASS12_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleClass_String13"
-                   table="HASHMAP_SIMPLE_CLASS13_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleClass_String15"
-                   table="HASHMAP_SIMPLE_CLASS15_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleClass_String17"
-                   column="HASHMAP_SIMPLE_CLASS17_STR">
-            </field>
-            <field name="HashMapOfSimpleInterface_String18"
-                   table="HASHMAP_SIMPLE_INTERFACE18_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleInterface_String19"
-                   table="HASHMAP_SIMPLE_INTERFACE19_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleInterface_String20"
-                   table="HASHMAP_SIMPLE_INTERFACE20_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleInterface_String21"
-                   table="HASHMAP_SIMPLE_INTERFACE21_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleInterface_String22"
-                   table="HASHMAP_SIMPLE_INTERFACE22_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleInterface_String24"
-                   table="HASHMAP_SIMPLE_INTERFACE24_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleInterface_String26"
-                   column="HASHMAP_SIMPLE_INTERFACE26_STR">
-            </field>
-            <field name="HashMapOfString_String27" table="HASHMAP_STRING27_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_String28" table="HASHMAP_STRING28_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_String29" table="HASHMAP_STRING29_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_String30" table="HASHMAP_STRING30_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_String31" table="HASHMAP_STRING31_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_String33" table="HASHMAP_STRING33_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_String35" column="HASHMAP_STRING35_STR">
-            </field>
-            <field name="HashMapOfDate_String36" table="HASHMAP_DATE36_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDate_String37" table="HASHMAP_DATE37_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDate_String38" table="HASHMAP_DATE38_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDate_String39" table="HASHMAP_DATE39_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDate_String40" table="HASHMAP_DATE40_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDate_String42" table="HASHMAP_DATE42_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDate_String44" column="HASHMAP_DATE44_STR">
-            </field>
-            <field name="HashMapOfBigDecimal_String45"
-                   table="HASHMAP_BIG_DECIMAL45_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigDecimal_String46"
-                   table="HASHMAP_BIG_DECIMAL46_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigDecimal_String47"
-                   table="HASHMAP_BIG_DECIMAL47_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigDecimal_String48"
-                   table="HASHMAP_BIG_DECIMAL48_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigDecimal_String49"
-                   table="HASHMAP_BIG_DECIMAL49_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigDecimal_String51"
-                   table="HASHMAP_BIG_DECIMAL51_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigDecimal_String53"
-                   column="HASHMAP_BIG_DECIMAL53_STR">
-            </field>
-            <field name="HashMapOfBigInteger_String54"
-                   table="HASHMAP_BIG_INTEGER54_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigInteger_String55"
-                   table="HASHMAP_BIG_INTEGER55_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigInteger_String56"
-                   table="HASHMAP_BIG_INTEGER56_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigInteger_String57"
-                   table="HASHMAP_BIG_INTEGER57_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigInteger_String58"
-                   table="HASHMAP_BIG_INTEGER58_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigInteger_String60"
-                   table="HASHMAP_BIG_INTEGER60_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigInteger_String62"
-                   column="HASHMAP_BIG_INTEGER62_STR">
-            </field>
-            <field name="HashMapOfByte_String63" table="HASHMAP_BYTE63_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfByte_String64" table="HASHMAP_BYTE64_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfByte_String65" table="HASHMAP_BYTE65_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfByte_String66" table="HASHMAP_BYTE66_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfByte_String67" table="HASHMAP_BYTE67_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfByte_String69" table="HASHMAP_BYTE69_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfByte_String71" column="HASHMAP_BYTE71_STR">
-            </field>
-            <field name="HashMapOfDouble_String72" table="HASHMAP_DOUBLE72_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDouble_String73" table="HASHMAP_DOUBLE73_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDouble_String74" table="HASHMAP_DOUBLE74_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDouble_String75" table="HASHMAP_DOUBLE75_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDouble_String76" table="HASHMAP_DOUBLE76_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDouble_String78" table="HASHMAP_DOUBLE78_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDouble_String80" column="HASHMAP_DOUBLE80_STR">
-            </field>
-            <field name="HashMapOfFloat_String81" table="HASHMAP_FLOAT81_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfFloat_String82" table="HASHMAP_FLOAT82_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfFloat_String83" table="HASHMAP_FLOAT83_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfFloat_String84" table="HASHMAP_FLOAT84_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfFloat_String85" table="HASHMAP_FLOAT85_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfFloat_String87" table="HASHMAP_FLOAT87_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfFloat_String89" column="HASHMAP_FLOAT89_STR">
-            </field>
-            <field name="HashMapOfInteger_String90"
-                   table="HASHMAP_INTEGER90_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfInteger_String91"
-                   table="HASHMAP_INTEGER91_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfInteger_String92"
-                   table="HASHMAP_INTEGER92_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfInteger_String93"
-                   table="HASHMAP_INTEGER93_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfInteger_String94"
-                   table="HASHMAP_INTEGER94_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfInteger_String96"
-                   table="HASHMAP_INTEGER96_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfInteger_String98"
-                   column="HASHMAP_INTEGER98_STR">
-            </field>
-            <field name="HashMapOfLong_String99" table="HASHMAP_LONG99_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfLong_String100" table="HASHMAP_LONG100_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfLong_String101" table="HASHMAP_LONG101_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfLong_String102" table="HASHMAP_LONG102_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfLong_String103" table="HASHMAP_LONG103_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfLong_String105" table="HASHMAP_LONG105_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfLong_String107" column="HASHMAP_LONG107_STR">
-            </field>
-            <field name="HashMapOfShort_String108" table="HASHMAP_SHORT108_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfShort_String109" table="HASHMAP_SHORT109_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfShort_String110" table="HASHMAP_SHORT110_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfShort_String111" table="HASHMAP_SHORT111_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfShort_String112" table="HASHMAP_SHORT112_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfShort_String114" table="HASHMAP_SHORT114_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfShort_String116" column="HASHMAP_SHORT116_STR">
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-derby.orm	(working copy)
@@ -1,82 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfPrimitivefloat" table="FIELDSOFPRIMITIVEFLOAT">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="float0" column="FLOAT0"/>
-            <field name="float1" column="FLOAT1"/>
-            <field name="float102" column="FLOAT102"/>
-            <field name="float103" column="FLOAT103"/>
-            <field name="float104" column="FLOAT104"/>
-            <field name="float108" column="FLOAT108"/>
-            <field name="float109" column="FLOAT109"/>
-            <field name="float11" column="FLOAT11"/>
-            <field name="float110" column="FLOAT110"/>
-            <field name="float112" column="FLOAT112"/>
-            <field name="float113" column="FLOAT113"/>
-            <field name="float114" column="FLOAT114"/>
-            <field name="float119" column="FLOAT119"/>
-            <field name="float12" column="FLOAT12"/>
-            <field name="float120" column="FLOAT120"/>
-            <field name="float121" column="FLOAT121"/>
-            <field name="float124" column="FLOAT124"/>
-            <field name="float125" column="FLOAT125"/>
-            <field name="float126" column="FLOAT126"/>
-            <field name="float128" column="FLOAT128"/>
-            <field name="float129" column="FLOAT129"/>
-            <field name="float13" column="FLOAT13"/>
-            <field name="float130" column="FLOAT130"/>
-            <field name="float138" column="FLOAT138"/>
-            <field name="float139" column="FLOAT139"/>
-            <field name="float140" column="FLOAT140"/>
-            <field name="float16" column="FLOAT16"/>
-            <field name="float17" column="FLOAT17"/>
-            <field name="float18" column="FLOAT18"/>
-            <field name="float2" column="FLOAT2"/>
-            <field name="float20" column="FLOAT20"/>
-            <field name="float21" column="FLOAT21"/>
-            <field name="float22" column="FLOAT22"/>
-            <field name="float30" column="FLOAT30"/>
-            <field name="float31" column="FLOAT31"/>
-            <field name="float32" column="FLOAT32"/>
-            <field name="float36" column="FLOAT36"/>
-            <field name="float37" column="FLOAT37"/>
-            <field name="float38" column="FLOAT38"/>
-            <field name="float4" column="FLOAT4"/>
-            <field name="float40" column="FLOAT40"/>
-            <field name="float41" column="FLOAT41"/>
-            <field name="float42" column="FLOAT42"/>
-            <field name="float47" column="FLOAT47"/>
-            <field name="float48" column="FLOAT48"/>
-            <field name="float49" column="FLOAT49"/>
-            <field name="float5" column="FLOAT5"/>
-            <field name="float52" column="FLOAT52"/>
-            <field name="float53" column="FLOAT53"/>
-            <field name="float54" column="FLOAT54"/>
-            <field name="float56" column="FLOAT56"/>
-            <field name="float57" column="FLOAT57"/>
-            <field name="float58" column="FLOAT58"/>
-            <field name="float6" column="FLOAT6"/>
-            <field name="float66" column="FLOAT66"/>
-            <field name="float67" column="FLOAT67"/>
-            <field name="float68" column="FLOAT68"/>
-            <field name="float72" column="FLOAT72"/>
-            <field name="float73" column="FLOAT73"/>
-            <field name="float74" column="FLOAT74"/>
-            <field name="float76" column="FLOAT76"/>
-            <field name="float77" column="FLOAT77"/>
-            <field name="float78" column="FLOAT78"/>
-            <field name="float83" column="FLOAT83"/>
-            <field name="float84" column="FLOAT84"/>
-            <field name="float85" column="FLOAT85"/>
-            <field name="float88" column="FLOAT88"/>
-            <field name="float89" column="FLOAT89"/>
-            <field name="float90" column="FLOAT90"/>
-            <field name="float92" column="FLOAT92"/>
-            <field name="float93" column="FLOAT93"/>
-            <field name="float94" column="FLOAT94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-derby.orm	(working copy)
@@ -1,82 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfLocale" table="FIELDSOFLOCALE">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="Locale0" column="LOCALE0"/>
-            <field name="Locale1" column="LOCALE1"/>
-            <field name="Locale102" column="LOCALE102"/>
-            <field name="Locale103" column="LOCALE103"/>
-            <field name="Locale104" column="LOCALE104"/>
-            <field name="Locale108" column="LOCALE108"/>
-            <field name="Locale109" column="LOCALE109"/>
-            <field name="Locale11" column="LOCALE11"/>
-            <field name="Locale110" column="LOCALE110"/>
-            <field name="Locale112" column="LOCALE112"/>
-            <field name="Locale113" column="LOCALE113"/>
-            <field name="Locale114" column="LOCALE114"/>
-            <field name="Locale119" column="LOCALE119"/>
-            <field name="Locale12" column="LOCALE12"/>
-            <field name="Locale120" column="LOCALE120"/>
-            <field name="Locale121" column="LOCALE121"/>
-            <field name="Locale124" column="LOCALE124"/>
-            <field name="Locale125" column="LOCALE125"/>
-            <field name="Locale126" column="LOCALE126"/>
-            <field name="Locale128" column="LOCALE128"/>
-            <field name="Locale129" column="LOCALE129"/>
-            <field name="Locale13" column="LOCALE13"/>
-            <field name="Locale130" column="LOCALE130"/>
-            <field name="Locale138" column="LOCALE138"/>
-            <field name="Locale139" column="LOCALE139"/>
-            <field name="Locale140" column="LOCALE140"/>
-            <field name="Locale16" column="LOCALE16"/>
-            <field name="Locale17" column="LOCALE17"/>
-            <field name="Locale18" column="LOCALE18"/>
-            <field name="Locale2" column="LOCALE2"/>
-            <field name="Locale20" column="LOCALE20"/>
-            <field name="Locale21" column="LOCALE21"/>
-            <field name="Locale22" column="LOCALE22"/>
-            <field name="Locale30" column="LOCALE30"/>
-            <field name="Locale31" column="LOCALE31"/>
-            <field name="Locale32" column="LOCALE32"/>
-            <field name="Locale36" column="LOCALE36"/>
-            <field name="Locale37" column="LOCALE37"/>
-            <field name="Locale38" column="LOCALE38"/>
-            <field name="Locale4" column="LOCALE4"/>
-            <field name="Locale40" column="LOCALE40"/>
-            <field name="Locale41" column="LOCALE41"/>
-            <field name="Locale42" column="LOCALE42"/>
-            <field name="Locale47" column="LOCALE47"/>
-            <field name="Locale48" column="LOCALE48"/>
-            <field name="Locale49" column="LOCALE49"/>
-            <field name="Locale5" column="LOCALE5"/>
-            <field name="Locale52" column="LOCALE52"/>
-            <field name="Locale53" column="LOCALE53"/>
-            <field name="Locale54" column="LOCALE54"/>
-            <field name="Locale56" column="LOCALE56"/>
-            <field name="Locale57" column="LOCALE57"/>
-            <field name="Locale58" column="LOCALE58"/>
-            <field name="Locale6" column="LOCALE6"/>
-            <field name="Locale66" column="LOCALE66"/>
-            <field name="Locale67" column="LOCALE67"/>
-            <field name="Locale68" column="LOCALE68"/>
-            <field name="Locale72" column="LOCALE72"/>
-            <field name="Locale73" column="LOCALE73"/>
-            <field name="Locale74" column="LOCALE74"/>
-            <field name="Locale76" column="LOCALE76"/>
-            <field name="Locale77" column="LOCALE77"/>
-            <field name="Locale78" column="LOCALE78"/>
-            <field name="Locale83" column="LOCALE83"/>
-            <field name="Locale84" column="LOCALE84"/>
-            <field name="Locale85" column="LOCALE85"/>
-            <field name="Locale88" column="LOCALE88"/>
-            <field name="Locale89" column="LOCALE89"/>
-            <field name="Locale90" column="LOCALE90"/>
-            <field name="Locale92" column="LOCALE92"/>
-            <field name="Locale93" column="LOCALE93"/>
-            <field name="Locale94" column="LOCALE94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-derby.orm	(working copy)
@@ -1,12 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="SimpleClass" table="SIMPLE_CLASS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="id" column="IDENTIFIER"/>
-            <field name="intField" column="INTVAL"/>
-            <field name="stringField" column="STRINGVAL"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm	(working copy)
@@ -1,615 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="TreeMapStringValueCollections"
-               table="TREEMAPSTRINGVALUE_COLLECTIONS">
-            <datastore-identity strategy="identity"
-                                column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="TreeMapOfObject_String0" table="TREEMAP_OBJECT0_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfObject_String1" table="TREEMAP_OBJECT1_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfObject_String2" table="TREEMAP_OBJECT2_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfObject_String3"
-                   table="TREEMAP_OBJECT3_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfObject_String4"
-                   table="TREEMAP_OBJECT4_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfObject_String6"
-                   table="TREEMAP_OBJECT6_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfObject_String8"
-                   column="TREEMAP_OBJECT8_STR">
-            </field>
-            <field name="TreeMapOfSimpleClass_String9"
-                   table="TREEMAP_SIMPLE_CLASS9_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleClass_String10"
-                   table="TREEMAP_SIMPLE_CLASS10_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleClass_String11"
-                   table="TREEMAP_SIMPLE_CLASS11_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleClass_String12"
-                   table="TREEMAP_SIMPLE_CLASS12_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleClass_String13"
-                   table="TREEMAP_SIMPLE_CLASS13_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleClass_String15"
-                   table="TREEMAP_SIMPLE_CLASS15_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleClass_String17"
-                   column="TREEMAP_SIMPLE_CLASS17_STR">
-            </field>
-            <field name="TreeMapOfSimpleInterface_String18"
-                   table="TREEMAP_SIMPLE_INTERFACE18_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleInterface_String19"
-                   table="TREEMAP_SIMPLE_INTERFACE19_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleInterface_String20"
-                   table="TREEMAP_SIMPLE_INTERFACE20_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleInterface_String21"
-                   table="TREEMAP_SIMPLE_INTERFACE21_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleInterface_String22"
-                   table="TREEMAP_SIMPLE_INTERFACE22_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleInterface_String24"
-                   table="TREEMAP_SIMPLE_INTERFACE24_STR">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleInterface_String26"
-                   column="TREEMAP_SIMPLE_INTERFACE26_STR">
-            </field>
-            <field name="TreeMapOfString_String27"
-                   table="TREEMAP_STRING27_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_String28"
-                   table="TREEMAP_STRING28_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_String29"
-                   table="TREEMAP_STRING29_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_String30"
-                   table="TREEMAP_STRING30_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_String31"
-                   table="TREEMAP_STRING31_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_String33"
-                   table="TREEMAP_STRING33_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_String35"
-                   column="TREEMAP_STRING35_STR">
-            </field>
-            <field name="TreeMapOfDate_String36"
-                   table="TREEMAP_DATE36_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDate_String37"
-                   table="TREEMAP_DATE37_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDate_String38"
-                   table="TREEMAP_DATE38_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDate_String39"
-                   table="TREEMAP_DATE39_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDate_String40"
-                   table="TREEMAP_DATE40_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDate_String42"
-                   table="TREEMAP_DATE42_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDate_String44"
-                   column="TREEMAP_DATE44_STR">
-            </field>
-            <field name="TreeMapOfBigDecimal_String45"
-                   table="TREEMAP_BIG_DECIMAL45_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigDecimal_String46"
-                   table="TREEMAP_BIG_DECIMAL46_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigDecimal_String47"
-                   table="TREEMAP_BIG_DECIMAL47_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigDecimal_String48"
-                   table="TREEMAP_BIG_DECIMAL48_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigDecimal_String49"
-                   table="TREEMAP_BIG_DECIMAL49_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigDecimal_String51"
-                   table="TREEMAP_BIG_DECIMAL51_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigDecimal_String53"
-                   column="TREEMAP_BIG_DECIMAL53_STR">
-            </field>
-            <field name="TreeMapOfBigInteger_String54"
-                   table="TREEMAP_BIG_INTEGER54_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigInteger_String55"
-                   table="TREEMAP_BIG_INTEGER55_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigInteger_String56"
-                   table="TREEMAP_BIG_INTEGER56_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigInteger_String57"
-                   table="TREEMAP_BIG_INTEGER57_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigInteger_String58"
-                   table="TREEMAP_BIG_INTEGER58_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigInteger_String60"
-                   table="TREEMAP_BIG_INTEGER60_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigInteger_String62"
-                   column="TREEMAP_BIG_INTEGER62_STR">
-            </field>
-            <field name="TreeMapOfByte_String63"
-                   table="TREEMAP_BYTE63_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfByte_String64"
-                   table="TREEMAP_BYTE64_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfByte_String65"
-                   table="TREEMAP_BYTE65_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfByte_String66"
-                   table="TREEMAP_BYTE66_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfByte_String67"
-                   table="TREEMAP_BYTE67_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfByte_String69"
-                   table="TREEMAP_BYTE69_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfByte_String71"
-                   column="TREEMAP_BYTE71_STR">
-            </field>
-            <field name="TreeMapOfDouble_String72"
-                   table="TREEMAP_DOUBLE72_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDouble_String73"
-                   table="TREEMAP_DOUBLE73_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDouble_String74"
-                   table="TREEMAP_DOUBLE74_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDouble_String75"
-                   table="TREEMAP_DOUBLE75_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDouble_String76"
-                   table="TREEMAP_DOUBLE76_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDouble_String78"
-                   table="TREEMAP_DOUBLE78_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDouble_String80"
-                   column="TREEMAP_DOUBLE80_STR">
-            </field>
-            <field name="TreeMapOfFloat_String81"
-                   table="TREEMAP_FLOAT81_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfFloat_String82"
-                   table="TREEMAP_FLOAT82_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfFloat_String83"
-                   table="TREEMAP_FLOAT83_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfFloat_String84"
-                   table="TREEMAP_FLOAT84_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfFloat_String85"
-                   table="TREEMAP_FLOAT85_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfFloat_String87"
-                   table="TREEMAP_FLOAT87_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfFloat_String89"
-                   column="TREEMAP_FLOAT89_STR">
-            </field>
-            <field name="TreeMapOfInteger_String90"
-                   table="TREEMAP_INTEGER90_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfInteger_String91"
-                   table="TREEMAP_INTEGER91_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfInteger_String92"
-                   table="TREEMAP_INTEGER92_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfInteger_String93"
-                   table="TREEMAP_INTEGER93_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfInteger_String94"
-                   table="TREEMAP_INTEGER94_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfInteger_String96"
-                   table="TREEMAP_INTEGER96_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfInteger_String98"
-                   column="TREEMAP_INTEGER98_STR">
-            </field>
-            <field name="TreeMapOfLong_String99"
-                   table="TREEMAP_LONG99_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfLong_String100"
-                   table="TREEMAP_LONG100_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfLong_String101"
-                   table="TREEMAP_LONG101_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfLong_String102"
-                   table="TREEMAP_LONG102_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfLong_String103"
-                   table="TREEMAP_LONG103_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfLong_String105"
-                   table="TREEMAP_LONG105_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfLong_String107"
-                   column="TREEMAP_LONG107_STR">
-            </field>
-            <field name="TreeMapOfShort_String108"
-                   table="TREEMAP_SHORT108_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfShort_String109"
-                   table="TREEMAP_SHORT109_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfShort_String110"
-                   table="TREEMAP_SHORT110_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfShort_String111"
-                   table="TREEMAP_SHORT111_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfShort_String112"
-                   table="TREEMAP_SHORT112_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfShort_String114"
-                   table="TREEMAP_SHORT114_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfShort_String116"
-                   column="TREEMAP_SHORT116_STR">
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-derby.orm	(working copy)
@@ -1,82 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfDate" table="FIELDSOFDATE">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="Date0" column="DATE0"/>
-            <field name="Date1" column="DATE1"/>
-            <field name="Date102" column="DATE102"/>
-            <field name="Date103" column="DATE103"/>
-            <field name="Date104" column="DATE104"/>
-            <field name="Date108" column="DATE108"/>
-            <field name="Date109" column="DATE109"/>
-            <field name="Date11" column="DATE11"/>
-            <field name="Date110" column="DATE110"/>
-            <field name="Date112" column="DATE112"/>
-            <field name="Date113" column="DATE113"/>
-            <field name="Date114" column="DATE114"/>
-            <field name="Date119" column="DATE119"/>
-            <field name="Date12" column="DATE12"/>
-            <field name="Date120" column="DATE120"/>
-            <field name="Date121" column="DATE121"/>
-            <field name="Date124" column="DATE124"/>
-            <field name="Date125" column="DATE125"/>
-            <field name="Date126" column="DATE126"/>
-            <field name="Date128" column="DATE128"/>
-            <field name="Date129" column="DATE129"/>
-            <field name="Date13" column="DATE13"/>
-            <field name="Date130" column="DATE130"/>
-            <field name="Date138" column="DATE138"/>
-            <field name="Date139" column="DATE139"/>
-            <field name="Date140" column="DATE140"/>
-            <field name="Date16" column="DATE16"/>
-            <field name="Date17" column="DATE17"/>
-            <field name="Date18" column="DATE18"/>
-            <field name="Date2" column="DATE2"/>
-            <field name="Date20" column="DATE20"/>
-            <field name="Date21" column="DATE21"/>
-            <field name="Date22" column="DATE22"/>
-            <field name="Date30" column="DATE30"/>
-            <field name="Date31" column="DATE31"/>
-            <field name="Date32" column="DATE32"/>
-            <field name="Date36" column="DATE36"/>
-            <field name="Date37" column="DATE37"/>
-            <field name="Date38" column="DATE38"/>
-            <field name="Date4" column="DATE4"/>
-            <field name="Date40" column="DATE40"/>
-            <field name="Date41" column="DATE41"/>
-            <field name="Date42" column="DATE42"/>
-            <field name="Date47" column="DATE47"/>
-            <field name="Date48" column="DATE48"/>
-            <field name="Date49" column="DATE49"/>
-            <field name="Date5" column="DATE5"/>
-            <field name="Date52" column="DATE52"/>
-            <field name="Date53" column="DATE53"/>
-            <field name="Date54" column="DATE54"/>
-            <field name="Date56" column="DATE56"/>
-            <field name="Date57" column="DATE57"/>
-            <field name="Date58" column="DATE58"/>
-            <field name="Date6" column="DATE6"/>
-            <field name="Date66" column="DATE66"/>
-            <field name="Date67" column="DATE67"/>
-            <field name="Date68" column="DATE68"/>
-            <field name="Date72" column="DATE72"/>
-            <field name="Date73" column="DATE73"/>
-            <field name="Date74" column="DATE74"/>
-            <field name="Date76" column="DATE76"/>
-            <field name="Date77" column="DATE77"/>
-            <field name="Date78" column="DATE78"/>
-            <field name="Date83" column="DATE83"/>
-            <field name="Date84" column="DATE84"/>
-            <field name="Date85" column="DATE85"/>
-            <field name="Date88" column="DATE88"/>
-            <field name="Date89" column="DATE89"/>
-            <field name="Date90" column="DATE90"/>
-            <field name="Date92" column="DATE92"/>
-            <field name="Date93" column="DATE93"/>
-            <field name="Date94" column="DATE94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm	(working copy)
@@ -1,250 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="CollectionCollections" table="COLLECTION_COLLECTIONS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="CollectionOfObject0"
-                   table="COLLECTION_OF_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfObject1"
-                   table="COLLECTION_OF_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfObject2"
-                   table="COLLECTION_OF_OBJECT2">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfSimpleClass3"
-                   table="COLLECTION_OF_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfSimpleClass4"
-                   table="COLLECTION_OF_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfSimpleClass5"
-                   table="COLLECTION_OF_SIMPLE_CLASS5">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfSimpleClass42"
-                   column="COLLECTION_OF_SIMPLE_CLASS42">
-            </field>
-            <field name="CollectionOfSimpleInterface6"
-                   table="COLLECTION_OF_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfSimpleInterface7"
-                   table="COLLECTION_OF_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfSimpleInterface8"
-                   table="COLLECTION_OF_SIMPLE_INTERFACE8">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfString9"
-                   table="COLLECTION_OF_STRING9">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfString11"
-                   column="COLLECTION_OF_STRING11">
-            </field>
-            <field name="CollectionOfString10"
-                   table="COLLECTION_OF_STRING10">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfDate12"
-                   table="COLLECTION_OF_DATE12">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfDate14"
-                   column="COLLECTION_OF_DATE14">
-            </field>
-            <field name="CollectionOfDate13"
-                   table="COLLECTION_OF_DATE13">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfLocale15"
-                   table="COLLECTION_OF_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfLocale17"
-                   column="COLLECTION_OF_LOCALE17">
-            </field>
-            <field name="CollectionOfLocale16"
-                   table="COLLECTION_OF_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfBigDecimal18"
-                   table="COLLECTION_OF_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfBigDecimal20"
-                   column="COLLECTION_OF_BIG_DECIMAL20">
-            </field>
-            <field name="CollectionOfBigDecimal19"
-                   table="COLLECTION_OF_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfBigInteger21"
-                   table="COLLECTION_OF_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfBigInteger23"
-                   column="COLLECTION_OF_BIG_INTEGER23">
-            </field>
-            <field name="CollectionOfBigInteger22"
-                   table="COLLECTION_OF_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfByte24"
-                   table="COLLECTION_OF_BYTE24">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfByte26"
-                   column="COLLECTION_OF_BYTE26">
-            </field>
-            <field name="CollectionOfByte25"
-                   table="COLLECTION_OF_BYTE25">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfDouble27"
-                   table="COLLECTION_OF_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfDouble29"
-                   column="COLLECTION_OF_DOUBLE29">
-            </field>
-            <field name="CollectionOfDouble28"
-                   table="COLLECTION_OF_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfFloat30"
-                   table="COLLECTION_OF_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfFloat32"
-                   column="COLLECTION_OF_FLOAT32">
-            </field>
-            <field name="CollectionOfFloat31"
-                   table="COLLECTION_OF_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfInteger33"
-                   table="COLLECTION_OF_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfInteger35"
-                   column="COLLECTION_OF_INTEGER35">
-            </field>
-            <field name="CollectionOfInteger34"
-                   table="COLLECTION_OF_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfLong36"
-                   table="COLLECTION_OF_LONG36">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfLong38"
-                   column="COLLECTION_OF_LONG38">
-            </field>
-            <field name="CollectionOfLong37"
-                   table="COLLECTION_OF_LONG37">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfShort39"
-                   table="COLLECTION_OF_SHORT39">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfShort41"
-                   column="COLLECTION_OF_SHORT41">
-            </field>
-            <field name="CollectionOfShort40"
-                   table="COLLECTION_OF_SHORT40">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-derby.orm	(working copy)
@@ -1,223 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfBigDecimal" table="FIELDSOFBIGDECIMAL">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="BigDecimal1">
-                <column name="BIG_DECIMAL1" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal102">
-                <column name="BIG_DECIMAL102" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal103">
-                <column name="BIG_DECIMAL103" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal104">
-                <column name="BIG_DECIMAL104" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal108">
-                <column name="BIG_DECIMAL108" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal109">
-                <column name="BIG_DECIMAL109" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal11">
-                <column name="BIG_DECIMAL11" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal110">
-                <column name="BIG_DECIMAL110" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal112">
-                <column name="BIG_DECIMAL112" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal113">
-                <column name="BIG_DECIMAL113" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal114">
-                <column name="BIG_DECIMAL114" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal119">
-                <column name="BIG_DECIMAL119" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal12">
-                <column name="BIG_DECIMAL12" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal120">
-                <column name="BIG_DECIMAL120" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal121">
-                <column name="BIG_DECIMAL121" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal124">
-                <column name="BIG_DECIMAL124" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal125">
-                <column name="BIG_DECIMAL125" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal126">
-                <column name="BIG_DECIMAL126" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal128">
-                <column name="BIG_DECIMAL128" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal129">
-                <column name="BIG_DECIMAL129" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal13">
-                <column name="BIG_DECIMAL13" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal130">
-                <column name="BIG_DECIMAL130" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal138">
-                <column name="BIG_DECIMAL138" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal139">
-                <column name="BIG_DECIMAL139" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal140">
-                <column name="BIG_DECIMAL140" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal16">
-                <column name="BIG_DECIMAL16" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal17">
-                <column name="BIG_DECIMAL17" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal18">
-                <column name="BIG_DECIMAL18" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal2">
-                <column name="BIG_DECIMAL2" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal20">
-                <column name="BIG_DECIMAL20" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal21">
-                <column name="BIG_DECIMAL21" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal22">
-                <column name="BIG_DECIMAL22" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal30">
-                <column name="BIG_DECIMAL30" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal31">
-                <column name="BIG_DECIMAL31" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal32">
-                <column name="BIG_DECIMAL32" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal36">
-                <column name="BIG_DECIMAL36" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal37">
-                <column name="BIG_DECIMAL37" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal38">
-                <column name="BIG_DECIMAL38" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal4">
-                <column name="BIG_DECIMAL4" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal40">
-                <column name="BIG_DECIMAL40" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal41">
-                <column name="BIG_DECIMAL41" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal42">
-                <column name="BIG_DECIMAL42" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal47">
-                <column name="BIG_DECIMAL47" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal48">
-                <column name="BIG_DECIMAL48" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal49">
-                <column name="BIG_DECIMAL49" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal5">
-                <column name="BIG_DECIMAL5" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal52">
-                <column name="BIG_DECIMAL52" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal53">
-                <column name="BIG_DECIMAL53" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal54">
-                <column name="BIG_DECIMAL54" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal56">
-                <column name="BIG_DECIMAL56" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal57">
-                <column name="BIG_DECIMAL57" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal58">
-                <column name="BIG_DECIMAL58" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal6">
-                <column name="BIG_DECIMAL6" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal66">
-                <column name="BIG_DECIMAL66" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal67">
-                <column name="BIG_DECIMAL67" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal68">
-                <column name="BIG_DECIMAL68" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal72">
-                <column name="BIG_DECIMAL72" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal73">
-                <column name="BIG_DECIMAL73" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal74">
-                <column name="BIG_DECIMAL74" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal76">
-                <column name="BIG_DECIMAL76" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal77">
-                <column name="BIG_DECIMAL77" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal78">
-                <column name="BIG_DECIMAL78" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal83">
-                <column name="BIG_DECIMAL83" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal84">
-                <column name="BIG_DECIMAL84" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal85">
-                <column name="BIG_DECIMAL85" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal88">
-                <column name="BIG_DECIMAL88" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal89">
-                <column name="BIG_DECIMAL89" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal90">
-                <column name="BIG_DECIMAL90" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal92">
-                <column name="BIG_DECIMAL92" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal93">
-                <column name="BIG_DECIMAL93" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal94">
-                <column name="BIG_DECIMAL94" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm	(working copy)
@@ -1,37 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="AllTypes" table="ALLTYPES">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="id" column="ID"/>
-            <field name="fld_boolean" column="PRIMITIVEBOOLEAN"/>
-            <field name="fld_byte" column="PRIMITIVEBYTE"/>
-            <field name="fld_char">
-                <column name="PRIMITIVECHAR" jdbc-type="INTEGER"/>
-            </field>
-            <field name="fld_double" column="PRIMITIVEDOUBLE"/>
-            <field name="fld_float" column="PRIMITIVEFLOAT"/>
-            <field name="fld_int" column="PRIMITIVEINT"/>
-            <field name="fld_long" column="PRIMITIVELONG"/>
-            <field name="fld_short" column="PRIMITIVESHORT"/>
-            <field name="fld_Boolean" column="BOOLEANVAL"/>
-            <field name="fld_Byte" column="BYTEVAL"/>
-            <field name="fld_Character">
-                <column name="CHARACTERVAL" jdbc-type="INTEGER"/>
-            </field>
-            <field name="fld_Double" column="DOUBLEVAL"/>
-            <field name="fld_Float" column="FLOATVAL"/>
-            <field name="fld_Integer" column="INTEGERVAL"/>
-            <field name="fld_Long" column="LONGVAL"/>
-            <field name="fld_Short" column="SHORTVAL"/>
-            <field name="fld_String" column="STRINGVAL"/>
-            <field name="fld_Locale" column="LOCALEVAL"/>
-            <field name="fld_Date" column="DATEVAL"/>
-            <field name="fld_BigDecimal">
-                <column name="BIGDECIMALVAL" jdbc-type="DECIMAL" length="25" scale="10"/>
-            </field>
-            <field name="fld_BigInteger" column="BIGINTEGERVAL"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm	(working copy)
@@ -1,228 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="HashSetCollections" table="HASHSET_COLLECTIONS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="HashSetOfObject0"
-                   table="HASHSET_OF_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-            </field>
-            <field name="HashSetOfObject1"
-                   table="HASHSET_OF_OBJECT1">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-            </field>
-            <field name="HashSetOfObject2"
-                   column="HASHSET_OF_OBJECT2">
-            </field>
-            <field name="HashSetOfSimpleClass3"
-                   table="HASHSET_OF_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-            </field>
-            <field name="HashSetOfSimpleClass4"
-                   table="HASHSET_OF_SIMPLE_CLASS4">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-            </field>
-            <field name="HashSetOfSimpleClass5"
-                   column="HASHSET_OF_SIMPLE_CLASS5">
-            </field>
-            <field name="HashSetOfSimpleClass42"
-                   column="HASHSET_OF_SIMPLE_CLASS42">
-            </field>
-            <field name="HashSetOfSimpleInterface6"
-                   table="HASHSET_OF_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-            </field>
-            <field name="HashSetOfSimpleInterface7"
-                   table="HASHSET_OF_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER">
-                    <primary-key>
-                        <column name="IDENTIFIER"/>
-                        <column name="ID"/>
-                    </primary-key>
-                </join>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-            </field>
-            <field name="HashSetOfSimpleInterface8"
-                   column="HASHSET_OF_SIMPLE_INTERFACE8">
-            </field>
-            <field name="HashSetOfString9"
-                   table="HASHSET_OF_STRING9">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-            </field>
-            <field name="HashSetOfString11"
-                   column="HASHSET_OF_STRING11">
-            </field>
-            <field name="HashSetOfString10"
-                   table="HASHSET_OF_STRING10">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-            </field>
-            <field name="HashSetOfDate12"
-                   table="HASHSET_OF_DATE12">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-            </field>
-            <field name="HashSetOfDate14"
-                   column="HASHSET_OF_DATE14">
-            </field>
-            <field name="HashSetOfDate13"
-                   table="HASHSET_OF_DATE13">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-            </field>
-            <field name="HashSetOfLocale15"
-                   table="HASHSET_OF_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-            </field>
-            <field name="HashSetOfLocale17"
-                   column="HASHSET_OF_LOCALE17">
-            </field>
-            <field name="HashSetOfLocale16"
-                   table="HASHSET_OF_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-            </field>
-            <field name="HashSetOfBigDecimal18"
-                   table="HASHSET_OF_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-            </field>
-            <field name="HashSetOfBigDecimal20"
-                   column="HASHSET_OF_BIG_DECIMAL20">
-            </field>
-            <field name="HashSetOfBigDecimal19"
-                   table="HASHSET_OF_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-            </field>
-            <field name="HashSetOfBigInteger21"
-                   table="HASHSET_OF_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-            </field>
-            <field name="HashSetOfBigInteger23"
-                   column="HASHSET_OF_BIG_INTEGER23">
-            </field>
-            <field name="HashSetOfBigInteger22"
-                   table="HASHSET_OF_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-            </field>
-            <field name="HashSetOfByte24"
-                   table="HASHSET_OF_BYTE24">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-            </field>
-            <field name="HashSetOfByte26"
-                   column="HASHSET_OF_BYTE26">
-            </field>
-            <field name="HashSetOfByte25"
-                   table="HASHSET_OF_BYTE25">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-            </field>
-            <field name="HashSetOfDouble27"
-                   table="HASHSET_OF_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-            </field>
-            <field name="HashSetOfDouble29"
-                   column="HASHSET_OF_DOUBLE29">
-            </field>
-            <field name="HashSetOfDouble28"
-                   table="HASHSET_OF_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-            </field>
-            <field name="HashSetOfFloat30"
-                   table="HASHSET_OF_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-            </field>
-            <field name="HashSetOfFloat32"
-                   column="HASHSET_OF_FLOAT32">
-            </field>
-            <field name="HashSetOfFloat31"
-                   table="HASHSET_OF_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-            </field>
-            <field name="HashSetOfInteger33"
-                   table="HASHSET_OF_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-            </field>
-            <field name="HashSetOfInteger35"
-                   column="HASHSET_OF_INTEGER35">
-            </field>
-            <field name="HashSetOfInteger34"
-                   table="HASHSET_OF_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-            </field>
-            <field name="HashSetOfLong36"
-                   table="HASHSET_OF_LONG36">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-            </field>
-            <field name="HashSetOfLong38"
-                   column="HASHSET_OF_LONG38">
-            </field>
-            <field name="HashSetOfLong37"
-                   table="HASHSET_OF_LONG37">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-            </field>
-            <field name="HashSetOfShort39"
-                   table="HASHSET_OF_SHORT39">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-            </field>
-            <field name="HashSetOfShort41"
-                   column="HASHSET_OF_SHORT41">
-            </field>
-            <field name="HashSetOfShort40"
-                   table="HASHSET_OF_SHORT40">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-derby.orm	(working copy)
@@ -1,82 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfPrimitivelong" table="FIELDSOFPRIMITIVELONG">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="long0" column="LONG0"/>
-            <field name="long1" column="LONG1"/>
-            <field name="long102" column="LONG102"/>
-            <field name="long103" column="LONG103"/>
-            <field name="long104" column="LONG104"/>
-            <field name="long108" column="LONG108"/>
-            <field name="long109" column="LONG109"/>
-            <field name="long11" column="LONG11"/>
-            <field name="long110" column="LONG110"/>
-            <field name="long112" column="LONG112"/>
-            <field name="long113" column="LONG113"/>
-            <field name="long114" column="LONG114"/>
-            <field name="long119" column="LONG119"/>
-            <field name="long12" column="LONG12"/>
-            <field name="long120" column="LONG120"/>
-            <field name="long121" column="LONG121"/>
-            <field name="long124" column="LONG124"/>
-            <field name="long125" column="LONG125"/>
-            <field name="long126" column="LONG126"/>
-            <field name="long128" column="LONG128"/>
-            <field name="long129" column="LONG129"/>
-            <field name="long13" column="LONG13"/>
-            <field name="long130" column="LONG130"/>
-            <field name="long138" column="LONG138"/>
-            <field name="long139" column="LONG139"/>
-            <field name="long140" column="LONG140"/>
-            <field name="long16" column="LONG16"/>
-            <field name="long17" column="LONG17"/>
-            <field name="long18" column="LONG18"/>
-            <field name="long2" column="LONG2"/>
-            <field name="long20" column="LONG20"/>
-            <field name="long21" column="LONG21"/>
-            <field name="long22" column="LONG22"/>
-            <field name="long30" column="LONG30"/>
-            <field name="long31" column="LONG31"/>
-            <field name="long32" column="LONG32"/>
-            <field name="long36" column="LONG36"/>
-            <field name="long37" column="LONG37"/>
-            <field name="long38" column="LONG38"/>
-            <field name="long4" column="LONG4"/>
-            <field name="long40" column="LONG40"/>
-            <field name="long41" column="LONG41"/>
-            <field name="long42" column="LONG42"/>
-            <field name="long47" column="LONG47"/>
-            <field name="long48" column="LONG48"/>
-            <field name="long49" column="LONG49"/>
-            <field name="long5" column="LONG5"/>
-            <field name="long52" column="LONG52"/>
-            <field name="long53" column="LONG53"/>
-            <field name="long54" column="LONG54"/>
-            <field name="long56" column="LONG56"/>
-            <field name="long57" column="LONG57"/>
-            <field name="long58" column="LONG58"/>
-            <field name="long6" column="LONG6"/>
-            <field name="long66" column="LONG66"/>
-            <field name="long67" column="LONG67"/>
-            <field name="long68" column="LONG68"/>
-            <field name="long72" column="LONG72"/>
-            <field name="long73" column="LONG73"/>
-            <field name="long74" column="LONG74"/>
-            <field name="long76" column="LONG76"/>
-            <field name="long77" column="LONG77"/>
-            <field name="long78" column="LONG78"/>
-            <field name="long83" column="LONG83"/>
-            <field name="long84" column="LONG84"/>
-            <field name="long85" column="LONG85"/>
-            <field name="long88" column="LONG88"/>
-            <field name="long89" column="LONG89"/>
-            <field name="long90" column="LONG90"/>
-            <field name="long92" column="LONG92"/>
-            <field name="long93" column="LONG93"/>
-            <field name="long94" column="LONG94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-derby.orm	(working copy)
@@ -1,82 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfPrimitivebyte" table="FIELDSOFPRIMITIVEBYTE">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="byte0" column="BYTE0"/>
-            <field name="byte1" column="BYTE1"/>
-            <field name="byte102" column="BYTE102"/>
-            <field name="byte103" column="BYTE103"/>
-            <field name="byte104" column="BYTE104"/>
-            <field name="byte108" column="BYTE108"/>
-            <field name="byte109" column="BYTE109"/>
-            <field name="byte11" column="BYTE11"/>
-            <field name="byte110" column="BYTE110"/>
-            <field name="byte112" column="BYTE112"/>
-            <field name="byte113" column="BYTE113"/>
-            <field name="byte114" column="BYTE114"/>
-            <field name="byte119" column="BYTE119"/>
-            <field name="byte12" column="BYTE12"/>
-            <field name="byte120" column="BYTE120"/>
-            <field name="byte121" column="BYTE121"/>
-            <field name="byte124" column="BYTE124"/>
-            <field name="byte125" column="BYTE125"/>
-            <field name="byte126" column="BYTE126"/>
-            <field name="byte128" column="BYTE128"/>
-            <field name="byte129" column="BYTE129"/>
-            <field name="byte13" column="BYTE13"/>
-            <field name="byte130" column="BYTE130"/>
-            <field name="byte138" column="BYTE138"/>
-            <field name="byte139" column="BYTE139"/>
-            <field name="byte140" column="BYTE140"/>
-            <field name="byte16" column="BYTE16"/>
-            <field name="byte17" column="BYTE17"/>
-            <field name="byte18" column="BYTE18"/>
-            <field name="byte2" column="BYTE2"/>
-            <field name="byte20" column="BYTE20"/>
-            <field name="byte21" column="BYTE21"/>
-            <field name="byte22" column="BYTE22"/>
-            <field name="byte30" column="BYTE30"/>
-            <field name="byte31" column="BYTE31"/>
-            <field name="byte32" column="BYTE32"/>
-            <field name="byte36" column="BYTE36"/>
-            <field name="byte37" column="BYTE37"/>
-            <field name="byte38" column="BYTE38"/>
-            <field name="byte4" column="BYTE4"/>
-            <field name="byte40" column="BYTE40"/>
-            <field name="byte41" column="BYTE41"/>
-            <field name="byte42" column="BYTE42"/>
-            <field name="byte47" column="BYTE47"/>
-            <field name="byte48" column="BYTE48"/>
-            <field name="byte49" column="BYTE49"/>
-            <field name="byte5" column="BYTE5"/>
-            <field name="byte52" column="BYTE52"/>
-            <field name="byte53" column="BYTE53"/>
-            <field name="byte54" column="BYTE54"/>
-            <field name="byte56" column="BYTE56"/>
-            <field name="byte57" column="BYTE57"/>
-            <field name="byte58" column="BYTE58"/>
-            <field name="byte6" column="BYTE6"/>
-            <field name="byte66" column="BYTE66"/>
-            <field name="byte67" column="BYTE67"/>
-            <field name="byte68" column="BYTE68"/>
-            <field name="byte72" column="BYTE72"/>
-            <field name="byte73" column="BYTE73"/>
-            <field name="byte74" column="BYTE74"/>
-            <field name="byte76" column="BYTE76"/>
-            <field name="byte77" column="BYTE77"/>
-            <field name="byte78" column="BYTE78"/>
-            <field name="byte83" column="BYTE83"/>
-            <field name="byte84" column="BYTE84"/>
-            <field name="byte85" column="BYTE85"/>
-            <field name="byte88" column="BYTE88"/>
-            <field name="byte89" column="BYTE89"/>
-            <field name="byte90" column="BYTE90"/>
-            <field name="byte92" column="BYTE92"/>
-            <field name="byte93" column="BYTE93"/>
-            <field name="byte94" column="BYTE94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm	(working copy)
@@ -1,250 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="ListCollections" table="LIST_COLLECTIONS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="ListOfObject0"
-                   table="LIST_OF_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfObject1"
-                   table="LIST_OF_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfObject2"
-                   table="LIST_OF_OBJECT2">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfSimpleClass3"
-                   table="LIST_OF_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfSimpleClass4"
-                   table="LIST_OF_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfSimpleClass5"
-                   table="LIST_OF_SIMPLE_CLASS5">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfSimpleClass42"
-                   column="LIST_OF_SIMPLE_CLASS42">
-            </field>
-            <field name="ListOfSimpleInterface6"
-                   table="LIST_OF_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfSimpleInterface7"
-                   table="LIST_OF_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfSimpleInterface8"
-                   table="LIST_OF_SIMPLE_INTERFACE8">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfString9"
-                   table="LIST_OF_STRING9">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfString11"
-                   column="LIST_OF_STRING11">
-            </field>
-            <field name="ListOfString10"
-                   table="LIST_OF_STRING10">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfDate12"
-                   table="LIST_OF_DATE12">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfDate14"
-                   column="LIST_OF_DATE14">
-            </field>
-            <field name="ListOfDate13"
-                   table="LIST_OF_DATE13">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfLocale15"
-                   table="LIST_OF_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfLocale17"
-                   column="LIST_OF_LOCALE17">
-            </field>
-            <field name="ListOfLocale16"
-                   table="LIST_OF_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfBigDecimal18"
-                   table="LIST_OF_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfBigDecimal20"
-                   column="LIST_OF_BIG_DECIMAL20">
-            </field>
-            <field name="ListOfBigDecimal19"
-                   table="LIST_OF_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfBigInteger21"
-                   table="LIST_OF_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfBigInteger23"
-                   column="LIST_OF_BIG_INTEGER23">
-            </field>
-            <field name="ListOfBigInteger22"
-                   table="LIST_OF_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfByte24"
-                   table="LIST_OF_BYTE24">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfByte26"
-                   column="LIST_OF_BYTE26">
-            </field>
-            <field name="ListOfByte25"
-                   table="LIST_OF_BYTE25">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfDouble27"
-                   table="LIST_OF_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfDouble29"
-                   column="LIST_OF_DOUBLE29">
-            </field>
-            <field name="ListOfDouble28"
-                   table="LIST_OF_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfFloat30"
-                   table="LIST_OF_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfFloat32"
-                   column="LIST_OF_FLOAT32">
-            </field>
-            <field name="ListOfFloat31"
-                   table="LIST_OF_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfInteger33"
-                   table="LIST_OF_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfInteger35"
-                   column="LIST_OF_INTEGER35">
-            </field>
-            <field name="ListOfInteger34"
-                   table="LIST_OF_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfLong36"
-                   table="LIST_OF_LONG36">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfLong38"
-                   column="LIST_OF_LONG38">
-            </field>
-            <field name="ListOfLong37"
-                   table="LIST_OF_LONG37">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfShort39"
-                   table="LIST_OF_SHORT39">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfShort41"
-                   column="LIST_OF_SHORT41">
-            </field>
-            <field name="ListOfShort40"
-                   table="LIST_OF_SHORT40">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-derby.orm	(working copy)
@@ -1,175 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="TreeSetCollections" table="TREESET_COLLECTIONS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="TreeSetOfObject0" table="TREESET_OF_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfObject1" table="TREESET_OF_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfObject2" table="TREESET_OF_OBJECT2">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfSimpleClass3" table="TREESET_OF_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfSimpleClass4" table="TREESET_OF_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfSimpleClass5" table="TREESET_OF_SIMPLE_CLASS5">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfSimpleInterface6" table="TREESET_OF_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfSimpleInterface7" table="TREESET_OF_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfSimpleInterface8" table="TREESET_OF_SIMPLE_INTERFACE8">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfString9" table="TREESET_OF_STRING9">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfString10" column="TREESET_OF_STRING10">
-            </field>
-            <field name="TreeSetOfString11" table="TREESET_OF_STRING11">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfDate12" table="TREESET_OF_DATE12">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfDate13" column="TREESET_OF_DATE13">
-            </field>
-            <field name="TreeSetOfDate14" table="TREESET_OF_DATE14">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfBigDecimal15" table="TREESET_OF_BIG_DECIMAL15">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfBigDecimal16" column="TREESET_OF_BIG_DECIMAL16">
-            </field>
-            <field name="TreeSetOfBigDecimal17" table="TREESET_OF_BIG_DECIMAL17">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfBigInteger18" table="TREESET_OF_BIG_INTEGER18">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfBigInteger19" column="TREESET_OF_BIG_INTEGER19">
-            </field>
-            <field name="TreeSetOfBigInteger20" table="TREESET_OF_BIG_INTEGER20">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfByte21" table="TREESET_OF_BYTE21">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfByte22" column="TREESET_OF_BYTE22">
-            </field>
-            <field name="TreeSetOfByte23" table="TREESET_OF_BYTE23">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfDouble24" table="TREESET_OF_DOUBLE24">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfDouble25" column="TREESET_OF_DOUBLE25">
-            </field>
-            <field name="TreeSetOfDouble26" table="TREESET_OF_DOUBLE26">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfFloat27" table="TREESET_OF_FLOAT27">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfFloat28" column="TREESET_OF_FLOAT28">
-            </field>
-            <field name="TreeSetOfFloat29" table="TREESET_OF_FLOAT29">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfInteger30" table="TREESET_OF_INTEGER30">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfInteger31" column="TREESET_OF_INTEGER31">
-            </field>
-            <field name="TreeSetOfInteger32" table="TREESET_OF_INTEGER32">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfLong33" table="TREESET_OF_LONG33">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfLong34" column="TREESET_OF_LONG34">
-            </field>
-            <field name="TreeSetOfLong35" table="TREESET_OF_LONG35">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfShort36" table="TREESET_OF_SHORT36">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfShort37" column="TREESET_OF_SHORT37">
-            </field>
-            <field name="TreeSetOfShort38" table="TREESET_OF_SHORT38">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="INDEX"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm	(working copy)
@@ -1,588 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="MapStringKeyCollections" table="MAPSTRINGKEY_COLLECTIONS">
-            <datastore-identity strategy="identity"
-                                column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="MapOfString_Object0" table="MAP_OF_STRING_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="MapOfString_Object1" table="MAP_OF_STRING_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="MapOfString_Object2" table="MAP_OF_STRING_OBJECT2">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="MapOfString_SimpleClass3"
-                   table="MAP_OF_STRING_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="MapOfString_SimpleClass4"
-                   table="MAP_OF_STRING_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="MapOfString_SimpleClass5"
-                   table="MAP_OF_STRING_SIMPLE_CLASS5">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="MapOfString_SimpleInterface6"
-                   table="MAP_OF_STRING_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="MapOfString_SimpleInterface7"
-                   table="MAP_OF_STRING_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="MapOfString_SimpleInterface8"
-                   table="MAP_OF_STRING_SIMPLE_INTERFACE8">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="MapOfString_String9"
-                   table="MAP_OF_STRING_STRING9">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_String10"
-                   table="MAP_OF_STRING_STRING10">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_String11"
-                   table="MAP_OF_STRING_STRING11">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Date12"
-                   table="MAP_OF_STRING_DATE12">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Date13"
-                   table="MAP_OF_STRING_DATE13">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Date14"
-                   table="MAP_OF_STRING_DATE14">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Locale15"
-                   table="MAP_OF_STRING_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Locale16"
-                   table="MAP_OF_STRING_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Locale17"
-                   table="MAP_OF_STRING_LOCALE17">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigDecimal18"
-                   table="MAP_OF_STRING_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigDecimal19"
-                   table="MAP_OF_STRING_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigDecimal20"
-                   table="MAP_OF_STRING_BIG_DECIMAL20">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigInteger21"
-                   table="MAP_OF_STRING_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigInteger22"
-                   table="MAP_OF_STRING_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigInteger23"
-                   table="MAP_OF_STRING_BIG_INTEGER23">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Byte24"
-                   table="MAP_OF_STRING_BYTE24">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Byte25"
-                   table="MAP_OF_STRING_BYTE25">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Byte26"
-                   table="MAP_OF_STRING_BYTE26">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Double27"
-                   table="MAP_OF_STRING_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Double28"
-                   table="MAP_OF_STRING_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Double29"
-                   table="MAP_OF_STRING_DOUBLE29">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Float30"
-                   table="MAP_OF_STRING_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Float31"
-                   table="MAP_OF_STRING_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Float32"
-                   table="MAP_OF_STRING_FLOAT32">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Integer33"
-                   table="MAP_OF_STRING_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Integer34"
-                   table="MAP_OF_STRING_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Integer35"
-                   table="MAP_OF_STRING_INTEGER35">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Long36"
-                   table="MAP_OF_STRING_LONG36">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Long37"
-                   table="MAP_OF_STRING_LONG37">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Long38"
-                   table="MAP_OF_STRING_LONG38">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Short39"
-                   table="MAP_OF_STRING_SHORT39">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Short40"
-                   table="MAP_OF_STRING_SHORT40">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Short41"
-                   table="MAP_OF_STRING_SHORT41">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Object42"
-                   table="MAP_OF_STRING_OBJECT42">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="MapOfString_Object43" table="MAP_OF_STRING_OBJECT43">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="MapOfString_SimpleClass45"
-                   table="MAP_OF_STRING_SIMPLE_CLASS45">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="MapOfString_SimpleClass46"
-                   table="MAP_OF_STRING_SIMPLE_CLASS46">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="MapOfString_SimpleInterface48"
-                   table="MAP_OF_STRING_SIMPLE_INTERFACE48">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="MapOfString_SimpleInterface49"
-                   table="MAP_OF_STRING_SIMPLE_INTERFACE49">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="MapOfString_String51"
-                   table="MAP_OF_STRING_STRING51">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_String52"
-                   table="MAP_OF_STRING_STRING52">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Date54"
-                   table="MAP_OF_STRING_DATE54">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Date55"
-                   table="MAP_OF_STRING_DATE55">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Locale57"
-                   table="MAP_OF_STRING_LOCALE57">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Locale58"
-                   table="MAP_OF_STRING_LOCALE58">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigDecimal60"
-                   table="MAP_OF_STRING_BIG_DECIMAL60">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigDecimal61"
-                   table="MAP_OF_STRING_BIG_DECIMAL61">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigInteger63"
-                   table="MAP_OF_STRING_BIG_INTEGER63">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigInteger64"
-                   table="MAP_OF_STRING_BIG_INTEGER64">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Byte66"
-                   table="MAP_OF_STRING_BYTE66">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Byte67"
-                   table="MAP_OF_STRING_BYTE67">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Double69"
-                   table="MAP_OF_STRING_DOUBLE69">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Double70"
-                   table="MAP_OF_STRING_DOUBLE70">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Float72"
-                   table="MAP_OF_STRING_FLOAT72">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Float73"
-                   table="MAP_OF_STRING_FLOAT73">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Integer75"
-                   table="MAP_OF_STRING_INTEGER75">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Integer76"
-                   table="MAP_OF_STRING_INTEGER76">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Long78"
-                   table="MAP_OF_STRING_LONG78">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Long79"
-                   table="MAP_OF_STRING_LONG79">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Short81"
-                   table="MAP_OF_STRING_SHORT81">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Short82"
-                   table="MAP_OF_STRING_SHORT82">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Object84" table="MAP_OF_STRING_OBJECT84">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Object86"
-                   column="MAP_OF_STRING_OBJECT86">
-            </field>
-            <field name="MapOfString_SimpleClass87"
-                   table="MAP_OF_STRING_SIMPLE_CLASS87">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_SimpleClass89"
-                   column="MAP_OF_STRING_SIMPLECLASS89">
-            </field>
-            <field name="MapOfString_SimpleInterface90"
-                   table="MAP_OF_STRING_SIMPLE_INTERFACE90">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_SimpleInterface92"
-                   column="MAP_OF_STRING_SIMPLEINTERFACE92">
-            </field>
-            <field name="MapOfString_String93"
-                   table="MAP_OF_STRING_STRING93">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_String95"
-                   column="MAP_OF_STRING_STRING95">
-            </field>
-            <field name="MapOfString_Date96"
-                   table="MAP_OF_STRING_DATE96">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Date98"
-                   column="MAP_OF_STRING_DATE98">
-            </field>
-            <field name="MapOfString_Locale99"
-                   table="MAP_OF_STRING_LOCALE99">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Locale101"
-                   column="MAP_OF_STRING_LOCALE101">
-            </field>
-            <field name="MapOfString_BigDecimal102"
-                   table="MAP_OF_STRING_BIG_DECIMAL102">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigDecimal104"
-                   column="MAP_OF_STRING_BIGDECIMAL104">
-            </field>
-            <field name="MapOfString_BigInteger105"
-                   table="MAP_OF_STRING_BIG_INTEGER105">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigInteger107"
-                   column="MAP_OF_STRING_BIGINTEGER107">
-            </field>
-            <field name="MapOfString_Byte108"
-                   table="MAP_OF_STRING_BYTE108">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Byte110"
-                   column="MAP_OF_STRING_BYTE110">
-            </field>
-            <field name="MapOfString_Double111" 
-                   table="MAP_OF_STRING_DOUBLE111">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Double113"
-                   column="MAP_OF_STRING_DOUBLE113">
-            </field>
-            <field name="MapOfString_Float114"
-                   table="MAP_OF_STRING_FLOAT114">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Float116"
-                   column="MAP_OF_STRING_FLOAT116">
-            </field>
-            <field name="MapOfString_Integer117"
-                   table="MAP_OF_STRING_INTEGER117">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Integer119"
-                   column="MAP_OF_STRING_INTEGER119">
-            </field>
-            <field name="MapOfString_Long120"
-                    table="MAP_OF_STRING_LONG120">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Long122"
-                   column="MAP_OF_STRING_LONG122">
-            </field>
-            <field name="MapOfString_Short123"
-                   table="MAP_OF_STRING_SHORT123">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Short125"
-                   column="MAP_OF_STRING_SHORT125">
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm	(working copy)
@@ -1,112 +0,0 @@
-<?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">
-<!--
-Metadata for datastore identity
--->
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="ArrayCollections" table="ARRAY_COLLECTIONS">
-            <datastore-identity strategy="identity"
-                                column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-           <field name="ArrayOfObject0" table="ARRAY_OF_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <element column="OBJVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfObject1" table="ARRAY_OF_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfSimpleClass2" table="ARRAY_OF_SIMPLE_CLASS2">
-                <join column="IDENTIFIER"/>
-                <element column="OBJVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfSimpleClass3" table="ARRAY_OF_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfSimpleInterface4"
-                   table="ARRAY_OF_SIMPLE_INTERFACE4">
-                <join column="IDENTIFIER"/>
-                <element column="OBJVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfSimpleInterface5"
-                   table="ARRAY_OF_SIMPLE_INTERFACE5">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfString6" column="ARRAY_OF_STRING6"/>
-            <field name="ArrayOfString7" table="ARRAY_OF_STRING7">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfDate8" column="ARRAY_OF_DATE8"/>
-            <field name="ArrayOfDate9" table="ARRAY_OF_DATE9">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfLocale10" column="ARRAY_OF_LOCALE10"/>
-            <field name="ArrayOfLocale11" table="ARRAY_OF_LOCALE11">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfBigDecimal12" column="ARRAY_OF_BIG_DECIMAL12"/>
-            <field name="ArrayOfBigDecimal13" table="ARRAY_OF_BIG_DECIMAL13">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfBigInteger14" column="ARRAY_OF_BIG_INTEGER14"/>
-            <field name="ArrayOfBigInteger15" table="ARRAY_OF_BIG_INTEGER15">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfByte16" column="ARRAY_OF_BYTE16"/>
-            <field name="ArrayOfByte17" table="ARRAY_OF_BYTE17">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfDouble18" column="ARRAY_OF_DOUBLE18"/>
-            <field name="ArrayOfDouble19" table="ARRAY_OF_DOUBLE19">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfFloat20" column="ARRAY_OF_FLOAT20"/>
-            <field name="ArrayOfFloat21" table="ARRAY_OF_FLOAT21">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfInteger22" column="ARRAY_OF_INTEGER22"/>
-            <field name="ArrayOfInteger23" table="ARRAY_OF_INTEGER23">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfLong24" column="ARRAY_OF_LONG24"/>
-            <field name="ArrayOfLong25" table="ARRAY_OF_LONG25">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfShort26" column="ARRAY_OF_SHORT26"/>
-            <field name="ArrayOfShort27" table="ARRAY_OF_SHORT27">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-derby.orm	(working copy)
@@ -1,82 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfFloat" table="FIELDSOFFLOAT">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="Float0" column="FLOAT0"/>
-            <field name="Float1" column="FLOAT1"/>
-            <field name="Float102" column="FLOAT102"/>
-            <field name="Float103" column="FLOAT103"/>
-            <field name="Float104" column="FLOAT104"/>
-            <field name="Float108" column="FLOAT108"/>
-            <field name="Float109" column="FLOAT109"/>
-            <field name="Float11" column="FLOAT11"/>
-            <field name="Float110" column="FLOAT110"/>
-            <field name="Float112" column="FLOAT112"/>
-            <field name="Float113" column="FLOAT113"/>
-            <field name="Float114" column="FLOAT114"/>
-            <field name="Float119" column="FLOAT119"/>
-            <field name="Float12" column="FLOAT12"/>
-            <field name="Float120" column="FLOAT120"/>
-            <field name="Float121" column="FLOAT121"/>
-            <field name="Float124" column="FLOAT124"/>
-            <field name="Float125" column="FLOAT125"/>
-            <field name="Float126" column="FLOAT126"/>
-            <field name="Float128" column="FLOAT128"/>
-            <field name="Float129" column="FLOAT129"/>
-            <field name="Float13" column="FLOAT13"/>
-            <field name="Float130" column="FLOAT130"/>
-            <field name="Float138" column="FLOAT138"/>
-            <field name="Float139" column="FLOAT139"/>
-            <field name="Float140" column="FLOAT140"/>
-            <field name="Float16" column="FLOAT16"/>
-            <field name="Float17" column="FLOAT17"/>
-            <field name="Float18" column="FLOAT18"/>
-            <field name="Float2" column="FLOAT2"/>
-            <field name="Float20" column="FLOAT20"/>
-            <field name="Float21" column="FLOAT21"/>
-            <field name="Float22" column="FLOAT22"/>
-            <field name="Float30" column="FLOAT30"/>
-            <field name="Float31" column="FLOAT31"/>
-            <field name="Float32" column="FLOAT32"/>
-            <field name="Float36" column="FLOAT36"/>
-            <field name="Float37" column="FLOAT37"/>
-            <field name="Float38" column="FLOAT38"/>
-            <field name="Float4" column="FLOAT4"/>
-            <field name="Float40" column="FLOAT40"/>
-            <field name="Float41" column="FLOAT41"/>
-            <field name="Float42" column="FLOAT42"/>
-            <field name="Float47" column="FLOAT47"/>
-            <field name="Float48" column="FLOAT48"/>
-            <field name="Float49" column="FLOAT49"/>
-            <field name="Float5" column="FLOAT5"/>
-            <field name="Float52" column="FLOAT52"/>
-            <field name="Float53" column="FLOAT53"/>
-            <field name="Float54" column="FLOAT54"/>
-            <field name="Float56" column="FLOAT56"/>
-            <field name="Float57" column="FLOAT57"/>
-            <field name="Float58" column="FLOAT58"/>
-            <field name="Float6" column="FLOAT6"/>
-            <field name="Float66" column="FLOAT66"/>
-            <field name="Float67" column="FLOAT67"/>
-            <field name="Float68" column="FLOAT68"/>
-            <field name="Float72" column="FLOAT72"/>
-            <field name="Float73" column="FLOAT73"/>
-            <field name="Float74" column="FLOAT74"/>
-            <field name="Float76" column="FLOAT76"/>
-            <field name="Float77" column="FLOAT77"/>
-            <field name="Float78" column="FLOAT78"/>
-            <field name="Float83" column="FLOAT83"/>
-            <field name="Float84" column="FLOAT84"/>
-            <field name="Float85" column="FLOAT85"/>
-            <field name="Float88" column="FLOAT88"/>
-            <field name="Float89" column="FLOAT89"/>
-            <field name="Float90" column="FLOAT90"/>
-            <field name="Float92" column="FLOAT92"/>
-            <field name="Float93" column="FLOAT93"/>
-            <field name="Float94" column="FLOAT94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-derby.orm	(working copy)
@@ -1,82 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfString" table="FIELDSOFSTRING">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="String0" column="STRING0"/>
-            <field name="String1" column="STRING1"/>
-            <field name="String102" column="STRING102"/>
-            <field name="String103" column="STRING103"/>
-            <field name="String104" column="STRING104"/>
-            <field name="String108" column="STRING108"/>
-            <field name="String109" column="STRING109"/>
-            <field name="String11" column="STRING11"/>
-            <field name="String110" column="STRING110"/>
-            <field name="String112" column="STRING112"/>
-            <field name="String113" column="STRING113"/>
-            <field name="String114" column="STRING114"/>
-            <field name="String119" column="STRING119"/>
-            <field name="String12" column="STRING12"/>
-            <field name="String120" column="STRING120"/>
-            <field name="String121" column="STRING121"/>
-            <field name="String124" column="STRING124"/>
-            <field name="String125" column="STRING125"/>
-            <field name="String126" column="STRING126"/>
-            <field name="String128" column="STRING128"/>
-            <field name="String129" column="STRING129"/>
-            <field name="String13" column="STRING13"/>
-            <field name="String130" column="STRING130"/>
-            <field name="String138" column="STRING138"/>
-            <field name="String139" column="STRING139"/>
-            <field name="String140" column="STRING140"/>
-            <field name="String16" column="STRING16"/>
-            <field name="String17" column="STRING17"/>
-            <field name="String18" column="STRING18"/>
-            <field name="String2" column="STRING2"/>
-            <field name="String20" column="STRING20"/>
-            <field name="String21" column="STRING21"/>
-            <field name="String22" column="STRING22"/>
-            <field name="String30" column="STRING30"/>
-            <field name="String31" column="STRING31"/>
-            <field name="String32" column="STRING32"/>
-            <field name="String36" column="STRING36"/>
-            <field name="String37" column="STRING37"/>
-            <field name="String38" column="STRING38"/>
-            <field name="String4" column="STRING4"/>
-            <field name="String40" column="STRING40"/>
-            <field name="String41" column="STRING41"/>
-            <field name="String42" column="STRING42"/>
-            <field name="String47" column="STRING47"/>
-            <field name="String48" column="STRING48"/>
-            <field name="String49" column="STRING49"/>
-            <field name="String5" column="STRING5"/>
-            <field name="String52" column="STRING52"/>
-            <field name="String53" column="STRING53"/>
-            <field name="String54" column="STRING54"/>
-            <field name="String56" column="STRING56"/>
-            <field name="String57" column="STRING57"/>
-            <field name="String58" column="STRING58"/>
-            <field name="String6" column="STRING6"/>
-            <field name="String66" column="STRING66"/>
-            <field name="String67" column="STRING67"/>
-            <field name="String68" column="STRING68"/>
-            <field name="String72" column="STRING72"/>
-            <field name="String73" column="STRING73"/>
-            <field name="String74" column="STRING74"/>
-            <field name="String76" column="STRING76"/>
-            <field name="String77" column="STRING77"/>
-            <field name="String78" column="STRING78"/>
-            <field name="String83" column="STRING83"/>
-            <field name="String84" column="STRING84"/>
-            <field name="String85" column="STRING85"/>
-            <field name="String88" column="STRING88"/>
-            <field name="String89" column="STRING89"/>
-            <field name="String90" column="STRING90"/>
-            <field name="String92" column="STRING92"/>
-            <field name="String93" column="STRING93"/>
-            <field name="String94" column="STRING94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-derby.orm	(working copy)
@@ -1,178 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfObject" table="FIELDSOFOBJECT">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="Object0" column="OBJECT0"/>
-            <field name="Object1" column="OBJECT1">
-            </field>
-            <field name="Object102" column="OBJECT102">
-                <foreign-key/>
-            </field>
-            <field name="Object103" column="OBJECT103">
-            </field>
-            <field name="Object104" column="OBJECT104">
-                <foreign-key/>
-            </field>
-            <field name="Object109" column="OBJECT109">
-            </field>
-            <field name="Object11" column="OBJECT11">
-                <foreign-key/>
-            </field>
-            <field name="Object110" column="OBJECT110">
-            </field>
-            <field name="Object112" column="OBJECT112">
-                <foreign-key/>
-            </field>
-            <field name="Object113" column="OBJECT113">
-            </field>
-            <field name="Object114" column="OBJECT114">
-                <foreign-key/>
-            </field>
-            <field name="Object119" column="OBJECT119">
-                <foreign-key/>
-            </field>
-            <field name="Object12" column="OBJECT12">
-            </field>
-            <field name="Object120" column="OBJECT120">
-            </field>
-            <field name="Object121" column="OBJECT121">
-                <foreign-key/>
-            </field>
-            <field name="Object125" column="OBJECT125">
-            </field>
-            <field name="Object126" column="OBJECT126">
-                <foreign-key/>
-            </field>
-            <field name="Object128" column="OBJECT128">
-                <foreign-key/>
-            </field>
-            <field name="Object129" column="OBJECT129">
-            </field>
-            <field name="Object13" column="OBJECT13">
-                <foreign-key/>
-            </field>
-            <field name="Object130" column="OBJECT130">
-                <foreign-key/>
-            </field>
-            <field name="Object138" column="OBJECT138">
-                <foreign-key/>
-            </field>
-            <field name="Object139" column="OBJECT139">
-            </field>
-            <field name="Object140" column="OBJECT140">
-                <foreign-key/>
-            </field>
-            <field name="Object17" column="OBJECT17">
-            </field>
-            <field name="Object18" column="OBJECT18">
-                <foreign-key/>
-            </field>
-            <field name="Object2" column="OBJECT2">
-                <foreign-key/>
-            </field>
-            <field name="Object20" column="OBJECT20">
-                <foreign-key/>
-            </field>
-            <field name="Object21" column="OBJECT21">
-            </field>
-            <field name="Object22" column="OBJECT22">
-                <foreign-key/>
-            </field>
-            <field name="Object30" column="OBJECT30">
-                <foreign-key/>
-            </field>
-            <field name="Object31" column="OBJECT31">
-            </field>
-            <field name="Object32" column="OBJECT32">
-                <foreign-key/>
-            </field>
-            <field name="Object37" column="OBJECT37">
-            </field>
-            <field name="Object38" column="OBJECT38">
-                <foreign-key/>
-            </field>
-            <field name="Object4" column="OBJECT4">
-                <foreign-key/>
-            </field>
-            <field name="Object40" column="OBJECT40">
-                <foreign-key/>
-            </field>
-            <field name="Object41" column="OBJECT41">
-            </field>
-            <field name="Object42" column="OBJECT42">
-                <foreign-key/>
-            </field>
-            <field name="Object47" column="OBJECT47">
-                <foreign-key/>
-            </field>
-            <field name="Object48" column="OBJECT48">
-            </field>
-            <field name="Object49" column="OBJECT49">
-                <foreign-key/>
-            </field>
-            <field name="Object5" column="OBJECT5">
-            </field>
-            <field name="Object53" column="OBJECT53">
-            </field>
-            <field name="Object54" column="OBJECT54">
-                <foreign-key/>
-            </field>
-            <field name="Object56" column="OBJECT56">
-                <foreign-key/>
-            </field>
-            <field name="Object57" column="OBJECT57">
-            </field>
-            <field name="Object58" column="OBJECT58">
-                <foreign-key/>
-            </field>
-            <field name="Object6" column="OBJECT6">
-                <foreign-key/>
-            </field>
-            <field name="Object66" column="OBJECT66">
-                <foreign-key/>
-            </field>
-            <field name="Object67" column="OBJECT67">
-            </field>
-            <field name="Object68" column="OBJECT68">
-                <foreign-key/>
-            </field>
-            <field name="Object73" column="OBJECT73">
-            </field>
-            <field name="Object74" column="OBJECT74">
-                <foreign-key/>
-            </field>
-            <field name="Object76" column="OBJECT76">
-                <foreign-key/>
-            </field>
-            <field name="Object77" column="OBJECT77">
-            </field>
-            <field name="Object78" column="OBJECT78">
-                <foreign-key/>
-            </field>
-            <field name="Object83" column="OBJECT83">
-                <foreign-key/>
-            </field>
-            <field name="Object84" column="OBJECT84">
-            </field>
-            <field name="Object85" column="OBJECT85">
-                <foreign-key/>
-            </field>
-            <field name="Object89" column="OBJECT89">
-            </field>
-            <field name="Object90" column="OBJECT90">
-                <foreign-key/>
-            </field>
-            <field name="Object92" column="OBJECT92">
-                <foreign-key/>
-            </field>
-            <field name="Object93" column="OBJECT93">
-            </field>
-            <field name="Object94" column="OBJECT94">
-                <foreign-key/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm	(working copy)
@@ -1,591 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="HashtableStringKeyCollections"
-               table="HASHTABLESTRINGKEY_COLLECTIONS">
-            <datastore-identity strategy="identity"
-                                column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="HashtableOfString_Object0" table="HASHTBL_STR_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="HashtableOfString_Object1" table="HASHTBL_STR_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="HashtableOfString_Object2" table="HASHTBL_STR_OBJECT2">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="HashtableOfString_SimpleClass3"
-                   table="HASHTBL_STR_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="HashtableOfString_SimpleClass4"
-                   table="HASHTBL_STR_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="HashtableOfString_SimpleClass5"
-                   table="HASHTBL_STR_SIMPLE_CLASS5">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="HashtableOfString_SimpleInterface6"
-                   table="HASHTBL_STR_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="HashtableOfString_SimpleInterface7"
-                   table="HASHTBL_STR_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="HashtableOfString_SimpleInterface8"
-                   table="HASHTBL_STR_SIMPLE_INTERFACE8">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="HashtableOfString_String9"
-                   table="HASHTBL_STR_STRING9">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_String10"
-                   table="HASHTBL_STR_STRING10">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_String11"
-                   table="HASHTBL_STR_STRING11">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Date12"
-                   table="HASHTBL_STR_DATE12">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Date13"
-                   table="HASHTBL_STR_DATE13">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Date14"
-                   table="HASHTBL_STR_DATE14">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Locale15"
-                   table="HASHTBL_STR_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Locale16"
-                   table="HASHTBL_STR_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Locale17"
-                   table="HASHTBL_STR_LOCALE17">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigDecimal18"
-                   table="HASHTBL_STR_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigDecimal19"
-                   table="HASHTBL_STR_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigDecimal20"
-                   table="HASHTBL_STR_BIG_DECIMAL20">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigInteger21"
-                   table="HASHTBL_STR_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigInteger22"
-                   table="HASHTBL_STR_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigInteger23"
-                   table="HASHTBL_STR_BIG_INTEGER23">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Byte24"
-                   table="HASHTBL_STR_BYTE24">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Byte25"
-                   table="HASHTBL_STR_BYTE25">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Byte26"
-                   table="HASHTBL_STR_BYTE26">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Double27"
-                   table="HASHTBL_STR_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Double28"
-                   table="HASHTBL_STR_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Double29"
-                   table="HASHTBL_STR_DOUBLE29">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Float30"
-                   table="HASHTBL_STR_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Float31"
-                   table="HASHTBL_STR_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Float32"
-                   table="HASHTBL_STR_FLOAT32">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Integer33"
-                   table="HASHTBL_STR_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Integer34"
-                   table="HASHTBL_STR_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Integer35"
-                   table="HASHTBL_STR_INTEGER35">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Long36"
-                   table="HASHTBL_STR_LONG36">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Long37"
-                   table="HASHTBL_STR_LONG37">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Long38"
-                   table="HASHTBL_STR_LONG38">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Short39"
-                   table="HASHTBL_STR_SHORT39">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Short40"
-                   table="HASHTBL_STR_SHORT40">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Short41"
-                   table="HASHTBL_STR_SHORT41">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Object42"
-                   table="HASHTBL_STR_OBJECT42">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashtableOfString_Object43"
-                   table="HASHTBL_STR_OBJECT43">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashtableOfString_SimpleClass45"
-                   table="HASHTBL_STR_SIMPLE_CLASS45">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashtableOfString_SimpleClass46"
-                   table="HASHTBL_STR_SIMPLE_CLASS46">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashtableOfString_SimpleInterface48"
-                   table="HASHTBL_STR_SIMPLE_INTERFACE48">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashtableOfString_SimpleInterface49"
-                   table="HASHTBL_STR_SIMPLE_INTERFACE49">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashtableOfString_String51"
-                   table="HASHTBL_STR_STRING51">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_String52"
-                   table="HASHTBL_STR_STRING52">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Date54"
-                   table="HASHTBL_STR_DATE54">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Date55"
-                   table="HASHTBL_STR_DATE55">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Locale57"
-                   table="HASHTBL_STR_LOCALE57">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Locale58"
-                   table="HASHTBL_STR_LOCALE58">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigDecimal60"
-                   table="HASHTBL_STR_BIG_DECIMAL60">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigDecimal61"
-                   table="HASHTBL_STR_BIG_DECIMAL61">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigInteger63"
-                   table="HASHTBL_STR_BIG_INTEGER63">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigInteger64"
-                   table="HASHTBL_STR_BIG_INTEGER64">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Byte66"
-                   table="HASHTBL_STR_BYTE66">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Byte67"
-                   table="HASHTBL_STR_BYTE67">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Double69"
-                   table="HASHTBL_STR_DOUBLE69">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Double70"
-                   table="HASHTBL_STR_DOUBLE70">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Float72"
-                   table="HASHTBL_STR_FLOAT72">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Float73"
-                   table="HASHTBL_STR_FLOAT73">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Integer75"
-                   table="HASHTBL_STR_INTEGER75">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Integer76"
-                   table="HASHTBL_STR_INTEGER76">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Long78"
-                   table="HASHTBL_STR_LONG78">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Long79"
-                   table="HASHTBL_STR_LONG79">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Short81"
-                   table="HASHTBL_STR_SHORT81">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Short82"
-                   table="HASHTBL_STR_SHORT82">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Object84"
-                   table="HASHTBL_STR_OBJECT84">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Object86"
-                   column="HASHTBL_STR_OBJECT86">
-            </field>
-            <field name="HashtableOfString_SimpleClass87"
-                   table="HASHTBL_STR_SIMPLE_CLASS87">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_SimpleClass89"
-                   column="HASHTBL_STR_SIMPLECLASS89">
-            </field>
-            <field name="HashtableOfString_SimpleInterface90"
-                   table="HASHTBL_STR_SIMPLE_INTERFACE90">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_SimpleInterface92"
-                   column="HASHTBL_STR_SIMPLEINTERFACE92">
-            </field>
-            <field name="HashtableOfString_String93"
-                   table="HASHTBL_STR_STRING93">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_String95"
-                   column="HASHTBL_STR_STRING95">
-            </field>
-            <field name="HashtableOfString_Date96"
-                   table="HASHTBL_STR_DATE96">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Date98"
-                   column="HASHTBL_STR_DATE98">
-            </field>
-            <field name="HashtableOfString_Locale99"
-                   table="HASHTBL_STR_LOCALE99">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Locale101"
-                   column="HASHTBL_STR_LOCALE101">
-            </field>
-            <field name="HashtableOfString_BigDecimal102"
-                   table="HASHTBL_STR_BIG_DECIMAL102">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigDecimal104"
-                   column="HASHTBL_STR_BIGDECIMAL104">
-            </field>
-            <field name="HashtableOfString_BigInteger105"
-                   table="HASHTBL_STR_BIG_INTEGER105">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigInteger107"
-                   column="HASHTBL_STR_BIGINTEGER107">
-            </field>
-            <field name="HashtableOfString_Byte108"
-                   table="HASHTBL_STR_BYTE108">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Byte110"
-                   column="HASHTBL_STR_BYTE110">
-            </field>
-            <field name="HashtableOfString_Double111" 
-                   table="HASHTBL_STR_DOUBLE111">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Double113"
-                   column="HASHTBL_STR_DOUBLE113">
-            </field>
-            <field name="HashtableOfString_Float114"
-                   table="HASHTBL_STR_FLOAT114">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Float116"
-                   column="HASHTBL_STR_FLOAT116">
-            </field>
-            <field name="HashtableOfString_Integer117"
-                   table="HASHTBL_STR_INTEGER117">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Integer119"
-                   column="HASHTBL_STR_INTEGER119">
-            </field>
-            <field name="HashtableOfString_Long120"
-                    table="HASHTBL_STR_LONG120">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Long122"
-                   column="HASHTBL_STR_LONG122">
-            </field>
-            <field name="HashtableOfString_Short123"
-                   table="HASHTBL_STR_SHORT123">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Short125"
-                   column="HASHTBL_STR_SHORT125">
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-derby.orm	(working copy)
@@ -1,82 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfPrimitiveshort" table="FIELDSOFPRIMITIVESHORT">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="short0" column="SHORT0"/>
-            <field name="short1" column="SHORT1"/>
-            <field name="short102" column="SHORT102"/>
-            <field name="short103" column="SHORT103"/>
-            <field name="short104" column="SHORT104"/>
-            <field name="short108" column="SHORT108"/>
-            <field name="short109" column="SHORT109"/>
-            <field name="short11" column="SHORT11"/>
-            <field name="short110" column="SHORT110"/>
-            <field name="short112" column="SHORT112"/>
-            <field name="short113" column="SHORT113"/>
-            <field name="short114" column="SHORT114"/>
-            <field name="short119" column="SHORT119"/>
-            <field name="short12" column="SHORT12"/>
-            <field name="short120" column="SHORT120"/>
-            <field name="short121" column="SHORT121"/>
-            <field name="short124" column="SHORT124"/>
-            <field name="short125" column="SHORT125"/>
-            <field name="short126" column="SHORT126"/>
-            <field name="short128" column="SHORT128"/>
-            <field name="short129" column="SHORT129"/>
-            <field name="short13" column="SHORT13"/>
-            <field name="short130" column="SHORT130"/>
-            <field name="short138" column="SHORT138"/>
-            <field name="short139" column="SHORT139"/>
-            <field name="short140" column="SHORT140"/>
-            <field name="short16" column="SHORT16"/>
-            <field name="short17" column="SHORT17"/>
-            <field name="short18" column="SHORT18"/>
-            <field name="short2" column="SHORT2"/>
-            <field name="short20" column="SHORT20"/>
-            <field name="short21" column="SHORT21"/>
-            <field name="short22" column="SHORT22"/>
-            <field name="short30" column="SHORT30"/>
-            <field name="short31" column="SHORT31"/>
-            <field name="short32" column="SHORT32"/>
-            <field name="short36" column="SHORT36"/>
-            <field name="short37" column="SHORT37"/>
-            <field name="short38" column="SHORT38"/>
-            <field name="short4" column="SHORT4"/>
-            <field name="short40" column="SHORT40"/>
-            <field name="short41" column="SHORT41"/>
-            <field name="short42" column="SHORT42"/>
-            <field name="short47" column="SHORT47"/>
-            <field name="short48" column="SHORT48"/>
-            <field name="short49" column="SHORT49"/>
-            <field name="short5" column="SHORT5"/>
-            <field name="short52" column="SHORT52"/>
-            <field name="short53" column="SHORT53"/>
-            <field name="short54" column="SHORT54"/>
-            <field name="short56" column="SHORT56"/>
-            <field name="short57" column="SHORT57"/>
-            <field name="short58" column="SHORT58"/>
-            <field name="short6" column="SHORT6"/>
-            <field name="short66" column="SHORT66"/>
-            <field name="short67" column="SHORT67"/>
-            <field name="short68" column="SHORT68"/>
-            <field name="short72" column="SHORT72"/>
-            <field name="short73" column="SHORT73"/>
-            <field name="short74" column="SHORT74"/>
-            <field name="short76" column="SHORT76"/>
-            <field name="short77" column="SHORT77"/>
-            <field name="short78" column="SHORT78"/>
-            <field name="short83" column="SHORT83"/>
-            <field name="short84" column="SHORT84"/>
-            <field name="short85" column="SHORT85"/>
-            <field name="short88" column="SHORT88"/>
-            <field name="short89" column="SHORT89"/>
-            <field name="short90" column="SHORT90"/>
-            <field name="short92" column="SHORT92"/>
-            <field name="short93" column="SHORT93"/>
-            <field name="short94" column="SHORT94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-derby.orm	(working copy)
@@ -1,82 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfPrimitivedouble" table="FIELDSOFPRIMITIVEDOUBLE">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-            <field name="double0" column="DOUBLE0"/>
-            <field name="double1" column="DOUBLE1"/>
-            <field name="double102" column="DOUBLE102"/>
-            <field name="double103" column="DOUBLE103"/>
-            <field name="double104" column="DOUBLE104"/>
-            <field name="double108" column="DOUBLE108"/>
-            <field name="double109" column="DOUBLE109"/>
-            <field name="double11" column="DOUBLE11"/>
-            <field name="double110" column="DOUBLE110"/>
-            <field name="double112" column="DOUBLE112"/>
-            <field name="double113" column="DOUBLE113"/>
-            <field name="double114" column="DOUBLE114"/>
-            <field name="double119" column="DOUBLE119"/>
-            <field name="double12" column="DOUBLE12"/>
-            <field name="double120" column="DOUBLE120"/>
-            <field name="double121" column="DOUBLE121"/>
-            <field name="double124" column="DOUBLE124"/>
-            <field name="double125" column="DOUBLE125"/>
-            <field name="double126" column="DOUBLE126"/>
-            <field name="double128" column="DOUBLE128"/>
-            <field name="double129" column="DOUBLE129"/>
-            <field name="double13" column="DOUBLE13"/>
-            <field name="double130" column="DOUBLE130"/>
-            <field name="double138" column="DOUBLE138"/>
-            <field name="double139" column="DOUBLE139"/>
-            <field name="double140" column="DOUBLE140"/>
-            <field name="double16" column="DOUBLE16"/>
-            <field name="double17" column="DOUBLE17"/>
-            <field name="double18" column="DOUBLE18"/>
-            <field name="double2" column="DOUBLE2"/>
-            <field name="double20" column="DOUBLE20"/>
-            <field name="double21" column="DOUBLE21"/>
-            <field name="double22" column="DOUBLE22"/>
-            <field name="double30" column="DOUBLE30"/>
-            <field name="double31" column="DOUBLE31"/>
-            <field name="double32" column="DOUBLE32"/>
-            <field name="double36" column="DOUBLE36"/>
-            <field name="double37" column="DOUBLE37"/>
-            <field name="double38" column="DOUBLE38"/>
-            <field name="double4" column="DOUBLE4"/>
-            <field name="double40" column="DOUBLE40"/>
-            <field name="double41" column="DOUBLE41"/>
-            <field name="double42" column="DOUBLE42"/>
-            <field name="double47" column="DOUBLE47"/>
-            <field name="double48" column="DOUBLE48"/>
-            <field name="double49" column="DOUBLE49"/>
-            <field name="double5" column="DOUBLE5"/>
-            <field name="double52" column="DOUBLE52"/>
-            <field name="double53" column="DOUBLE53"/>
-            <field name="double54" column="DOUBLE54"/>
-            <field name="double56" column="DOUBLE56"/>
-            <field name="double57" column="DOUBLE57"/>
-            <field name="double58" column="DOUBLE58"/>
-            <field name="double6" column="DOUBLE6"/>
-            <field name="double66" column="DOUBLE66"/>
-            <field name="double67" column="DOUBLE67"/>
-            <field name="double68" column="DOUBLE68"/>
-            <field name="double72" column="DOUBLE72"/>
-            <field name="double73" column="DOUBLE73"/>
-            <field name="double74" column="DOUBLE74"/>
-            <field name="double76" column="DOUBLE76"/>
-            <field name="double77" column="DOUBLE77"/>
-            <field name="double78" column="DOUBLE78"/>
-            <field name="double83" column="DOUBLE83"/>
-            <field name="double84" column="DOUBLE84"/>
-            <field name="double85" column="DOUBLE85"/>
-            <field name="double88" column="DOUBLE88"/>
-            <field name="double89" column="DOUBLE89"/>
-            <field name="double90" column="DOUBLE90"/>
-            <field name="double92" column="DOUBLE92"/>
-            <field name="double93" column="DOUBLE93"/>
-            <field name="double94" column="DOUBLE94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm	(working copy)
@@ -1,114 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.inheritance">
-        <class name="AllPersist" table="AllPersist">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <inheritance strategy="new-table">
-                <discriminator strategy="class-name" column="DISCRIMINATOR"/>
-            </inheritance>
-            <field name="intB" column="INT_B"/>
-            <field name="doubleB" column="DOUBLE_B"/>
-            <field name="keyValue" column="KEY_VALUE"/>
-        </class>
-
-        <class name="AllPersist2">
-            <inheritance strategy="superclass-table"/>
-            <field name="floatE" column="FLOAT_E"/>
-        </class>
-
-        <class name="AllPersist3">
-            <inheritance strategy="superclass-table"/>
-            <field name="shortF" column="SHORT_F"/>
-            <field name="secondObj" column="SECOND_OBJ" foreign-key="true"/>
-            <field name="thirdObj" column="THIRD_OBJ" foreign-key="true"/>
-        </class>
-
-        <class name="AllPersist4">
-            <inheritance strategy="superclass-table"/>
-            <field name="intH" column="INT_H"/>
-        </class>
-
-        <class name="TopNonPersistB" table="TopNonPersistB">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <inheritance strategy="new-table">
-                <discriminator strategy="class-name" column="DISCRIMINATOR"/>
-            </inheritance>
-            <field name="keyValue" column="KEY_VALUE"/>
-            <field name="doubleB" column="DOUBLE_B"/>
-            <field name="intB" column="INT_B"/>
-        </class>
-
-        <class name="TopNonPersistE">
-            <inheritance strategy="superclass-table"/>
-            <field name="floatE" column="FLOAT_E"/>
-        </class>
-
-        <class name="TopNonPersistF">
-            <inheritance strategy="superclass-table"/>
-            <field name="shortF" column="SHORT_F"/>
-            <field name="secondObj" column="SECOND_OBJ" foreign-key="true"/>
-            <field name="thirdObj" column="THIRD_OBJ" foreign-key="true"/>
-        </class>
-
-        <class name="TopNonPersistH">
-            <inheritance strategy="superclass-table"/>
-            <field name="intH" column="INT_H"/>
-        </class>
-
-        <class name="TopPersist" table="TopPersist">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <inheritance strategy="new-table">
-                <discriminator strategy="class-name" column="DISCRIMINATOR"/>
-            </inheritance>
-            <field name="doubleB" column="DOUBLE_B"/>
-            <field name="intB" column="INT_B"/>
-            <field name="keyValue" column="KEY_VALUE"/>
-        </class>
-
-        <class name="TopPersistE">
-            <inheritance strategy="superclass-table"/>
-            <field name="floatE" column="FLOAT_E"/>
-        </class>
-
-        <class name="TopPersistF">
-            <inheritance strategy="superclass-table"/>
-            <field name="shortF" column="SHORT_F"/>
-            <field name="secondObj" column="SECOND_OBJ" foreign-key="true"/>
-            <field name="thirdObj" column="THIRD_OBJ" foreign-key="true"/>
-        </class>
-
-        <class name="TopPersistH">
-            <inheritance strategy="superclass-table"/>
-            <field name="intH" column="INT_H"/>
-        </class>
-
-        <class name="FieldSameName" table="FieldSameName">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <inheritance strategy="new-table">
-                <discriminator strategy="class-name" column="DISCRIMINATOR"/>
-            </inheritance>
-            <field name="n2" column="N2"/>
-            <field name="n3" column="N3"/>
-            <field name="keyValue" column="KEY_VALUE"/>
-        </class>
-
-        <class name="FieldSameName2">
-            <inheritance strategy="superclass-table"/>
-            <field name="n3" column="FSN2_N3"/>
-        </class>
-
-        <class name="FieldSameName3">
-            <inheritance strategy="superclass-table"/>
-            <field name="n1" column="FSN3_N1"/>
-            <field name="n2" column="FSN3_N2" foreign-key="true"/>
-            <field name="n3" column="FSN3_N3" foreign-key="true"/>
-        </class>
-
-        <class name="FieldSameName4">
-            <inheritance strategy="superclass-table"/>
-            <field name="n3" column="FSN4_N3"/>
-        </class>
-
-</package>
-</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby5.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby5.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby5.orm	(working copy)
@@ -1,59 +0,0 @@
-<?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">
-<orm schema="datastoreidentity_orm">
-  <package name="org.apache.jdo.tck.pc.mylib">
-
-    <class name="PCPoint" table="PCPoint">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCPoint2" table="PCPoint2">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCRect" table="PCRect">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="lowerRight" column="LOWER_RIGHT">
-        <foreign-key/>
-      </field>
-      <field name="upperLeft" column="UPPER_LEFT">
-        <foreign-key/>
-      </field>
-    </class>
-
-    <class name="PrimitiveTypes" table="PrimitiveTypes">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="booleanNotNull" column="booleanNotNull"/>
-      <field name="booleanNull" column="booleanNull"/>
-      <field name="byteNotNull" column="byteNotNull"/>
-      <field name="byteNull" column="byteNull"/>
-      <field name="shortNotNull" column="shortNotNull"/>
-      <field name="shortNull" column="shortNull"/>
-      <field name="intNotNull" column="intNotNull"/>
-      <field name="intNull" column="intNull"/>
-      <field name="longNotNull" column="longNotNull"/>
-      <field name="longNull" column="longNull"/>
-      <field name="floatNotNull" column="floatNotNull"/>
-      <field name="floatNull" column="floatNull"/>
-      <field name="doubleNotNull" column="doubleNotNull"/>
-      <field name="doubleNull" column="doubleNull"/>
-      <field name="charNotNull" column="charNotNull"/>
-      <field name="charNull" column="charNull"/>
-      <field name="dateNull" column="dateNull"/>
-      <field name="stringNull" column="stringNull"/>
-      <field name="bigDecimal" column="bigDecimal"/>
-      <field name="bigInteger" column="bigInteger"/>
-      <field name="PrimitiveTypes" column="PrimitiveTypes"/>
-    </class>
-
-  </package>
-</orm>
-
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby6.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby6.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby6.orm	(working copy)
@@ -1,59 +0,0 @@
-<?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">
-<orm>
-  <package name="org.apache.jdo.tck.pc.mylib" schema="datastoreidentity_pkg" >
-
-    <class name="PCPoint" table="PCPoint">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCPoint2" table="PCPoint2">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCRect" table="PCRect">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="lowerRight" column="LOWER_RIGHT">
-        <foreign-key/>
-      </field>
-      <field name="upperLeft" column="UPPER_LEFT">
-        <foreign-key/>
-      </field>
-    </class>
-
-    <class name="PrimitiveTypes" table="PrimitiveTypes">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="booleanNotNull" column="booleanNotNull"/>
-      <field name="booleanNull" column="booleanNull"/>
-      <field name="byteNotNull" column="byteNotNull"/>
-      <field name="byteNull" column="byteNull"/>
-      <field name="shortNotNull" column="shortNotNull"/>
-      <field name="shortNull" column="shortNull"/>
-      <field name="intNotNull" column="intNotNull"/>
-      <field name="intNull" column="intNull"/>
-      <field name="longNotNull" column="longNotNull"/>
-      <field name="longNull" column="longNull"/>
-      <field name="floatNotNull" column="floatNotNull"/>
-      <field name="floatNull" column="floatNull"/>
-      <field name="doubleNotNull" column="doubleNotNull"/>
-      <field name="doubleNull" column="doubleNull"/>
-      <field name="charNotNull" column="charNotNull"/>
-      <field name="charNull" column="charNull"/>
-      <field name="dateNull" column="dateNull"/>
-      <field name="stringNull" column="stringNull"/>
-      <field name="bigDecimal" column="bigDecimal"/>
-      <field name="bigInteger" column="bigInteger"/>
-      <field name="PrimitiveTypes" column="PrimitiveTypes"/>
-    </class>
-
-  </package>
-</orm>
-
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby7.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby7.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby7.orm	(working copy)
@@ -1,59 +0,0 @@
-<?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">
-<orm>
-  <package name="org.apache.jdo.tck.pc.mylib">
-
-    <class name="PCPoint" table="PCPoint" schema="datastoreidentity_cls">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCPoint2" table="PCPoint2" schema="datastoreidentity_cls">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCRect" table="PCRect" schema="datastoreidentity_cls">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="lowerRight" column="LOWER_RIGHT">
-        <foreign-key/>
-      </field>
-      <field name="upperLeft" column="UPPER_LEFT">
-        <foreign-key/>
-      </field>
-    </class>
-
-    <class name="PrimitiveTypes" table="PrimitiveTypes" schema="datastoreidentity_cls">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="booleanNotNull" column="booleanNotNull"/>
-      <field name="booleanNull" column="booleanNull"/>
-      <field name="byteNotNull" column="byteNotNull"/>
-      <field name="byteNull" column="byteNull"/>
-      <field name="shortNotNull" column="shortNotNull"/>
-      <field name="shortNull" column="shortNull"/>
-      <field name="intNotNull" column="intNotNull"/>
-      <field name="intNull" column="intNull"/>
-      <field name="longNotNull" column="longNotNull"/>
-      <field name="longNull" column="longNull"/>
-      <field name="floatNotNull" column="floatNotNull"/>
-      <field name="floatNull" column="floatNull"/>
-      <field name="doubleNotNull" column="doubleNotNull"/>
-      <field name="doubleNull" column="doubleNull"/>
-      <field name="charNotNull" column="charNotNull"/>
-      <field name="charNull" column="charNull"/>
-      <field name="dateNull" column="dateNull"/>
-      <field name="stringNull" column="stringNull"/>
-      <field name="bigDecimal" column="bigDecimal"/>
-      <field name="bigInteger" column="bigInteger"/>
-      <field name="PrimitiveTypes" column="PrimitiveTypes"/>
-    </class>
-
-  </package>
-</orm>
-
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby.orm	(working copy)
@@ -1,73 +0,0 @@
-<?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">
-<orm>
-  <package name="org.apache.jdo.tck.pc.mylib">
-
-    <class name="PCPoint" table="PCPoint">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="VersionedPCPoint" table="VersionedPCPoint">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCPoint2" table="PCPoint2">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCRect" table="PCRect">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="lowerRight" column="LOWER_RIGHT">
-        <foreign-key/>
-      </field>
-      <field name="upperLeft" column="UPPER_LEFT">
-        <foreign-key/>
-      </field>
-    </class>
-
-    <class name="PrimitiveTypes" table="PrimitiveTypes">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="booleanNotNull" column="booleanNotNull"/>
-      <field name="booleanNull" column="booleanNull"/>
-      <field name="byteNotNull" column="byteNotNull"/>
-      <field name="byteNull" column="byteNull"/>
-      <field name="shortNotNull" column="shortNotNull"/>
-      <field name="shortNull" column="shortNull"/>
-      <field name="intNotNull" column="intNotNull"/>
-      <field name="intNull" column="intNull"/>
-      <field name="longNotNull" column="longNotNull"/>
-      <field name="longNull" column="longNull"/>
-      <field name="floatNotNull" column="floatNotNull"/>
-      <field name="floatNull" column="floatNull"/>
-      <field name="doubleNotNull" column="doubleNotNull"/>
-      <field name="doubleNull" column="doubleNull"/>
-      <field name="charNotNull" column="charNotNull"/>
-      <field name="charNull" column="charNull"/>
-      <field name="dateNull" column="dateNull"/>
-      <field name="stringNull" column="stringNull"/>
-      <field name="bigDecimal" column="bigDecimal"/>
-      <field name="bigInteger" column="bigInteger"/>
-      <field name="PrimitiveTypes" column="PrimitiveTypes"/>
-    </class>
-
-    <class name="PCClass" table="PCClass">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="number1" column="NUMBER1"/>
-      <field name="number2" column="NUMBER2"/>
-    </class>
-
-  </package>
-</orm>
-
Index: src/orm/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package-derby.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package-derby.orm	(revision 375164)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package-derby.orm	(working copy)
@@ -1,42 +0,0 @@
-<?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 datastore identity.
--->
-<orm>
-    <package name="org.apache.jdo.tck.api.instancecallbacks">
-
-        <class name="InstanceLifecycleListenerAttach$PC" 
-                table="LIFECYCLELISTENERATTACH">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="id" column="ID"/>
-        </class>
-        <class name="InstanceLifecycleListenerClear$PC" 
-                table="LIFECYCLELISTENERCLEAR">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="id" column="ID"/>
-        </class>
-        <class name="InstanceLifecycleListenerDelete$PC" 
-                table="LIFECYCLELISTENERDELETE">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="id" column="ID"/>
-        </class>
-        <class name="InstanceLifecycleListenerDetach$PC" 
-                table="LIFECYCLELISTENERDETACH">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="id" column="ID"/>
-        </class>
-        <class name="InstanceLifecycleListenerLoad$PC" 
-                table="LIFECYCLELISTENERLOAD">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="id" column="ID"/>
-            <field name="value" column="VALUE"/>
-        </class>
-        <class name="InstanceLifecycleListenerStore$PC" 
-                table="LIFECYCLELISTENERSTORE">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-            <field name="id" column="ID"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-derby.orm	(working copy)
@@ -1,10 +0,0 @@
-<?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">
-<orm>
-  <package name="org.apache.jdo.tck.pc.lifecycle">
-    <class name="StateTransitionObj" table="STATETRANSITIONOBJ">
-       <field name="id" column="ID" primary-key="true"/>
-       <field name="int_field" column="INT_FIELD"/>
-    </class>
-  </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package-derby.orm	(working copy)
@@ -1,84 +0,0 @@
-<?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">
-<orm>
-  <package name="org.apache.jdo.tck.pc.singlefieldidentity">
-
-    <class name="PCPointSingleFieldPrimitivebyte" table="PCPointSingleFieldByte">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCPointSingleFieldByte" table="PCPointSingleFieldByte">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCPointSingleFieldPrimitivechar" table="PCPointSingleFieldChar">
-      <field name="id" primary-key="true">
-        <column name="ID" jdbc-type="INTEGER"/>
-      </field>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCPointSingleFieldCharacter" table="PCPointSingleFieldChar">
-      <field name="id" primary-key="true">
-        <column name="ID" jdbc-type="INTEGER"/>
-      </field>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCPointSingleFieldPrimitiveint" table="PCPointSingleFieldInteger">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCPointSingleFieldInteger" table="PCPointSingleFieldInteger">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCPointSingleFieldPrimitivelong" table="PCPointSingleFieldLong">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCPointSingleFieldLong" table="PCPointSingleFieldLong">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCPointSingleFieldPrimitiveshort" table="PCPointSingleFieldShort">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCPointSingleFieldShort" table="PCPointSingleFieldShort">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCPointSingleFieldString" table="PCPointSingleFieldString">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCPointSingleFieldDate" table="PCPointSingleFieldDate">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-  </package>
-</orm>
-
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package-derby8.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package-derby8.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package-derby8.orm	(working copy)
@@ -1,43 +0,0 @@
-<?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.shoppingcart">
-
-        <class name="Cart" table="CARTS">
-            <version strategy="version-number" column="VERSION"/>
-
-            <field name="id" column="CART_ID"/>
-            <field name="customerId" column="CUSTOMER_ID"/>
-            <field name="entries" mapped-by="cart"/>
-        </class>
-
-        <class name="CartEntry" table="CART_ENTRIES">
-            <version strategy="version-number" column="VERSION"/>
-
-            <field name="id" column="ID"/>
-            <field name="quantity" column="QUANTITY"/>
-            <field name="product" column="SKU" foreign-key="true"/>
-            <field name="cart" column="CART_ID" foreign-key="true"/>
-        </class>
-
-        <class name="Product" table="PRODUCTS">
-            <version strategy="version-number" column="VERSION"/>
-
-            <field name="sku" column="SKU"/>
-            <field name="description" column="DESCRIPTION"/>
-        </class>
-
-        <class name="Undetachable" table="UNDETACHABLES">
-            <version strategy="version-number" column="VERSION"/>
-
-            <field name="id" column="ID"/>
-            <field name="foo" column="FOO"/>
-            <field name="bar" column="BAR"/>
-        </class>
-
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package-derby.orm	(working copy)
@@ -1,47 +0,0 @@
-<?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.dtd">
-<orm>
-    <package name="org.apache.jdo.tck.pc.instancecallbacks">
-        <class name="InstanceCallbackNonPersistFdsClass" table="ICNonPersistFds">
-            <field name="keyValue" primary-key="true">
-                <column name="ICKEY"/>
-            </field>
-            <field name="d" column="D"/>
-            <field name="s" column="S"/>
-            <field name="floatValue">
-                <column name="FLOATVAL"/>
-            </field>
-            <field name="intValue">
-                <column name="INTVAL"/>
-            </field>
-        </class>
-
-        <class name="InstanceCallbackClass" table="InstanceCallbacks">
-            <field name="keyValue" primary-key="true">
-                <column name="ICKEY"/>
-            </field>
-            <field name="name" column="NAME"/>
-            <field name="timeStamp">
-                <column name="TIMEDATE"/>
-            </field>
-            <field name="nextObj">
-                <column name="NEXTOBJ"/>
-            </field>
-            <field name="children">
-                <element column="CHILD"/>
-            </field>
-            <field name="intValue">
-                <column name="INTVAL"/>
-            </field>
-            <field name="doubleValue">
-                <column name="DOUBLEVAL"/>
-            </field>
-            <field name="childToDelete">
-                <column name="CHILD2DEL"/>
-            </field>
-            <field name="charValue">
-                <column name="CHARVAL"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/query/package-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/query/package-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/query/package-derby.orm	(working copy)
@@ -1,16 +0,0 @@
-<?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">
-<orm>
-  <package name="org.apache.jdo.tck.pc.query">
-
-    <class name="JDOQLKeywordsAsFieldNames" table="JDOQLKeywordsAsFieldNames">
-      <field name="select" column="ID" primary-key="true"/>
-    </class>
-
-    <class name="NoExtent" table="NoExtent">
-      <field name="id" column="ID" primary-key="true"/>
-    </class>
-
-  </package>
-</orm>
-
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm	(working copy)
@@ -1,164 +0,0 @@
-<?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="Company" table="companies">
-            <field name="companyid" column="ID" primary-key="true"/>
-            <field name="name" column="NAME">
-              <column name="NAME" sql-type="VARCHAR"/>
-            </field>
-            <field name="founded" column="FOUNDEDDATE"/>
-            <field name="address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
-                </embedded>
-            </field>
-            <field name="departments" mapped-by="company"/>
-        </class>
-
-        <class name="Department" table="departments">
-            <field name="deptid" column="ID" primary-key="true"/>
-            <field name="name" column="NAME"/>
-            <field name="company" column="COMPANYID" foreign-key="true"/>
-            <field name="employees" mapped-by="department"/>
-            <field name="fundedEmps" mapped-by="fundingDept"/>
-            <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
-        </class>
-
-        <class name="PartTimeEmployee">
-            <inheritance strategy="superclass-table"/>
-            <field name="wage" column="WAGE"/>
-        </class>
-
-        <class name="FullTimeEmployee">
-            <inheritance strategy="superclass-table"/>
-            <field name="salary" column="SALARY"/>
-        </class>
-
-        <class name="Employee">
-            <inheritance strategy="superclass-table"/>
-            <field name="hiredate" column="HIREDATE"/>
-            <field name="weeklyhours" column="WEEKLYHOURS"/>
-            <field name="dentalInsurance" mapped-by="employee"/>
-            <field name="medicalInsurance" mapped-by="employee"/>
-            <field name="department" column="DEPARTMENT">
-                        <foreign-key/>
-            </field>
-            <field name="fundingDept" column="FUNDINGDEPT">
-                        <foreign-key/>
-            </field>
-            <field name="manager" column="MANAGER">
-                        <foreign-key/>
-            </field>
-            <field name="mentor" column="MENTOR">
-                        <foreign-key/>
-            </field>
-            <field name="protege" mapped-by="mentor"/>
-            <field name="hradvisor" column="HRADVISOR">
-                        <foreign-key/>
-            </field>
-            <field name="reviewedProjects" mapped-by="reviewers">
-            </field>
-            <field name="projects" mapped-by="members"/>
-            <field name="team" mapped-by="manager"/>
-            <field name="hradvisees" mapped-by="hradvisor"/>
-        </class>
-
-        <class name="Person" table="persons">
-            <inheritance strategy="new-table">
-                <discriminator strategy="class-name" column="DISCRIMINATOR"
-                    indexed="true"/>
-            </inheritance>
-            <field name="personid" column="PERSONID" primary-key="true"/>
-            <field name="firstname" column="FIRSTNAME"/>
-            <field name="lastname" column="LASTNAME"/>
-            <field name="middlename">
-              <column name="MIDDLENAME" allows-null="true"/>
-            </field>
-            <field name="address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid">
-                      <column name="ADDRID" allows-null="true"/>
-                    </field>
-                    <field name="street">
-                      <column name="STREET" allows-null="true"/>
-                    </field>
-                    <field name="city">
-                      <column name="CITY" allows-null="true"/>
-                    </field>
-                    <field name="state">
-                      <column name="STATE" allows-null="true"/>
-                    </field>
-                    <field name="zipcode">
-                      <column name="ZIPCODE" allows-null="true"/>
-                    </field>
-                    <field name="country">
-                      <column name="COUNTRY" allows-null="true"/>
-                    </field>
-                </embedded>
-            </field>
-            <field name="phoneNumbers" table="employee_phoneno_type" >
-                <join column="EMPID"/>
-                <key column="TYPE"/>
-                <value column="PHONENO"/>
-            </field>
-            <query name="packageORM">
-                SELECT FROM org.apache.jdo.tck.pc.company.Person
-                WHERE personid > 2
-            </query>
-        </class>
-
-        <class name="Insurance" table="insuranceplans">
-            <inheritance strategy="new-table">
-                <discriminator strategy="class-name" column="DISCRIMINATOR">
-                    <index name="INS_DISCRIMINATOR_INDEX" unique="false"/>
-                </discriminator>
-            </inheritance>
-            <field name="insid" column="INSID" primary-key="true"/>
-            <field name="carrier" column="CARRIER"/>
-            <field name="employee" column="EMPLOYEE">
-                 <foreign-key/>
-            </field>
-        </class>
-
-        <class name="DentalInsurance">
-            <inheritance strategy="superclass-table"/>
-            <field name="lifetimeOrthoBenefit" column="LIFETIME_ORTHO_BENEFIT"/>
-        </class>
-
-        <class name="MedicalInsurance">
-            <inheritance strategy="superclass-table"/>
-            <field name="planType" column="PLANTYPE"/>
-        </class>
-
-        <class name="Project" table="projects">
-            <field name="projid" column="PROJID" primary-key="true"/>
-            <field name="name" column="NAME"/>
-            <field name="budget">
-               <column name="BUDGET" jdbc-type="DECIMAL" length="11" scale="2"/>
-            </field>
-            <field name="reviewers" table="project_reviewer">
-                <join column="PROJID">
-                    <foreign-key name="PR_PROJ_FK"/>
-                </join>
-                <element column="REVIEWER">
-                    <foreign-key name="PR_REV_FK"/>
-                </element>
-            </field>
-            <field name="members" table="project_member">
-                <join column="PROJID"/>
-                <element column="MEMBER"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby1.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby1.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby1.orm	(working copy)
@@ -1,152 +0,0 @@
-<?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.
-
-Inheritance mapping: 
-Separate table for each class in the inheritance hierarchy.
-Each table contains columns for the declared fields.
-Inheritance strategy: new-table for all classes.
--->
-<orm>
-    <package name="org.apache.jdo.tck.pc.company">
-
-        <class name="Company" table="companies">
-            <field name="companyid" column="ID" primary-key="true"/>
-            <field name="name" column="NAME"/>
-            <field name="founded" column="FOUNDEDDATE"/>
-            <field name="address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
-                </embedded>
-            </field>
-            <field name="departments" mapped-by="company"/>
-        </class>
-
-        <class name="Department" table="departments">
-            <field name="deptid" column="ID" primary-key="true"/>
-            <field name="name" column="NAME"/>
-            <field name="company" column="COMPANYID" foreign-key="true"/>
-            <field name="employees" mapped-by="department"/>
-            <field name="fundedEmps" mapped-by="fundingDept"/>
-            <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
-        </class>
-
-        <class name="PartTimeEmployee" table="parttimeemployees">
-            <inheritance strategy="new-table">
-                <join column="PERSONID"/>
-            </inheritance>
-            <field name="wage" column="WAGE"/>
-        </class>
-
-        <class name="FullTimeEmployee" table="fulltimeemployees">
-            <inheritance strategy="new-table">
-                <join column="PERSONID"/>
-            </inheritance>
-            <field name="salary" column="SALARY"/>
-        </class>
-
-        <class name="Employee" table="employees">
-            <inheritance strategy="new-table">
-                <join column="PERSONID"/>
-            </inheritance>
-            <field name="hiredate" column="HIREDATE"/>
-            <field name="weeklyhours" column="WEEKLYHOURS"/>
-            <field name="dentalInsurance" mapped-by="employee"/>
-            <field name="medicalInsurance" mapped-by="employee"/>
-            <field name="department" column="DEPARTMENT">
-                        <foreign-key/>
-            </field>
-            <field name="fundingDept" column="FUNDINGDEPT">
-                        <foreign-key/>
-            </field>
-            <field name="manager" column="MANAGER">
-                        <foreign-key/>
-            </field>
-            <field name="mentor" column="MENTOR">
-                        <foreign-key/>
-            </field>
-            <field name="protege" mapped-by="mentor"/>
-            <field name="hradvisor" column="HRADVISOR">
-                        <foreign-key/>
-            </field>
-            <field name="reviewedProjects" mapped-by="reviewers">
-            </field>
-            <field name="projects" mapped-by="members"/>
-            <field name="team" mapped-by="manager"/>
-            <field name="hradvisees" mapped-by="hradvisor"/>
-        </class>
-
-        <class name="Person" table="persons">
-            <inheritance strategy="new-table"/>
-            <field name="personid" column="PERSONID" primary-key="true"/>
-            <field name="firstname" column="FIRSTNAME"/>
-            <field name="lastname" column="LASTNAME"/>
-            <field name="middlename" column="MIDDLENAME"/>
-            <field name="address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
-                </embedded>
-            </field>
-            <field name="phoneNumbers" table="employee_phoneno_type" >
-                <join column="EMPID"/>
-                <key column="TYPE"/>
-                <value column="PHONENO"/>
-            </field>
-        </class>
-
-        <class name="Insurance" table="insuranceplans">
-            <inheritance strategy="new-table"/>
-            <field name="insid" column="INSID" primary-key="true"/>
-            <field name="carrier" column="CARRIER"/>
-            <field name="employee" column="EMPLOYEE">
-                 <foreign-key/>
-            </field>
-        </class>
-
-        <class name="DentalInsurance" table="dentalinsurance">
-            <inheritance strategy="new-table">
-                <join column="INSID"/>
-            </inheritance>
-            <field name="lifetimeOrthoBenefit" column="LIFETIME_ORTHO_BENEFIT"/>
-        </class>
-
-        <class name="MedicalInsurance" table="medicalinsurance">
-            <inheritance strategy="new-table">
-                <join column="INSID"/>
-            </inheritance>
-            <field name="planType" column="PLANTYPE"/>
-        </class>
-
-        <class name="Project" table="projects">
-            <field name="projid" column="PROJID" primary-key="true"/>
-            <field name="name" column="NAME"/>
-            <field name="budget">
-               <column name="BUDGET" jdbc-type="DECIMAL" length="11" scale="2"/>
-            </field>
-            <field name="reviewers" table="project_reviewer">
-                <join column="PROJID">
-                    <foreign-key name="PR_PROJ_FK"/>
-                </join>
-                <element column="REVIEWER">
-                    <foreign-key name="PR_REV_FK"/>
-                </element>
-            </field>
-            <field name="members" table="project_member">
-                <join column="PROJID"/>
-                <element column="MEMBER"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby2.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby2.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby2.orm	(working copy)
@@ -1,219 +0,0 @@
-<?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.
-
-Inheritance mapping: 
-Separate table for each class in the inheritance hierarchy.
-No tables for abstract classes.
-Each table contains columns for all fields.
-Managers, mentors, hradvisors, and employees of the month 
-are fulltime employees.
-Only fulltime employees can have insurances, can be project members,
-and can be project reviewers.
-Separate phone number type tables for persons, fulltime employees,
-and parttime employees.
-Inheritance strategy: 
-    Employee, Insurance: subclass-table.
-    all other classes:   new-table.
--->
-<orm>
-    <package name="org.apache.jdo.tck.pc.company">
-
-        <class name="Company" table="companies">
-            <field name="companyid" column="ID" primary-key="true"/>
-            <field name="name" column="NAME"/>
-            <field name="founded" column="FOUNDEDDATE"/>
-            <field name="address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
-                </embedded>
-            </field>
-            <field name="departments" mapped-by="company"/>
-        </class>
-
-        <class name="Department" table="departments">
-            <field name="deptid" column="ID" primary-key="true"/>
-            <field name="name" column="NAME"/>
-            <field name="company" column="COMPANYID" foreign-key="true"/>
-            <field name="employees" mapped-by="department"/>
-            <field name="fundedEmps" mapped-by="fundingDept"/>
-            <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
-        </class>
-
-        <class name="PartTimeEmployee" table="parttimeemployees">
-            <inheritance strategy="new-table"/>
-            <field name="Person.personid" column="PERSONID" primary-key="true"/>
-            <field name="Person.firstname" column="FIRSTNAME"/>
-            <field name="Person.lastname" column="LASTNAME"/>
-            <field name="Person.middlename" column="MIDDLENAME"/>
-            <field name="Person.address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
-                </embedded>
-            </field>
-            <field name="Person.phoneNumbers" table="parttime_employee_phoneno_type" >
-                <join column="EMPID"/>
-                <key column="TYPE"/>
-                <value column="PHONENO"/>
-            </field>
-            <field name="Employee.hiredate" column="HIREDATE"/>
-            <field name="Employee.weeklyhours" column="WEEKLYHOURS"/>
-            <field name="Employee.dentalInsurance" mapped-by="employee"/>
-            <field name="Employee.medicalInsurance" mapped-by="employee"/>
-            <field name="Employee.department" column="DEPARTMENT">
-                        <foreign-key/>
-            </field>
-            <field name="Employee.fundingDept" column="FUNDINGDEPT">
-                        <foreign-key/>
-            </field>
-            <field name="Employee.manager" column="MANAGER">
-                        <foreign-key/>
-            </field>
-            <field name="Employee.mentor" column="MENTOR">
-                        <foreign-key/>
-            </field>
-            <field name="Employee.protege" mapped-by="mentor"/>
-            <field name="Employee.hradvisor" column="HRADVISOR">
-                        <foreign-key/>
-            </field>
-            <field name="Employee.reviewedProjects" mapped-by="reviewers">
-            </field>
-            <field name="Employee.projects" mapped-by="members"/>
-            <field name="Employee.team" mapped-by="manager"/>
-            <field name="Employee.hradvisees" mapped-by="hradvisor"/>
-            <field name="wage" column="WAGE"/>
-        </class>
-
-        <class name="FullTimeEmployee" table="fulltimeemployees">
-            <inheritance strategy="new-table"/>
-            <field name="Person.personid" column="PERSONID" primary-key="true"/>
-            <field name="Person.firstname" column="FIRSTNAME"/>
-            <field name="Person.lastname" column="LASTNAME"/>
-            <field name="Person.middlename" column="MIDDLENAME"/>
-            <field name="Person.address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
-                </embedded>
-            </field>
-            <field name="Person.phoneNumbers" table="fulltime_employee_phoneno_type" >
-                <join column="EMPID"/>
-                <key column="TYPE"/>
-                <value column="PHONENO"/>
-            </field>
-            <field name="Employee.hiredate" column="HIREDATE"/>
-            <field name="Employee.weeklyhours" column="WEEKLYHOURS"/>
-            <field name="Employee.dentalInsurance" mapped-by="employee"/>
-            <field name="Employee.medicalInsurance" mapped-by="employee"/>
-            <field name="Employee.department" column="DEPARTMENT">
-                        <foreign-key/>
-            </field>
-            <field name="Employee.fundingDept" column="FUNDINGDEPT">
-                        <foreign-key/>
-            </field>
-            <field name="Employee.manager" column="MANAGER">
-                        <foreign-key/>
-            </field>
-            <field name="Employee.mentor" column="MENTOR">
-                        <foreign-key/>
-            </field>
-            <field name="Employee.protege" mapped-by="mentor"/>
-            <field name="Employee.hradvisor" column="HRADVISOR">
-                        <foreign-key/>
-            </field>
-            <field name="Employee.reviewedProjects" mapped-by="reviewers">
-            </field>
-            <field name="Employee.projects" mapped-by="members"/>
-            <field name="Employee.team" mapped-by="manager"/>
-            <field name="Employee.hradvisees" mapped-by="hradvisor"/>
-            <field name="salary" column="SALARY"/>
-        </class>
-
-        <class name="Employee">
-            <inheritance strategy="subclass-table"/>
-        </class>
-
-        <class name="Person" table="persons">
-            <inheritance strategy="new-table"/>
-            <field name="personid" column="PERSONID" primary-key="true"/>
-            <field name="firstname" column="FIRSTNAME"/>
-            <field name="lastname" column="LASTNAME"/>
-            <field name="middlename" column="MIDDLENAME"/>
-            <field name="address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
-                </embedded>
-            </field>
-            <field name="phoneNumbers" table="employee_phoneno_type" >
-                <join column="EMPID"/>
-                <key column="TYPE"/>
-                <value column="PHONENO"/>
-            </field>
-        </class>
-
-        <class name="Insurance">
-            <inheritance strategy="subclass-table"/>
-        </class>
-
-        <class name="DentalInsurance" table="dentalinsurance">
-            <inheritance strategy="new-table"/>
-            <field name="Insurance.insid" column="INSID" primary-key="true"/>
-            <field name="Insurance.carrier" column="CARRIER"/>
-            <field name="Insurance.employee" column="EMPLOYEE">
-                 <foreign-key/>
-            </field>
-            <field name="lifetimeOrthoBenefit" column="LIFETIME_ORTHO_BENEFIT"/>
-        </class>
-
-        <class name="MedicalInsurance" table="medicalinsurance">
-            <inheritance strategy="new-table"/>
-            <field name="Insurance.insid" column="INSID" primary-key="true"/>
-            <field name="Insurance.carrier" column="CARRIER"/>
-            <field name="Insurance.employee" column="EMPLOYEE">
-                 <foreign-key/>
-            </field>
-            <field name="planType" column="PLANTYPE"/>
-        </class>
-
-        <class name="Project" table="projects">
-            <field name="projid" column="PROJID" primary-key="true"/>
-            <field name="name" column="NAME"/>
-            <field name="budget">
-               <column name="BUDGET" jdbc-type="DECIMAL" length="11" scale="2"/>
-            </field>
-            <field name="reviewers" table="project_reviewer">
-                <join column="PROJID">
-                    <foreign-key name="PR_PROJ_FK"/>
-                </join>
-                <element column="REVIEWER">
-                    <foreign-key name="PR_REV_FK"/>
-                </element>
-            </field>
-            <field name="members" table="project_member">
-                <join column="PROJID"/>
-                <element column="MEMBER"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby3.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby3.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby3.orm	(working copy)
@@ -1,148 +0,0 @@
-<?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.
-
-Inheritance mapping: 
-Person has inheritance strategy "new-table".
-Employee has inheritance strategy "subclass-table".
-PartTimeEmployee and FullTimeEmployee has inheritance strategy "new-table".
-Insurance has inheritance strategy "subclass-table".
-MedicalInsurance and DentalInsurance have inheritance strategy "new-table".
--->
-<orm>
-    <package name="org.apache.jdo.tck.pc.company">
-
-        <class name="Company" table="companies">
-            <field name="companyid" column="ID" primary-key="true"/>
-            <field name="name" column="NAME"/>
-            <field name="founded" column="FOUNDEDDATE"/>
-            <field name="address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
-                </embedded>
-            </field>
-            <field name="departments" mapped-by="company"/>
-        </class>
-
-        <class name="Department" table="departments">
-            <field name="deptid" column="ID" primary-key="true"/>
-            <field name="name" column="NAME"/>
-            <field name="company" column="COMPANYID" foreign-key="true"/>
-            <field name="employees" mapped-by="department"/>
-            <field name="fundedEmps" mapped-by="fundingDept"/>
-            <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
-        </class>
-
-        <class name="PartTimeEmployee" table="parttimeemployees">
-            <inheritance strategy="new-table">
-                <join column="PERSONID"/>
-            </inheritance>
-            <field name="wage" column="WAGE"/>
-        </class>
-
-        <class name="FullTimeEmployee" table="fulltimeemployees">
-            <inheritance strategy="new-table">
-                <join column="PERSONID"/>
-            </inheritance>
-            <field name="salary" column="SALARY"/>
-        </class>
-
-        <class name="Employee">
-            <inheritance strategy="subclass-table"/>
-            <field name="hiredate" column="HIREDATE"/>
-            <field name="weeklyhours" column="WEEKLYHOURS"/>
-            <field name="dentalInsurance" mapped-by="employee"/>
-            <field name="medicalInsurance" mapped-by="employee"/>
-            <field name="department" column="DEPARTMENT">
-                        <foreign-key/>
-            </field>
-            <field name="fundingDept" column="FUNDINGDEPT">
-                        <foreign-key/>
-            </field>
-            <field name="manager" column="MANAGER">
-                        <foreign-key/>
-            </field>
-            <field name="mentor" column="MENTOR">
-                        <foreign-key/>
-            </field>
-            <field name="protege" mapped-by="mentor"/>
-            <field name="hradvisor" column="HRADVISOR">
-                        <foreign-key/>
-            </field>
-            <field name="reviewedProjects" mapped-by="reviewers">
-            </field>
-            <field name="projects" mapped-by="members"/>
-            <field name="team" mapped-by="manager"/>
-            <field name="hradvisees" mapped-by="hradvisor"/>
-        </class>
-
-        <class name="Person" table="persons">
-            <inheritance strategy="new-table"/>
-            <field name="personid" column="PERSONID" primary-key="true"/>
-            <field name="firstname" column="FIRSTNAME"/>
-            <field name="lastname" column="LASTNAME"/>
-            <field name="middlename" column="MIDDLENAME"/>
-            <field name="address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
-                </embedded>
-            </field>
-            <field name="phoneNumbers" table="employee_phoneno_type" >
-                <join column="EMPID"/>
-                <key column="TYPE"/>
-                <value column="PHONENO"/>
-            </field>
-        </class>
-
-        <class name="Insurance">
-            <inheritance strategy="subclass-table"/>
-            <field name="insid" column="INSID" primary-key="true"/>
-            <field name="carrier" column="CARRIER"/>
-            <field name="employee" column="EMPLOYEE">
-                 <foreign-key/>
-            </field>
-        </class>
-
-        <class name="DentalInsurance" table="dentalinsurance">
-            <inheritance strategy="new-table"/>
-            <field name="lifetimeOrthoBenefit" column="LIFETIME_ORTHO_BENEFIT"/>
-        </class>
-
-        <class name="MedicalInsurance" table="medicalinsurance">
-            <inheritance strategy="new-table"/>
-            <field name="planType" column="PLANTYPE"/>
-        </class>
-
-        <class name="Project" table="projects">
-            <field name="projid" column="PROJID" primary-key="true"/>
-            <field name="name" column="NAME"/>
-            <field name="budget">
-               <column name="BUDGET" jdbc-type="DECIMAL" length="11" scale="2"/>
-            </field>
-            <field name="reviewers" table="project_reviewer">
-                <join column="PROJID">
-                    <foreign-key name="PR_PROJ_FK"/>
-                </join>
-                <element column="REVIEWER">
-                    <foreign-key name="PR_REV_FK"/>
-                </element>
-            </field>
-            <field name="members" table="project_member">
-                <join column="PROJID"/>
-                <element column="MEMBER"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby4.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby4.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby4.orm	(working copy)
@@ -1,149 +0,0 @@
-<?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.
-
-Inheritance mapping: 
-Person, Employee, and Insurance have inheritance strategy "new-table". 
-PartTimeEmployee, FullTimeEmployee, MedicalInsurance, and DentalInsurance
-have inheritance strategy "superclass-table".
--->
-<orm>
-    <package name="org.apache.jdo.tck.pc.company">
-
-        <class name="Company" table="companies">
-            <field name="companyid" column="ID" primary-key="true"/>
-            <field name="name" column="NAME"/>
-            <field name="founded" column="FOUNDEDDATE"/>
-            <field name="address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
-                </embedded>
-            </field>
-            <field name="departments" mapped-by="company"/>
-        </class>
-
-        <class name="Department" table="departments">
-            <field name="deptid" column="ID" primary-key="true"/>
-            <field name="name" column="NAME"/>
-            <field name="company" column="COMPANYID" foreign-key="true"/>
-            <field name="employees" mapped-by="department"/>
-            <field name="fundedEmps" mapped-by="fundingDept"/>
-            <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
-        </class>
-
-        <class name="PartTimeEmployee">
-            <inheritance strategy="superclass-table"/>
-            <field name="wage" column="WAGE"/>
-        </class>
-
-        <class name="FullTimeEmployee">
-            <inheritance strategy="superclass-table"/>
-            <field name="salary" column="SALARY"/>
-        </class>
-
-        <class name="Employee" table="employees">
-            <inheritance strategy="new-table">
-                <join column="PERSONID"/>
-                <discriminator strategy="class-name" column="DISCRIMINATOR"
-                    indexed="true"/>
-            </inheritance>
-            <field name="hiredate" column="HIREDATE"/>
-            <field name="weeklyhours" column="WEEKLYHOURS"/>
-            <field name="dentalInsurance" mapped-by="employee"/>
-            <field name="medicalInsurance" mapped-by="employee"/>
-            <field name="department" column="DEPARTMENT">
-                        <foreign-key/>
-            </field>
-            <field name="fundingDept" column="FUNDINGDEPT">
-                        <foreign-key/>
-            </field>
-            <field name="manager" column="MANAGER">
-                        <foreign-key/>
-            </field>
-            <field name="mentor" column="MENTOR">
-                        <foreign-key/>
-            </field>
-            <field name="protege" mapped-by="mentor"/>
-            <field name="hradvisor" column="HRADVISOR">
-                        <foreign-key/>
-            </field>
-            <field name="reviewedProjects" mapped-by="reviewers">
-            </field>
-            <field name="projects" mapped-by="members"/>
-            <field name="team" mapped-by="manager"/>
-            <field name="hradvisees" mapped-by="hradvisor"/>
-        </class>
-
-        <class name="Person" table="persons">
-            <inheritance strategy="new-table"/>
-            <field name="personid" column="PERSONID" primary-key="true"/>
-            <field name="firstname" column="FIRSTNAME"/>
-            <field name="lastname" column="LASTNAME"/>
-            <field name="middlename" column="MIDDLENAME"/>
-            <field name="address">
-                <embedded null-indicator-column="COUNTRY">
-                    <field name="addrid" column="ADDRID"/>
-                    <field name="street" column="STREET"/>
-                    <field name="city" column="CITY"/>
-                    <field name="state" column="STATE"/>
-                    <field name="zipcode" column="ZIPCODE"/>
-                    <field name="country" column="COUNTRY"/>
-                </embedded>
-            </field>
-            <field name="phoneNumbers" table="employee_phoneno_type" >
-                <join column="EMPID"/>
-                <key column="TYPE"/>
-                <value column="PHONENO"/>
-            </field>
-        </class>
-
-        <class name="Insurance" table="insuranceplans">
-            <inheritance strategy="new-table">
-                <discriminator strategy="class-name" column="DISCRIMINATOR"
-                    indexed="true"/>
-            </inheritance>
-            <field name="insid" column="INSID" primary-key="true"/>
-            <field name="carrier" column="CARRIER"/>
-            <field name="employee" column="EMPLOYEE">
-                 <foreign-key/>
-            </field>
-        </class>
-
-        <class name="DentalInsurance">
-            <inheritance strategy="superclass-table"/>
-            <field name="lifetimeOrthoBenefit" column="LIFETIME_ORTHO_BENEFIT"/>
-        </class>
-
-        <class name="MedicalInsurance">
-            <inheritance strategy="superclass-table"/>
-            <field name="planType" column="PLANTYPE"/>
-        </class>
-
-        <class name="Project" table="projects">
-            <field name="projid" column="PROJID" primary-key="true"/>
-            <field name="name" column="NAME"/>
-            <field name="budget">
-               <column name="BUDGET" jdbc-type="DECIMAL" length="11" scale="2"/>
-            </field>
-            <field name="reviewers" table="project_reviewer">
-                <join column="PROJID">
-                    <foreign-key name="PR_PROJ_FK"/>
-                </join>
-                <element column="REVIEWER">
-                    <foreign-key name="PR_REV_FK"/>
-                </element>
-            </field>
-            <field name="members" table="project_member">
-                <join column="PROJID"/>
-                <element column="MEMBER"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm	(working copy)
@@ -1,587 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="HashMapStringKeyCollections"
-               table="HASHMAPSTRINGKEY_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
-            <field name="HashMapOfString_Object0" table="HASHMAP_STR_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="HashMapOfString_Object1" table="HASHMAP_STR_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="HashMapOfString_Object2" table="HASHMAP_STR_OBJECT2">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="HashMapOfString_SimpleClass3"
-                   table="HASHMAP_STR_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="HashMapOfString_SimpleClass4"
-                   table="HASHMAP_STR_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="HashMapOfString_SimpleClass5"
-                   table="HASHMAP_STR_SIMPLE_CLASS5">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="HashMapOfString_SimpleInterface6"
-                   table="HASHMAP_STR_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="HashMapOfString_SimpleInterface7"
-                   table="HASHMAP_STR_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="HashMapOfString_SimpleInterface8"
-                   table="HASHMAP_STR_SIMPLE_INTERFACE8">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="HashMapOfString_String9"
-                   table="HASHMAP_STR_STRING9">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_String10"
-                   table="HASHMAP_STR_STRING10">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_String11"
-                   table="HASHMAP_STR_STRING11">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Date12"
-                   table="HASHMAP_STR_DATE12">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Date13"
-                   table="HASHMAP_STR_DATE13">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Date14"
-                   table="HASHMAP_STR_DATE14">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Locale15"
-                   table="HASHMAP_STR_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Locale16"
-                   table="HASHMAP_STR_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Locale17"
-                   table="HASHMAP_STR_LOCALE17">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigDecimal18"
-                   table="HASHMAP_STR_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigDecimal19"
-                   table="HASHMAP_STR_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigDecimal20"
-                   table="HASHMAP_STR_BIG_DECIMAL20">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigInteger21"
-                   table="HASHMAP_STR_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigInteger22"
-                   table="HASHMAP_STR_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigInteger23"
-                   table="HASHMAP_STR_BIG_INTEGER23">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Byte24"
-                   table="HASHMAP_STR_BYTE24">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Byte25"
-                   table="HASHMAP_STR_BYTE25">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Byte26"
-                   table="HASHMAP_STR_BYTE26">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Double27"
-                   table="HASHMAP_STR_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Double28"
-                   table="HASHMAP_STR_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Double29"
-                   table="HASHMAP_STR_DOUBLE29">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Float30"
-                   table="HASHMAP_STR_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Float31"
-                   table="HASHMAP_STR_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Float32"
-                   table="HASHMAP_STR_FLOAT32">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Integer33"
-                   table="HASHMAP_STR_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Integer34"
-                   table="HASHMAP_STR_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Integer35"
-                   table="HASHMAP_STR_INTEGER35">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Long36"
-                   table="HASHMAP_STR_LONG36">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Long37"
-                   table="HASHMAP_STR_LONG37">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Long38"
-                   table="HASHMAP_STR_LONG38">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Short39"
-                   table="HASHMAP_STR_SHORT39">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Short40"
-                   table="HASHMAP_STR_SHORT40">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Short41"
-                   table="HASHMAP_STR_SHORT41">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Object42"
-                   table="HASHMAP_STR_OBJECT42">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashMapOfString_Object43" table="HASHMAP_STR_OBJECT43">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashMapOfString_SimpleClass45"
-                   table="HASHMAP_STR_SIMPLE_CLASS45">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashMapOfString_SimpleClass46"
-                   table="HASHMAP_STR_SIMPLE_CLASS46">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashMapOfString_SimpleInterface48"
-                   table="HASHMAP_STR_SIMPLE_INTERFACE48">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashMapOfString_SimpleInterface49"
-                   table="HASHMAP_STR_SIMPLE_INTERFACE49">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashMapOfString_String51"
-                   table="HASHMAP_STR_STRING51">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_String52"
-                   table="HASHMAP_STR_STRING52">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Date54"
-                   table="HASHMAP_STR_DATE54">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Date55"
-                   table="HASHMAP_STR_DATE55">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Locale57"
-                   table="HASHMAP_STR_LOCALE57">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Locale58"
-                   table="HASHMAP_STR_LOCALE58">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigDecimal60"
-                   table="HASHMAP_STR_BIG_DECIMAL60">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigDecimal61"
-                   table="HASHMAP_STR_BIG_DECIMAL61">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigInteger63"
-                   table="HASHMAP_STR_BIG_INTEGER63">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigInteger64"
-                   table="HASHMAP_STR_BIG_INTEGER64">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Byte66"
-                   table="HASHMAP_STR_BYTE66">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Byte67"
-                   table="HASHMAP_STR_BYTE67">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Double69"
-                   table="HASHMAP_STR_DOUBLE69">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Double70"
-                   table="HASHMAP_STR_DOUBLE70">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Float72"
-                   table="HASHMAP_STR_FLOAT72">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Float73"
-                   table="HASHMAP_STR_FLOAT73">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Integer75"
-                   table="HASHMAP_STR_INTEGER75">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Integer76"
-                   table="HASHMAP_STR_INTEGER76">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Long78"
-                   table="HASHMAP_STR_LONG78">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Long79"
-                   table="HASHMAP_STR_LONG79">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Short81"
-                   table="HASHMAP_STR_SHORT81">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Short82"
-                   table="HASHMAP_STR_SHORT82">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Object84" table="HASHMAP_STR_OBJECT84">
-               <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Object86"
-                   column="HASHMAP_STR_OBJECT86">
-            </field>
-            <field name="HashMapOfString_SimpleClass87"
-                   table="HASHMAP_STR_SIMPLE_CLASS87">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_SimpleClass89"
-                   column="HASHMAP_STR_SIMPLECLASS89">
-            </field>
-            <field name="HashMapOfString_SimpleInterface90"
-                   table="HASHMAP_STR_SIMPLE_INTERFACE90">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_SimpleInterface92"
-                   column="HASHMAP_STR_SIMPLEINTERFACE92">
-            </field>
-            <field name="HashMapOfString_String93"
-                   table="HASHMAP_STR_STRING93">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_String95"
-                   column="HASHMAP_STR_STRING95">
-            </field>
-            <field name="HashMapOfString_Date96"
-                   table="HASHMAP_STR_DATE96">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Date98"
-                   column="HASHMAP_STR_DATE98">
-            </field>
-            <field name="HashMapOfString_Locale99"
-                   table="HASHMAP_STR_LOCALE99">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Locale101"
-                   column="HASHMAP_STR_LOCALE101">
-            </field>
-            <field name="HashMapOfString_BigDecimal102"
-                   table="HASHMAP_STR_BIG_DECIMAL102">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigDecimal104"
-                   column="HASHMAP_STR_BIGDECIMAL104">
-            </field>
-            <field name="HashMapOfString_BigInteger105"
-                   table="HASHMAP_STR_BIG_INTEGER105">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_BigInteger107"
-                   column="HASHMAP_STR_BIGINTEGER107">
-            </field>
-            <field name="HashMapOfString_Byte108"
-                   table="HASHMAP_STR_BYTE108">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Byte110"
-                   column="HASHMAP_STR_BYTE110">
-            </field>
-            <field name="HashMapOfString_Double111" 
-                   table="HASHMAP_STR_DOUBLE111">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Double113"
-                   column="HASHMAP_STR_DOUBLE113">
-            </field>
-            <field name="HashMapOfString_Float114"
-                   table="HASHMAP_STR_FLOAT114">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Float116"
-                   column="HASHMAP_STR_FLOAT116">
-            </field>
-            <field name="HashMapOfString_Integer117"
-                   table="HASHMAP_STR_INTEGER117">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Integer119"
-                   column="HASHMAP_STR_INTEGER119">
-            </field>
-            <field name="HashMapOfString_Long120"
-                    table="HASHMAP_STR_LONG120">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Long122"
-                   column="HASHMAP_STR_LONG122">
-            </field>
-            <field name="HashMapOfString_Short123"
-                   table="HASHMAP_STR_SHORT123">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_Short125"
-                   column="HASHMAP_STR_SHORT125">
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-derby.orm	(working copy)
@@ -1,81 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfPrimitivechar" table="FIELDSOFPRIMITIVECHAR">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="char0" column="CHAR0"/>
-            <field name="char1" column="CHAR1"/>
-            <field name="char102" column="CHAR102"/>
-            <field name="char103" column="CHAR103"/>
-            <field name="char104" column="CHAR104"/>
-            <field name="char108" column="CHAR108"/>
-            <field name="char109" column="CHAR109"/>
-            <field name="char11" column="CHAR11"/>
-            <field name="char110" column="CHAR110"/>
-            <field name="char112" column="CHAR112"/>
-            <field name="char113" column="CHAR113"/>
-            <field name="char114" column="CHAR114"/>
-            <field name="char119" column="CHAR119"/>
-            <field name="char12" column="CHAR12"/>
-            <field name="char120" column="CHAR120"/>
-            <field name="char121" column="CHAR121"/>
-            <field name="char124" column="CHAR124"/>
-            <field name="char125" column="CHAR125"/>
-            <field name="char126" column="CHAR126"/>
-            <field name="char128" column="CHAR128"/>
-            <field name="char129" column="CHAR129"/>
-            <field name="char13" column="CHAR13"/>
-            <field name="char130" column="CHAR130"/>
-            <field name="char138" column="CHAR138"/>
-            <field name="char139" column="CHAR139"/>
-            <field name="char140" column="CHAR140"/>
-            <field name="char16" column="CHAR16"/>
-            <field name="char17" column="CHAR17"/>
-            <field name="char18" column="CHAR18"/>
-            <field name="char2" column="CHAR2"/>
-            <field name="char20" column="CHAR20"/>
-            <field name="char21" column="CHAR21"/>
-            <field name="char22" column="CHAR22"/>
-            <field name="char30" column="CHAR30"/>
-            <field name="char31" column="CHAR31"/>
-            <field name="char32" column="CHAR32"/>
-            <field name="char36" column="CHAR36"/>
-            <field name="char37" column="CHAR37"/>
-            <field name="char38" column="CHAR38"/>
-            <field name="char4" column="CHAR4"/>
-            <field name="char40" column="CHAR40"/>
-            <field name="char41" column="CHAR41"/>
-            <field name="char42" column="CHAR42"/>
-            <field name="char47" column="CHAR47"/>
-            <field name="char48" column="CHAR48"/>
-            <field name="char49" column="CHAR49"/>
-            <field name="char5" column="CHAR5"/>
-            <field name="char52" column="CHAR52"/>
-            <field name="char53" column="CHAR53"/>
-            <field name="char54" column="CHAR54"/>
-            <field name="char56" column="CHAR56"/>
-            <field name="char57" column="CHAR57"/>
-            <field name="char58" column="CHAR58"/>
-            <field name="char6" column="CHAR6"/>
-            <field name="char66" column="CHAR66"/>
-            <field name="char67" column="CHAR67"/>
-            <field name="char68" column="CHAR68"/>
-            <field name="char72" column="CHAR72"/>
-            <field name="char73" column="CHAR73"/>
-            <field name="char74" column="CHAR74"/>
-            <field name="char76" column="CHAR76"/>
-            <field name="char77" column="CHAR77"/>
-            <field name="char78" column="CHAR78"/>
-            <field name="char83" column="CHAR83"/>
-            <field name="char84" column="CHAR84"/>
-            <field name="char85" column="CHAR85"/>
-            <field name="char88" column="CHAR88"/>
-            <field name="char89" column="CHAR89"/>
-            <field name="char90" column="CHAR90"/>
-            <field name="char92" column="CHAR92"/>
-            <field name="char93" column="CHAR93"/>
-            <field name="char94" column="CHAR94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-derby.orm	(working copy)
@@ -1,80 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfDouble" table="FIELDSOFDOUBLE">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="Double1" column="DOUBLE1"/>
-            <field name="Double102" column="DOUBLE102"/>
-            <field name="Double103" column="DOUBLE103"/>
-            <field name="Double104" column="DOUBLE104"/>
-            <field name="Double108" column="DOUBLE108"/>
-            <field name="Double109" column="DOUBLE109"/>
-            <field name="Double11" column="DOUBLE11"/>
-            <field name="Double110" column="DOUBLE110"/>
-            <field name="Double112" column="DOUBLE112"/>
-            <field name="Double113" column="DOUBLE113"/>
-            <field name="Double114" column="DOUBLE114"/>
-            <field name="Double119" column="DOUBLE119"/>
-            <field name="Double12" column="DOUBLE12"/>
-            <field name="Double120" column="DOUBLE120"/>
-            <field name="Double121" column="DOUBLE121"/>
-            <field name="Double124" column="DOUBLE124"/>
-            <field name="Double125" column="DOUBLE125"/>
-            <field name="Double126" column="DOUBLE126"/>
-            <field name="Double128" column="DOUBLE128"/>
-            <field name="Double129" column="DOUBLE129"/>
-            <field name="Double13" column="DOUBLE13"/>
-            <field name="Double130" column="DOUBLE130"/>
-            <field name="Double138" column="DOUBLE138"/>
-            <field name="Double139" column="DOUBLE139"/>
-            <field name="Double140" column="DOUBLE140"/>
-            <field name="Double16" column="DOUBLE16"/>
-            <field name="Double17" column="DOUBLE17"/>
-            <field name="Double18" column="DOUBLE18"/>
-            <field name="Double2" column="DOUBLE2"/>
-            <field name="Double20" column="DOUBLE20"/>
-            <field name="Double21" column="DOUBLE21"/>
-            <field name="Double22" column="DOUBLE22"/>
-            <field name="Double30" column="DOUBLE30"/>
-            <field name="Double31" column="DOUBLE31"/>
-            <field name="Double32" column="DOUBLE32"/>
-            <field name="Double36" column="DOUBLE36"/>
-            <field name="Double37" column="DOUBLE37"/>
-            <field name="Double38" column="DOUBLE38"/>
-            <field name="Double4" column="DOUBLE4"/>
-            <field name="Double40" column="DOUBLE40"/>
-            <field name="Double41" column="DOUBLE41"/>
-            <field name="Double42" column="DOUBLE42"/>
-            <field name="Double47" column="DOUBLE47"/>
-            <field name="Double48" column="DOUBLE48"/>
-            <field name="Double49" column="DOUBLE49"/>
-            <field name="Double5" column="DOUBLE5"/>
-            <field name="Double52" column="DOUBLE52"/>
-            <field name="Double53" column="DOUBLE53"/>
-            <field name="Double54" column="DOUBLE54"/>
-            <field name="Double56" column="DOUBLE56"/>
-            <field name="Double57" column="DOUBLE57"/>
-            <field name="Double58" column="DOUBLE58"/>
-            <field name="Double6" column="DOUBLE6"/>
-            <field name="Double66" column="DOUBLE66"/>
-            <field name="Double67" column="DOUBLE67"/>
-            <field name="Double68" column="DOUBLE68"/>
-            <field name="Double72" column="DOUBLE72"/>
-            <field name="Double73" column="DOUBLE73"/>
-            <field name="Double74" column="DOUBLE74"/>
-            <field name="Double76" column="DOUBLE76"/>
-            <field name="Double77" column="DOUBLE77"/>
-            <field name="Double78" column="DOUBLE78"/>
-            <field name="Double83" column="DOUBLE83"/>
-            <field name="Double84" column="DOUBLE84"/>
-            <field name="Double85" column="DOUBLE85"/>
-            <field name="Double88" column="DOUBLE88"/>
-            <field name="Double89" column="DOUBLE89"/>
-            <field name="Double90" column="DOUBLE90"/>
-            <field name="Double92" column="DOUBLE92"/>
-            <field name="Double93" column="DOUBLE93"/>
-            <field name="Double94" column="DOUBLE94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-derby.orm	(working copy)
@@ -1,177 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfSimpleInterface" table="FIELDSOFSIMPLEINTERFACE">
-            <field name="identifier" primary-key="true" column="IDENTIFIER">
-            </field>
-            <field name="SimpleInterface1" column="SIMPLEINTERFACE1">
-            </field>
-            <field name="SimpleInterface102" column="SIMPLEINTERFACE102">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface103" column="SIMPLEINTERFACE103">
-            </field>
-            <field name="SimpleInterface104" column="SIMPLEINTERFACE104">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface109" column="SIMPLEINTERFACE109">
-            </field>
-            <field name="SimpleInterface11" column="SIMPLEINTERFACE11">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface110" column="SIMPLEINTERFACE110">
-            </field>
-            <field name="SimpleInterface112" column="SIMPLEINTERFACE112">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface113" column="SIMPLEINTERFACE113">
-            </field>
-            <field name="SimpleInterface114" column="SIMPLEINTERFACE114">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface119" column="SIMPLEINTERFACE119">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface12" column="SIMPLEINTERFACE12">
-            </field>
-            <field name="SimpleInterface120" column="SIMPLEINTERFACE120">
-            </field>
-            <field name="SimpleInterface121" column="SIMPLEINTERFACE121">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface125" column="SIMPLEINTERFACE125">
-            </field>
-            <field name="SimpleInterface126" column="SIMPLEINTERFACE126">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface128" column="SIMPLEINTERFACE128">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface129" column="SIMPLEINTERFACE129">
-            </field>
-            <field name="SimpleInterface13" column="SIMPLEINTERFACE13">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface130" column="SIMPLEINTERFACE130">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface138" column="SIMPLEINTERFACE138">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface139" column="SIMPLEINTERFACE139">
-            </field>
-            <field name="SimpleInterface140" column="SIMPLEINTERFACE140">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface17" column="SIMPLEINTERFACE17">
-            </field>
-            <field name="SimpleInterface18" column="SIMPLEINTERFACE18">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface2" column="SIMPLEINTERFACE2">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface20" column="SIMPLEINTERFACE20">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface21" column="SIMPLEINTERFACE21">
-            </field>
-            <field name="SimpleInterface22" column="SIMPLEINTERFACE22">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface30" column="SIMPLEINTERFACE30">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface31" column="SIMPLEINTERFACE31">
-            </field>
-            <field name="SimpleInterface32" column="SIMPLEINTERFACE32">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface37" column="SIMPLEINTERFACE37">
-            </field>
-            <field name="SimpleInterface38" column="SIMPLEINTERFACE38">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface4" column="SIMPLEINTERFACE4">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface40" column="SIMPLEINTERFACE40">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface41" column="SIMPLEINTERFACE41">
-            </field>
-            <field name="SimpleInterface42" column="SIMPLEINTERFACE42">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface47" column="SIMPLEINTERFACE47">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface48" column="SIMPLEINTERFACE48">
-            </field>
-            <field name="SimpleInterface49" column="SIMPLEINTERFACE49">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface5" column="SIMPLEINTERFACE5">
-            </field>
-            <field name="SimpleInterface53" column="SIMPLEINTERFACE53">
-            </field>
-            <field name="SimpleInterface54" column="SIMPLEINTERFACE54">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface56" column="SIMPLEINTERFACE56">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface57" column="SIMPLEINTERFACE57">
-            </field>
-            <field name="SimpleInterface58" column="SIMPLEINTERFACE58">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface6" column="SIMPLEINTERFACE6">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface66" column="SIMPLEINTERFACE66">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface67" column="SIMPLEINTERFACE67">
-            </field>
-            <field name="SimpleInterface68" column="SIMPLEINTERFACE68">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface73" column="SIMPLEINTERFACE73">
-            </field>
-            <field name="SimpleInterface74" column="SIMPLEINTERFACE74">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface76" column="SIMPLEINTERFACE76">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface77" column="SIMPLEINTERFACE77">
-            </field>
-            <field name="SimpleInterface78" column="SIMPLEINTERFACE78">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface83" column="SIMPLEINTERFACE83">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface84" column="SIMPLEINTERFACE84">
-            </field>
-            <field name="SimpleInterface85" column="SIMPLEINTERFACE85">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface89" column="SIMPLEINTERFACE89">
-            </field>
-            <field name="SimpleInterface90" column="SIMPLEINTERFACE90">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface92" column="SIMPLEINTERFACE92">
-                <foreign-key/>
-            </field>
-            <field name="SimpleInterface93" column="SIMPLEINTERFACE93">
-            </field>
-            <field name="SimpleInterface94" column="SIMPLEINTERFACE94">
-                <foreign-key/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-derby.orm	(working copy)
@@ -1,80 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfBoolean" table="FIELDSOFBOOLEAN">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="Boolean1" column="BOOLEAN1"/>
-            <field name="Boolean102" column="BOOLEAN102"/>
-            <field name="Boolean103" column="BOOLEAN103"/>
-            <field name="Boolean104" column="BOOLEAN104"/>
-            <field name="Boolean108" column="BOOLEAN108"/>
-            <field name="Boolean109" column="BOOLEAN109"/>
-            <field name="Boolean11" column="BOOLEAN11"/>
-            <field name="Boolean110" column="BOOLEAN110"/>
-            <field name="Boolean112" column="BOOLEAN112"/>
-            <field name="Boolean113" column="BOOLEAN113"/>
-            <field name="Boolean114" column="BOOLEAN114"/>
-            <field name="Boolean119" column="BOOLEAN119"/>
-            <field name="Boolean12" column="BOOLEAN12"/>
-            <field name="Boolean120" column="BOOLEAN120"/>
-            <field name="Boolean121" column="BOOLEAN121"/>
-            <field name="Boolean124" column="BOOLEAN124"/>
-            <field name="Boolean125" column="BOOLEAN125"/>
-            <field name="Boolean126" column="BOOLEAN126"/>
-            <field name="Boolean128" column="BOOLEAN128"/>
-            <field name="Boolean129" column="BOOLEAN129"/>
-            <field name="Boolean13" column="BOOLEAN13"/>
-            <field name="Boolean130" column="BOOLEAN130"/>
-            <field name="Boolean138" column="BOOLEAN138"/>
-            <field name="Boolean139" column="BOOLEAN139"/>
-            <field name="Boolean140" column="BOOLEAN140"/>
-            <field name="Boolean16" column="BOOLEAN16"/>
-            <field name="Boolean17" column="BOOLEAN17"/>
-            <field name="Boolean18" column="BOOLEAN18"/>
-            <field name="Boolean2" column="BOOLEAN2"/>
-            <field name="Boolean20" column="BOOLEAN20"/>
-            <field name="Boolean21" column="BOOLEAN21"/>
-            <field name="Boolean22" column="BOOLEAN22"/>
-            <field name="Boolean30" column="BOOLEAN30"/>
-            <field name="Boolean31" column="BOOLEAN31"/>
-            <field name="Boolean32" column="BOOLEAN32"/>
-            <field name="Boolean36" column="BOOLEAN36"/>
-            <field name="Boolean37" column="BOOLEAN37"/>
-            <field name="Boolean38" column="BOOLEAN38"/>
-            <field name="Boolean4" column="BOOLEAN4"/>
-            <field name="Boolean40" column="BOOLEAN40"/>
-            <field name="Boolean41" column="BOOLEAN41"/>
-            <field name="Boolean42" column="BOOLEAN42"/>
-            <field name="Boolean47" column="BOOLEAN47"/>
-            <field name="Boolean48" column="BOOLEAN48"/>
-            <field name="Boolean49" column="BOOLEAN49"/>
-            <field name="Boolean5" column="BOOLEAN5"/>
-            <field name="Boolean52" column="BOOLEAN52"/>
-            <field name="Boolean53" column="BOOLEAN53"/>
-            <field name="Boolean54" column="BOOLEAN54"/>
-            <field name="Boolean56" column="BOOLEAN56"/>
-            <field name="Boolean57" column="BOOLEAN57"/>
-            <field name="Boolean58" column="BOOLEAN58"/>
-            <field name="Boolean6" column="BOOLEAN6"/>
-            <field name="Boolean66" column="BOOLEAN66"/>
-            <field name="Boolean67" column="BOOLEAN67"/>
-            <field name="Boolean68" column="BOOLEAN68"/>
-            <field name="Boolean72" column="BOOLEAN72"/>
-            <field name="Boolean73" column="BOOLEAN73"/>
-            <field name="Boolean74" column="BOOLEAN74"/>
-            <field name="Boolean76" column="BOOLEAN76"/>
-            <field name="Boolean77" column="BOOLEAN77"/>
-            <field name="Boolean78" column="BOOLEAN78"/>
-            <field name="Boolean83" column="BOOLEAN83"/>
-            <field name="Boolean84" column="BOOLEAN84"/>
-            <field name="Boolean85" column="BOOLEAN85"/>
-            <field name="Boolean88" column="BOOLEAN88"/>
-            <field name="Boolean89" column="BOOLEAN89"/>
-            <field name="Boolean90" column="BOOLEAN90"/>
-            <field name="Boolean92" column="BOOLEAN92"/>
-            <field name="Boolean93" column="BOOLEAN93"/>
-            <field name="Boolean94" column="BOOLEAN94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-derby.orm	(working copy)
@@ -1,80 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfBigInteger" table="FIELDSOFBIGINTEGER">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="BigInteger1" column="BIG_INTEGER1"/>
-            <field name="BigInteger102" column="BIG_INTEGER102"/>
-            <field name="BigInteger103" column="BIG_INTEGER103"/>
-            <field name="BigInteger104" column="BIG_INTEGER104"/>
-            <field name="BigInteger108" column="BIG_INTEGER108"/>
-            <field name="BigInteger109" column="BIG_INTEGER109"/>
-            <field name="BigInteger11" column="BIG_INTEGER11"/>
-            <field name="BigInteger110" column="BIG_INTEGER110"/>
-            <field name="BigInteger112" column="BIG_INTEGER112"/>
-            <field name="BigInteger113" column="BIG_INTEGER113"/>
-            <field name="BigInteger114" column="BIG_INTEGER114"/>
-            <field name="BigInteger119" column="BIG_INTEGER119"/>
-            <field name="BigInteger12" column="BIG_INTEGER12"/>
-            <field name="BigInteger120" column="BIG_INTEGER120"/>
-            <field name="BigInteger121" column="BIG_INTEGER121"/>
-            <field name="BigInteger124" column="BIG_INTEGER124"/>
-            <field name="BigInteger125" column="BIG_INTEGER125"/>
-            <field name="BigInteger126" column="BIG_INTEGER126"/>
-            <field name="BigInteger128" column="BIG_INTEGER128"/>
-            <field name="BigInteger129" column="BIG_INTEGER129"/>
-            <field name="BigInteger13" column="BIG_INTEGER13"/>
-            <field name="BigInteger130" column="BIG_INTEGER130"/>
-            <field name="BigInteger138" column="BIG_INTEGER138"/>
-            <field name="BigInteger139" column="BIG_INTEGER139"/>
-            <field name="BigInteger140" column="BIG_INTEGER140"/>
-            <field name="BigInteger16" column="BIG_INTEGER16"/>
-            <field name="BigInteger17" column="BIG_INTEGER17"/>
-            <field name="BigInteger18" column="BIG_INTEGER18"/>
-            <field name="BigInteger2" column="BIG_INTEGER2"/>
-            <field name="BigInteger20" column="BIG_INTEGER20"/>
-            <field name="BigInteger21" column="BIG_INTEGER21"/>
-            <field name="BigInteger22" column="BIG_INTEGER22"/>
-            <field name="BigInteger30" column="BIG_INTEGER30"/>
-            <field name="BigInteger31" column="BIG_INTEGER31"/>
-            <field name="BigInteger32" column="BIG_INTEGER32"/>
-            <field name="BigInteger36" column="BIG_INTEGER36"/>
-            <field name="BigInteger37" column="BIG_INTEGER37"/>
-            <field name="BigInteger38" column="BIG_INTEGER38"/>
-            <field name="BigInteger4" column="BIG_INTEGER4"/>
-            <field name="BigInteger40" column="BIG_INTEGER40"/>
-            <field name="BigInteger41" column="BIG_INTEGER41"/>
-            <field name="BigInteger42" column="BIG_INTEGER42"/>
-            <field name="BigInteger47" column="BIG_INTEGER47"/>
-            <field name="BigInteger48" column="BIG_INTEGER48"/>
-            <field name="BigInteger49" column="BIG_INTEGER49"/>
-            <field name="BigInteger5" column="BIG_INTEGER5"/>
-            <field name="BigInteger52" column="BIG_INTEGER52"/>
-            <field name="BigInteger53" column="BIG_INTEGER53"/>
-            <field name="BigInteger54" column="BIG_INTEGER54"/>
-            <field name="BigInteger56" column="BIG_INTEGER56"/>
-            <field name="BigInteger57" column="BIG_INTEGER57"/>
-            <field name="BigInteger58" column="BIG_INTEGER58"/>
-            <field name="BigInteger6" column="BIG_INTEGER6"/>
-            <field name="BigInteger66" column="BIG_INTEGER66"/>
-            <field name="BigInteger67" column="BIG_INTEGER67"/>
-            <field name="BigInteger68" column="BIG_INTEGER68"/>
-            <field name="BigInteger72" column="BIG_INTEGER72"/>
-            <field name="BigInteger73" column="BIG_INTEGER73"/>
-            <field name="BigInteger74" column="BIG_INTEGER74"/>
-            <field name="BigInteger76" column="BIG_INTEGER76"/>
-            <field name="BigInteger77" column="BIG_INTEGER77"/>
-            <field name="BigInteger78" column="BIG_INTEGER78"/>
-            <field name="BigInteger83" column="BIG_INTEGER83"/>
-            <field name="BigInteger84" column="BIG_INTEGER84"/>
-            <field name="BigInteger85" column="BIG_INTEGER85"/>
-            <field name="BigInteger88" column="BIG_INTEGER88"/>
-            <field name="BigInteger89" column="BIG_INTEGER89"/>
-            <field name="BigInteger90" column="BIG_INTEGER90"/>
-            <field name="BigInteger92" column="BIG_INTEGER92"/>
-            <field name="BigInteger93" column="BIG_INTEGER93"/>
-            <field name="BigInteger94" column="BIG_INTEGER94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm	(working copy)
@@ -1,345 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfSimpleClass" table="FIELDSOFSIMPLECLASS">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="SimpleClass0" column="SIMPLECLASS0">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass1">
-                <embedded>
-                    <field name="id" column="ID1"/>
-                    <field name="intField" column="INTFIELD1"/>
-                    <field name="stringField" column="STRINGFIELD1"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass102" column="SIMPLECLASS102">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass103">
-                <embedded>
-                    <field name="id" column="ID103"/>
-                    <field name="intField" column="INTFIELD103"/>
-                    <field name="stringField" column="STRINGFIELD103"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass104" column="SIMPLECLASS104">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass108" column="SIMPLECLASS108">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass109" column="SIMPLECLASS109">
-                <embedded>
-                    <field name="id" column="ID109"/>
-                    <field name="intField" column="INTFIELD109"/>
-                    <field name="stringField" column="STRINGFIELD109"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass11" column="SIMPLECLASS11">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass110" column="SIMPLECLASS110">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass112" column="SIMPLECLASS112">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass113">
-                <embedded>
-                    <field name="id" column="ID113"/>
-                    <field name="intField" column="INTFIELD113"/>
-                    <field name="stringField" column="STRINGFIELD113"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass114" column="SIMPLECLASS114">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass119" column="SIMPLECLASS119">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass12">
-                <embedded>
-                    <field name="id" column="ID12"/>
-                    <field name="intField" column="INTFIELD12"/>
-                    <field name="stringField" column="STRINGFIELD12"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass120">
-                <embedded>
-                    <field name="id" column="ID120"/>
-                    <field name="intField" column="INTFIELD120"/>
-                    <field name="stringField" column="STRINGFIELD120"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass121" column="SIMPLECLASS121">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass124" column="SIMPLECLASS124">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass125" column="SIMPLECLASS125">
-                <embedded>
-                    <field name="id" column="ID125"/>
-                    <field name="intField" column="INTFIELD125"/>
-                    <field name="stringField" column="STRINGFIELD125"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass126" column="SIMPLECLASS126">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass128" column="SIMPLECLASS128">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass129">
-                <embedded>
-                    <field name="id" column="ID129"/>
-                    <field name="intField" column="INTFIELD129"/>
-                    <field name="stringField" column="STRINGFIELD129"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass13" column="SIMPLECLASS13">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass130" column="SIMPLECLASS130">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass138" column="SIMPLECLASS138">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass139">
-                <embedded>
-                    <field name="id" column="ID139"/>
-                    <field name="intField" column="INTFIELD139"/>
-                    <field name="stringField" column="STRINGFIELD139"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass140" column="SIMPLECLASS140">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass16" column="SIMPLECLASS16">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass17" column="SIMPLECLASS17">
-                <embedded>
-                    <field name="id" column="ID17"/>
-                    <field name="intField" column="INTFIELD17"/>
-                    <field name="stringField" column="STRINGFIELD17"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass18" column="SIMPLECLASS18">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass2" column="SIMPLECLASS2">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass20" column="SIMPLECLASS20">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass21">
-                <embedded>
-                    <field name="id" column="ID21"/>
-                    <field name="intField" column="INTFIELD21"/>
-                    <field name="stringField" column="STRINGFIELD21"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass22" column="SIMPLECLASS22">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass30" column="SIMPLECLASS30">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass31">
-                <embedded>
-                    <field name="id" column="ID31"/>
-                    <field name="intField" column="INTFIELD31"/>
-                    <field name="stringField" column="STRINGFIELD31"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass32" column="SIMPLECLASS32">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass36" column="SIMPLECLASS36">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass37" column="SIMPLECLASS37">
-                <embedded>
-                    <field name="id" column="ID37"/>
-                    <field name="intField" column="INTFIELD37"/>
-                    <field name="stringField" column="STRINGFIELD37"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass38" column="SIMPLECLASS38">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass4" column="SIMPLECLASS4">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass40" column="SIMPLECLASS40">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass41">
-                <embedded>
-                    <field name="id" column="ID41"/>
-                    <field name="intField" column="INTFIELD41"/>
-                    <field name="stringField" column="STRINGFIELD41"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass42" column="SIMPLECLASS42">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass47" column="SIMPLECLASS47">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass48">
-                <embedded>
-                    <field name="id" column="ID48"/>
-                    <field name="intField" column="INTFIELD48"/>
-                    <field name="stringField" column="STRINGFIELD48"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass49" column="SIMPLECLASS49">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass5">
-                <embedded>
-                    <field name="id" column="ID5"/>
-                    <field name="intField" column="INTFIELD5"/>
-                    <field name="stringField" column="STRINGFIELD5"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass52" column="SIMPLECLASS52">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass53" column="SIMPLECLASS53">
-                <embedded>
-                    <field name="id" column="ID53"/>
-                    <field name="intField" column="INTFIELD53"/>
-                    <field name="stringField" column="STRINGFIELD53"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass54" column="SIMPLECLASS54">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass56" column="SIMPLECLASS56">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass57">
-                <embedded>
-                    <field name="id" column="ID57"/>
-                    <field name="intField" column="INTFIELD57"/>
-                    <field name="stringField" column="STRINGFIELD57"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass58" column="SIMPLECLASS58">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass6" column="SIMPLECLASS6">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass66" column="SIMPLECLASS66">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass67">
-                <embedded>
-                    <field name="id" column="ID67"/>
-                    <field name="intField" column="INTFIELD67"/>
-                    <field name="stringField" column="STRINGFIELD67"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass68" column="SIMPLECLASS68">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass72" column="SIMPLECLASS72">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass73" column="SIMPLECLASS73">
-                <embedded>
-                    <field name="id" column="ID73"/>
-                    <field name="intField" column="INTFIELD73"/>
-                    <field name="stringField" column="STRINGFIELD73"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass74" column="SIMPLECLASS74">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass76" column="SIMPLECLASS76">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass77">
-                <embedded>
-                    <field name="id" column="ID77"/>
-                    <field name="intField" column="INTFIELD77"/>
-                    <field name="stringField" column="STRINGFIELD77"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass78" column="SIMPLECLASS78">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass83" column="SIMPLECLASS83">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass84">
-                <embedded>
-                    <field name="id" column="ID84"/>
-                    <field name="intField" column="INTFIELD84"/>
-                    <field name="stringField" column="STRINGFIELD84"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass85" column="SIMPLECLASS85">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass88" column="SIMPLECLASS88">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass89" column="SIMPLECLASS89">
-                <embedded>
-                    <field name="id" column="ID89"/>
-                    <field name="intField" column="INTFIELD89"/>
-                    <field name="stringField" column="STRINGFIELD89"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass90" column="SIMPLECLASS90">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass92" column="SIMPLECLASS92">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass93">
-                <embedded>
-                    <field name="id" column="ID93"/>
-                    <field name="intField" column="INTFIELD93"/>
-                    <field name="stringField" column="STRINGFIELD93"/>
-                </embedded>
-            </field>
-            <field name="SimpleClass94" column="SIMPLECLASS94">
-                <foreign-key/>
-            </field>
-            <field name="SimpleClass144" column="SIMPLECLASS144"/>
-            <field name="SimpleClass145" column="SIMPLECLASS145"/>
-            <field name="SimpleClass146" column="SIMPLECLASS146"/>
-            <field name="SimpleClass147" column="SIMPLECLASS147"/>
-            <field name="SimpleClass148" column="SIMPLECLASS148"/>
-            <field name="SimpleClass149" column="SIMPLECLASS149"/>
-            <field name="SimpleClass150" column="SIMPLECLASS150"/>
-            <field name="SimpleClass151" column="SIMPLECLASS151"/>
-            <field name="SimpleClass152" column="SIMPLECLASS152"/>
-            <field name="SimpleClass153" column="SIMPLECLASS153"/>
-            <field name="SimpleClass154" column="SIMPLECLASS154"/>
-            <field name="SimpleClass155" column="SIMPLECLASS155"/>
-            <field name="SimpleClass156" column="SIMPLECLASS156"/>
-            <field name="SimpleClass157" column="SIMPLECLASS157"/>
-            <field name="SimpleClass158" column="SIMPLECLASS158"/>
-            <field name="SimpleClass159" column="SIMPLECLASS159"/>
-            <field name="SimpleClass160" column="SIMPLECLASS160"/>
-            <field name="SimpleClass161" column="SIMPLECLASS161"/>
-            <field name="SimpleClass162" column="SIMPLECLASS162"/>
-            <field name="SimpleClass163" column="SIMPLECLASS163"/>
-            <field name="SimpleClass164" column="SIMPLECLASS164"/>
-            <field name="SimpleClass165" column="SIMPLECLASS165"/>
-            <field name="SimpleClass166" column="SIMPLECLASS166"/>
-            <field name="SimpleClass167" column="SIMPLECLASS167"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm	(working copy)
@@ -1,587 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="TreeMapStringKeyCollections"
-               table="TREEMAPSTRINGKEY_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
-            <field name="TreeMapOfString_Object0" table="TREEMAP_STR_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="TreeMapOfString_Object1" table="TREEMAP_STR_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="TreeMapOfString_Object2" table="TREEMAP_STR_OBJECT2">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="TreeMapOfString_SimpleClass3"
-                   table="TREEMAP_STR_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="TreeMapOfString_SimpleClass4"
-                   table="TREEMAP_STR_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="TreeMapOfString_SimpleClass5"
-                   table="TREEMAP_STR_SIMPLE_CLASS5">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="TreeMapOfString_SimpleInterface6"
-                   table="TREEMAP_STR_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="TreeMapOfString_SimpleInterface7"
-                   table="TREEMAP_STR_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="TreeMapOfString_SimpleInterface8"
-                   table="TREEMAP_STR_SIMPLE_INTERFACE8">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="TreeMapOfString_String9"
-                   table="TREEMAP_STR_STRING9">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_String10"
-                   table="TREEMAP_STR_STRING10">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_String11"
-                   table="TREEMAP_STR_STRING11">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Date12"
-                   table="TREEMAP_STR_DATE12">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Date13"
-                   table="TREEMAP_STR_DATE13">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Date14"
-                   table="TREEMAP_STR_DATE14">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Locale15"
-                   table="TREEMAP_STR_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Locale16"
-                   table="TREEMAP_STR_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Locale17"
-                   table="TREEMAP_STR_LOCALE17">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigDecimal18"
-                   table="TREEMAP_STR_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigDecimal19"
-                   table="TREEMAP_STR_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigDecimal20"
-                   table="TREEMAP_STR_BIG_DECIMAL20">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigInteger21"
-                   table="TREEMAP_STR_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigInteger22"
-                   table="TREEMAP_STR_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigInteger23"
-                   table="TREEMAP_STR_BIG_INTEGER23">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Byte24"
-                   table="TREEMAP_STR_BYTE24">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Byte25"
-                   table="TREEMAP_STR_BYTE25">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Byte26"
-                   table="TREEMAP_STR_BYTE26">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Double27"
-                   table="TREEMAP_STR_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Double28"
-                   table="TREEMAP_STR_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Double29"
-                   table="TREEMAP_STR_DOUBLE29">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Float30"
-                   table="TREEMAP_STR_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Float31"
-                   table="TREEMAP_STR_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Float32"
-                   table="TREEMAP_STR_FLOAT32">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Integer33"
-                   table="TREEMAP_STR_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Integer34"
-                   table="TREEMAP_STR_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Integer35"
-                   table="TREEMAP_STR_INTEGER35">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Long36"
-                   table="TREEMAP_STR_LONG36">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Long37"
-                   table="TREEMAP_STR_LONG37">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Long38"
-                   table="TREEMAP_STR_LONG38">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Short39"
-                   table="TREEMAP_STR_SHORT39">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Short40"
-                   table="TREEMAP_STR_SHORT40">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Short41"
-                   table="TREEMAP_STR_SHORT41">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Object42"
-                   table="TREEMAP_STR_OBJECT42">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="TreeMapOfString_Object43" table="TREEMAP_STR_OBJECT43">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="TreeMapOfString_SimpleClass45"
-                   table="TREEMAP_STR_SIMPLE_CLASS45">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="TreeMapOfString_SimpleClass46"
-                   table="TREEMAP_STR_SIMPLE_CLASS46">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="TreeMapOfString_SimpleInterface48"
-                   table="TREEMAP_STR_SIMPLE_INTERFACE48">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="TreeMapOfString_SimpleInterface49"
-                   table="TREEMAP_STR_SIMPLE_INTERFACE49">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="TreeMapOfString_String51"
-                   table="TREEMAP_STR_STRING51">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_String52"
-                   table="TREEMAP_STR_STRING52">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Date54"
-                   table="TREEMAP_STR_DATE54">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Date55"
-                   table="TREEMAP_STR_DATE55">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Locale57"
-                   table="TREEMAP_STR_LOCALE57">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Locale58"
-                   table="TREEMAP_STR_LOCALE58">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigDecimal60"
-                   table="TREEMAP_STR_BIG_DECIMAL60">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigDecimal61"
-                   table="TREEMAP_STR_BIG_DECIMAL61">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigInteger63"
-                   table="TREEMAP_STR_BIG_INTEGER63">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigInteger64"
-                   table="TREEMAP_STR_BIG_INTEGER64">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Byte66"
-                   table="TREEMAP_STR_BYTE66">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Byte67"
-                   table="TREEMAP_STR_BYTE67">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Double69"
-                   table="TREEMAP_STR_DOUBLE69">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Double70"
-                   table="TREEMAP_STR_DOUBLE70">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Float72"
-                   table="TREEMAP_STR_FLOAT72">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Float73"
-                   table="TREEMAP_STR_FLOAT73">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Integer75"
-                   table="TREEMAP_STR_INTEGER75">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Integer76"
-                   table="TREEMAP_STR_INTEGER76">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Long78"
-                   table="TREEMAP_STR_LONG78">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Long79"
-                   table="TREEMAP_STR_LONG79">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Short81"
-                   table="TREEMAP_STR_SHORT81">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Short82"
-                   table="TREEMAP_STR_SHORT82">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Object84" table="TREEMAP_STR_OBJECT84">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Object86"
-                   column="TREEMAP_STR_OBJECT86">
-            </field>
-            <field name="TreeMapOfString_SimpleClass87"
-                   table="TREEMAP_STR_SIMPLE_CLASS87">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_SimpleClass89"
-                   column="TREEMAP_STR_SIMPLECLASS89">
-            </field>
-            <field name="TreeMapOfString_SimpleInterface90"
-                   table="TREEMAP_STR_SIMPLE_INTERFACE90">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_SimpleInterface92"
-                   column="TREEMAP_STR_SIMPLEINTERFACE92">
-            </field>
-            <field name="TreeMapOfString_String93"
-                   table="TREEMAP_STR_STRING93">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_String95"
-                   column="TREEMAP_STR_STRING95">
-            </field>
-            <field name="TreeMapOfString_Date96"
-                   table="TREEMAP_STR_DATE96">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Date98"
-                   column="TREEMAP_STR_DATE98">
-            </field>
-            <field name="TreeMapOfString_Locale99"
-                   table="TREEMAP_STR_LOCALE99">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Locale101"
-                   column="TREEMAP_STR_LOCALE101">
-            </field>
-            <field name="TreeMapOfString_BigDecimal102"
-                   table="TREEMAP_STR_BIG_DECIMAL102">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigDecimal104"
-                   column="TREEMAP_STR_BIGDECIMAL104">
-            </field>
-            <field name="TreeMapOfString_BigInteger105"
-                   table="TREEMAP_STR_BIG_INTEGER105">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_BigInteger107"
-                   column="TREEMAP_STR_BIGINTEGER107">
-            </field>
-            <field name="TreeMapOfString_Byte108"
-                   table="TREEMAP_STR_BYTE108">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Byte110"
-                   column="TREEMAP_STR_BYTE110">
-            </field>
-            <field name="TreeMapOfString_Double111" 
-                   table="TREEMAP_STR_DOUBLE111">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Double113"
-                   column="TREEMAP_STR_DOUBLE113">
-            </field>
-            <field name="TreeMapOfString_Float114"
-                   table="TREEMAP_STR_FLOAT114">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Float116"
-                   column="TREEMAP_STR_FLOAT116">
-            </field>
-            <field name="TreeMapOfString_Integer117"
-                   table="TREEMAP_STR_INTEGER117">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Integer119"
-                   column="TREEMAP_STR_INTEGER119">
-            </field>
-            <field name="TreeMapOfString_Long120"
-                    table="TREEMAP_STR_LONG120">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Long122"
-                   column="TREEMAP_STR_LONG122">
-            </field>
-            <field name="TreeMapOfString_Short123"
-                   table="TREEMAP_STR_SHORT123">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_Short125"
-                   column="TREEMAP_STR_SHORT125">
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-derby.orm	(working copy)
@@ -1,81 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfPrimitiveint" table="FIELDSOFPRIMITIVEINT">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="int0" column="INT0"/>
-            <field name="int1" column="INT1"/>
-            <field name="int102" column="INT102"/>
-            <field name="int103" column="INT103"/>
-            <field name="int104" column="INT104"/>
-            <field name="int108" column="INT108"/>
-            <field name="int109" column="INT109"/>
-            <field name="int11" column="INT11"/>
-            <field name="int110" column="INT110"/>
-            <field name="int112" column="INT112"/>
-            <field name="int113" column="INT113"/>
-            <field name="int114" column="INT114"/>
-            <field name="int119" column="INT119"/>
-            <field name="int12" column="INT12"/>
-            <field name="int120" column="INT120"/>
-            <field name="int121" column="INT121"/>
-            <field name="int124" column="INT124"/>
-            <field name="int125" column="INT125"/>
-            <field name="int126" column="INT126"/>
-            <field name="int128" column="INT128"/>
-            <field name="int129" column="INT129"/>
-            <field name="int13" column="INT13"/>
-            <field name="int130" column="INT130"/>
-            <field name="int138" column="INT138"/>
-            <field name="int139" column="INT139"/>
-            <field name="int140" column="INT140"/>
-            <field name="int16" column="INT16"/>
-            <field name="int17" column="INT17"/>
-            <field name="int18" column="INT18"/>
-            <field name="int2" column="INT2"/>
-            <field name="int20" column="INT20"/>
-            <field name="int21" column="INT21"/>
-            <field name="int22" column="INT22"/>
-            <field name="int30" column="INT30"/>
-            <field name="int31" column="INT31"/>
-            <field name="int32" column="INT32"/>
-            <field name="int36" column="INT36"/>
-            <field name="int37" column="INT37"/>
-            <field name="int38" column="INT38"/>
-            <field name="int4" column="INT4"/>
-            <field name="int40" column="INT40"/>
-            <field name="int41" column="INT41"/>
-            <field name="int42" column="INT42"/>
-            <field name="int47" column="INT47"/>
-            <field name="int48" column="INT48"/>
-            <field name="int49" column="INT49"/>
-            <field name="int5" column="INT5"/>
-            <field name="int52" column="INT52"/>
-            <field name="int53" column="INT53"/>
-            <field name="int54" column="INT54"/>
-            <field name="int56" column="INT56"/>
-            <field name="int57" column="INT57"/>
-            <field name="int58" column="INT58"/>
-            <field name="int6" column="INT6"/>
-            <field name="int66" column="INT66"/>
-            <field name="int67" column="INT67"/>
-            <field name="int68" column="INT68"/>
-            <field name="int72" column="INT72"/>
-            <field name="int73" column="INT73"/>
-            <field name="int74" column="INT74"/>
-            <field name="int76" column="INT76"/>
-            <field name="int77" column="INT77"/>
-            <field name="int78" column="INT78"/>
-            <field name="int83" column="INT83"/>
-            <field name="int84" column="INT84"/>
-            <field name="int85" column="INT85"/>
-            <field name="int88" column="INT88"/>
-            <field name="int89" column="INT89"/>
-            <field name="int90" column="INT90"/>
-            <field name="int92" column="INT92"/>
-            <field name="int93" column="INT93"/>
-            <field name="int94" column="INT94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm	(working copy)
@@ -1,508 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="MapStringValueCollections"
-               table="MAPSTRINGVALUE_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
-            <field name="MapOfObject_String0" table="MAP_OBJECT0_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfObject_String1" table="MAP_OBJECT1_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfObject_String2" table="MAP_OBJECT2_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfObject_String3" table="MAP_OBJECT3_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfObject_String4" table="MAP_OBJECT4_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfObject_String6" table="MAP_OBJECT6_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfObject_String8" column="MAP_OBJECT8_STR">
-            </field>
-            <field name="MapOfSimpleClass_String9"
-                   table="MAP_SIMPLE_CLASS9_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleClass_String10"
-                   table="MAP_SIMPLE_CLASS10_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleClass_String11"
-                   table="MAP_SIMPLE_CLASS11_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleClass_String12"
-                   table="MAP_SIMPLE_CLASS12_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleClass_String13"
-                   table="MAP_SIMPLE_CLASS13_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleClass_String15"
-                   table="MAP_SIMPLE_CLASS15_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleClass_String17"
-                   column="MAP_SIMPLE_CLASS17_STR">
-            </field>
-            <field name="MapOfSimpleInterface_String18"
-                   table="MAP_SIMPLE_INTERFACE18_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleInterface_String19"
-                   table="MAP_SIMPLE_INTERFACE19_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleInterface_String20"
-                   table="MAP_SIMPLE_INTERFACE20_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleInterface_String21"
-                   table="MAP_SIMPLE_INTERFACE21_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleInterface_String22"
-                   table="MAP_SIMPLE_INTERFACE22_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleInterface_String24"
-                   table="MAP_SIMPLE_INTERFACE24_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleInterface_String26"
-                   column="MAP_SIMPLE_INTERFACE26_STR">
-            </field>
-            <field name="MapOfString_String27" table="MAP_STRING27_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_String28" table="MAP_STRING28_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_String29" table="MAP_STRING29_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_String30" table="MAP_STRING30_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_String31" table="MAP_STRING31_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_String33" table="MAP_STRING33_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_String35" column="MAP_STRING35_STR">
-            </field>
-            <field name="MapOfDate_String36" table="MAP_DATE36_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDate_String37" table="MAP_DATE37_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDate_String38" table="MAP_DATE38_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDate_String39" table="MAP_DATE39_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDate_String40" table="MAP_DATE40_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDate_String42" table="MAP_DATE42_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDate_String44" column="MAP_DATE44_STR">
-            </field>
-            <field name="MapOfBigDecimal_String45"
-                   table="MAP_BIG_DECIMAL45_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigDecimal_String46"
-                   table="MAP_BIG_DECIMAL46_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigDecimal_String47"
-                   table="MAP_BIG_DECIMAL47_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigDecimal_String48"
-                   table="MAP_BIG_DECIMAL48_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigDecimal_String49"
-                   table="MAP_BIG_DECIMAL49_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigDecimal_String51"
-                   table="MAP_BIG_DECIMAL51_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigDecimal_String53"
-                   column="MAP_BIG_DECIMAL53_STR">
-            </field>
-            <field name="MapOfBigInteger_String54"
-                   table="MAP_BIG_INTEGER54_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigInteger_String55"
-                   table="MAP_BIG_INTEGER55_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigInteger_String56"
-                   table="MAP_BIG_INTEGER56_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigInteger_String57"
-                   table="MAP_BIG_INTEGER57_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigInteger_String58"
-                   table="MAP_BIG_INTEGER58_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigInteger_String60"
-                   table="MAP_BIG_INTEGER60_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfBigInteger_String62"
-                   column="MAP_BIG_INTEGER62_STR">
-            </field>
-            <field name="MapOfByte_String63" table="MAP_BYTE63_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfByte_String64" table="MAP_BYTE64_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfByte_String65" table="MAP_BYTE65_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfByte_String66" table="MAP_BYTE66_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfByte_String67" table="MAP_BYTE67_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfByte_String69" table="MAP_BYTE69_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfByte_String71" column="MAP_BYTE71_STR">
-            </field>
-            <field name="MapOfDouble_String72" table="MAP_DOUBLE72_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDouble_String73" table="MAP_DOUBLE73_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDouble_String74" table="MAP_DOUBLE74_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDouble_String75" table="MAP_DOUBLE75_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDouble_String76" table="MAP_DOUBLE76_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDouble_String78" table="MAP_DOUBLE78_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfDouble_String80" column="MAP_DOUBLE80_STR">
-            </field>
-            <field name="MapOfFloat_String81" table="MAP_FLOAT81_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfFloat_String82" table="MAP_FLOAT82_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfFloat_String83" table="MAP_FLOAT83_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfFloat_String84" table="MAP_FLOAT84_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfFloat_String85" table="MAP_FLOAT85_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfFloat_String87" table="MAP_FLOAT87_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfFloat_String89" column="MAP_FLOAT89_STR">
-            </field>
-            <field name="MapOfInteger_String90" table="MAP_INTEGER90_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfInteger_String91" table="MAP_INTEGER91_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfInteger_String92" table="MAP_INTEGER92_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfInteger_String93" table="MAP_INTEGER93_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfInteger_String94" table="MAP_INTEGER94_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfInteger_String96" table="MAP_INTEGER96_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfInteger_String98" column="MAP_INTEGER98_STR">
-            </field>
-            <field name="MapOfLong_String99" table="MAP_LONG99_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfLong_String100" table="MAP_LONG100_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfLong_String101" table="MAP_LONG101_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfLong_String102" table="MAP_LONG102_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfLong_String103" table="MAP_LONG103_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfLong_String105" table="MAP_LONG105_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfLong_String107" column="MAP_LONG107_STR">
-            </field>
-            <field name="MapOfShort_String108" table="MAP_SHORT108_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfShort_String109" table="MAP_SHORT109_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfShort_String110" table="MAP_SHORT110_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfShort_String111" table="MAP_SHORT111_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfShort_String112" table="MAP_SHORT112_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfShort_String114" table="MAP_SHORT114_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfShort_String116" column="MAP_SHORT116_STR">
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-derby.orm	(working copy)
@@ -1,225 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfCharacter" table="FIELDSOFCHARACTER">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="Character0">
-                <column name="CHARACTER0" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character1">
-                <column name="CHARACTER1" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character102">
-                <column name="CHARACTER102" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character103">
-                <column name="CHARACTER103" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character104">
-                <column name="CHARACTER104" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character108">
-                <column name="CHARACTER108" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character109">
-                <column name="CHARACTER109" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character11">
-                <column name="CHARACTER11" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character110">
-                <column name="CHARACTER110" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character112">
-                <column name="CHARACTER112" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character113">
-                <column name="CHARACTER113" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character114">
-                <column name="CHARACTER114" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character119">
-                <column name="CHARACTER119" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character12">
-                <column name="CHARACTER12" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character120">
-                <column name="CHARACTER120" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character121">
-                <column name="CHARACTER121" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character124">
-                <column name="CHARACTER124" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character125">
-                <column name="CHARACTER125" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character126">
-                <column name="CHARACTER126" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character128">
-                <column name="CHARACTER128" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character129">
-                <column name="CHARACTER129" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character13">
-                <column name="CHARACTER13" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character130">
-                <column name="CHARACTER130" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character138">
-                <column name="CHARACTER138" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character139">
-                <column name="CHARACTER139" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character140">
-                <column name="CHARACTER140" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character16">
-                <column name="CHARACTER16" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character17">
-                <column name="CHARACTER17" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character18">
-                <column name="CHARACTER18" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character2">
-                <column name="CHARACTER2" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character20">
-                <column name="CHARACTER20" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character21">
-                <column name="CHARACTER21" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character22">
-                <column name="CHARACTER22" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character30">
-                <column name="CHARACTER30" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character31">
-                <column name="CHARACTER31" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character32">
-                <column name="CHARACTER32" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character36">
-                <column name="CHARACTER36" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character37">
-                <column name="CHARACTER37" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character38">
-                <column name="CHARACTER38" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character4">
-                <column name="CHARACTER4" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character40">
-                <column name="CHARACTER40" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character41">
-                <column name="CHARACTER41" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character42">
-                <column name="CHARACTER42" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character47">
-                <column name="CHARACTER47" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character48">
-                <column name="CHARACTER48" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character49">
-                <column name="CHARACTER49" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character5">
-                <column name="CHARACTER5" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character52">
-                <column name="CHARACTER52" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character53">
-                <column name="CHARACTER53" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character54">
-                <column name="CHARACTER54" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character56">
-                <column name="CHARACTER56" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character57">
-                <column name="CHARACTER57" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character58">
-                <column name="CHARACTER58" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character6">
-                <column name="CHARACTER6" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character66">
-                <column name="CHARACTER66" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character67">
-                <column name="CHARACTER67" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character68">
-                <column name="CHARACTER68" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character72">
-                <column name="CHARACTER72" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character73">
-                <column name="CHARACTER73" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character74">
-                <column name="CHARACTER74" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character76">
-                <column name="CHARACTER76" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character77">
-                <column name="CHARACTER77" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character78">
-                <column name="CHARACTER78" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character83">
-                <column name="CHARACTER83" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character84">
-                <column name="CHARACTER84" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character85">
-                <column name="CHARACTER85" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character88">
-                <column name="CHARACTER88" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character89">
-                <column name="CHARACTER89" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character90">
-                <column name="CHARACTER90" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character92">
-                <column name="CHARACTER92" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character93">
-                <column name="CHARACTER93" jdbc-type="INTEGER"/>
-            </field>
-            <field name="Character94">
-                <column name="CHARACTER94" jdbc-type="INTEGER"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-derby.orm	(working copy)
@@ -1,228 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="ArrayListCollections" table="ARRAYLIST_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
-            <field name="ArrayListOfObject0"
-                   table="ARRAYLIST_OF_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfObject1"
-                   table="ARRAYLIST_OF_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfObject2"
-                   table="ARRAYLIST_OF_OBJECT2">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfSimpleClass3"
-                   table="ARRAYLIST_OF_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfSimpleClass4"
-                   table="ARRAYLIST_OF_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfSimpleClass5"
-                   table="ARRAYLIST_OF_SIMPLE_CLASS5">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfSimpleInterface6"
-                   table="ARRAYLIST_OF_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfSimpleInterface7"
-                   table="ARRAYLIST_OF_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfSimpleInterface8"
-                   table="ARRAYLIST_OF_SIMPLE_INTERFACE8">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfString9"
-                   table="ARRAYLIST_OF_STRING9">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfString10" column="ARRAYLIST_OF_STRING10"
-                   >
-            </field>
-            <field name="ArrayListOfString11"
-                   table="ARRAYLIST_OF_STRING11">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfDate12"
-                   table="ARRAYLIST_OF_DATE12">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfDate13" column="ARRAYLIST_OF_DATE13"
-                   >
-            </field>
-            <field name="ArrayListOfDate14"
-                   table="ARRAYLIST_OF_DATE14">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfLocale15"
-                   table="ARRAYLIST_OF_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfLocale16" column="ARRAYLIST_OF_LOCALE16"
-                   >
-            </field>
-            <field name="ArrayListOfLocale17"
-                   table="ARRAYLIST_OF_LOCALE17">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfBigDecimal18"
-                   table="ARRAYLIST_OF_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfBigDecimal19" column="ARRAYLIST_OF_BIG_DECIMAL19"
-                   >
-            </field>
-            <field name="ArrayListOfBigDecimal20"
-                   table="ARRAYLIST_OF_BIG_DECIMAL20">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfBigInteger21"
-                   table="ARRAYLIST_OF_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfBigInteger22" column="ARRAYLIST_OF_BIG_INTEGER22"
-                   >
-            </field>
-            <field name="ArrayListOfBigInteger23"
-                   table="ARRAYLIST_OF_BIG_INTEGER23">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfByte24"
-                   table="ARRAYLIST_OF_BYTE24">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfByte25" column="ARRAYLIST_OF_BYTE25"
-                   >
-            </field>
-            <field name="ArrayListOfByte26"
-                   table="ARRAYLIST_OF_BYTE26">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfDouble27"
-                   table="ARRAYLIST_OF_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfDouble28" column="ARRAYLIST_OF_DOUBLE28"
-                   >
-            </field>
-            <field name="ArrayListOfDouble29"
-                   table="ARRAYLIST_OF_DOUBLE29">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfFloat30"
-                   table="ARRAYLIST_OF_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfFloat31" column="ARRAYLIST_OF_FLOAT31"
-                   >
-            </field>
-            <field name="ArrayListOfFloat32"
-                   table="ARRAYLIST_OF_FLOAT32">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfInteger33"
-                   table="ARRAYLIST_OF_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfInteger34" column="ARRAYLIST_OF_INTEGER34"
-                   >
-            </field>
-            <field name="ArrayListOfInteger35"
-                   table="ARRAYLIST_OF_INTEGER35">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfLong36"
-                   table="ARRAYLIST_OF_LONG36">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfLong37" column="ARRAYLIST_OF_LONG37"
-                   >
-            </field>
-            <field name="ArrayListOfLong38"
-                   table="ARRAYLIST_OF_LONG38">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfShort39"
-                   table="ARRAYLIST_OF_SHORT39">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayListOfShort40" column="ARRAYLIST_OF_SHORT40"
-                   >
-            </field>
-            <field name="ArrayListOfShort41"
-                   table="ARRAYLIST_OF_SHORT41">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="INDEX"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-derby.orm	(working copy)
@@ -1,81 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfInteger" table="FIELDSOFINTEGER">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="Integer0" column="INTEGER0"/>
-            <field name="Integer1" column="INTEGER1"/>
-            <field name="Integer102" column="INTEGER102"/>
-            <field name="Integer103" column="INTEGER103"/>
-            <field name="Integer104" column="INTEGER104"/>
-            <field name="Integer108" column="INTEGER108"/>
-            <field name="Integer109" column="INTEGER109"/>
-            <field name="Integer11" column="INTEGER11"/>
-            <field name="Integer110" column="INTEGER110"/>
-            <field name="Integer112" column="INTEGER112"/>
-            <field name="Integer113" column="INTEGER113"/>
-            <field name="Integer114" column="INTEGER114"/>
-            <field name="Integer119" column="INTEGER119"/>
-            <field name="Integer12" column="INTEGER12"/>
-            <field name="Integer120" column="INTEGER120"/>
-            <field name="Integer121" column="INTEGER121"/>
-            <field name="Integer124" column="INTEGER124"/>
-            <field name="Integer125" column="INTEGER125"/>
-            <field name="Integer126" column="INTEGER126"/>
-            <field name="Integer128" column="INTEGER128"/>
-            <field name="Integer129" column="INTEGER129"/>
-            <field name="Integer13" column="INTEGER13"/>
-            <field name="Integer130" column="INTEGER130"/>
-            <field name="Integer138" column="INTEGER138"/>
-            <field name="Integer139" column="INTEGER139"/>
-            <field name="Integer140" column="INTEGER140"/>
-            <field name="Integer16" column="INTEGER16"/>
-            <field name="Integer17" column="INTEGER17"/>
-            <field name="Integer18" column="INTEGER18"/>
-            <field name="Integer2" column="INTEGER2"/>
-            <field name="Integer20" column="INTEGER20"/>
-            <field name="Integer21" column="INTEGER21"/>
-            <field name="Integer22" column="INTEGER22"/>
-            <field name="Integer30" column="INTEGER30"/>
-            <field name="Integer31" column="INTEGER31"/>
-            <field name="Integer32" column="INTEGER32"/>
-            <field name="Integer36" column="INTEGER36"/>
-            <field name="Integer37" column="INTEGER37"/>
-            <field name="Integer38" column="INTEGER38"/>
-            <field name="Integer4" column="INTEGER4"/>
-            <field name="Integer40" column="INTEGER40"/>
-            <field name="Integer41" column="INTEGER41"/>
-            <field name="Integer42" column="INTEGER42"/>
-            <field name="Integer47" column="INTEGER47"/>
-            <field name="Integer48" column="INTEGER48"/>
-            <field name="Integer49" column="INTEGER49"/>
-            <field name="Integer5" column="INTEGER5"/>
-            <field name="Integer52" column="INTEGER52"/>
-            <field name="Integer53" column="INTEGER53"/>
-            <field name="Integer54" column="INTEGER54"/>
-            <field name="Integer56" column="INTEGER56"/>
-            <field name="Integer57" column="INTEGER57"/>
-            <field name="Integer58" column="INTEGER58"/>
-            <field name="Integer6" column="INTEGER6"/>
-            <field name="Integer66" column="INTEGER66"/>
-            <field name="Integer67" column="INTEGER67"/>
-            <field name="Integer68" column="INTEGER68"/>
-            <field name="Integer72" column="INTEGER72"/>
-            <field name="Integer73" column="INTEGER73"/>
-            <field name="Integer74" column="INTEGER74"/>
-            <field name="Integer76" column="INTEGER76"/>
-            <field name="Integer77" column="INTEGER77"/>
-            <field name="Integer78" column="INTEGER78"/>
-            <field name="Integer83" column="INTEGER83"/>
-            <field name="Integer84" column="INTEGER84"/>
-            <field name="Integer85" column="INTEGER85"/>
-            <field name="Integer88" column="INTEGER88"/>
-            <field name="Integer89" column="INTEGER89"/>
-            <field name="Integer90" column="INTEGER90"/>
-            <field name="Integer92" column="INTEGER92"/>
-            <field name="Integer93" column="INTEGER93"/>
-            <field name="Integer94" column="INTEGER94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-derby.orm	(working copy)
@@ -1,81 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfLong" table="FIELDSOFLONG">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="Long0" column="LONG0"/>
-            <field name="Long1" column="LONG1"/>
-            <field name="Long102" column="LONG102"/>
-            <field name="Long103" column="LONG103"/>
-            <field name="Long104" column="LONG104"/>
-            <field name="Long108" column="LONG108"/>
-            <field name="Long109" column="LONG109"/>
-            <field name="Long11" column="LONG11"/>
-            <field name="Long110" column="LONG110"/>
-            <field name="Long112" column="LONG112"/>
-            <field name="Long113" column="LONG113"/>
-            <field name="Long114" column="LONG114"/>
-            <field name="Long119" column="LONG119"/>
-            <field name="Long12" column="LONG12"/>
-            <field name="Long120" column="LONG120"/>
-            <field name="Long121" column="LONG121"/>
-            <field name="Long124" column="LONG124"/>
-            <field name="Long125" column="LONG125"/>
-            <field name="Long126" column="LONG126"/>
-            <field name="Long128" column="LONG128"/>
-            <field name="Long129" column="LONG129"/>
-            <field name="Long13" column="LONG13"/>
-            <field name="Long130" column="LONG130"/>
-            <field name="Long138" column="LONG138"/>
-            <field name="Long139" column="LONG139"/>
-            <field name="Long140" column="LONG140"/>
-            <field name="Long16" column="LONG16"/>
-            <field name="Long17" column="LONG17"/>
-            <field name="Long18" column="LONG18"/>
-            <field name="Long2" column="LONG2"/>
-            <field name="Long20" column="LONG20"/>
-            <field name="Long21" column="LONG21"/>
-            <field name="Long22" column="LONG22"/>
-            <field name="Long30" column="LONG30"/>
-            <field name="Long31" column="LONG31"/>
-            <field name="Long32" column="LONG32"/>
-            <field name="Long36" column="LONG36"/>
-            <field name="Long37" column="LONG37"/>
-            <field name="Long38" column="LONG38"/>
-            <field name="Long4" column="LONG4"/>
-            <field name="Long40" column="LONG40"/>
-            <field name="Long41" column="LONG41"/>
-            <field name="Long42" column="LONG42"/>
-            <field name="Long47" column="LONG47"/>
-            <field name="Long48" column="LONG48"/>
-            <field name="Long49" column="LONG49"/>
-            <field name="Long5" column="LONG5"/>
-            <field name="Long52" column="LONG52"/>
-            <field name="Long53" column="LONG53"/>
-            <field name="Long54" column="LONG54"/>
-            <field name="Long56" column="LONG56"/>
-            <field name="Long57" column="LONG57"/>
-            <field name="Long58" column="LONG58"/>
-            <field name="Long6" column="LONG6"/>
-            <field name="Long66" column="LONG66"/>
-            <field name="Long67" column="LONG67"/>
-            <field name="Long68" column="LONG68"/>
-            <field name="Long72" column="LONG72"/>
-            <field name="Long73" column="LONG73"/>
-            <field name="Long74" column="LONG74"/>
-            <field name="Long76" column="LONG76"/>
-            <field name="Long77" column="LONG77"/>
-            <field name="Long78" column="LONG78"/>
-            <field name="Long83" column="LONG83"/>
-            <field name="Long84" column="LONG84"/>
-            <field name="Long85" column="LONG85"/>
-            <field name="Long88" column="LONG88"/>
-            <field name="Long89" column="LONG89"/>
-            <field name="Long90" column="LONG90"/>
-            <field name="Long92" column="LONG92"/>
-            <field name="Long93" column="LONG93"/>
-            <field name="Long94" column="LONG94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-derby.orm	(working copy)
@@ -1,81 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-           <class name="FieldsOfShort" table="FIELDSOFSHORT">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="Short0" column="SHORT0"/>
-            <field name="Short1" column="SHORT1"/>
-            <field name="Short102" column="SHORT102"/>
-            <field name="Short103" column="SHORT103"/>
-            <field name="Short104" column="SHORT104"/>
-            <field name="Short108" column="SHORT108"/>
-            <field name="Short109" column="SHORT109"/>
-            <field name="Short11" column="SHORT11"/>
-            <field name="Short110" column="SHORT110"/>
-            <field name="Short112" column="SHORT112"/>
-            <field name="Short113" column="SHORT113"/>
-            <field name="Short114" column="SHORT114"/>
-            <field name="Short119" column="SHORT119"/>
-            <field name="Short12" column="SHORT12"/>
-            <field name="Short120" column="SHORT120"/>
-            <field name="Short121" column="SHORT121"/>
-            <field name="Short124" column="SHORT124"/>
-            <field name="Short125" column="SHORT125"/>
-            <field name="Short126" column="SHORT126"/>
-            <field name="Short128" column="SHORT128"/>
-            <field name="Short129" column="SHORT129"/>
-            <field name="Short13" column="SHORT13"/>
-            <field name="Short130" column="SHORT130"/>
-            <field name="Short138" column="SHORT138"/>
-            <field name="Short139" column="SHORT139"/>
-            <field name="Short140" column="SHORT140"/>
-            <field name="Short16" column="SHORT16"/>
-            <field name="Short17" column="SHORT17"/>
-            <field name="Short18" column="SHORT18"/>
-            <field name="Short2" column="SHORT2"/>
-            <field name="Short20" column="SHORT20"/>
-            <field name="Short21" column="SHORT21"/>
-            <field name="Short22" column="SHORT22"/>
-            <field name="Short30" column="SHORT30"/>
-            <field name="Short31" column="SHORT31"/>
-            <field name="Short32" column="SHORT32"/>
-            <field name="Short36" column="SHORT36"/>
-            <field name="Short37" column="SHORT37"/>
-            <field name="Short38" column="SHORT38"/>
-            <field name="Short4" column="SHORT4"/>
-            <field name="Short40" column="SHORT40"/>
-            <field name="Short41" column="SHORT41"/>
-            <field name="Short42" column="SHORT42"/>
-            <field name="Short47" column="SHORT47"/>
-            <field name="Short48" column="SHORT48"/>
-            <field name="Short49" column="SHORT49"/>
-            <field name="Short5" column="SHORT5"/>
-            <field name="Short52" column="SHORT52"/>
-            <field name="Short53" column="SHORT53"/>
-            <field name="Short54" column="SHORT54"/>
-            <field name="Short56" column="SHORT56"/>
-            <field name="Short57" column="SHORT57"/>
-            <field name="Short58" column="SHORT58"/>
-            <field name="Short6" column="SHORT6"/>
-            <field name="Short66" column="SHORT66"/>
-            <field name="Short67" column="SHORT67"/>
-            <field name="Short68" column="SHORT68"/>
-            <field name="Short72" column="SHORT72"/>
-            <field name="Short73" column="SHORT73"/>
-            <field name="Short74" column="SHORT74"/>
-            <field name="Short76" column="SHORT76"/>
-            <field name="Short77" column="SHORT77"/>
-            <field name="Short78" column="SHORT78"/>
-            <field name="Short83" column="SHORT83"/>
-            <field name="Short84" column="SHORT84"/>
-            <field name="Short85" column="SHORT85"/>
-            <field name="Short88" column="SHORT88"/>
-            <field name="Short89" column="SHORT89"/>
-            <field name="Short90" column="SHORT90"/>
-            <field name="Short92" column="SHORT92"/>
-            <field name="Short93" column="SHORT93"/>
-            <field name="Short94" column="SHORT94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm	(working copy)
@@ -1,570 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="HashtableStringValueCollections"
-               table="HASHTBLSTRINGVALUE_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
-            <field name="HashtableOfObject_String0"
-                   table="HASHTBL_OBJECT0_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfObject_String1"
-                   table="HASHTBL_OBJECT1_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfObject_String2"
-                   table="HASHTBL_OBJECT2_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfObject_String3"
-                   table="HASHTBL_OBJECT3_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfObject_String4"
-                   table="HASHTBL_OBJECT4_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfObject_String6"
-                   table="HASHTBL_OBJECT6_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfObject_String8"
-                   column="HASHTBL_OBJECT8_STR">
-            </field>
-            <field name="HashtableOfSimpleClass_String9"
-                   table="HASHTBL_SIMPLE_CLASS9_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleClass_String10"
-                   table="HASHTBL_SIMPLE_CLASS10_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleClass_String11"
-                   table="HASHTBL_SIMPLE_CLASS11_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleClass_String12"
-                   table="HASHTBL_SIMPLE_CLASS12_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleClass_String13"
-                   table="HASHTBL_SIMPLE_CLASS13_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleClass_String15"
-                   table="HASHTBL_SIMPLE_CLASS15_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleClass_String17"
-                   column="HASHTBL_SIMPLE_CLASS17_STR">
-            </field>
-            <field name="HashtableOfSimpleInterface_String18"
-                   table="HASHTBL_SIMPLE_INTERFACE18_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleInterface_String19"
-                   table="HASHTBL_SIMPLE_INTERFACE19_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleInterface_String20"
-                   table="HASHTBL_SIMPLE_INTERFACE20_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleInterface_String21"
-                   table="HASHTBL_SIMPLE_INTERFACE21_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleInterface_String22"
-                   table="HASHTBL_SIMPLE_INTERFACE22_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleInterface_String24"
-                   table="HASHTBL_SIMPLE_INTERFACE24_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleInterface_String26"
-                   column="HASHTBL_SIMPLE_INTERFACE26_STR">
-            </field>
-            <field name="HashtableOfString_String27"
-                   table="HASHTBL_STRING27_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_String28"
-                   table="HASHTBL_STRING28_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_String29"
-                   table="HASHTBL_STRING29_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_String30"
-                   table="HASHTBL_STRING30_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_String31"
-                   table="HASHTBL_STRING31_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_String33"
-                   table="HASHTBL_STRING33_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_String35" column="HASHTBL_STRING35_STR">
-            </field>
-            <field name="HashtableOfDate_String36"
-                   table="HASHTBL_DATE36_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDate_String37"
-                   table="HASHTBL_DATE37_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDate_String38"
-                   table="HASHTBL_DATE38_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDate_String39"
-                   table="HASHTBL_DATE39_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDate_String40"
-                   table="HASHTBL_DATE40_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDate_String42"
-                   table="HASHTBL_DATE42_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDate_String44"
-                   column="HASHTBL_DATE44_STR">
-            </field>
-            <field name="HashtableOfBigDecimal_String45"
-                   table="HASHTBL_BIG_DECIMAL45_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigDecimal_String46"
-                   table="HASHTBL_BIG_DECIMAL46_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigDecimal_String47"
-                   table="HASHTBL_BIG_DECIMAL47_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigDecimal_String48"
-                   table="HASHTBL_BIG_DECIMAL48_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigDecimal_String49"
-                   table="HASHTBL_BIG_DECIMAL49_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigDecimal_String51"
-                   table="HASHTBL_BIG_DECIMAL51_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigDecimal_String53"
-                   column="HASHTBL_BIG_DECIMAL53_STR">
-            </field>
-            <field name="HashtableOfBigInteger_String54"
-                   table="HASHTBL_BIG_INTEGER54_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigInteger_String55"
-                   table="HASHTBL_BIG_INTEGER55_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigInteger_String56"
-                   table="HASHTBL_BIG_INTEGER56_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigInteger_String57"
-                   table="HASHTBL_BIG_INTEGER57_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigInteger_String58"
-                   table="HASHTBL_BIG_INTEGER58_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigInteger_String60"
-                   table="HASHTBL_BIG_INTEGER60_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfBigInteger_String62"
-                   column="HASHTBL_BIG_INTEGER62_STR">
-            </field>
-            <field name="HashtableOfByte_String63"
-                   table="HASHTBL_BYTE63_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfByte_String64"
-                   table="HASHTBL_BYTE64_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfByte_String65"
-                   table="HASHTBL_BYTE65_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfByte_String66"
-                   table="HASHTBL_BYTE66_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfByte_String67"
-                   table="HASHTBL_BYTE67_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfByte_String69"
-                   table="HASHTBL_BYTE69_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfByte_String71"
-                   column="HASHTBL_BYTE71_STR">
-            </field>
-            <field name="HashtableOfDouble_String72"
-                   table="HASHTBL_DOUBLE72_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDouble_String73"
-                   table="HASHTBL_DOUBLE73_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDouble_String74"
-                   table="HASHTBL_DOUBLE74_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDouble_String75"
-                   table="HASHTBL_DOUBLE75_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDouble_String76"
-                   table="HASHTBL_DOUBLE76_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDouble_String78"
-                   table="HASHTBL_DOUBLE78_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfDouble_String80"
-                   column="HASHTBL_DOUBLE80_STR">
-            </field>
-            <field name="HashtableOfFloat_String81"
-                   table="HASHTBL_FLOAT81_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfFloat_String82"
-                   table="HASHTBL_FLOAT82_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfFloat_String83"
-                   table="HASHTBL_FLOAT83_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfFloat_String84"
-                   table="HASHTBL_FLOAT84_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfFloat_String85"
-                   table="HASHTBL_FLOAT85_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfFloat_String87"
-                   table="HASHTBL_FLOAT87_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfFloat_String89"
-                   column="HASHTBL_FLOAT89_STR">
-            </field>
-            <field name="HashtableOfInteger_String90"
-                   table="HASHTBL_INTEGER90_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfInteger_String91"
-                   table="HASHTBL_INTEGER91_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfInteger_String92"
-                   table="HASHTBL_INTEGER92_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfInteger_String93"
-                   table="HASHTBL_INTEGER93_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfInteger_String94"
-                   table="HASHTBL_INTEGER94_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfInteger_String96"
-                   table="HASHTBL_INTEGER96_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfInteger_String98"
-                   column="HASHTBL_INTEGER98_STR">
-            </field>
-            <field name="HashtableOfLong_String99"
-                   table="HASHTBL_LONG99_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfLong_String100"
-                   table="HASHTBL_LONG100_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfLong_String101"
-                   table="HASHTBL_LONG101_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfLong_String102"
-                   table="HASHTBL_LONG102_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfLong_String103"
-                   table="HASHTBL_LONG103_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfLong_String105"
-                   table="HASHTBL_LONG105_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfLong_String107"
-                   column="HASHTBL_LONG107_STR">
-            </field>
-            <field name="HashtableOfShort_String108"
-                   table="HASHTBL_SHORT108_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfShort_String109"
-                   table="HASHTBL_SHORT109_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfShort_String110"
-                   table="HASHTBL_SHORT110_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfShort_String111"
-                   table="HASHTBL_SHORT111_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfShort_String112"
-                   table="HASHTBL_SHORT112_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfShort_String114"
-                   table="HASHTBL_SHORT114_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfShort_String116"
-                   column="HASHTBL_SHORT116_STR">
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-derby.orm	(working copy)
@@ -1,82 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfByte" table="FieldsOfByte">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
-            <field name="Byte0" column="BYTE0"/>
-            <field name="Byte1" column="BYTE1"/>
-            <field name="Byte2" column="BYTE2"/>
-            <field name="Byte4" column="BYTE4"/>
-            <field name="Byte5" column="BYTE5"/>
-            <field name="Byte6" column="BYTE6"/>
-            <field name="Byte11" column="BYTE11"/>
-            <field name="Byte12" column="BYTE12"/>
-            <field name="Byte13" column="BYTE13"/>
-            <field name="Byte16" column="BYTE16"/>
-            <field name="Byte17" column="BYTE17"/>
-            <field name="Byte18" column="BYTE18"/>
-            <field name="Byte20" column="BYTE20"/>
-            <field name="Byte21" column="BYTE21"/>
-            <field name="Byte22" column="BYTE22"/>
-            <field name="Byte30" column="BYTE30"/>
-            <field name="Byte31" column="BYTE31"/>
-            <field name="Byte32" column="BYTE32"/>
-            <field name="Byte36" column="BYTE36"/>
-            <field name="Byte37" column="BYTE37"/>
-            <field name="Byte38" column="BYTE38"/>
-            <field name="Byte40" column="BYTE40"/>
-            <field name="Byte41" column="BYTE41"/>
-            <field name="Byte42" column="BYTE42"/>
-            <field name="Byte43" column="BYTE43"/>
-            <field name="Byte47" column="BYTE47"/>
-            <field name="Byte48" column="BYTE48"/>
-            <field name="Byte49" column="BYTE49"/>
-            <field name="Byte52" column="BYTE52"/>
-            <field name="Byte53" column="BYTE53"/>
-            <field name="Byte54" column="BYTE54"/>
-            <field name="Byte56" column="BYTE56"/>
-            <field name="Byte57" column="BYTE57"/>
-            <field name="Byte58" column="BYTE58"/>
-            <field name="Byte66" column="BYTE66"/>
-            <field name="Byte67" column="BYTE67"/>
-            <field name="Byte68" column="BYTE68"/>
-            <field name="Byte72" column="BYTE72"/>
-            <field name="Byte73" column="BYTE73"/>
-            <field name="Byte74" column="BYTE74"/>
-            <field name="Byte76" column="BYTE76"/>
-            <field name="Byte77" column="BYTE77"/>
-            <field name="Byte78" column="BYTE78"/>
-            <field name="Byte83" column="BYTE83"/>
-            <field name="Byte84" column="BYTE84"/>
-            <field name="Byte85" column="BYTE85"/>
-            <field name="Byte88" column="BYTE88"/>
-            <field name="Byte89" column="BYTE89"/>
-            <field name="Byte90" column="BYTE90"/>
-            <field name="Byte92" column="BYTE92"/>
-            <field name="Byte93" column="BYTE93"/>
-            <field name="Byte94" column="BYTE94"/>
-            <field name="Byte102" column="BYTE102"/>
-            <field name="Byte103" column="BYTE103"/>
-            <field name="Byte104" column="BYTE104"/>
-            <field name="Byte108" column="BYTE108"/>
-            <field name="Byte109" column="BYTE109"/>
-            <field name="Byte110" column="BYTE110"/>
-            <field name="Byte112" column="BYTE112"/>
-            <field name="Byte113" column="BYTE113"/>
-            <field name="Byte114" column="BYTE114"/>
-            <field name="Byte119" column="BYTE119"/>
-            <field name="Byte120" column="BYTE120"/>
-            <field name="Byte121" column="BYTE121"/>
-            <field name="Byte124" column="BYTE124"/>
-            <field name="Byte125" column="BYTE125"/>
-            <field name="Byte126" column="BYTE126"/>
-            <field name="Byte128" column="BYTE128"/>
-            <field name="Byte129" column="BYTE129"/>
-            <field name="Byte130" column="BYTE130"/>
-            <field name="Byte138" column="BYTE138"/>
-            <field name="Byte139" column="BYTE139"/>
-            <field name="Byte140" column="BYTE140"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-derby.orm	(working copy)
@@ -1,81 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfPrimitiveBoolean" table="FIELDSOFPRIMITIVEBOOLEAN">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="boolean0" column="BOOLEAN0"/>
-            <field name="boolean1" column="BOOLEAN1"/>
-            <field name="boolean102" column="BOOLEAN102"/>
-            <field name="boolean103" column="BOOLEAN103"/>
-            <field name="boolean104" column="BOOLEAN104"/>
-            <field name="boolean108" column="BOOLEAN108"/>
-            <field name="boolean109" column="BOOLEAN109"/>
-            <field name="boolean11" column="BOOLEAN11"/>
-            <field name="boolean110" column="BOOLEAN110"/>
-            <field name="boolean112" column="BOOLEAN112"/>
-            <field name="boolean113" column="BOOLEAN113"/>
-            <field name="boolean114" column="BOOLEAN114"/>
-            <field name="boolean119" column="BOOLEAN119"/>
-            <field name="boolean12" column="BOOLEAN12"/>
-            <field name="boolean120" column="BOOLEAN120"/>
-            <field name="boolean121" column="BOOLEAN121"/>
-            <field name="boolean124" column="BOOLEAN124"/>
-            <field name="boolean125" column="BOOLEAN125"/>
-            <field name="boolean126" column="BOOLEAN126"/>
-            <field name="boolean128" column="BOOLEAN128"/>
-            <field name="boolean129" column="BOOLEAN129"/>
-            <field name="boolean13" column="BOOLEAN13"/>
-            <field name="boolean130" column="BOOLEAN130"/>
-            <field name="boolean138" column="BOOLEAN138"/>
-            <field name="boolean139" column="BOOLEAN139"/>
-            <field name="boolean140" column="BOOLEAN140"/>
-            <field name="boolean16" column="BOOLEAN16"/>
-            <field name="boolean17" column="BOOLEAN17"/>
-            <field name="boolean18" column="BOOLEAN18"/>
-            <field name="boolean2" column="BOOLEAN2"/>
-            <field name="boolean20" column="BOOLEAN20"/>
-            <field name="boolean21" column="BOOLEAN21"/>
-            <field name="boolean22" column="BOOLEAN22"/>
-            <field name="boolean30" column="BOOLEAN30"/>
-            <field name="boolean31" column="BOOLEAN31"/>
-            <field name="boolean32" column="BOOLEAN32"/>
-            <field name="boolean36" column="BOOLEAN36"/>
-            <field name="boolean37" column="BOOLEAN37"/>
-            <field name="boolean38" column="BOOLEAN38"/>
-            <field name="boolean4" column="BOOLEAN4"/>
-            <field name="boolean40" column="BOOLEAN40"/>
-            <field name="boolean41" column="BOOLEAN41"/>
-            <field name="boolean42" column="BOOLEAN42"/>
-            <field name="boolean47" column="BOOLEAN47"/>
-            <field name="boolean48" column="BOOLEAN48"/>
-            <field name="boolean49" column="BOOLEAN49"/>
-            <field name="boolean5" column="BOOLEAN5"/>
-            <field name="boolean52" column="BOOLEAN52"/>
-            <field name="boolean53" column="BOOLEAN53"/>
-            <field name="boolean54" column="BOOLEAN54"/>
-            <field name="boolean56" column="BOOLEAN56"/>
-            <field name="boolean57" column="BOOLEAN57"/>
-            <field name="boolean58" column="BOOLEAN58"/>
-            <field name="boolean6" column="BOOLEAN6"/>
-            <field name="boolean66" column="BOOLEAN66"/>
-            <field name="boolean67" column="BOOLEAN67"/>
-            <field name="boolean68" column="BOOLEAN68"/>
-            <field name="boolean72" column="BOOLEAN72"/>
-            <field name="boolean73" column="BOOLEAN73"/>
-            <field name="boolean74" column="BOOLEAN74"/>
-            <field name="boolean76" column="BOOLEAN76"/>
-            <field name="boolean77" column="BOOLEAN77"/>
-            <field name="boolean78" column="BOOLEAN78"/>
-            <field name="boolean83" column="BOOLEAN83"/>
-            <field name="boolean84" column="BOOLEAN84"/>
-            <field name="boolean85" column="BOOLEAN85"/>
-            <field name="boolean88" column="BOOLEAN88"/>
-            <field name="boolean89" column="BOOLEAN89"/>
-            <field name="boolean90" column="BOOLEAN90"/>
-            <field name="boolean92" column="BOOLEAN92"/>
-            <field name="boolean93" column="BOOLEAN93"/>
-            <field name="boolean94" column="BOOLEAN94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm	(working copy)
@@ -1,212 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="SetCollections" table="SET_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
-            <field name="SetOfObject0"
-                   table="SET_OF_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-            </field>
-            <field name="SetOfObject1"
-                   table="SET_OF_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-            </field>
-            <field name="SetOfObject2"
-                   column="SET_OF_OBJECT2">
-            </field>
-            <field name="SetOfSimpleClass3"
-                   table="SET_OF_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-            </field>
-            <field name="SetOfSimpleClass4"
-                   table="SET_OF_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-            </field>
-            <field name="SetOfSimpleClass5"
-                   column="SET_OF_SIMPLE_CLASS5">
-            </field>
-            <field name="SetOfSimpleClass42"
-                   column="SET_OF_SIMPLE_CLASS42">
-            </field>
-            <field name="SetOfSimpleInterface6"
-                   table="SET_OF_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-            </field>
-            <field name="SetOfSimpleInterface7"
-                   table="SET_OF_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-            </field>
-            <field name="SetOfSimpleInterface8"
-                   column="SET_OF_SIMPLE_INTERFACE8">
-            </field>
-            <field name="SetOfString9"
-                   table="SET_OF_STRING9">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-            </field>
-            <field name="SetOfString11"
-                   column="SET_OF_STRING11">
-            </field>
-            <field name="SetOfString10"
-                   table="SET_OF_STRING10">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-            </field>
-            <field name="SetOfDate12"
-                   table="SET_OF_DATE12">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-            </field>
-            <field name="SetOfDate14"
-                   column="SET_OF_DATE14">
-            </field>
-            <field name="SetOfDate13"
-                   table="SET_OF_DATE13">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-            </field>
-            <field name="SetOfLocale15"
-                   table="SET_OF_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-            </field>
-            <field name="SetOfLocale17"
-                   column="SET_OF_LOCALE17">
-            </field>
-            <field name="SetOfLocale16"
-                   table="SET_OF_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-            </field>
-            <field name="SetOfBigDecimal18"
-                   table="SET_OF_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-            </field>
-            <field name="SetOfBigDecimal20"
-                   column="SET_OF_BIG_DECIMAL20">
-            </field>
-            <field name="SetOfBigDecimal19"
-                   table="SET_OF_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-            </field>
-            <field name="SetOfBigInteger21"
-                   table="SET_OF_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-            </field>
-            <field name="SetOfBigInteger23"
-                   column="SET_OF_BIG_INTEGER23">
-            </field>
-            <field name="SetOfBigInteger22"
-                   table="SET_OF_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-            </field>
-            <field name="SetOfByte24"
-                   table="SET_OF_BYTE24">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-            </field>
-            <field name="SetOfByte26"
-                   column="SET_OF_BYTE26">
-            </field>
-            <field name="SetOfByte25"
-                   table="SET_OF_BYTE25">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-            </field>
-            <field name="SetOfDouble27"
-                   table="SET_OF_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-            </field>
-            <field name="SetOfDouble29"
-                   column="SET_OF_DOUBLE29">
-            </field>
-            <field name="SetOfDouble28"
-                   table="SET_OF_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-            </field>
-            <field name="SetOfFloat30"
-                   table="SET_OF_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-            </field>
-            <field name="SetOfFloat32"
-                   column="SET_OF_FLOAT32">
-            </field>
-            <field name="SetOfFloat31"
-                   table="SET_OF_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-            </field>
-            <field name="SetOfInteger33"
-                   table="SET_OF_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-            </field>
-            <field name="SetOfInteger35"
-                   column="SET_OF_INTEGER35">
-            </field>
-            <field name="SetOfInteger34"
-                   table="SET_OF_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-            </field>
-            <field name="SetOfLong36"
-                   table="SET_OF_LONG36">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-            </field>
-            <field name="SetOfLong38"
-                   column="SET_OF_LONG38">
-            </field>
-            <field name="SetOfLong37"
-                   table="SET_OF_LONG37">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-            </field>
-            <field name="SetOfShort39"
-                   table="SET_OF_SHORT39">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-            </field>
-            <field name="SetOfShort41"
-                   column="SET_OF_SHORT41">
-            </field>
-            <field name="SetOfShort40"
-                   table="SET_OF_SHORT40">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm	(working copy)
@@ -1,249 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="VectorCollections" table="VECTOR_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
-            <field name="VectorOfObject0"
-                   table="VECTOR_OF_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfObject1"
-                   table="VECTOR_OF_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfObject2"
-                   table="VECTOR_OF_OBJECT2">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfSimpleClass3"
-                   table="VECTOR_OF_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfSimpleClass4"
-                   table="VECTOR_OF_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfSimpleClass5"
-                   table="VECTOR_OF_SIMPLE_CLASS5">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfSimpleClass42"
-                   column="VECTOR_OF_SIMPLE_CLASS42">
-            </field>
-            <field name="VectorOfSimpleInterface6"
-                   table="VECTOR_OF_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfSimpleInterface7"
-                   table="VECTOR_OF_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfSimpleInterface8"
-                   table="VECTOR_OF_SIMPLE_INTERFACE8">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfString9"
-                   table="VECTOR_OF_STRING9">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfString11"
-                   column="VECTOR_OF_STRING11">
-            </field>
-            <field name="VectorOfString10"
-                   table="VECTOR_OF_STRING10">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfDate12"
-                   table="VECTOR_OF_DATE12">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfDate14"
-                   column="VECTOR_OF_DATE14">
-            </field>
-            <field name="VectorOfDate13"
-                   table="VECTOR_OF_DATE13">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfLocale15"
-                   table="VECTOR_OF_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfLocale17"
-                   column="VECTOR_OF_LOCALE17">
-            </field>
-            <field name="VectorOfLocale16"
-                   table="VECTOR_OF_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfBigDecimal18"
-                   table="VECTOR_OF_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfBigDecimal20"
-                   column="VECTOR_OF_BIG_DECIMAL20">
-            </field>
-            <field name="VectorOfBigDecimal19"
-                   table="VECTOR_OF_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfBigInteger21"
-                   table="VECTOR_OF_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfBigInteger23"
-                   column="VECTOR_OF_BIG_INTEGER23">
-            </field>
-            <field name="VectorOfBigInteger22"
-                   table="VECTOR_OF_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfByte24"
-                   table="VECTOR_OF_BYTE24">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfByte26"
-                   column="VECTOR_OF_BYTE26">
-            </field>
-            <field name="VectorOfByte25"
-                   table="VECTOR_OF_BYTE25">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfDouble27"
-                   table="VECTOR_OF_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfDouble29"
-                   column="VECTOR_OF_DOUBLE29">
-            </field>
-            <field name="VectorOfDouble28"
-                   table="VECTOR_OF_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfFloat30"
-                   table="VECTOR_OF_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfFloat32"
-                   column="VECTOR_OF_FLOAT32">
-            </field>
-            <field name="VectorOfFloat31"
-                   table="VECTOR_OF_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfInteger33"
-                   table="VECTOR_OF_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfInteger35"
-                   column="VECTOR_OF_INTEGER35">
-            </field>
-            <field name="VectorOfInteger34"
-                   table="VECTOR_OF_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfLong36"
-                   table="VECTOR_OF_LONG36">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfLong38"
-                   column="VECTOR_OF_LONG38">
-            </field>
-            <field name="VectorOfLong37"
-                   table="VECTOR_OF_LONG37">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfShort39"
-                   table="VECTOR_OF_SHORT39">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="VectorOfShort41"
-                   column="VECTOR_OF_SHORT41">
-            </field>
-            <field name="VectorOfShort40"
-                   table="VECTOR_OF_SHORT40">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm	(working copy)
@@ -1,249 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="LinkedListCollections" table="LINKEDLIST_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
-            <field name="LinkedListOfObject0"
-                   table="LINKEDLIST_OF_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfObject1"
-                   table="LINKEDLIST_OF_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfObject2"
-                   table="LINKEDLIST_OF_OBJECT2">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfSimpleClass3"
-                   table="LINKEDLIST_OF_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfSimpleClass4"
-                   table="LINKEDLIST_OF_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfSimpleClass5"
-                   table="LINKEDLIST_OF_SIMPLE_CLASS5">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfSimpleClass42"
-                   column="LINKEDLIST_OF_SIMPLE_CLASS42">
-            </field>
-            <field name="LinkedListOfSimpleInterface6"
-                   table="LINKEDLIST_OF_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfSimpleInterface7"
-                   table="LINKEDLIST_OF_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfSimpleInterface8"
-                   table="LINKEDLIST_OF_SIMPLE_INTERFACE8">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfString9"
-                   table="LINKEDLIST_OF_STRING9">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfString11"
-                   column="LINKEDLIST_OF_STRING11">
-            </field>
-            <field name="LinkedListOfString10"
-                   table="LINKEDLIST_OF_STRING10">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfDate12"
-                   table="LINKEDLIST_OF_DATE12">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfDate14"
-                   column="LINKEDLIST_OF_DATE14">
-            </field>
-            <field name="LinkedListOfDate13"
-                   table="LINKEDLIST_OF_DATE13">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfLocale15"
-                   table="LINKEDLIST_OF_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfLocale17"
-                   column="LINKEDLIST_OF_LOCALE17">
-            </field>
-            <field name="LinkedListOfLocale16"
-                   table="LINKEDLIST_OF_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfBigDecimal18"
-                   table="LINKEDLIST_OF_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfBigDecimal20"
-                   column="LINKEDLIST_OF_BIG_DECIMAL20">
-            </field>
-            <field name="LinkedListOfBigDecimal19"
-                   table="LINKEDLIST_OF_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfBigInteger21"
-                   table="LINKEDLIST_OF_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfBigInteger23"
-                   column="LINKEDLIST_OF_BIG_INTEGER23">
-            </field>
-            <field name="LinkedListOfBigInteger22"
-                   table="LINKEDLIST_OF_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfByte24"
-                   table="LINKEDLIST_OF_BYTE24">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfByte26"
-                   column="LINKEDLIST_OF_BYTE26">
-            </field>
-            <field name="LinkedListOfByte25"
-                   table="LINKEDLIST_OF_BYTE25">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfDouble27"
-                   table="LINKEDLIST_OF_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfDouble29"
-                   column="LINKEDLIST_OF_DOUBLE29">
-            </field>
-            <field name="LinkedListOfDouble28"
-                   table="LINKEDLIST_OF_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfFloat30"
-                   table="LINKEDLIST_OF_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfFloat32"
-                   column="LINKEDLIST_OF_FLOAT32">
-            </field>
-            <field name="LinkedListOfFloat31"
-                   table="LINKEDLIST_OF_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfInteger33"
-                   table="LINKEDLIST_OF_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfInteger35"
-                   column="LINKEDLIST_OF_INTEGER35">
-            </field>
-            <field name="LinkedListOfInteger34"
-                   table="LINKEDLIST_OF_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfLong36"
-                   table="LINKEDLIST_OF_LONG36">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfLong38"
-                   column="LINKEDLIST_OF_LONG38">
-            </field>
-            <field name="LinkedListOfLong37"
-                   table="LINKEDLIST_OF_LONG37">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfShort39"
-                   table="LINKEDLIST_OF_SHORT39">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="LinkedListOfShort41"
-                   column="LINKEDLIST_OF_SHORT41">
-            </field>
-            <field name="LinkedListOfShort40"
-                   table="LINKEDLIST_OF_SHORT40">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm	(working copy)
@@ -1,508 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="HashMapStringValueCollections"
-               table="HASHMAPSTRINGVALUE_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
-            <field name="HashMapOfObject_String0" table="HASHMAP_OBJECT0_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfObject_String1" table="HASHMAP_OBJECT1_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfObject_String2" table="HASHMAP_OBJECT2_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfObject_String3" table="HASHMAP_OBJECT3_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfObject_String4" table="HASHMAP_OBJECT4_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfObject_String6" table="HASHMAP_OBJECT6_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfObject_String8" column="HASHMAP_OBJECT8_STR">
-            </field>
-            <field name="HashMapOfSimpleClass_String9"
-                   table="HASHMAP_SIMPLE_CLASS9_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleClass_String10"
-                   table="HASHMAP_SIMPLE_CLASS10_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleClass_String11"
-                   table="HASHMAP_SIMPLE_CLASS11_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleClass_String12"
-                   table="HASHMAP_SIMPLE_CLASS12_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleClass_String13"
-                   table="HASHMAP_SIMPLE_CLASS13_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleClass_String15"
-                   table="HASHMAP_SIMPLE_CLASS15_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleClass_String17"
-                   column="HASHMAP_SIMPLE_CLASS17_STR">
-            </field>
-            <field name="HashMapOfSimpleInterface_String18"
-                   table="HASHMAP_SIMPLE_INTERFACE18_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleInterface_String19"
-                   table="HASHMAP_SIMPLE_INTERFACE19_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleInterface_String20"
-                   table="HASHMAP_SIMPLE_INTERFACE20_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleInterface_String21"
-                   table="HASHMAP_SIMPLE_INTERFACE21_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleInterface_String22"
-                   table="HASHMAP_SIMPLE_INTERFACE22_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleInterface_String24"
-                   table="HASHMAP_SIMPLE_INTERFACE24_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleInterface_String26"
-                   column="HASHMAP_SIMPLE_INTERFACE26_STR">
-            </field>
-            <field name="HashMapOfString_String27" table="HASHMAP_STRING27_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_String28" table="HASHMAP_STRING28_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_String29" table="HASHMAP_STRING29_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_String30" table="HASHMAP_STRING30_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_String31" table="HASHMAP_STRING31_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_String33" table="HASHMAP_STRING33_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfString_String35" column="HASHMAP_STRING35_STR">
-            </field>
-            <field name="HashMapOfDate_String36" table="HASHMAP_DATE36_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDate_String37" table="HASHMAP_DATE37_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDate_String38" table="HASHMAP_DATE38_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDate_String39" table="HASHMAP_DATE39_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDate_String40" table="HASHMAP_DATE40_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDate_String42" table="HASHMAP_DATE42_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDate_String44" column="HASHMAP_DATE44_STR">
-            </field>
-            <field name="HashMapOfBigDecimal_String45"
-                   table="HASHMAP_BIG_DECIMAL45_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigDecimal_String46"
-                   table="HASHMAP_BIG_DECIMAL46_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigDecimal_String47"
-                   table="HASHMAP_BIG_DECIMAL47_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigDecimal_String48"
-                   table="HASHMAP_BIG_DECIMAL48_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigDecimal_String49"
-                   table="HASHMAP_BIG_DECIMAL49_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigDecimal_String51"
-                   table="HASHMAP_BIG_DECIMAL51_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigDecimal_String53"
-                   column="HASHMAP_BIG_DECIMAL53_STR">
-            </field>
-            <field name="HashMapOfBigInteger_String54"
-                   table="HASHMAP_BIG_INTEGER54_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigInteger_String55"
-                   table="HASHMAP_BIG_INTEGER55_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigInteger_String56"
-                   table="HASHMAP_BIG_INTEGER56_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigInteger_String57"
-                   table="HASHMAP_BIG_INTEGER57_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigInteger_String58"
-                   table="HASHMAP_BIG_INTEGER58_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigInteger_String60"
-                   table="HASHMAP_BIG_INTEGER60_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfBigInteger_String62"
-                   column="HASHMAP_BIG_INTEGER62_STR">
-            </field>
-            <field name="HashMapOfByte_String63" table="HASHMAP_BYTE63_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfByte_String64" table="HASHMAP_BYTE64_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfByte_String65" table="HASHMAP_BYTE65_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfByte_String66" table="HASHMAP_BYTE66_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfByte_String67" table="HASHMAP_BYTE67_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfByte_String69" table="HASHMAP_BYTE69_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfByte_String71" column="HASHMAP_BYTE71_STR">
-            </field>
-            <field name="HashMapOfDouble_String72" table="HASHMAP_DOUBLE72_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDouble_String73" table="HASHMAP_DOUBLE73_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDouble_String74" table="HASHMAP_DOUBLE74_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDouble_String75" table="HASHMAP_DOUBLE75_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDouble_String76" table="HASHMAP_DOUBLE76_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDouble_String78" table="HASHMAP_DOUBLE78_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfDouble_String80" column="HASHMAP_DOUBLE80_STR">
-            </field>
-            <field name="HashMapOfFloat_String81" table="HASHMAP_FLOAT81_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfFloat_String82" table="HASHMAP_FLOAT82_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfFloat_String83" table="HASHMAP_FLOAT83_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfFloat_String84" table="HASHMAP_FLOAT84_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfFloat_String85" table="HASHMAP_FLOAT85_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfFloat_String87" table="HASHMAP_FLOAT87_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfFloat_String89" column="HASHMAP_FLOAT89_STR">
-            </field>
-            <field name="HashMapOfInteger_String90" table="HASHMAP_INTEGER90_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfInteger_String91" table="HASHMAP_INTEGER91_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfInteger_String92" table="HASHMAP_INTEGER92_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfInteger_String93" table="HASHMAP_INTEGER93_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfInteger_String94" table="HASHMAP_INTEGER94_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfInteger_String96" table="HASHMAP_INTEGER96_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfInteger_String98" column="HASHMAP_INTEGER98_STR">
-            </field>
-            <field name="HashMapOfLong_String99" table="HASHMAP_LONG99_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfLong_String100" table="HASHMAP_LONG100_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfLong_String101" table="HASHMAP_LONG101_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfLong_String102" table="HASHMAP_LONG102_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfLong_String103" table="HASHMAP_LONG103_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfLong_String105" table="HASHMAP_LONG105_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfLong_String107" column="HASHMAP_LONG107_STR">
-            </field>
-            <field name="HashMapOfShort_String108" table="HASHMAP_SHORT108_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfShort_String109" table="HASHMAP_SHORT109_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfShort_String110" table="HASHMAP_SHORT110_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfShort_String111" table="HASHMAP_SHORT111_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfShort_String112" table="HASHMAP_SHORT112_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfShort_String114" table="HASHMAP_SHORT114_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfShort_String116" column="HASHMAP_SHORT116_STR">
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-derby.orm	(working copy)
@@ -1,81 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfPrimitivefloat" table="FIELDSOFPRIMITIVEFLOAT">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="float0" column="FLOAT0"/>
-            <field name="float1" column="FLOAT1"/>
-            <field name="float102" column="FLOAT102"/>
-            <field name="float103" column="FLOAT103"/>
-            <field name="float104" column="FLOAT104"/>
-            <field name="float108" column="FLOAT108"/>
-            <field name="float109" column="FLOAT109"/>
-            <field name="float11" column="FLOAT11"/>
-            <field name="float110" column="FLOAT110"/>
-            <field name="float112" column="FLOAT112"/>
-            <field name="float113" column="FLOAT113"/>
-            <field name="float114" column="FLOAT114"/>
-            <field name="float119" column="FLOAT119"/>
-            <field name="float12" column="FLOAT12"/>
-            <field name="float120" column="FLOAT120"/>
-            <field name="float121" column="FLOAT121"/>
-            <field name="float124" column="FLOAT124"/>
-            <field name="float125" column="FLOAT125"/>
-            <field name="float126" column="FLOAT126"/>
-            <field name="float128" column="FLOAT128"/>
-            <field name="float129" column="FLOAT129"/>
-            <field name="float13" column="FLOAT13"/>
-            <field name="float130" column="FLOAT130"/>
-            <field name="float138" column="FLOAT138"/>
-            <field name="float139" column="FLOAT139"/>
-            <field name="float140" column="FLOAT140"/>
-            <field name="float16" column="FLOAT16"/>
-            <field name="float17" column="FLOAT17"/>
-            <field name="float18" column="FLOAT18"/>
-            <field name="float2" column="FLOAT2"/>
-            <field name="float20" column="FLOAT20"/>
-            <field name="float21" column="FLOAT21"/>
-            <field name="float22" column="FLOAT22"/>
-            <field name="float30" column="FLOAT30"/>
-            <field name="float31" column="FLOAT31"/>
-            <field name="float32" column="FLOAT32"/>
-            <field name="float36" column="FLOAT36"/>
-            <field name="float37" column="FLOAT37"/>
-            <field name="float38" column="FLOAT38"/>
-            <field name="float4" column="FLOAT4"/>
-            <field name="float40" column="FLOAT40"/>
-            <field name="float41" column="FLOAT41"/>
-            <field name="float42" column="FLOAT42"/>
-            <field name="float47" column="FLOAT47"/>
-            <field name="float48" column="FLOAT48"/>
-            <field name="float49" column="FLOAT49"/>
-            <field name="float5" column="FLOAT5"/>
-            <field name="float52" column="FLOAT52"/>
-            <field name="float53" column="FLOAT53"/>
-            <field name="float54" column="FLOAT54"/>
-            <field name="float56" column="FLOAT56"/>
-            <field name="float57" column="FLOAT57"/>
-            <field name="float58" column="FLOAT58"/>
-            <field name="float6" column="FLOAT6"/>
-            <field name="float66" column="FLOAT66"/>
-            <field name="float67" column="FLOAT67"/>
-            <field name="float68" column="FLOAT68"/>
-            <field name="float72" column="FLOAT72"/>
-            <field name="float73" column="FLOAT73"/>
-            <field name="float74" column="FLOAT74"/>
-            <field name="float76" column="FLOAT76"/>
-            <field name="float77" column="FLOAT77"/>
-            <field name="float78" column="FLOAT78"/>
-            <field name="float83" column="FLOAT83"/>
-            <field name="float84" column="FLOAT84"/>
-            <field name="float85" column="FLOAT85"/>
-            <field name="float88" column="FLOAT88"/>
-            <field name="float89" column="FLOAT89"/>
-            <field name="float90" column="FLOAT90"/>
-            <field name="float92" column="FLOAT92"/>
-            <field name="float93" column="FLOAT93"/>
-            <field name="float94" column="FLOAT94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-derby.orm	(working copy)
@@ -1,81 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfLocale" table="FIELDSOFLOCALE">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="Locale0" column="LOCALE0"/>
-            <field name="Locale1" column="LOCALE1"/>
-            <field name="Locale102" column="LOCALE102"/>
-            <field name="Locale103" column="LOCALE103"/>
-            <field name="Locale104" column="LOCALE104"/>
-            <field name="Locale108" column="LOCALE108"/>
-            <field name="Locale109" column="LOCALE109"/>
-            <field name="Locale11" column="LOCALE11"/>
-            <field name="Locale110" column="LOCALE110"/>
-            <field name="Locale112" column="LOCALE112"/>
-            <field name="Locale113" column="LOCALE113"/>
-            <field name="Locale114" column="LOCALE114"/>
-            <field name="Locale119" column="LOCALE119"/>
-            <field name="Locale12" column="LOCALE12"/>
-            <field name="Locale120" column="LOCALE120"/>
-            <field name="Locale121" column="LOCALE121"/>
-            <field name="Locale124" column="LOCALE124"/>
-            <field name="Locale125" column="LOCALE125"/>
-            <field name="Locale126" column="LOCALE126"/>
-            <field name="Locale128" column="LOCALE128"/>
-            <field name="Locale129" column="LOCALE129"/>
-            <field name="Locale13" column="LOCALE13"/>
-            <field name="Locale130" column="LOCALE130"/>
-            <field name="Locale138" column="LOCALE138"/>
-            <field name="Locale139" column="LOCALE139"/>
-            <field name="Locale140" column="LOCALE140"/>
-            <field name="Locale16" column="LOCALE16"/>
-            <field name="Locale17" column="LOCALE17"/>
-            <field name="Locale18" column="LOCALE18"/>
-            <field name="Locale2" column="LOCALE2"/>
-            <field name="Locale20" column="LOCALE20"/>
-            <field name="Locale21" column="LOCALE21"/>
-            <field name="Locale22" column="LOCALE22"/>
-            <field name="Locale30" column="LOCALE30"/>
-            <field name="Locale31" column="LOCALE31"/>
-            <field name="Locale32" column="LOCALE32"/>
-            <field name="Locale36" column="LOCALE36"/>
-            <field name="Locale37" column="LOCALE37"/>
-            <field name="Locale38" column="LOCALE38"/>
-            <field name="Locale4" column="LOCALE4"/>
-            <field name="Locale40" column="LOCALE40"/>
-            <field name="Locale41" column="LOCALE41"/>
-            <field name="Locale42" column="LOCALE42"/>
-            <field name="Locale47" column="LOCALE47"/>
-            <field name="Locale48" column="LOCALE48"/>
-            <field name="Locale49" column="LOCALE49"/>
-            <field name="Locale5" column="LOCALE5"/>
-            <field name="Locale52" column="LOCALE52"/>
-            <field name="Locale53" column="LOCALE53"/>
-            <field name="Locale54" column="LOCALE54"/>
-            <field name="Locale56" column="LOCALE56"/>
-            <field name="Locale57" column="LOCALE57"/>
-            <field name="Locale58" column="LOCALE58"/>
-            <field name="Locale6" column="LOCALE6"/>
-            <field name="Locale66" column="LOCALE66"/>
-            <field name="Locale67" column="LOCALE67"/>
-            <field name="Locale68" column="LOCALE68"/>
-            <field name="Locale72" column="LOCALE72"/>
-            <field name="Locale73" column="LOCALE73"/>
-            <field name="Locale74" column="LOCALE74"/>
-            <field name="Locale76" column="LOCALE76"/>
-            <field name="Locale77" column="LOCALE77"/>
-            <field name="Locale78" column="LOCALE78"/>
-            <field name="Locale83" column="LOCALE83"/>
-            <field name="Locale84" column="LOCALE84"/>
-            <field name="Locale85" column="LOCALE85"/>
-            <field name="Locale88" column="LOCALE88"/>
-            <field name="Locale89" column="LOCALE89"/>
-            <field name="Locale90" column="LOCALE90"/>
-            <field name="Locale92" column="LOCALE92"/>
-            <field name="Locale93" column="LOCALE93"/>
-            <field name="Locale94" column="LOCALE94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-derby.orm	(working copy)
@@ -1,11 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="SimpleClass" table="SIMPLE_CLASS">
-            <field name="id" primary-key="true" column="IDENTIFIER"/>
-            <field name="intField" column="INTVAL"/>
-            <field name="stringField" column="STRINGVAL"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm	(working copy)
@@ -1,568 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="TreeMapStringValueCollections"
-               table="TREEMAPSTRINGVALUE_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
-            <field name="TreeMapOfObject_String0" table="TREEMAP_OBJECT0_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfObject_String1" table="TREEMAP_OBJECT1_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfObject_String2" table="TREEMAP_OBJECT2_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfObject_String3"
-                   table="TREEMAP_OBJECT3_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfObject_String4"
-                   table="TREEMAP_OBJECT4_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfObject_String6"
-                   table="TREEMAP_OBJECT6_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfObject_String8"
-                   column="TREEMAP_OBJECT8_STR">
-            </field>
-            <field name="TreeMapOfSimpleClass_String9"
-                   table="TREEMAP_SIMPLE_CLASS9_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleClass_String10"
-                   table="TREEMAP_SIMPLE_CLASS10_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleClass_String11"
-                   table="TREEMAP_SIMPLE_CLASS11_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleClass_String12"
-                   table="TREEMAP_SIMPLE_CLASS12_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleClass_String13"
-                   table="TREEMAP_SIMPLE_CLASS13_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleClass_String15"
-                   table="TREEMAP_SIMPLE_CLASS15_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleClass_String17"
-                   column="TREEMAP_SIMPLE_CLASS17_STR">
-            </field>
-            <field name="TreeMapOfSimpleInterface_String18"
-                   table="TREEMAP_SIMPLE_INTERFACE18_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleInterface_String19"
-                   table="TREEMAP_SIMPLE_INTERFACE19_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleInterface_String20"
-                   table="TREEMAP_SIMPLE_INTERFACE20_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleInterface_String21"
-                   table="TREEMAP_SIMPLE_INTERFACE21_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleInterface_String22"
-                   table="TREEMAP_SIMPLE_INTERFACE22_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleInterface_String24"
-                   table="TREEMAP_SIMPLE_INTERFACE24_STR">
-                <join column="IDENTIFIER"/>
-                <key>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleInterface_String26"
-                   column="TREEMAP_SIMPLE_INTERFACE26_STR">
-            </field>
-            <field name="TreeMapOfString_String27"
-                   table="TREEMAP_STRING27_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_String28"
-                   table="TREEMAP_STRING28_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_String29"
-                   table="TREEMAP_STRING29_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_String30"
-                   table="TREEMAP_STRING30_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_String31"
-                   table="TREEMAP_STRING31_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_String33"
-                   table="TREEMAP_STRING33_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfString_String35"
-                   column="TREEMAP_STRING35_STR">
-            </field>
-            <field name="TreeMapOfDate_String36"
-                   table="TREEMAP_DATE36_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDate_String37"
-                   table="TREEMAP_DATE37_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDate_String38"
-                   table="TREEMAP_DATE38_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDate_String39"
-                   table="TREEMAP_DATE39_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDate_String40"
-                   table="TREEMAP_DATE40_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDate_String42"
-                   table="TREEMAP_DATE42_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDate_String44"
-                   column="TREEMAP_DATE44_STR">
-            </field>
-            <field name="TreeMapOfBigDecimal_String45"
-                   table="TREEMAP_BIG_DECIMAL45_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigDecimal_String46"
-                   table="TREEMAP_BIG_DECIMAL46_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigDecimal_String47"
-                   table="TREEMAP_BIG_DECIMAL47_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigDecimal_String48"
-                   table="TREEMAP_BIG_DECIMAL48_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigDecimal_String49"
-                   table="TREEMAP_BIG_DECIMAL49_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigDecimal_String51"
-                   table="TREEMAP_BIG_DECIMAL51_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigDecimal_String53"
-                   column="TREEMAP_BIG_DECIMAL53_STR">
-            </field>
-            <field name="TreeMapOfBigInteger_String54"
-                   table="TREEMAP_BIG_INTEGER54_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigInteger_String55"
-                   table="TREEMAP_BIG_INTEGER55_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigInteger_String56"
-                   table="TREEMAP_BIG_INTEGER56_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigInteger_String57"
-                   table="TREEMAP_BIG_INTEGER57_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigInteger_String58"
-                   table="TREEMAP_BIG_INTEGER58_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigInteger_String60"
-                   table="TREEMAP_BIG_INTEGER60_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfBigInteger_String62"
-                   column="TREEMAP_BIG_INTEGER62_STR">
-            </field>
-            <field name="TreeMapOfByte_String63"
-                   table="TREEMAP_BYTE63_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfByte_String64"
-                   table="TREEMAP_BYTE64_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfByte_String65"
-                   table="TREEMAP_BYTE65_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfByte_String66"
-                   table="TREEMAP_BYTE66_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfByte_String67"
-                   table="TREEMAP_BYTE67_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfByte_String69"
-                   table="TREEMAP_BYTE69_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfByte_String71"
-                   column="TREEMAP_BYTE71_STR">
-            </field>
-            <field name="TreeMapOfDouble_String72"
-                   table="TREEMAP_DOUBLE72_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDouble_String73"
-                   table="TREEMAP_DOUBLE73_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDouble_String74"
-                   table="TREEMAP_DOUBLE74_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDouble_String75"
-                   table="TREEMAP_DOUBLE75_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDouble_String76"
-                   table="TREEMAP_DOUBLE76_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDouble_String78"
-                   table="TREEMAP_DOUBLE78_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfDouble_String80"
-                   column="TREEMAP_DOUBLE80_STR">
-            </field>
-            <field name="TreeMapOfFloat_String81"
-                   table="TREEMAP_FLOAT81_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfFloat_String82"
-                   table="TREEMAP_FLOAT82_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfFloat_String83"
-                   table="TREEMAP_FLOAT83_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfFloat_String84"
-                   table="TREEMAP_FLOAT84_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfFloat_String85"
-                   table="TREEMAP_FLOAT85_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfFloat_String87"
-                   table="TREEMAP_FLOAT87_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfFloat_String89"
-                   column="TREEMAP_FLOAT89_STR">
-            </field>
-            <field name="TreeMapOfInteger_String90"
-                   table="TREEMAP_INTEGER90_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfInteger_String91"
-                   table="TREEMAP_INTEGER91_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfInteger_String92"
-                   table="TREEMAP_INTEGER92_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfInteger_String93"
-                   table="TREEMAP_INTEGER93_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfInteger_String94"
-                   table="TREEMAP_INTEGER94_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfInteger_String96"
-                   table="TREEMAP_INTEGER96_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfInteger_String98"
-                   column="TREEMAP_INTEGER98_STR">
-            </field>
-            <field name="TreeMapOfLong_String99"
-                   table="TREEMAP_LONG99_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfLong_String100"
-                   table="TREEMAP_LONG100_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfLong_String101"
-                   table="TREEMAP_LONG101_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfLong_String102"
-                   table="TREEMAP_LONG102_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfLong_String103"
-                   table="TREEMAP_LONG103_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfLong_String105"
-                   table="TREEMAP_LONG105_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfLong_String107"
-                   column="TREEMAP_LONG107_STR">
-            </field>
-            <field name="TreeMapOfShort_String108"
-                   table="TREEMAP_SHORT108_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfShort_String109"
-                   table="TREEMAP_SHORT109_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfShort_String110"
-                   table="TREEMAP_SHORT110_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfShort_String111"
-                   table="TREEMAP_SHORT111_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfShort_String112"
-                   table="TREEMAP_SHORT112_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfShort_String114"
-                   table="TREEMAP_SHORT114_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfShort_String116"
-                   column="TREEMAP_SHORT116_STR">
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-derby.orm	(working copy)
@@ -1,81 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfDate" table="FIELDSOFDATE">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="Date0" column="DATE0"/>
-            <field name="Date1" column="DATE1"/>
-            <field name="Date102" column="DATE102"/>
-            <field name="Date103" column="DATE103"/>
-            <field name="Date104" column="DATE104"/>
-            <field name="Date108" column="DATE108"/>
-            <field name="Date109" column="DATE109"/>
-            <field name="Date11" column="DATE11"/>
-            <field name="Date110" column="DATE110"/>
-            <field name="Date112" column="DATE112"/>
-            <field name="Date113" column="DATE113"/>
-            <field name="Date114" column="DATE114"/>
-            <field name="Date119" column="DATE119"/>
-            <field name="Date12" column="DATE12"/>
-            <field name="Date120" column="DATE120"/>
-            <field name="Date121" column="DATE121"/>
-            <field name="Date124" column="DATE124"/>
-            <field name="Date125" column="DATE125"/>
-            <field name="Date126" column="DATE126"/>
-            <field name="Date128" column="DATE128"/>
-            <field name="Date129" column="DATE129"/>
-            <field name="Date13" column="DATE13"/>
-            <field name="Date130" column="DATE130"/>
-            <field name="Date138" column="DATE138"/>
-            <field name="Date139" column="DATE139"/>
-            <field name="Date140" column="DATE140"/>
-            <field name="Date16" column="DATE16"/>
-            <field name="Date17" column="DATE17"/>
-            <field name="Date18" column="DATE18"/>
-            <field name="Date2" column="DATE2"/>
-            <field name="Date20" column="DATE20"/>
-            <field name="Date21" column="DATE21"/>
-            <field name="Date22" column="DATE22"/>
-            <field name="Date30" column="DATE30"/>
-            <field name="Date31" column="DATE31"/>
-            <field name="Date32" column="DATE32"/>
-            <field name="Date36" column="DATE36"/>
-            <field name="Date37" column="DATE37"/>
-            <field name="Date38" column="DATE38"/>
-            <field name="Date4" column="DATE4"/>
-            <field name="Date40" column="DATE40"/>
-            <field name="Date41" column="DATE41"/>
-            <field name="Date42" column="DATE42"/>
-            <field name="Date47" column="DATE47"/>
-            <field name="Date48" column="DATE48"/>
-            <field name="Date49" column="DATE49"/>
-            <field name="Date5" column="DATE5"/>
-            <field name="Date52" column="DATE52"/>
-            <field name="Date53" column="DATE53"/>
-            <field name="Date54" column="DATE54"/>
-            <field name="Date56" column="DATE56"/>
-            <field name="Date57" column="DATE57"/>
-            <field name="Date58" column="DATE58"/>
-            <field name="Date6" column="DATE6"/>
-            <field name="Date66" column="DATE66"/>
-            <field name="Date67" column="DATE67"/>
-            <field name="Date68" column="DATE68"/>
-            <field name="Date72" column="DATE72"/>
-            <field name="Date73" column="DATE73"/>
-            <field name="Date74" column="DATE74"/>
-            <field name="Date76" column="DATE76"/>
-            <field name="Date77" column="DATE77"/>
-            <field name="Date78" column="DATE78"/>
-            <field name="Date83" column="DATE83"/>
-            <field name="Date84" column="DATE84"/>
-            <field name="Date85" column="DATE85"/>
-            <field name="Date88" column="DATE88"/>
-            <field name="Date89" column="DATE89"/>
-            <field name="Date90" column="DATE90"/>
-            <field name="Date92" column="DATE92"/>
-            <field name="Date93" column="DATE93"/>
-            <field name="Date94" column="DATE94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm	(working copy)
@@ -1,249 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="CollectionCollections" table="COLLECTION_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
-            <field name="CollectionOfObject0"
-                   table="COLLECTION_OF_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfObject1"
-                   table="COLLECTION_OF_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfObject2"
-                   table="COLLECTION_OF_OBJECT2">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfSimpleClass3"
-                   table="COLLECTION_OF_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfSimpleClass4"
-                   table="COLLECTION_OF_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfSimpleClass5"
-                   table="COLLECTION_OF_SIMPLE_CLASS5">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfSimpleClass42"
-                   column="COLLECTION_OF_SIMPLE_CLASS42">
-            </field>
-            <field name="CollectionOfSimpleInterface6"
-                   table="COLLECTION_OF_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfSimpleInterface7"
-                   table="COLLECTION_OF_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfSimpleInterface8"
-                   table="COLLECTION_OF_SIMPLE_INTERFACE8">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfString9"
-                   table="COLLECTION_OF_STRING9">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfString11"
-                   column="COLLECTION_OF_STRING11">
-            </field>
-            <field name="CollectionOfString10"
-                   table="COLLECTION_OF_STRING10">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfDate12"
-                   table="COLLECTION_OF_DATE12">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfDate14"
-                   column="COLLECTION_OF_DATE14">
-            </field>
-            <field name="CollectionOfDate13"
-                   table="COLLECTION_OF_DATE13">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfLocale15"
-                   table="COLLECTION_OF_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfLocale17"
-                   column="COLLECTION_OF_LOCALE17">
-            </field>
-            <field name="CollectionOfLocale16"
-                   table="COLLECTION_OF_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfBigDecimal18"
-                   table="COLLECTION_OF_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfBigDecimal20"
-                   column="COLLECTION_OF_BIG_DECIMAL20">
-            </field>
-            <field name="CollectionOfBigDecimal19"
-                   table="COLLECTION_OF_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfBigInteger21"
-                   table="COLLECTION_OF_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfBigInteger23"
-                   column="COLLECTION_OF_BIG_INTEGER23">
-            </field>
-            <field name="CollectionOfBigInteger22"
-                   table="COLLECTION_OF_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfByte24"
-                   table="COLLECTION_OF_BYTE24">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfByte26"
-                   column="COLLECTION_OF_BYTE26">
-            </field>
-            <field name="CollectionOfByte25"
-                   table="COLLECTION_OF_BYTE25">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfDouble27"
-                   table="COLLECTION_OF_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfDouble29"
-                   column="COLLECTION_OF_DOUBLE29">
-            </field>
-            <field name="CollectionOfDouble28"
-                   table="COLLECTION_OF_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfFloat30"
-                   table="COLLECTION_OF_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfFloat32"
-                   column="COLLECTION_OF_FLOAT32">
-            </field>
-            <field name="CollectionOfFloat31"
-                   table="COLLECTION_OF_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfInteger33"
-                   table="COLLECTION_OF_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfInteger35"
-                   column="COLLECTION_OF_INTEGER35">
-            </field>
-            <field name="CollectionOfInteger34"
-                   table="COLLECTION_OF_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfLong36"
-                   table="COLLECTION_OF_LONG36">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfLong38"
-                   column="COLLECTION_OF_LONG38">
-            </field>
-            <field name="CollectionOfLong37"
-                   table="COLLECTION_OF_LONG37">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfShort39"
-                   table="COLLECTION_OF_SHORT39">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="CollectionOfShort41"
-                   column="COLLECTION_OF_SHORT41">
-            </field>
-            <field name="CollectionOfShort40"
-                   table="COLLECTION_OF_SHORT40">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-derby.orm	(working copy)
@@ -1,222 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfBigDecimal" table="FIELDSOFBIGDECIMAL">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="BigDecimal1">
-                <column name="BIG_DECIMAL1" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal102">
-                <column name="BIG_DECIMAL102" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal103">
-                <column name="BIG_DECIMAL103" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal104">
-                <column name="BIG_DECIMAL104" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal108">
-                <column name="BIG_DECIMAL108" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal109">
-                <column name="BIG_DECIMAL109" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal11">
-                <column name="BIG_DECIMAL11" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal110">
-                <column name="BIG_DECIMAL110" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal112">
-                <column name="BIG_DECIMAL112" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal113">
-                <column name="BIG_DECIMAL113" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal114">
-                <column name="BIG_DECIMAL114" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal119">
-                <column name="BIG_DECIMAL119" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal12">
-                <column name="BIG_DECIMAL12" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal120">
-                <column name="BIG_DECIMAL120" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal121">
-                <column name="BIG_DECIMAL121" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal124">
-                <column name="BIG_DECIMAL124" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal125">
-                <column name="BIG_DECIMAL125" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal126">
-                <column name="BIG_DECIMAL126" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal128">
-                <column name="BIG_DECIMAL128" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal129">
-                <column name="BIG_DECIMAL129" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal13">
-                <column name="BIG_DECIMAL13" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal130">
-                <column name="BIG_DECIMAL130" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal138">
-                <column name="BIG_DECIMAL138" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal139">
-                <column name="BIG_DECIMAL139" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal140">
-                <column name="BIG_DECIMAL140" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal16">
-                <column name="BIG_DECIMAL16" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal17">
-                <column name="BIG_DECIMAL17" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal18">
-                <column name="BIG_DECIMAL18" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal2">
-                <column name="BIG_DECIMAL2" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal20">
-                <column name="BIG_DECIMAL20" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal21">
-                <column name="BIG_DECIMAL21" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal22">
-                <column name="BIG_DECIMAL22" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal30">
-                <column name="BIG_DECIMAL30" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal31">
-                <column name="BIG_DECIMAL31" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal32">
-                <column name="BIG_DECIMAL32" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal36">
-                <column name="BIG_DECIMAL36" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal37">
-                <column name="BIG_DECIMAL37" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal38">
-                <column name="BIG_DECIMAL38" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal4">
-                <column name="BIG_DECIMAL4" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal40">
-                <column name="BIG_DECIMAL40" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal41">
-                <column name="BIG_DECIMAL41" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal42">
-                <column name="BIG_DECIMAL42" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal47">
-                <column name="BIG_DECIMAL47" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal48">
-                <column name="BIG_DECIMAL48" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal49">
-                <column name="BIG_DECIMAL49" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal5">
-                <column name="BIG_DECIMAL5" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal52">
-                <column name="BIG_DECIMAL52" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal53">
-                <column name="BIG_DECIMAL53" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal54">
-                <column name="BIG_DECIMAL54" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal56">
-                <column name="BIG_DECIMAL56" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal57">
-                <column name="BIG_DECIMAL57" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal58">
-                <column name="BIG_DECIMAL58" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal6">
-                <column name="BIG_DECIMAL6" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal66">
-                <column name="BIG_DECIMAL66" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal67">
-                <column name="BIG_DECIMAL67" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal68">
-                <column name="BIG_DECIMAL68" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal72">
-                <column name="BIG_DECIMAL72" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal73">
-                <column name="BIG_DECIMAL73" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal74">
-                <column name="BIG_DECIMAL74" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal76">
-                <column name="BIG_DECIMAL76" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal77">
-                <column name="BIG_DECIMAL77" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal78">
-                <column name="BIG_DECIMAL78" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal83">
-                <column name="BIG_DECIMAL83" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal84">
-                <column name="BIG_DECIMAL84" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal85">
-                <column name="BIG_DECIMAL85" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal88">
-                <column name="BIG_DECIMAL88" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal89">
-                <column name="BIG_DECIMAL89" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal90">
-                <column name="BIG_DECIMAL90" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal92">
-                <column name="BIG_DECIMAL92" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal93">
-                <column name="BIG_DECIMAL93" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-            <field name="BigDecimal94">
-                <column name="BIG_DECIMAL94" jdbc-type="DECIMAL" length="11" scale="4"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm	(working copy)
@@ -1,36 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="AllTypes" table="ALLTYPES">
-            <field name="id" column="ID" primary-key="true"/>
-            <field name="fld_boolean" column="PRIMITIVEBOOLEAN"/>
-            <field name="fld_byte" column="PRIMITIVEBYTE"/>
-            <field name="fld_char">
-                <column name="PRIMITIVECHAR" jdbc-type="INTEGER"/>
-            </field>
-            <field name="fld_double" column="PRIMITIVEDOUBLE"/>
-            <field name="fld_float" column="PRIMITIVEFLOAT"/>
-            <field name="fld_int" column="PRIMITIVEINT"/>
-            <field name="fld_long" column="PRIMITIVELONG"/>
-            <field name="fld_short" column="PRIMITIVESHORT"/>
-            <field name="fld_Boolean" column="BOOLEANVAL"/>
-            <field name="fld_Byte" column="BYTEVAL"/>
-            <field name="fld_Character">
-                <column name="CHARACTERVAL" jdbc-type="INTEGER"/>
-            </field>
-            <field name="fld_Double" column="DOUBLEVAL"/>
-            <field name="fld_Float" column="FLOATVAL"/>
-            <field name="fld_Integer" column="INTEGERVAL"/>
-            <field name="fld_Long" column="LONGVAL"/>
-            <field name="fld_Short" column="SHORTVAL"/>
-            <field name="fld_String" column="STRINGVAL"/>
-            <field name="fld_Locale" column="LOCALEVAL"/>
-            <field name="fld_Date" column="DATEVAL"/>
-            <field name="fld_BigDecimal">
-                <column name="BIGDECIMALVAL" jdbc-type="DECIMAL" length="25" scale="10"/>
-            </field>
-            <field name="fld_BigInteger" column="BIGINTEGERVAL"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm	(working copy)
@@ -1,212 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="HashSetCollections" table="HASHSET_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
-            <field name="HashSetOfObject0"
-                   table="HASHSET_OF_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-            </field>
-            <field name="HashSetOfObject1"
-                   table="HASHSET_OF_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-            </field>
-            <field name="HashSetOfObject2"
-                   column="HASHSET_OF_OBJECT2">
-            </field>
-            <field name="HashSetOfSimpleClass3"
-                   table="HASHSET_OF_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-            </field>
-            <field name="HashSetOfSimpleClass4"
-                   table="HASHSET_OF_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-            </field>
-            <field name="HashSetOfSimpleClass5"
-                   column="HASHSET_OF_SIMPLE_CLASS5">
-            </field>
-            <field name="HashSetOfSimpleClass42"
-                   column="HASHSET_OF_SIMPLE_CLASS42">
-            </field>
-            <field name="HashSetOfSimpleInterface6"
-                   table="HASHSET_OF_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-            </field>
-            <field name="HashSetOfSimpleInterface7"
-                   table="HASHSET_OF_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-            </field>
-            <field name="HashSetOfSimpleInterface8"
-                   column="HASHSET_OF_SIMPLE_INTERFACE8">
-            </field>
-            <field name="HashSetOfString9"
-                   table="HASHSET_OF_STRING9">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-            </field>
-            <field name="HashSetOfString11"
-                   column="HASHSET_OF_STRING11">
-            </field>
-            <field name="HashSetOfString10"
-                   table="HASHSET_OF_STRING10">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-            </field>
-            <field name="HashSetOfDate12"
-                   table="HASHSET_OF_DATE12">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-            </field>
-            <field name="HashSetOfDate14"
-                   column="HASHSET_OF_DATE14">
-            </field>
-            <field name="HashSetOfDate13"
-                   table="HASHSET_OF_DATE13">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-            </field>
-            <field name="HashSetOfLocale15"
-                   table="HASHSET_OF_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-            </field>
-            <field name="HashSetOfLocale17"
-                   column="HASHSET_OF_LOCALE17">
-            </field>
-            <field name="HashSetOfLocale16"
-                   table="HASHSET_OF_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-            </field>
-            <field name="HashSetOfBigDecimal18"
-                   table="HASHSET_OF_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-            </field>
-            <field name="HashSetOfBigDecimal20"
-                   column="HASHSET_OF_BIG_DECIMAL20">
-            </field>
-            <field name="HashSetOfBigDecimal19"
-                   table="HASHSET_OF_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-            </field>
-            <field name="HashSetOfBigInteger21"
-                   table="HASHSET_OF_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-            </field>
-            <field name="HashSetOfBigInteger23"
-                   column="HASHSET_OF_BIG_INTEGER23">
-            </field>
-            <field name="HashSetOfBigInteger22"
-                   table="HASHSET_OF_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-            </field>
-            <field name="HashSetOfByte24"
-                   table="HASHSET_OF_BYTE24">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-            </field>
-            <field name="HashSetOfByte26"
-                   column="HASHSET_OF_BYTE26">
-            </field>
-            <field name="HashSetOfByte25"
-                   table="HASHSET_OF_BYTE25">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-            </field>
-            <field name="HashSetOfDouble27"
-                   table="HASHSET_OF_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-            </field>
-            <field name="HashSetOfDouble29"
-                   column="HASHSET_OF_DOUBLE29">
-            </field>
-            <field name="HashSetOfDouble28"
-                   table="HASHSET_OF_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-            </field>
-            <field name="HashSetOfFloat30"
-                   table="HASHSET_OF_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-            </field>
-            <field name="HashSetOfFloat32"
-                   column="HASHSET_OF_FLOAT32">
-            </field>
-            <field name="HashSetOfFloat31"
-                   table="HASHSET_OF_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-            </field>
-            <field name="HashSetOfInteger33"
-                   table="HASHSET_OF_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-            </field>
-            <field name="HashSetOfInteger35"
-                   column="HASHSET_OF_INTEGER35">
-            </field>
-            <field name="HashSetOfInteger34"
-                   table="HASHSET_OF_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-            </field>
-            <field name="HashSetOfLong36"
-                   table="HASHSET_OF_LONG36">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-            </field>
-            <field name="HashSetOfLong38"
-                   column="HASHSET_OF_LONG38">
-            </field>
-            <field name="HashSetOfLong37"
-                   table="HASHSET_OF_LONG37">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-            </field>
-            <field name="HashSetOfShort39"
-                   table="HASHSET_OF_SHORT39">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-            </field>
-            <field name="HashSetOfShort41"
-                   column="HASHSET_OF_SHORT41">
-            </field>
-            <field name="HashSetOfShort40"
-                   table="HASHSET_OF_SHORT40">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-derby.orm	(working copy)
@@ -1,81 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfPrimitivelong" table="FIELDSOFPRIMITIVELONG">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="long0" column="LONG0"/>
-            <field name="long1" column="LONG1"/>
-            <field name="long102" column="LONG102"/>
-            <field name="long103" column="LONG103"/>
-            <field name="long104" column="LONG104"/>
-            <field name="long108" column="LONG108"/>
-            <field name="long109" column="LONG109"/>
-            <field name="long11" column="LONG11"/>
-            <field name="long110" column="LONG110"/>
-            <field name="long112" column="LONG112"/>
-            <field name="long113" column="LONG113"/>
-            <field name="long114" column="LONG114"/>
-            <field name="long119" column="LONG119"/>
-            <field name="long12" column="LONG12"/>
-            <field name="long120" column="LONG120"/>
-            <field name="long121" column="LONG121"/>
-            <field name="long124" column="LONG124"/>
-            <field name="long125" column="LONG125"/>
-            <field name="long126" column="LONG126"/>
-            <field name="long128" column="LONG128"/>
-            <field name="long129" column="LONG129"/>
-            <field name="long13" column="LONG13"/>
-            <field name="long130" column="LONG130"/>
-            <field name="long138" column="LONG138"/>
-            <field name="long139" column="LONG139"/>
-            <field name="long140" column="LONG140"/>
-            <field name="long16" column="LONG16"/>
-            <field name="long17" column="LONG17"/>
-            <field name="long18" column="LONG18"/>
-            <field name="long2" column="LONG2"/>
-            <field name="long20" column="LONG20"/>
-            <field name="long21" column="LONG21"/>
-            <field name="long22" column="LONG22"/>
-            <field name="long30" column="LONG30"/>
-            <field name="long31" column="LONG31"/>
-            <field name="long32" column="LONG32"/>
-            <field name="long36" column="LONG36"/>
-            <field name="long37" column="LONG37"/>
-            <field name="long38" column="LONG38"/>
-            <field name="long4" column="LONG4"/>
-            <field name="long40" column="LONG40"/>
-            <field name="long41" column="LONG41"/>
-            <field name="long42" column="LONG42"/>
-            <field name="long47" column="LONG47"/>
-            <field name="long48" column="LONG48"/>
-            <field name="long49" column="LONG49"/>
-            <field name="long5" column="LONG5"/>
-            <field name="long52" column="LONG52"/>
-            <field name="long53" column="LONG53"/>
-            <field name="long54" column="LONG54"/>
-            <field name="long56" column="LONG56"/>
-            <field name="long57" column="LONG57"/>
-            <field name="long58" column="LONG58"/>
-            <field name="long6" column="LONG6"/>
-            <field name="long66" column="LONG66"/>
-            <field name="long67" column="LONG67"/>
-            <field name="long68" column="LONG68"/>
-            <field name="long72" column="LONG72"/>
-            <field name="long73" column="LONG73"/>
-            <field name="long74" column="LONG74"/>
-            <field name="long76" column="LONG76"/>
-            <field name="long77" column="LONG77"/>
-            <field name="long78" column="LONG78"/>
-            <field name="long83" column="LONG83"/>
-            <field name="long84" column="LONG84"/>
-            <field name="long85" column="LONG85"/>
-            <field name="long88" column="LONG88"/>
-            <field name="long89" column="LONG89"/>
-            <field name="long90" column="LONG90"/>
-            <field name="long92" column="LONG92"/>
-            <field name="long93" column="LONG93"/>
-            <field name="long94" column="LONG94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-derby.orm	(working copy)
@@ -1,81 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfPrimitivebyte" table="FIELDSOFPRIMITIVEBYTE">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="byte0" column="BYTE0"/>
-            <field name="byte1" column="BYTE1"/>
-            <field name="byte102" column="BYTE102"/>
-            <field name="byte103" column="BYTE103"/>
-            <field name="byte104" column="BYTE104"/>
-            <field name="byte108" column="BYTE108"/>
-            <field name="byte109" column="BYTE109"/>
-            <field name="byte11" column="BYTE11"/>
-            <field name="byte110" column="BYTE110"/>
-            <field name="byte112" column="BYTE112"/>
-            <field name="byte113" column="BYTE113"/>
-            <field name="byte114" column="BYTE114"/>
-            <field name="byte119" column="BYTE119"/>
-            <field name="byte12" column="BYTE12"/>
-            <field name="byte120" column="BYTE120"/>
-            <field name="byte121" column="BYTE121"/>
-            <field name="byte124" column="BYTE124"/>
-            <field name="byte125" column="BYTE125"/>
-            <field name="byte126" column="BYTE126"/>
-            <field name="byte128" column="BYTE128"/>
-            <field name="byte129" column="BYTE129"/>
-            <field name="byte13" column="BYTE13"/>
-            <field name="byte130" column="BYTE130"/>
-            <field name="byte138" column="BYTE138"/>
-            <field name="byte139" column="BYTE139"/>
-            <field name="byte140" column="BYTE140"/>
-            <field name="byte16" column="BYTE16"/>
-            <field name="byte17" column="BYTE17"/>
-            <field name="byte18" column="BYTE18"/>
-            <field name="byte2" column="BYTE2"/>
-            <field name="byte20" column="BYTE20"/>
-            <field name="byte21" column="BYTE21"/>
-            <field name="byte22" column="BYTE22"/>
-            <field name="byte30" column="BYTE30"/>
-            <field name="byte31" column="BYTE31"/>
-            <field name="byte32" column="BYTE32"/>
-            <field name="byte36" column="BYTE36"/>
-            <field name="byte37" column="BYTE37"/>
-            <field name="byte38" column="BYTE38"/>
-            <field name="byte4" column="BYTE4"/>
-            <field name="byte40" column="BYTE40"/>
-            <field name="byte41" column="BYTE41"/>
-            <field name="byte42" column="BYTE42"/>
-            <field name="byte47" column="BYTE47"/>
-            <field name="byte48" column="BYTE48"/>
-            <field name="byte49" column="BYTE49"/>
-            <field name="byte5" column="BYTE5"/>
-            <field name="byte52" column="BYTE52"/>
-            <field name="byte53" column="BYTE53"/>
-            <field name="byte54" column="BYTE54"/>
-            <field name="byte56" column="BYTE56"/>
-            <field name="byte57" column="BYTE57"/>
-            <field name="byte58" column="BYTE58"/>
-            <field name="byte6" column="BYTE6"/>
-            <field name="byte66" column="BYTE66"/>
-            <field name="byte67" column="BYTE67"/>
-            <field name="byte68" column="BYTE68"/>
-            <field name="byte72" column="BYTE72"/>
-            <field name="byte73" column="BYTE73"/>
-            <field name="byte74" column="BYTE74"/>
-            <field name="byte76" column="BYTE76"/>
-            <field name="byte77" column="BYTE77"/>
-            <field name="byte78" column="BYTE78"/>
-            <field name="byte83" column="BYTE83"/>
-            <field name="byte84" column="BYTE84"/>
-            <field name="byte85" column="BYTE85"/>
-            <field name="byte88" column="BYTE88"/>
-            <field name="byte89" column="BYTE89"/>
-            <field name="byte90" column="BYTE90"/>
-            <field name="byte92" column="BYTE92"/>
-            <field name="byte93" column="BYTE93"/>
-            <field name="byte94" column="BYTE94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm	(working copy)
@@ -1,249 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="ListCollections" table="LIST_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
-            <field name="ListOfObject0"
-                   table="LIST_OF_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfObject1"
-                   table="LIST_OF_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfObject2"
-                   table="LIST_OF_OBJECT2">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfSimpleClass3"
-                   table="LIST_OF_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfSimpleClass4"
-                   table="LIST_OF_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfSimpleClass5"
-                   table="LIST_OF_SIMPLE_CLASS5">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfSimpleClass42"
-                   column="LIST_OF_SIMPLE_CLASS42">
-            </field>
-            <field name="ListOfSimpleInterface6"
-                   table="LIST_OF_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfSimpleInterface7"
-                   table="LIST_OF_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
-                <element>
-                  <embedded>
-                    <field name="id" column="ID"/>
-                    <field name="intField" column="INTVAL"/>
-                    <field name="stringField" column="STRINGVAL"/>
-                  </embedded>
-                </element>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfSimpleInterface8"
-                   table="LIST_OF_SIMPLE_INTERFACE8">
-                <join column="IDENTIFIER"/>
-                <element column="COLLVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfString9"
-                   table="LIST_OF_STRING9">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfString11"
-                   column="LIST_OF_STRING11">
-            </field>
-            <field name="ListOfString10"
-                   table="LIST_OF_STRING10">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfDate12"
-                   table="LIST_OF_DATE12">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfDate14"
-                   column="LIST_OF_DATE14">
-            </field>
-            <field name="ListOfDate13"
-                   table="LIST_OF_DATE13">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfLocale15"
-                   table="LIST_OF_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfLocale17"
-                   column="LIST_OF_LOCALE17">
-            </field>
-            <field name="ListOfLocale16"
-                   table="LIST_OF_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfBigDecimal18"
-                   table="LIST_OF_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfBigDecimal20"
-                   column="LIST_OF_BIG_DECIMAL20">
-            </field>
-            <field name="ListOfBigDecimal19"
-                   table="LIST_OF_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfBigInteger21"
-                   table="LIST_OF_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfBigInteger23"
-                   column="LIST_OF_BIG_INTEGER23">
-            </field>
-            <field name="ListOfBigInteger22"
-                   table="LIST_OF_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfByte24"
-                   table="LIST_OF_BYTE24">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfByte26"
-                   column="LIST_OF_BYTE26">
-            </field>
-            <field name="ListOfByte25"
-                   table="LIST_OF_BYTE25">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfDouble27"
-                   table="LIST_OF_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfDouble29"
-                   column="LIST_OF_DOUBLE29">
-            </field>
-            <field name="ListOfDouble28"
-                   table="LIST_OF_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfFloat30"
-                   table="LIST_OF_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfFloat32"
-                   column="LIST_OF_FLOAT32">
-            </field>
-            <field name="ListOfFloat31"
-                   table="LIST_OF_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfInteger33"
-                   table="LIST_OF_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfInteger35"
-                   column="LIST_OF_INTEGER35">
-            </field>
-            <field name="ListOfInteger34"
-                   table="LIST_OF_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfLong36"
-                   table="LIST_OF_LONG36">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfLong38"
-                   column="LIST_OF_LONG38">
-            </field>
-            <field name="ListOfLong37"
-                   table="LIST_OF_LONG37">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfShort39"
-                   table="LIST_OF_SHORT39">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-            <field name="ListOfShort41"
-                   column="LIST_OF_SHORT41">
-            </field>
-            <field name="ListOfShort40"
-                   table="LIST_OF_SHORT40">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="ALLOW_DUPLICATES"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-derby.orm	(working copy)
@@ -1,174 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="TreeSetCollections" table="TREESET_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
-            <field name="TreeSetOfObject0" table="TREESET_OF_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfObject1" table="TREESET_OF_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfObject2" table="TREESET_OF_OBJECT2">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfSimpleClass3" table="TREESET_OF_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfSimpleClass4" table="TREESET_OF_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfSimpleClass5" table="TREESET_OF_SIMPLE_CLASS5">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfSimpleInterface6" table="TREESET_OF_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfSimpleInterface7" table="TREESET_OF_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfSimpleInterface8" table="TREESET_OF_SIMPLE_INTERFACE8">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfString9" table="TREESET_OF_STRING9">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfString10" column="TREESET_OF_STRING10">
-            </field>
-            <field name="TreeSetOfString11" table="TREESET_OF_STRING11">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfDate12" table="TREESET_OF_DATE12">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfDate13" column="TREESET_OF_DATE13">
-            </field>
-            <field name="TreeSetOfDate14" table="TREESET_OF_DATE14">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfBigDecimal15" table="TREESET_OF_BIG_DECIMAL15">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfBigDecimal16" column="TREESET_OF_BIG_DECIMAL16">
-            </field>
-            <field name="TreeSetOfBigDecimal17" table="TREESET_OF_BIG_DECIMAL17">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfBigInteger18" table="TREESET_OF_BIG_INTEGER18">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfBigInteger19" column="TREESET_OF_BIG_INTEGER19">
-            </field>
-            <field name="TreeSetOfBigInteger20" table="TREESET_OF_BIG_INTEGER20">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfByte21" table="TREESET_OF_BYTE21">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfByte22" column="TREESET_OF_BYTE22">
-            </field>
-            <field name="TreeSetOfByte23" table="TREESET_OF_BYTE23">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfDouble24" table="TREESET_OF_DOUBLE24">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfDouble25" column="TREESET_OF_DOUBLE25">
-            </field>
-            <field name="TreeSetOfDouble26" table="TREESET_OF_DOUBLE26">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfFloat27" table="TREESET_OF_FLOAT27">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfFloat28" column="TREESET_OF_FLOAT28">
-            </field>
-            <field name="TreeSetOfFloat29" table="TREESET_OF_FLOAT29">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfInteger30" table="TREESET_OF_INTEGER30">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfInteger31" column="TREESET_OF_INTEGER31">
-            </field>
-            <field name="TreeSetOfInteger32" table="TREESET_OF_INTEGER32">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfLong33" table="TREESET_OF_LONG33">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfLong34" column="TREESET_OF_LONG34">
-            </field>
-            <field name="TreeSetOfLong35" table="TREESET_OF_LONG35">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfShort36" table="TREESET_OF_SHORT36">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="TreeSetOfShort37" column="TREESET_OF_SHORT37">
-            </field>
-            <field name="TreeSetOfShort38" table="TREESET_OF_SHORT38">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="INDEX"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm	(working copy)
@@ -1,586 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="MapStringKeyCollections" table="MAPSTRINGKEY_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
-            <field name="MapOfString_Object0" table="MAP_OF_STRING_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="MapOfString_Object1" table="MAP_OF_STRING_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="MapOfString_Object2" table="MAP_OF_STRING_OBJECT2">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="MapOfString_SimpleClass3"
-                   table="MAP_OF_STRING_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="MapOfString_SimpleClass4"
-                   table="MAP_OF_STRING_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="MapOfString_SimpleClass5"
-                   table="MAP_OF_STRING_SIMPLE_CLASS5">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="MapOfString_SimpleInterface6"
-                   table="MAP_OF_STRING_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="MapOfString_SimpleInterface7"
-                   table="MAP_OF_STRING_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="MapOfString_SimpleInterface8"
-                   table="MAP_OF_STRING_SIMPLE_INTERFACE8">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="MapOfString_String9"
-                   table="MAP_OF_STRING_STRING9">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_String10"
-                   table="MAP_OF_STRING_STRING10">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_String11"
-                   table="MAP_OF_STRING_STRING11">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Date12"
-                   table="MAP_OF_STRING_DATE12">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Date13"
-                   table="MAP_OF_STRING_DATE13">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Date14"
-                   table="MAP_OF_STRING_DATE14">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Locale15"
-                   table="MAP_OF_STRING_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Locale16"
-                   table="MAP_OF_STRING_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Locale17"
-                   table="MAP_OF_STRING_LOCALE17">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigDecimal18"
-                   table="MAP_OF_STRING_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigDecimal19"
-                   table="MAP_OF_STRING_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigDecimal20"
-                   table="MAP_OF_STRING_BIG_DECIMAL20">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigInteger21"
-                   table="MAP_OF_STRING_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigInteger22"
-                   table="MAP_OF_STRING_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigInteger23"
-                   table="MAP_OF_STRING_BIG_INTEGER23">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Byte24"
-                   table="MAP_OF_STRING_BYTE24">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Byte25"
-                   table="MAP_OF_STRING_BYTE25">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Byte26"
-                   table="MAP_OF_STRING_BYTE26">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Double27"
-                   table="MAP_OF_STRING_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Double28"
-                   table="MAP_OF_STRING_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Double29"
-                   table="MAP_OF_STRING_DOUBLE29">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Float30"
-                   table="MAP_OF_STRING_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Float31"
-                   table="MAP_OF_STRING_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Float32"
-                   table="MAP_OF_STRING_FLOAT32">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Integer33"
-                   table="MAP_OF_STRING_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Integer34"
-                   table="MAP_OF_STRING_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Integer35"
-                   table="MAP_OF_STRING_INTEGER35">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Long36"
-                   table="MAP_OF_STRING_LONG36">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Long37"
-                   table="MAP_OF_STRING_LONG37">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Long38"
-                   table="MAP_OF_STRING_LONG38">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Short39"
-                   table="MAP_OF_STRING_SHORT39">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Short40"
-                   table="MAP_OF_STRING_SHORT40">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Short41"
-                   table="MAP_OF_STRING_SHORT41">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Object42"
-                   table="MAP_OF_STRING_OBJECT42">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="MapOfString_Object43" table="MAP_OF_STRING_OBJECT43">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="MapOfString_SimpleClass45"
-                   table="MAP_OF_STRING_SIMPLE_CLASS45">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="MapOfString_SimpleClass46"
-                   table="MAP_OF_STRING_SIMPLE_CLASS46">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="MapOfString_SimpleInterface48"
-                   table="MAP_OF_STRING_SIMPLE_INTERFACE48">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="MapOfString_SimpleInterface49"
-                   table="MAP_OF_STRING_SIMPLE_INTERFACE49">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="MapOfString_String51"
-                   table="MAP_OF_STRING_STRING51">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_String52"
-                   table="MAP_OF_STRING_STRING52">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Date54"
-                   table="MAP_OF_STRING_DATE54">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Date55"
-                   table="MAP_OF_STRING_DATE55">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Locale57"
-                   table="MAP_OF_STRING_LOCALE57">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Locale58"
-                   table="MAP_OF_STRING_LOCALE58">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigDecimal60"
-                   table="MAP_OF_STRING_BIG_DECIMAL60">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigDecimal61"
-                   table="MAP_OF_STRING_BIG_DECIMAL61">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigInteger63"
-                   table="MAP_OF_STRING_BIG_INTEGER63">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigInteger64"
-                   table="MAP_OF_STRING_BIG_INTEGER64">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Byte66"
-                   table="MAP_OF_STRING_BYTE66">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Byte67"
-                   table="MAP_OF_STRING_BYTE67">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Double69"
-                   table="MAP_OF_STRING_DOUBLE69">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Double70"
-                   table="MAP_OF_STRING_DOUBLE70">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Float72"
-                   table="MAP_OF_STRING_FLOAT72">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Float73"
-                   table="MAP_OF_STRING_FLOAT73">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Integer75"
-                   table="MAP_OF_STRING_INTEGER75">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Integer76"
-                   table="MAP_OF_STRING_INTEGER76">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Long78"
-                   table="MAP_OF_STRING_LONG78">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Long79"
-                   table="MAP_OF_STRING_LONG79">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Short81"
-                   table="MAP_OF_STRING_SHORT81">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Short82"
-                   table="MAP_OF_STRING_SHORT82">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Object84" table="MAP_OF_STRING_OBJECT84">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Object86"
-                   column="MAP_OF_STRING_OBJECT86">
-            </field>
-            <field name="MapOfString_SimpleClass87"
-                   table="MAP_OF_STRING_SIMPLE_CLASS87">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_SimpleClass89"
-                   column="MAP_OF_STRING_SIMPLECLASS89">
-            </field>
-            <field name="MapOfString_SimpleInterface90"
-                   table="MAP_OF_STRING_SIMPLE_INTERFACE90">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_SimpleInterface92"
-                   column="MAP_OF_STRING_SIMPLEINTERFACE92">
-            </field>
-            <field name="MapOfString_String93"
-                   table="MAP_OF_STRING_STRING93">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_String95"
-                   column="MAP_OF_STRING_STRING95">
-            </field>
-            <field name="MapOfString_Date96"
-                   table="MAP_OF_STRING_DATE96">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Date98"
-                   column="MAP_OF_STRING_DATE98">
-            </field>
-            <field name="MapOfString_Locale99"
-                   table="MAP_OF_STRING_LOCALE99">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Locale101"
-                   column="MAP_OF_STRING_LOCALE101">
-            </field>
-            <field name="MapOfString_BigDecimal102"
-                   table="MAP_OF_STRING_BIG_DECIMAL102">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigDecimal104"
-                   column="MAP_OF_STRING_BIGDECIMAL104">
-            </field>
-            <field name="MapOfString_BigInteger105"
-                   table="MAP_OF_STRING_BIG_INTEGER105">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_BigInteger107"
-                   column="MAP_OF_STRING_BIGINTEGER107">
-            </field>
-            <field name="MapOfString_Byte108"
-                   table="MAP_OF_STRING_BYTE108">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Byte110"
-                   column="MAP_OF_STRING_BYTE110">
-            </field>
-            <field name="MapOfString_Double111" 
-                   table="MAP_OF_STRING_DOUBLE111">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Double113"
-                   column="MAP_OF_STRING_DOUBLE113">
-            </field>
-            <field name="MapOfString_Float114"
-                   table="MAP_OF_STRING_FLOAT114">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Float116"
-                   column="MAP_OF_STRING_FLOAT116">
-            </field>
-            <field name="MapOfString_Integer117"
-                   table="MAP_OF_STRING_INTEGER117">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Integer119"
-                   column="MAP_OF_STRING_INTEGER119">
-            </field>
-            <field name="MapOfString_Long120"
-                    table="MAP_OF_STRING_LONG120">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Long122"
-                   column="MAP_OF_STRING_LONG122">
-            </field>
-            <field name="MapOfString_Short123"
-                   table="MAP_OF_STRING_SHORT123">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfString_Short125"
-                   column="MAP_OF_STRING_SHORT125">
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm	(working copy)
@@ -1,110 +0,0 @@
-<?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">
-<!--
-Metadata for application identity
--->
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="ArrayCollections" table="ARRAY_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
-            <field name="ArrayOfObject0" table="ARRAY_OF_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <element column="OBJVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfObject1" table="ARRAY_OF_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfSimpleClass2" table="ARRAY_OF_SIMPLE_CLASS2">
-                <join column="IDENTIFIER"/>
-                <element column="OBJVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfSimpleClass3" table="ARRAY_OF_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfSimpleInterface4"
-                   table="ARRAY_OF_SIMPLE_INTERFACE4">
-                <join column="IDENTIFIER"/>
-                <element column="OBJVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfSimpleInterface5"
-                   table="ARRAY_OF_SIMPLE_INTERFACE5">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfString6" column="ARRAY_OF_STRING6"/>
-            <field name="ArrayOfString7" table="ARRAY_OF_STRING7">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfDate8" column="ARRAY_OF_DATE8"/>
-            <field name="ArrayOfDate9" table="ARRAY_OF_DATE9">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfLocale10" column="ARRAY_OF_LOCALE10"/>
-            <field name="ArrayOfLocale11" table="ARRAY_OF_LOCALE11">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfBigDecimal12" column="ARRAY_OF_BIG_DECIMAL12"/>
-            <field name="ArrayOfBigDecimal13" table="ARRAY_OF_BIG_DECIMAL13">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfBigInteger14" column="ARRAY_OF_BIG_INTEGER14"/>
-            <field name="ArrayOfBigInteger15" table="ARRAY_OF_BIG_INTEGER15">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfByte16" column="ARRAY_OF_BYTE16"/>
-            <field name="ArrayOfByte17" table="ARRAY_OF_BYTE17">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfDouble18" column="ARRAY_OF_DOUBLE18"/>
-            <field name="ArrayOfDouble19" table="ARRAY_OF_DOUBLE19">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfFloat20" column="ARRAY_OF_FLOAT20"/>
-            <field name="ArrayOfFloat21" table="ARRAY_OF_FLOAT21">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfInteger22" column="ARRAY_OF_INTEGER22"/>
-            <field name="ArrayOfInteger23" table="ARRAY_OF_INTEGER23">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfLong24" column="ARRAY_OF_LONG24"/>
-            <field name="ArrayOfLong25" table="ARRAY_OF_LONG25">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfShort26" column="ARRAY_OF_SHORT26"/>
-            <field name="ArrayOfShort27" table="ARRAY_OF_SHORT27">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-derby.orm	(working copy)
@@ -1,81 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfFloat" table="FIELDSOFFLOAT">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="Float0" column="FLOAT0"/>
-            <field name="Float1" column="FLOAT1"/>
-            <field name="Float102" column="FLOAT102"/>
-            <field name="Float103" column="FLOAT103"/>
-            <field name="Float104" column="FLOAT104"/>
-            <field name="Float108" column="FLOAT108"/>
-            <field name="Float109" column="FLOAT109"/>
-            <field name="Float11" column="FLOAT11"/>
-            <field name="Float110" column="FLOAT110"/>
-            <field name="Float112" column="FLOAT112"/>
-            <field name="Float113" column="FLOAT113"/>
-            <field name="Float114" column="FLOAT114"/>
-            <field name="Float119" column="FLOAT119"/>
-            <field name="Float12" column="FLOAT12"/>
-            <field name="Float120" column="FLOAT120"/>
-            <field name="Float121" column="FLOAT121"/>
-            <field name="Float124" column="FLOAT124"/>
-            <field name="Float125" column="FLOAT125"/>
-            <field name="Float126" column="FLOAT126"/>
-            <field name="Float128" column="FLOAT128"/>
-            <field name="Float129" column="FLOAT129"/>
-            <field name="Float13" column="FLOAT13"/>
-            <field name="Float130" column="FLOAT130"/>
-            <field name="Float138" column="FLOAT138"/>
-            <field name="Float139" column="FLOAT139"/>
-            <field name="Float140" column="FLOAT140"/>
-            <field name="Float16" column="FLOAT16"/>
-            <field name="Float17" column="FLOAT17"/>
-            <field name="Float18" column="FLOAT18"/>
-            <field name="Float2" column="FLOAT2"/>
-            <field name="Float20" column="FLOAT20"/>
-            <field name="Float21" column="FLOAT21"/>
-            <field name="Float22" column="FLOAT22"/>
-            <field name="Float30" column="FLOAT30"/>
-            <field name="Float31" column="FLOAT31"/>
-            <field name="Float32" column="FLOAT32"/>
-            <field name="Float36" column="FLOAT36"/>
-            <field name="Float37" column="FLOAT37"/>
-            <field name="Float38" column="FLOAT38"/>
-            <field name="Float4" column="FLOAT4"/>
-            <field name="Float40" column="FLOAT40"/>
-            <field name="Float41" column="FLOAT41"/>
-            <field name="Float42" column="FLOAT42"/>
-            <field name="Float47" column="FLOAT47"/>
-            <field name="Float48" column="FLOAT48"/>
-            <field name="Float49" column="FLOAT49"/>
-            <field name="Float5" column="FLOAT5"/>
-            <field name="Float52" column="FLOAT52"/>
-            <field name="Float53" column="FLOAT53"/>
-            <field name="Float54" column="FLOAT54"/>
-            <field name="Float56" column="FLOAT56"/>
-            <field name="Float57" column="FLOAT57"/>
-            <field name="Float58" column="FLOAT58"/>
-            <field name="Float6" column="FLOAT6"/>
-            <field name="Float66" column="FLOAT66"/>
-            <field name="Float67" column="FLOAT67"/>
-            <field name="Float68" column="FLOAT68"/>
-            <field name="Float72" column="FLOAT72"/>
-            <field name="Float73" column="FLOAT73"/>
-            <field name="Float74" column="FLOAT74"/>
-            <field name="Float76" column="FLOAT76"/>
-            <field name="Float77" column="FLOAT77"/>
-            <field name="Float78" column="FLOAT78"/>
-            <field name="Float83" column="FLOAT83"/>
-            <field name="Float84" column="FLOAT84"/>
-            <field name="Float85" column="FLOAT85"/>
-            <field name="Float88" column="FLOAT88"/>
-            <field name="Float89" column="FLOAT89"/>
-            <field name="Float90" column="FLOAT90"/>
-            <field name="Float92" column="FLOAT92"/>
-            <field name="Float93" column="FLOAT93"/>
-            <field name="Float94" column="FLOAT94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-derby.orm	(working copy)
@@ -1,176 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfObject" table="FIELDSOFOBJECT">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="Object1" column="OBJECT1">
-            </field>
-            <field name="Object102" column="OBJECT102">
-                <foreign-key/>
-            </field>
-            <field name="Object103" column="OBJECT103">
-            </field>
-            <field name="Object104" column="OBJECT104">
-                <foreign-key/>
-            </field>
-            <field name="Object109" column="OBJECT109">
-            </field>
-            <field name="Object11" column="OBJECT11">
-                <foreign-key/>
-            </field>
-            <field name="Object110" column="OBJECT110">
-            </field>
-            <field name="Object112" column="OBJECT112">
-                <foreign-key/>
-            </field>
-            <field name="Object113" column="OBJECT113">
-            </field>
-            <field name="Object114" column="OBJECT114">
-                <foreign-key/>
-            </field>
-            <field name="Object119" column="OBJECT119">
-                <foreign-key/>
-            </field>
-            <field name="Object12" column="OBJECT12">
-            </field>
-            <field name="Object120" column="OBJECT120">
-            </field>
-            <field name="Object121" column="OBJECT121">
-                <foreign-key/>
-            </field>
-            <field name="Object125" column="OBJECT125">
-            </field>
-            <field name="Object126" column="OBJECT126">
-                <foreign-key/>
-            </field>
-            <field name="Object128" column="OBJECT128">
-                <foreign-key/>
-            </field>
-            <field name="Object129" column="OBJECT129">
-            </field>
-            <field name="Object13" column="OBJECT13">
-                <foreign-key/>
-            </field>
-            <field name="Object130" column="OBJECT130">
-                <foreign-key/>
-            </field>
-            <field name="Object138" column="OBJECT138">
-                <foreign-key/>
-            </field>
-            <field name="Object139" column="OBJECT139">
-            </field>
-            <field name="Object140" column="OBJECT140">
-                <foreign-key/>
-            </field>
-            <field name="Object17" column="OBJECT17">
-            </field>
-            <field name="Object18" column="OBJECT18">
-                <foreign-key/>
-            </field>
-            <field name="Object2" column="OBJECT2">
-                <foreign-key/>
-            </field>
-            <field name="Object20" column="OBJECT20">
-                <foreign-key/>
-            </field>
-            <field name="Object21" column="OBJECT21">
-            </field>
-            <field name="Object22" column="OBJECT22">
-                <foreign-key/>
-            </field>
-            <field name="Object30" column="OBJECT30">
-                <foreign-key/>
-            </field>
-            <field name="Object31" column="OBJECT31">
-            </field>
-            <field name="Object32" column="OBJECT32">
-                <foreign-key/>
-            </field>
-            <field name="Object37" column="OBJECT37">
-            </field>
-            <field name="Object38" column="OBJECT38">
-                <foreign-key/>
-            </field>
-            <field name="Object4" column="OBJECT4">
-                <foreign-key/>
-            </field>
-            <field name="Object40" column="OBJECT40">
-                <foreign-key/>
-            </field>
-            <field name="Object41" column="OBJECT41">
-            </field>
-            <field name="Object42" column="OBJECT42">
-                <foreign-key/>
-            </field>
-            <field name="Object47" column="OBJECT47">
-                <foreign-key/>
-            </field>
-            <field name="Object48" column="OBJECT48">
-            </field>
-            <field name="Object49" column="OBJECT49">
-                <foreign-key/>
-            </field>
-            <field name="Object5" column="OBJECT5">
-            </field>
-            <field name="Object53" column="OBJECT53">
-            </field>
-            <field name="Object54" column="OBJECT54">
-                <foreign-key/>
-            </field>
-            <field name="Object56" column="OBJECT56">
-                <foreign-key/>
-            </field>
-            <field name="Object57" column="OBJECT57">
-            </field>
-            <field name="Object58" column="OBJECT58">
-                <foreign-key/>
-            </field>
-            <field name="Object6" column="OBJECT6">
-                <foreign-key/>
-            </field>
-            <field name="Object66" column="OBJECT66">
-                <foreign-key/>
-            </field>
-            <field name="Object67" column="OBJECT67">
-            </field>
-            <field name="Object68" column="OBJECT68">
-                <foreign-key/>
-            </field>
-            <field name="Object73" column="OBJECT73">
-            </field>
-            <field name="Object74" column="OBJECT74">
-                <foreign-key/>
-            </field>
-            <field name="Object76" column="OBJECT76">
-                <foreign-key/>
-            </field>
-            <field name="Object77" column="OBJECT77">
-            </field>
-            <field name="Object78" column="OBJECT78">
-                <foreign-key/>
-            </field>
-            <field name="Object83" column="OBJECT83">
-                <foreign-key/>
-            </field>
-            <field name="Object84" column="OBJECT84">
-            </field>
-            <field name="Object85" column="OBJECT85">
-                <foreign-key/>
-            </field>
-            <field name="Object89" column="OBJECT89">
-            </field>
-            <field name="Object90" column="OBJECT90">
-                <foreign-key/>
-            </field>
-            <field name="Object92" column="OBJECT92">
-                <foreign-key/>
-            </field>
-            <field name="Object93" column="OBJECT93">
-            </field>
-            <field name="Object94" column="OBJECT94">
-                <foreign-key/>
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-derby.orm	(working copy)
@@ -1,81 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfString" table="FIELDSOFSTRING">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="String0" column="STRING0"/>
-            <field name="String1" column="STRING1"/>
-            <field name="String102" column="STRING102"/>
-            <field name="String103" column="STRING103"/>
-            <field name="String104" column="STRING104"/>
-            <field name="String108" column="STRING108"/>
-            <field name="String109" column="STRING109"/>
-            <field name="String11" column="STRING11"/>
-            <field name="String110" column="STRING110"/>
-            <field name="String112" column="STRING112"/>
-            <field name="String113" column="STRING113"/>
-            <field name="String114" column="STRING114"/>
-            <field name="String119" column="STRING119"/>
-            <field name="String12" column="STRING12"/>
-            <field name="String120" column="STRING120"/>
-            <field name="String121" column="STRING121"/>
-            <field name="String124" column="STRING124"/>
-            <field name="String125" column="STRING125"/>
-            <field name="String126" column="STRING126"/>
-            <field name="String128" column="STRING128"/>
-            <field name="String129" column="STRING129"/>
-            <field name="String13" column="STRING13"/>
-            <field name="String130" column="STRING130"/>
-            <field name="String138" column="STRING138"/>
-            <field name="String139" column="STRING139"/>
-            <field name="String140" column="STRING140"/>
-            <field name="String16" column="STRING16"/>
-            <field name="String17" column="STRING17"/>
-            <field name="String18" column="STRING18"/>
-            <field name="String2" column="STRING2"/>
-            <field name="String20" column="STRING20"/>
-            <field name="String21" column="STRING21"/>
-            <field name="String22" column="STRING22"/>
-            <field name="String30" column="STRING30"/>
-            <field name="String31" column="STRING31"/>
-            <field name="String32" column="STRING32"/>
-            <field name="String36" column="STRING36"/>
-            <field name="String37" column="STRING37"/>
-            <field name="String38" column="STRING38"/>
-            <field name="String4" column="STRING4"/>
-            <field name="String40" column="STRING40"/>
-            <field name="String41" column="STRING41"/>
-            <field name="String42" column="STRING42"/>
-            <field name="String47" column="STRING47"/>
-            <field name="String48" column="STRING48"/>
-            <field name="String49" column="STRING49"/>
-            <field name="String5" column="STRING5"/>
-            <field name="String52" column="STRING52"/>
-            <field name="String53" column="STRING53"/>
-            <field name="String54" column="STRING54"/>
-            <field name="String56" column="STRING56"/>
-            <field name="String57" column="STRING57"/>
-            <field name="String58" column="STRING58"/>
-            <field name="String6" column="STRING6"/>
-            <field name="String66" column="STRING66"/>
-            <field name="String67" column="STRING67"/>
-            <field name="String68" column="STRING68"/>
-            <field name="String72" column="STRING72"/>
-            <field name="String73" column="STRING73"/>
-            <field name="String74" column="STRING74"/>
-            <field name="String76" column="STRING76"/>
-            <field name="String77" column="STRING77"/>
-            <field name="String78" column="STRING78"/>
-            <field name="String83" column="STRING83"/>
-            <field name="String84" column="STRING84"/>
-            <field name="String85" column="STRING85"/>
-            <field name="String88" column="STRING88"/>
-            <field name="String89" column="STRING89"/>
-            <field name="String90" column="STRING90"/>
-            <field name="String92" column="STRING92"/>
-            <field name="String93" column="STRING93"/>
-            <field name="String94" column="STRING94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm	(working copy)
@@ -1,589 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="HashtableStringKeyCollections"
-               table="HASHTABLESTRINGKEY_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
-            <field name="HashtableOfString_Object0" table="HASHTBL_STR_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="HashtableOfString_Object1" table="HASHTBL_STR_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="HashtableOfString_Object2" table="HASHTBL_STR_OBJECT2">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="OBJREF"/>
-            </field>
-            <field name="HashtableOfString_SimpleClass3"
-                   table="HASHTBL_STR_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="HashtableOfString_SimpleClass4"
-                   table="HASHTBL_STR_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="HashtableOfString_SimpleClass5"
-                   table="HASHTBL_STR_SIMPLE_CLASS5">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPCLSREF"/>
-            </field>
-            <field name="HashtableOfString_SimpleInterface6"
-                   table="HASHTBL_STR_SIMPLE_INTERFACE6">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="HashtableOfString_SimpleInterface7"
-                   table="HASHTBL_STR_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="HashtableOfString_SimpleInterface8"
-                   table="HASHTBL_STR_SIMPLE_INTERFACE8">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="SIMPINTREF"/>
-            </field>
-            <field name="HashtableOfString_String9"
-                   table="HASHTBL_STR_STRING9">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_String10"
-                   table="HASHTBL_STR_STRING10">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_String11"
-                   table="HASHTBL_STR_STRING11">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Date12"
-                   table="HASHTBL_STR_DATE12">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Date13"
-                   table="HASHTBL_STR_DATE13">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Date14"
-                   table="HASHTBL_STR_DATE14">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Locale15"
-                   table="HASHTBL_STR_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Locale16"
-                   table="HASHTBL_STR_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Locale17"
-                   table="HASHTBL_STR_LOCALE17">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigDecimal18"
-                   table="HASHTBL_STR_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigDecimal19"
-                   table="HASHTBL_STR_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigDecimal20"
-                   table="HASHTBL_STR_BIG_DECIMAL20">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigInteger21"
-                   table="HASHTBL_STR_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigInteger22"
-                   table="HASHTBL_STR_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigInteger23"
-                   table="HASHTBL_STR_BIG_INTEGER23">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Byte24"
-                   table="HASHTBL_STR_BYTE24">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Byte25"
-                   table="HASHTBL_STR_BYTE25">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Byte26"
-                   table="HASHTBL_STR_BYTE26">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Double27"
-                   table="HASHTBL_STR_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Double28"
-                   table="HASHTBL_STR_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Double29"
-                   table="HASHTBL_STR_DOUBLE29">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Float30"
-                   table="HASHTBL_STR_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Float31"
-                   table="HASHTBL_STR_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Float32"
-                   table="HASHTBL_STR_FLOAT32">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Integer33"
-                   table="HASHTBL_STR_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Integer34"
-                   table="HASHTBL_STR_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Integer35"
-                   table="HASHTBL_STR_INTEGER35">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Long36"
-                   table="HASHTBL_STR_LONG36">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Long37"
-                   table="HASHTBL_STR_LONG37">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Long38"
-                   table="HASHTBL_STR_LONG38">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Short39"
-                   table="HASHTBL_STR_SHORT39">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Short40"
-                   table="HASHTBL_STR_SHORT40">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Short41"
-                   table="HASHTBL_STR_SHORT41">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Object42"
-                   table="HASHTBL_STR_OBJECT42">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashtableOfString_Object43"
-                   table="HASHTBL_STR_OBJECT43">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashtableOfString_SimpleClass45"
-                   table="HASHTBL_STR_SIMPLE_CLASS45">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashtableOfString_SimpleClass46"
-                   table="HASHTBL_STR_SIMPLE_CLASS46">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashtableOfString_SimpleInterface48"
-                   table="HASHTBL_STR_SIMPLE_INTERFACE48">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashtableOfString_SimpleInterface49"
-                   table="HASHTBL_STR_SIMPLE_INTERFACE49">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
-            </field>
-            <field name="HashtableOfString_String51"
-                   table="HASHTBL_STR_STRING51">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_String52"
-                   table="HASHTBL_STR_STRING52">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Date54"
-                   table="HASHTBL_STR_DATE54">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Date55"
-                   table="HASHTBL_STR_DATE55">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Locale57"
-                   table="HASHTBL_STR_LOCALE57">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Locale58"
-                   table="HASHTBL_STR_LOCALE58">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigDecimal60"
-                   table="HASHTBL_STR_BIG_DECIMAL60">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigDecimal61"
-                   table="HASHTBL_STR_BIG_DECIMAL61">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigInteger63"
-                   table="HASHTBL_STR_BIG_INTEGER63">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigInteger64"
-                   table="HASHTBL_STR_BIG_INTEGER64">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Byte66"
-                   table="HASHTBL_STR_BYTE66">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Byte67"
-                   table="HASHTBL_STR_BYTE67">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Double69"
-                   table="HASHTBL_STR_DOUBLE69">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Double70"
-                   table="HASHTBL_STR_DOUBLE70">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Float72"
-                   table="HASHTBL_STR_FLOAT72">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Float73"
-                   table="HASHTBL_STR_FLOAT73">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Integer75"
-                   table="HASHTBL_STR_INTEGER75">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Integer76"
-                   table="HASHTBL_STR_INTEGER76">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Long78"
-                   table="HASHTBL_STR_LONG78">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Long79"
-                   table="HASHTBL_STR_LONG79">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Short81"
-                   table="HASHTBL_STR_SHORT81">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Short82"
-                   table="HASHTBL_STR_SHORT82">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Object84"
-                   table="HASHTBL_STR_OBJECT84">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Object86"
-                   column="HASHTBL_STR_OBJECT86">
-            </field>
-            <field name="HashtableOfString_SimpleClass87"
-                   table="HASHTBL_STR_SIMPLE_CLASS87">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_SimpleClass89"
-                   column="HASHTBL_STR_SIMPLECLASS89">
-            </field>
-            <field name="HashtableOfString_SimpleInterface90"
-                   table="HASHTBL_STR_SIMPLE_INTERFACE90">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_SimpleInterface92"
-                   column="HASHTBL_STR_SIMPLEINTERFACE92">
-            </field>
-            <field name="HashtableOfString_String93"
-                   table="HASHTBL_STR_STRING93">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_String95"
-                   column="HASHTBL_STR_STRING95">
-            </field>
-            <field name="HashtableOfString_Date96"
-                   table="HASHTBL_STR_DATE96">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Date98"
-                   column="HASHTBL_STR_DATE98">
-            </field>
-            <field name="HashtableOfString_Locale99"
-                   table="HASHTBL_STR_LOCALE99">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Locale101"
-                   column="HASHTBL_STR_LOCALE101">
-            </field>
-            <field name="HashtableOfString_BigDecimal102"
-                   table="HASHTBL_STR_BIG_DECIMAL102">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigDecimal104"
-                   column="HASHTBL_STR_BIGDECIMAL104">
-            </field>
-            <field name="HashtableOfString_BigInteger105"
-                   table="HASHTBL_STR_BIG_INTEGER105">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_BigInteger107"
-                   column="HASHTBL_STR_BIGINTEGER107">
-            </field>
-            <field name="HashtableOfString_Byte108"
-                   table="HASHTBL_STR_BYTE108">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Byte110"
-                   column="HASHTBL_STR_BYTE110">
-            </field>
-            <field name="HashtableOfString_Double111" 
-                   table="HASHTBL_STR_DOUBLE111">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Double113"
-                   column="HASHTBL_STR_DOUBLE113">
-            </field>
-            <field name="HashtableOfString_Float114"
-                   table="HASHTBL_STR_FLOAT114">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Float116"
-                   column="HASHTBL_STR_FLOAT116">
-            </field>
-            <field name="HashtableOfString_Integer117"
-                   table="HASHTBL_STR_INTEGER117">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Integer119"
-                   column="HASHTBL_STR_INTEGER119">
-            </field>
-            <field name="HashtableOfString_Long120"
-                    table="HASHTBL_STR_LONG120">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Long122"
-                   column="HASHTBL_STR_LONG122">
-            </field>
-            <field name="HashtableOfString_Short123"
-                   table="HASHTBL_STR_SHORT123">
-                <join column="IDENTIFIER"/>
-                <key column="KEYVAL"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfString_Short125"
-                   column="HASHTBL_STR_SHORT125">
-            </field>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-derby.orm	(working copy)
@@ -1,81 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfPrimitiveshort" table="FIELDSOFPRIMITIVESHORT">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="short0" column="SHORT0"/>
-            <field name="short1" column="SHORT1"/>
-            <field name="short102" column="SHORT102"/>
-            <field name="short103" column="SHORT103"/>
-            <field name="short104" column="SHORT104"/>
-            <field name="short108" column="SHORT108"/>
-            <field name="short109" column="SHORT109"/>
-            <field name="short11" column="SHORT11"/>
-            <field name="short110" column="SHORT110"/>
-            <field name="short112" column="SHORT112"/>
-            <field name="short113" column="SHORT113"/>
-            <field name="short114" column="SHORT114"/>
-            <field name="short119" column="SHORT119"/>
-            <field name="short12" column="SHORT12"/>
-            <field name="short120" column="SHORT120"/>
-            <field name="short121" column="SHORT121"/>
-            <field name="short124" column="SHORT124"/>
-            <field name="short125" column="SHORT125"/>
-            <field name="short126" column="SHORT126"/>
-            <field name="short128" column="SHORT128"/>
-            <field name="short129" column="SHORT129"/>
-            <field name="short13" column="SHORT13"/>
-            <field name="short130" column="SHORT130"/>
-            <field name="short138" column="SHORT138"/>
-            <field name="short139" column="SHORT139"/>
-            <field name="short140" column="SHORT140"/>
-            <field name="short16" column="SHORT16"/>
-            <field name="short17" column="SHORT17"/>
-            <field name="short18" column="SHORT18"/>
-            <field name="short2" column="SHORT2"/>
-            <field name="short20" column="SHORT20"/>
-            <field name="short21" column="SHORT21"/>
-            <field name="short22" column="SHORT22"/>
-            <field name="short30" column="SHORT30"/>
-            <field name="short31" column="SHORT31"/>
-            <field name="short32" column="SHORT32"/>
-            <field name="short36" column="SHORT36"/>
-            <field name="short37" column="SHORT37"/>
-            <field name="short38" column="SHORT38"/>
-            <field name="short4" column="SHORT4"/>
-            <field name="short40" column="SHORT40"/>
-            <field name="short41" column="SHORT41"/>
-            <field name="short42" column="SHORT42"/>
-            <field name="short47" column="SHORT47"/>
-            <field name="short48" column="SHORT48"/>
-            <field name="short49" column="SHORT49"/>
-            <field name="short5" column="SHORT5"/>
-            <field name="short52" column="SHORT52"/>
-            <field name="short53" column="SHORT53"/>
-            <field name="short54" column="SHORT54"/>
-            <field name="short56" column="SHORT56"/>
-            <field name="short57" column="SHORT57"/>
-            <field name="short58" column="SHORT58"/>
-            <field name="short6" column="SHORT6"/>
-            <field name="short66" column="SHORT66"/>
-            <field name="short67" column="SHORT67"/>
-            <field name="short68" column="SHORT68"/>
-            <field name="short72" column="SHORT72"/>
-            <field name="short73" column="SHORT73"/>
-            <field name="short74" column="SHORT74"/>
-            <field name="short76" column="SHORT76"/>
-            <field name="short77" column="SHORT77"/>
-            <field name="short78" column="SHORT78"/>
-            <field name="short83" column="SHORT83"/>
-            <field name="short84" column="SHORT84"/>
-            <field name="short85" column="SHORT85"/>
-            <field name="short88" column="SHORT88"/>
-            <field name="short89" column="SHORT89"/>
-            <field name="short90" column="SHORT90"/>
-            <field name="short92" column="SHORT92"/>
-            <field name="short93" column="SHORT93"/>
-            <field name="short94" column="SHORT94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-derby.orm	(working copy)
@@ -1,81 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="FieldsOfPrimitivedouble" table="FIELDSOFPRIMITIVEDOUBLE">
-            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="double0" column="DOUBLE0"/>
-            <field name="double1" column="DOUBLE1"/>
-            <field name="double102" column="DOUBLE102"/>
-            <field name="double103" column="DOUBLE103"/>
-            <field name="double104" column="DOUBLE104"/>
-            <field name="double108" column="DOUBLE108"/>
-            <field name="double109" column="DOUBLE109"/>
-            <field name="double11" column="DOUBLE11"/>
-            <field name="double110" column="DOUBLE110"/>
-            <field name="double112" column="DOUBLE112"/>
-            <field name="double113" column="DOUBLE113"/>
-            <field name="double114" column="DOUBLE114"/>
-            <field name="double119" column="DOUBLE119"/>
-            <field name="double12" column="DOUBLE12"/>
-            <field name="double120" column="DOUBLE120"/>
-            <field name="double121" column="DOUBLE121"/>
-            <field name="double124" column="DOUBLE124"/>
-            <field name="double125" column="DOUBLE125"/>
-            <field name="double126" column="DOUBLE126"/>
-            <field name="double128" column="DOUBLE128"/>
-            <field name="double129" column="DOUBLE129"/>
-            <field name="double13" column="DOUBLE13"/>
-            <field name="double130" column="DOUBLE130"/>
-            <field name="double138" column="DOUBLE138"/>
-            <field name="double139" column="DOUBLE139"/>
-            <field name="double140" column="DOUBLE140"/>
-            <field name="double16" column="DOUBLE16"/>
-            <field name="double17" column="DOUBLE17"/>
-            <field name="double18" column="DOUBLE18"/>
-            <field name="double2" column="DOUBLE2"/>
-            <field name="double20" column="DOUBLE20"/>
-            <field name="double21" column="DOUBLE21"/>
-            <field name="double22" column="DOUBLE22"/>
-            <field name="double30" column="DOUBLE30"/>
-            <field name="double31" column="DOUBLE31"/>
-            <field name="double32" column="DOUBLE32"/>
-            <field name="double36" column="DOUBLE36"/>
-            <field name="double37" column="DOUBLE37"/>
-            <field name="double38" column="DOUBLE38"/>
-            <field name="double4" column="DOUBLE4"/>
-            <field name="double40" column="DOUBLE40"/>
-            <field name="double41" column="DOUBLE41"/>
-            <field name="double42" column="DOUBLE42"/>
-            <field name="double47" column="DOUBLE47"/>
-            <field name="double48" column="DOUBLE48"/>
-            <field name="double49" column="DOUBLE49"/>
-            <field name="double5" column="DOUBLE5"/>
-            <field name="double52" column="DOUBLE52"/>
-            <field name="double53" column="DOUBLE53"/>
-            <field name="double54" column="DOUBLE54"/>
-            <field name="double56" column="DOUBLE56"/>
-            <field name="double57" column="DOUBLE57"/>
-            <field name="double58" column="DOUBLE58"/>
-            <field name="double6" column="DOUBLE6"/>
-            <field name="double66" column="DOUBLE66"/>
-            <field name="double67" column="DOUBLE67"/>
-            <field name="double68" column="DOUBLE68"/>
-            <field name="double72" column="DOUBLE72"/>
-            <field name="double73" column="DOUBLE73"/>
-            <field name="double74" column="DOUBLE74"/>
-            <field name="double76" column="DOUBLE76"/>
-            <field name="double77" column="DOUBLE77"/>
-            <field name="double78" column="DOUBLE78"/>
-            <field name="double83" column="DOUBLE83"/>
-            <field name="double84" column="DOUBLE84"/>
-            <field name="double85" column="DOUBLE85"/>
-            <field name="double88" column="DOUBLE88"/>
-            <field name="double89" column="DOUBLE89"/>
-            <field name="double90" column="DOUBLE90"/>
-            <field name="double92" column="DOUBLE92"/>
-            <field name="double93" column="DOUBLE93"/>
-            <field name="double94" column="DOUBLE94"/>
-        </class>
-    </package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm	(working copy)
@@ -1,110 +0,0 @@
-<?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">
-<orm>
-    <package name="org.apache.jdo.tck.pc.inheritance">
-        <class name="AllPersist" table="AllPersist">
-            <inheritance strategy="new-table">
-                <discriminator strategy="class-name" column="DISCRIMINATOR"/>
-            </inheritance>
-            <field name="intB" column="INT_B"/>
-            <field name="doubleB" column="DOUBLE_B"/>
-            <field name="keyValue" column="KEY_VALUE" primary-key="true"/>
-        </class>
-
-        <class name="AllPersist2">
-            <inheritance strategy="superclass-table"/>
-            <field name="floatE" column="FLOAT_E"/>
-        </class>
-
-        <class name="AllPersist3">
-            <inheritance strategy="superclass-table"/>
-            <field name="shortF" column="SHORT_F"/>
-            <field name="secondObj" column="SECOND_OBJ" foreign-key="true"/>
-            <field name="thirdObj" column="THIRD_OBJ" foreign-key="true"/>
-        </class>
-
-        <class name="AllPersist4">
-            <inheritance strategy="superclass-table"/>
-            <field name="intH" column="INT_H"/>
-        </class>
-
-        <class name="TopNonPersistB" table="TopNonPersistB">
-            <inheritance strategy="new-table">
-                <discriminator strategy="class-name" column="DISCRIMINATOR"/>
-            </inheritance>
-            <field name="keyValue" column="KEY_VALUE" primary-key="true" />
-            <field name="doubleB" column="DOUBLE_B"/>
-            <field name="intB" column="INT_B"/>
-        </class>
-
-        <class name="TopNonPersistE">
-            <inheritance strategy="superclass-table"/>
-            <field name="floatE" column="FLOAT_E"/>
-        </class>
-
-        <class name="TopNonPersistF">
-            <inheritance strategy="superclass-table"/>
-            <field name="shortF" column="SHORT_F"/>
-            <field name="secondObj" column="SECOND_OBJ" foreign-key="true"/>
-            <field name="thirdObj" column="THIRD_OBJ" foreign-key="true"/>
-        </class>
-
-        <class name="TopNonPersistH">
-            <inheritance strategy="superclass-table"/>
-            <field name="intH" column="INT_H"/>
-        </class>
-
-        <class name="TopPersist" table="TopPersist">
-            <inheritance strategy="new-table">
-                <discriminator strategy="class-name" column="DISCRIMINATOR"/>
-            </inheritance>
-            <field name="doubleB" column="DOUBLE_B"/>
-            <field name="intB" column="INT_B"/>
-            <field name="keyValue" column="KEY_VALUE" primary-key="true" />
-        </class>
-
-        <class name="TopPersistE">
-            <inheritance strategy="superclass-table"/>
-            <field name="floatE" column="FLOAT_E"/>
-        </class>
-
-        <class name="TopPersistF">
-            <inheritance strategy="superclass-table"/>
-            <field name="shortF" column="SHORT_F"/>
-            <field name="secondObj" column="SECOND_OBJ" foreign-key="true"/>
-            <field name="thirdObj" column="THIRD_OBJ" foreign-key="true"/>
-        </class>
-
-        <class name="TopPersistH">
-            <inheritance strategy="superclass-table"/>
-            <field name="intH" column="INT_H"/>
-        </class>
-
-        <class name="FieldSameName" table="FieldSameName">
-            <inheritance strategy="new-table">
-                <discriminator strategy="class-name" column="DISCRIMINATOR"/>
-            </inheritance>
-            <field name="n2" column="N2"/>
-            <field name="n3" column="N3"/>
-            <field name="keyValue" column="KEY_VALUE" primary-key="true"/>
-        </class>
-
-        <class name="FieldSameName2">
-            <inheritance strategy="superclass-table"/>
-            <field name="n3" column="FSN2_N3"/>
-        </class>
-
-        <class name="FieldSameName3">
-            <inheritance strategy="superclass-table"/>
-            <field name="n1" column="FSN3_N1"/>
-            <field name="n2" column="FSN3_N2" foreign-key="true"/>
-            <field name="n3" column="FSN3_N3" foreign-key="true"/>
-        </class>
-
-        <class name="FieldSameName4">
-            <inheritance strategy="superclass-table"/>
-            <field name="n3" column="FSN4_N3"/>
-        </class>
-
-</package>
-</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby5.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby5.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby5.orm	(working copy)
@@ -1,55 +0,0 @@
-<?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">
-<orm schema="applicationidentity_orm">
-  <package name="org.apache.jdo.tck.pc.mylib">
-
-    <class name="PCPoint" table="PCPoint">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCPoint2" table="PCPoint2">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCRect" table="PCRect">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="lowerRight" column="LOWER_RIGHT">
-        <foreign-key/>
-      </field>
-      <field name="upperLeft" column="UPPER_LEFT">
-        <foreign-key/>
-      </field>
-    </class>
-
-    <class name="PrimitiveTypes" table="PrimitiveTypes">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="booleanNotNull" column="booleanNotNull"/>
-      <field name="booleanNull" column="booleanNull"/>
-      <field name="byteNotNull" column="byteNotNull"/>
-      <field name="byteNull" column="byteNull"/>
-      <field name="shortNotNull" column="shortNotNull"/>
-      <field name="shortNull" column="shortNull"/>
-      <field name="intNotNull" column="intNotNull"/>
-      <field name="intNull" column="intNull"/>
-      <field name="longNotNull" column="longNotNull"/>
-      <field name="longNull" column="longNull"/>
-      <field name="floatNotNull" column="floatNotNull"/>
-      <field name="floatNull" column="floatNull"/>
-      <field name="doubleNotNull" column="doubleNotNull"/>
-      <field name="doubleNull" column="doubleNull"/>
-      <field name="charNotNull" column="charNotNull"/>
-      <field name="charNull" column="charNull"/>
-      <field name="dateNull" column="dateNull"/>
-      <field name="stringNull" column="stringNull"/>
-      <field name="bigDecimal" column="bigDecimal"/>
-      <field name="bigInteger" column="bigInteger"/>
-      <field name="PrimitiveTypes" column="PrimitiveTypes"/>
-    </class>
-
-  </package>
-</orm>
-
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby6.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby6.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby6.orm	(working copy)
@@ -1,55 +0,0 @@
-<?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">
-<orm>
-  <package name="org.apache.jdo.tck.pc.mylib" schema="applicationidentity_pkg">
-
-    <class name="PCPoint" table="PCPoint">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCPoint2" table="PCPoint2">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCRect" table="PCRect">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="lowerRight" column="LOWER_RIGHT">
-        <foreign-key/>
-      </field>
-      <field name="upperLeft" column="UPPER_LEFT">
-        <foreign-key/>
-      </field>
-    </class>
-
-    <class name="PrimitiveTypes" table="PrimitiveTypes">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="booleanNotNull" column="booleanNotNull"/>
-      <field name="booleanNull" column="booleanNull"/>
-      <field name="byteNotNull" column="byteNotNull"/>
-      <field name="byteNull" column="byteNull"/>
-      <field name="shortNotNull" column="shortNotNull"/>
-      <field name="shortNull" column="shortNull"/>
-      <field name="intNotNull" column="intNotNull"/>
-      <field name="intNull" column="intNull"/>
-      <field name="longNotNull" column="longNotNull"/>
-      <field name="longNull" column="longNull"/>
-      <field name="floatNotNull" column="floatNotNull"/>
-      <field name="floatNull" column="floatNull"/>
-      <field name="doubleNotNull" column="doubleNotNull"/>
-      <field name="doubleNull" column="doubleNull"/>
-      <field name="charNotNull" column="charNotNull"/>
-      <field name="charNull" column="charNull"/>
-      <field name="dateNull" column="dateNull"/>
-      <field name="stringNull" column="stringNull"/>
-      <field name="bigDecimal" column="bigDecimal"/>
-      <field name="bigInteger" column="bigInteger"/>
-      <field name="PrimitiveTypes" column="PrimitiveTypes"/>
-    </class>
-
-  </package>
-</orm>
-
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby7.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby7.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby7.orm	(working copy)
@@ -1,55 +0,0 @@
-<?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">
-<orm>
-  <package name="org.apache.jdo.tck.pc.mylib">
-
-    <class name="PCPoint" table="PCPoint" schema="applicationidentity_cls">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCPoint2" table="PCPoint2" schema="applicationidentity_cls">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCRect" table="PCRect" schema="applicationidentity_cls">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="lowerRight" column="LOWER_RIGHT">
-        <foreign-key/>
-      </field>
-      <field name="upperLeft" column="UPPER_LEFT">
-        <foreign-key/>
-      </field>
-    </class>
-
-    <class name="PrimitiveTypes" table="PrimitiveTypes" schema="applicationidentity_cls">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="booleanNotNull" column="booleanNotNull"/>
-      <field name="booleanNull" column="booleanNull"/>
-      <field name="byteNotNull" column="byteNotNull"/>
-      <field name="byteNull" column="byteNull"/>
-      <field name="shortNotNull" column="shortNotNull"/>
-      <field name="shortNull" column="shortNull"/>
-      <field name="intNotNull" column="intNotNull"/>
-      <field name="intNull" column="intNull"/>
-      <field name="longNotNull" column="longNotNull"/>
-      <field name="longNull" column="longNull"/>
-      <field name="floatNotNull" column="floatNotNull"/>
-      <field name="floatNull" column="floatNull"/>
-      <field name="doubleNotNull" column="doubleNotNull"/>
-      <field name="doubleNull" column="doubleNull"/>
-      <field name="charNotNull" column="charNotNull"/>
-      <field name="charNull" column="charNull"/>
-      <field name="dateNull" column="dateNull"/>
-      <field name="stringNull" column="stringNull"/>
-      <field name="bigDecimal" column="bigDecimal"/>
-      <field name="bigInteger" column="bigInteger"/>
-      <field name="PrimitiveTypes" column="PrimitiveTypes"/>
-    </class>
-
-  </package>
-</orm>
-
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby.orm	(working copy)
@@ -1,67 +0,0 @@
-<?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">
-<orm>
-  <package name="org.apache.jdo.tck.pc.mylib">
-
-    <class name="PCPoint" table="PCPoint">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="VersionedPCPoint" table="VersionedPCPoint">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCPoint2" table="PCPoint2">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCRect" table="PCRect">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="lowerRight" column="LOWER_RIGHT">
-        <foreign-key/>
-      </field>
-      <field name="upperLeft" column="UPPER_LEFT">
-        <foreign-key/>
-      </field>
-    </class>
-
-    <class name="PrimitiveTypes" table="PrimitiveTypes">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="booleanNotNull" column="booleanNotNull"/>
-      <field name="booleanNull" column="booleanNull"/>
-      <field name="byteNotNull" column="byteNotNull"/>
-      <field name="byteNull" column="byteNull"/>
-      <field name="shortNotNull" column="shortNotNull"/>
-      <field name="shortNull" column="shortNull"/>
-      <field name="intNotNull" column="intNotNull"/>
-      <field name="intNull" column="intNull"/>
-      <field name="longNotNull" column="longNotNull"/>
-      <field name="longNull" column="longNull"/>
-      <field name="floatNotNull" column="floatNotNull"/>
-      <field name="floatNull" column="floatNull"/>
-      <field name="doubleNotNull" column="doubleNotNull"/>
-      <field name="doubleNull" column="doubleNull"/>
-      <field name="charNotNull" column="charNotNull"/>
-      <field name="charNull" column="charNull"/>
-      <field name="dateNull" column="dateNull"/>
-      <field name="stringNull" column="stringNull"/>
-      <field name="bigDecimal" column="bigDecimal"/>
-      <field name="bigInteger" column="bigInteger"/>
-      <field name="PrimitiveTypes" column="PrimitiveTypes"/>
-    </class>
-
-    <class name="PCClass" table="PCClass">
-      <field name="id" column="ID" primary-key="true"/>
-      <field name="number1" column="NUMBER1"/>
-      <field name="number2" column="NUMBER2"/>
-    </class>
-
-  </package>
-</orm>
-
Index: src/orm/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package-derby.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package-derby.orm	(revision 375164)
+++ src/orm/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package-derby.orm	(working copy)
@@ -1,36 +0,0 @@
-<?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.api.instancecallbacks">
-
-        <class name="InstanceLifecycleListenerAttach$PC" 
-                table="LIFECYCLELISTENERATTACH">
-            <field name="id" column="ID" primary-key="true"/>
-        </class>
-        <class name="InstanceLifecycleListenerClear$PC" 
-                table="LIFECYCLELISTENERCLEAR">
-            <field name="id" column="ID" primary-key="true"/>
-        </class>
-        <class name="InstanceLifecycleListenerDelete$PC" 
-                table="LIFECYCLELISTENERDELETE">
-            <field name="id" column="ID" primary-key="true"/>
-        </class>
-        <class name="InstanceLifecycleListenerDetach$PC" 
-                table="LIFECYCLELISTENERDETACH">
-            <field name="id" column="ID" primary-key="true"/>
-        </class>
-        <class name="InstanceLifecycleListenerLoad$PC" 
-                table="LIFECYCLELISTENERLOAD">
-            <field name="id" column="ID" primary-key="true"/>
-            <field name="value" column="VALUE"/>
-        </class>
-        <class name="InstanceLifecycleListenerStore$PC" 
-                table="LIFECYCLELISTENERSTORE">
-            <field name="id" column="ID" primary-key="true"/>
-        </class>
-    </package>
-</orm>