You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mb...@apache.org on 2022/03/24 20:27:39 UTC

[db-jdo] branch main updated: JDO-807: Update schema descriptor of JDO Metadata file to use latest 3.2 xsd definition (#39)

This is an automated email from the ASF dual-hosted git repository.

mbo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/db-jdo.git


The following commit(s) were added to refs/heads/main by this push:
     new 682b704  JDO-807: Update schema descriptor of JDO Metadata file to use latest 3.2 xsd definition (#39)
682b704 is described below

commit 682b70438bd9380cbe947bba372a4485feca040d
Author: Michael Bouschen <mb...@apache.org>
AuthorDate: Thu Mar 24 21:27:34 2022 +0100

    JDO-807: Update schema descriptor of JDO Metadata file to use latest 3.2 xsd definition (#39)
---
 api/src/test/java/javax/jdo/util/XMLTestUtil.java  | 42 ++++++++++++----------
 api/src/test/resources/Negative0-dtd.jdo           |  4 +--
 api/src/test/resources/Negative0-dtd.jdoquery      |  4 +--
 api/src/test/resources/Negative0-dtd.orm           |  4 +--
 api/src/test/resources/Negative0-xsd.jdo           |  4 +--
 api/src/test/resources/Negative0-xsd.jdoquery      |  4 +--
 api/src/test/resources/Negative0-xsd.orm           |  4 +--
 api/src/test/resources/Positive0-dtd.jdo           |  4 +--
 api/src/test/resources/Positive0-dtd.jdoquery      |  4 +--
 api/src/test/resources/Positive0-dtd.orm           |  4 +--
 api/src/test/resources/Positive0-xsd.jdo           |  4 +--
 api/src/test/resources/Positive0-xsd.jdoquery      |  4 +--
 api/src/test/resources/Positive0-xsd.orm           |  4 +--
 api/src/test/resources/Positive1-dtd.jdo           |  4 +--
 api/src/test/resources/Positive1-dtd.orm           |  3 +-
 api/src/test/resources/Positive1-xsd.jdo           |  4 +--
 api/src/test/resources/Positive1-xsd.orm           |  4 +--
 api/src/test/resources/Positive15.1-dtd.orm        |  4 +--
 api/src/test/resources/Positive15.1-xsd.orm        |  4 +--
 api/src/test/resources/Positive15.2.1-dtd.orm      |  4 +--
 api/src/test/resources/Positive15.2.1-xsd.orm      |  4 +--
 api/src/test/resources/Positive15.2.2-dtd.orm      |  4 +--
 api/src/test/resources/Positive15.2.2-xsd.orm      |  4 +--
 api/src/test/resources/Positive15.3.1-dtd.orm      |  4 +--
 api/src/test/resources/Positive15.3.1-xsd.orm      |  4 +--
 api/src/test/resources/Positive15.3.2-dtd.orm      |  4 +--
 api/src/test/resources/Positive15.3.2-xsd.orm      |  4 +--
 api/src/test/resources/Positive15.3.3-dtd.orm      |  4 +--
 api/src/test/resources/Positive15.3.3-xsd.orm      |  4 +--
 api/src/test/resources/Positive15.3.4-dtd.orm      |  4 +--
 api/src/test/resources/Positive15.3.4-xsd.orm      |  4 +--
 api/src/test/resources/Positive15.3.5-dtd.orm      |  4 +--
 api/src/test/resources/Positive15.3.5-xsd.orm      |  4 +--
 api/src/test/resources/Positive15.3.6-dtd.orm      |  4 +--
 api/src/test/resources/Positive15.3.6-xsd.orm      |  4 +--
 api/src/test/resources/Positive15.4-dtd.orm        |  4 +--
 api/src/test/resources/Positive15.4-xsd.orm        |  4 +--
 api/src/test/resources/Positive15.5-dtd.orm        |  4 +--
 api/src/test/resources/Positive15.5-xsd.orm        |  4 +--
 api/src/test/resources/Positive15.6-dtd.orm        |  4 +--
 api/src/test/resources/Positive15.6-xsd.orm        |  4 +--
 api/src/test/resources/Positive15.8.1-dtd.orm      |  4 +--
 api/src/test/resources/Positive15.8.1-xsd.orm      |  4 +--
 api/src/test/resources/Positive15.8.2-dtd.orm      |  4 +--
 api/src/test/resources/Positive15.8.2-xsd.orm      |  4 +--
 api/src/test/resources/Positive15.8.3-dtd.orm      |  4 +--
 api/src/test/resources/Positive15.8.3-xsd.orm      |  4 +--
 api/src/test/resources/Positive99-dtd.jdo          |  2 +-
 api/src/test/resources/Positive99-dtd.jdoquery     |  2 +-
 api/src/test/resources/Positive99-dtd.orm          |  2 +-
 api/src/test/resources/Positive99-xsd.jdo          |  4 +--
 api/src/test/resources/Positive99-xsd.jdoquery     |  4 +--
 api/src/test/resources/Positive99-xsd.orm          |  4 +--
 .../jdo/tck/api/instancecallbacks/package.jdo      |  6 ++--
 .../org/apache/jdo/tck/package.jdo                 |  6 ++--
 .../org/apache/jdo/tck/pc/building/package.jdo     |  6 ++--
 .../org/apache/jdo/tck/pc/company/Person.jdoquery  |  6 ++--
 .../org/apache/jdo/tck/pc/company/package.jdo      |  6 ++--
 .../jdo/tck/pc/companyListWithoutJoin/package.jdo  |  6 ++--
 .../jdo/tck/pc/companyMapWithoutJoin/package.jdo   |  6 ++--
 .../org/apache/jdo/tck/pc/converter/package.jdo    |  6 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo  |  6 ++--
 .../jdo/tck/pc/fieldtypes/ArrayCollections.jdo     |  6 ++--
 .../jdo/tck/pc/fieldtypes/ArrayListCollections.jdo |  6 ++--
 .../tck/pc/fieldtypes/CollectionCollections.jdo    |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo   |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo   |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo      |  6 ++--
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo  |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo    |  6 ++--
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo  |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo       |  6 ++--
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo      |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo       |  6 ++--
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo  |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfObject.jdo       |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo    |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo    |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo  |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo   |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo    |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo   |  6 ++--
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo  |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo   |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo  |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfString.jdo       |  6 ++--
 .../pc/fieldtypes/HashMapStringKeyCollections.jdo  |  6 ++--
 .../fieldtypes/HashMapStringValueCollections.jdo   |  6 ++--
 .../jdo/tck/pc/fieldtypes/HashSetCollections.jdo   |  6 ++--
 .../fieldtypes/HashtableStringKeyCollections.jdo   |  6 ++--
 .../fieldtypes/HashtableStringValueCollections.jdo |  6 ++--
 .../tck/pc/fieldtypes/LinkedListCollections.jdo    |  6 ++--
 .../jdo/tck/pc/fieldtypes/ListCollections.jdo      |  6 ++--
 .../tck/pc/fieldtypes/MapStringKeyCollections.jdo  |  6 ++--
 .../pc/fieldtypes/MapStringValueCollections.jdo    |  6 ++--
 .../jdo/tck/pc/fieldtypes/SetCollections.jdo       |  6 ++--
 .../pc/fieldtypes/TreeMapStringKeyCollections.jdo  |  6 ++--
 .../fieldtypes/TreeMapStringValueCollections.jdo   |  6 ++--
 .../jdo/tck/pc/fieldtypes/TreeSetCollections.jdo   |  6 ++--
 .../jdo/tck/pc/fieldtypes/VectorCollections.jdo    |  6 ++--
 .../org/apache/jdo/tck/pc/inheritance/package.jdo  |  6 ++--
 .../jdo/tck/pc/instancecallbacks/package.jdo       |  6 ++--
 .../jdo/tck/pc/lifecycle/StateTransitionObj.jdo    |  6 ++--
 .../org/apache/jdo/tck/pc/mylib/PCClass.jdo        |  6 ++--
 .../org/apache/jdo/tck/pc/mylib/package.jdo        |  6 ++--
 .../org/apache/jdo/tck/pc/newInstance/AAddress.jdo |  6 ++--
 .../apache/jdo/tck/pc/newInstance/AAddress_bad.jdo |  6 ++--
 .../org/apache/jdo/tck/pc/newInstance/Address.jdo  |  6 ++--
 .../apache/jdo/tck/pc/newInstance/Address_bad.jdo  |  6 ++--
 .../org/apache/jdo/tck/pc/newInstance/IAddress.jdo |  6 ++--
 .../apache/jdo/tck/pc/newInstance/IAddress_bad.jdo |  6 ++--
 .../org/apache/jdo/tck/pc/order/package.jdo        |  6 ++--
 .../org/apache/jdo/tck/pc/query/package.jdo        |  6 ++--
 .../org/apache/jdo/tck/pc/shoppingcart/package.jdo |  6 ++--
 .../jdo/tck/pc/singlefieldidentity/package.jdo     |  6 ++--
 .../resources/jdo/applicationidentity/package.jdo  |  6 ++--
 .../jdo/tck/api/instancecallbacks/package.jdo      |  6 ++--
 .../org/apache/jdo/tck/package.jdo                 |  6 ++--
 .../org/apache/jdo/tck/pc/building/package.jdo     |  6 ++--
 .../org/apache/jdo/tck/pc/company/Person.jdoquery  |  6 ++--
 .../org/apache/jdo/tck/pc/company/package.jdo      |  6 ++--
 .../jdo/tck/pc/companyListWithoutJoin/package.jdo  |  6 ++--
 .../jdo/tck/pc/companyMapWithoutJoin/package.jdo   |  6 ++--
 .../org/apache/jdo/tck/pc/converter/package.jdo    |  6 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo  |  6 ++--
 .../jdo/tck/pc/fieldtypes/ArrayCollections.jdo     |  6 ++--
 .../jdo/tck/pc/fieldtypes/ArrayListCollections.jdo |  6 ++--
 .../tck/pc/fieldtypes/CollectionCollections.jdo    |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo   |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo   |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo      |  6 ++--
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo  |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo    |  6 ++--
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo  |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo       |  6 ++--
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo      |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo       |  6 ++--
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo  |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfObject.jdo       |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo    |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo    |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo  |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo   |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo    |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo   |  6 ++--
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo  |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo   |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo  |  6 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfString.jdo       |  6 ++--
 .../pc/fieldtypes/HashMapStringKeyCollections.jdo  |  6 ++--
 .../fieldtypes/HashMapStringValueCollections.jdo   |  6 ++--
 .../jdo/tck/pc/fieldtypes/HashSetCollections.jdo   |  6 ++--
 .../fieldtypes/HashtableStringKeyCollections.jdo   |  6 ++--
 .../fieldtypes/HashtableStringValueCollections.jdo |  6 ++--
 .../tck/pc/fieldtypes/LinkedListCollections.jdo    |  6 ++--
 .../jdo/tck/pc/fieldtypes/ListCollections.jdo      |  6 ++--
 .../tck/pc/fieldtypes/MapStringKeyCollections.jdo  |  6 ++--
 .../pc/fieldtypes/MapStringValueCollections.jdo    |  6 ++--
 .../jdo/tck/pc/fieldtypes/SetCollections.jdo       |  6 ++--
 .../pc/fieldtypes/TreeMapStringKeyCollections.jdo  |  6 ++--
 .../fieldtypes/TreeMapStringValueCollections.jdo   |  6 ++--
 .../jdo/tck/pc/fieldtypes/TreeSetCollections.jdo   |  6 ++--
 .../jdo/tck/pc/fieldtypes/VectorCollections.jdo    |  6 ++--
 .../org/apache/jdo/tck/pc/inheritance/package.jdo  |  6 ++--
 .../jdo/tck/pc/instancecallbacks/package.jdo       |  6 ++--
 .../jdo/tck/pc/lifecycle/StateTransitionObj.jdo    |  6 ++--
 .../org/apache/jdo/tck/pc/mylib/PCClass.jdo        |  6 ++--
 .../org/apache/jdo/tck/pc/mylib/package.jdo        |  6 ++--
 .../org/apache/jdo/tck/pc/newInstance/AAddress.jdo |  6 ++--
 .../apache/jdo/tck/pc/newInstance/AAddress_bad.jdo |  6 ++--
 .../org/apache/jdo/tck/pc/newInstance/Address.jdo  |  6 ++--
 .../apache/jdo/tck/pc/newInstance/Address_bad.jdo  |  6 ++--
 .../org/apache/jdo/tck/pc/newInstance/IAddress.jdo |  6 ++--
 .../apache/jdo/tck/pc/newInstance/IAddress_bad.jdo |  6 ++--
 .../org/apache/jdo/tck/pc/order/package.jdo        |  6 ++--
 .../org/apache/jdo/tck/pc/query/package.jdo        |  6 ++--
 .../org/apache/jdo/tck/pc/shoppingcart/package.jdo |  6 ++--
 .../jdo/tck/pc/singlefieldidentity/package.jdo     |  6 ++--
 .../resources/jdo/datastoreidentity/package.jdo    |  6 ++--
 .../tck/api/instancecallbacks/package-standard.orm |  6 ++--
 .../jdo/tck/pc/building/package-standard12.orm     |  6 ++--
 .../apache/jdo/tck/pc/company/package-standard.orm |  6 ++--
 .../jdo/tck/pc/company/package-standard1.orm       |  6 ++--
 .../jdo/tck/pc/company/package-standard2.orm       |  6 ++--
 .../jdo/tck/pc/company/package-standard3.orm       |  6 ++--
 .../jdo/tck/pc/company/package-standard4.orm       |  6 ++--
 .../pc/companyAnnotatedFC/package-standard11.orm   |  6 ++--
 .../companyListWithoutJoin/package-standard10.orm  |  6 ++--
 .../pc/companyMapWithoutJoin/package-standard9.orm |  6 ++--
 .../jdo/tck/pc/converter/package-standard.orm      |  8 ++---
 .../jdo/tck/pc/fieldtypes/AllTypes-standard.orm    |  6 ++--
 .../pc/fieldtypes/ArrayCollections-standard.orm    |  6 ++--
 .../fieldtypes/ArrayListCollections-standard.orm   |  6 ++--
 .../fieldtypes/CollectionCollections-standard.orm  |  6 ++--
 .../pc/fieldtypes/FieldsOfBigDecimal-standard.orm  |  6 ++--
 .../pc/fieldtypes/FieldsOfBigInteger-standard.orm  |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfBoolean-standard.orm |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfByte-standard.orm    |  6 ++--
 .../pc/fieldtypes/FieldsOfCharacter-standard.orm   |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfDate-standard.orm    |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfDouble-standard.orm  |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfFloat-standard.orm   |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfInteger-standard.orm |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfLocale-standard.orm  |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfLong-standard.orm    |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfObject-standard.orm  |  6 ++--
 .../FieldsOfPrimitiveboolean-standard.orm          |  6 ++--
 .../fieldtypes/FieldsOfPrimitivebyte-standard.orm  |  6 ++--
 .../fieldtypes/FieldsOfPrimitivechar-standard.orm  |  6 ++--
 .../FieldsOfPrimitivedouble-standard.orm           |  6 ++--
 .../fieldtypes/FieldsOfPrimitivefloat-standard.orm |  6 ++--
 .../fieldtypes/FieldsOfPrimitiveint-standard.orm   |  6 ++--
 .../fieldtypes/FieldsOfPrimitivelong-standard.orm  |  6 ++--
 .../fieldtypes/FieldsOfPrimitiveshort-standard.orm |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfShort-standard.orm   |  6 ++--
 .../pc/fieldtypes/FieldsOfSimpleClass-standard.orm |  6 ++--
 .../pc/fieldtypes/FieldsOfSimpleEnum-standard.orm  |  6 ++--
 .../pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm |  6 ++--
 .../FieldsOfSimpleInterface-standard.orm           |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfString-standard.orm  |  6 ++--
 .../HashMapStringKeyCollections-standard.orm       |  6 ++--
 .../HashMapStringValueCollections-standard.orm     |  6 ++--
 .../pc/fieldtypes/HashSetCollections-standard.orm  |  6 ++--
 .../HashtableStringKeyCollections-standard.orm     |  6 ++--
 .../HashtableStringValueCollections-standard.orm   |  6 ++--
 .../fieldtypes/LinkedListCollections-standard.orm  |  6 ++--
 .../tck/pc/fieldtypes/ListCollections-standard.orm |  6 ++--
 .../MapStringKeyCollections-standard.orm           |  6 ++--
 .../MapStringValueCollections-standard.orm         |  6 ++--
 .../tck/pc/fieldtypes/SetCollections-standard.orm  |  6 ++--
 .../jdo/tck/pc/fieldtypes/SimpleClass-standard.orm |  6 ++--
 .../TreeMapStringKeyCollections-standard.orm       |  6 ++--
 .../TreeMapStringValueCollections-standard.orm     |  6 ++--
 .../pc/fieldtypes/TreeSetCollections-standard.orm  |  6 ++--
 .../pc/fieldtypes/VectorCollections-standard.orm   |  6 ++--
 .../jdo/tck/pc/inheritance/package-standard.orm    |  6 ++--
 .../tck/pc/instancecallbacks/package-standard.orm  |  6 ++--
 .../pc/lifecycle/StateTransitionObj-standard.orm   |  6 ++--
 .../apache/jdo/tck/pc/mylib/package-standard.orm   |  6 ++--
 .../apache/jdo/tck/pc/mylib/package-standard5.orm  |  6 ++--
 .../apache/jdo/tck/pc/mylib/package-standard6.orm  |  6 ++--
 .../apache/jdo/tck/pc/mylib/package-standard7.orm  |  6 ++--
 .../jdo/tck/pc/newInstance/package-standard.orm    |  6 ++--
 .../apache/jdo/tck/pc/order/package-standard.orm   |  6 ++--
 .../apache/jdo/tck/pc/query/package-standard.orm   |  6 ++--
 .../jdo/tck/pc/shoppingcart/package-standard8.orm  |  6 ++--
 .../pc/singlefieldidentity/package-standard.orm    |  6 ++--
 .../tck/api/instancecallbacks/package-standard.orm |  6 ++--
 .../jdo/tck/pc/building/package-standard12.orm     |  6 ++--
 .../apache/jdo/tck/pc/company/package-standard.orm |  6 ++--
 .../jdo/tck/pc/company/package-standard1.orm       |  6 ++--
 .../jdo/tck/pc/company/package-standard2.orm       |  6 ++--
 .../jdo/tck/pc/company/package-standard3.orm       |  6 ++--
 .../jdo/tck/pc/company/package-standard4.orm       |  6 ++--
 .../pc/companyAnnotatedFC/package-standard11.orm   |  6 ++--
 .../companyListWithoutJoin/package-standard10.orm  |  6 ++--
 .../pc/companyMapWithoutJoin/package-standard9.orm |  6 ++--
 .../jdo/tck/pc/converter/package-standard.orm      |  6 ++--
 .../jdo/tck/pc/fieldtypes/AllTypes-standard.orm    |  6 ++--
 .../pc/fieldtypes/ArrayCollections-standard.orm    |  6 ++--
 .../fieldtypes/ArrayListCollections-standard.orm   |  6 ++--
 .../fieldtypes/CollectionCollections-standard.orm  |  6 ++--
 .../pc/fieldtypes/FieldsOfBigDecimal-standard.orm  |  6 ++--
 .../pc/fieldtypes/FieldsOfBigInteger-standard.orm  |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfBoolean-standard.orm |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfByte-standard.orm    |  6 ++--
 .../pc/fieldtypes/FieldsOfCharacter-standard.orm   |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfDate-standard.orm    |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfDouble-standard.orm  |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfFloat-standard.orm   |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfInteger-standard.orm |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfLocale-standard.orm  |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfLong-standard.orm    |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfObject-standard.orm  |  6 ++--
 .../FieldsOfPrimitiveboolean-standard.orm          |  6 ++--
 .../fieldtypes/FieldsOfPrimitivebyte-standard.orm  |  6 ++--
 .../fieldtypes/FieldsOfPrimitivechar-standard.orm  |  6 ++--
 .../FieldsOfPrimitivedouble-standard.orm           |  6 ++--
 .../fieldtypes/FieldsOfPrimitivefloat-standard.orm |  6 ++--
 .../fieldtypes/FieldsOfPrimitiveint-standard.orm   |  6 ++--
 .../fieldtypes/FieldsOfPrimitivelong-standard.orm  |  6 ++--
 .../fieldtypes/FieldsOfPrimitiveshort-standard.orm |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfShort-standard.orm   |  6 ++--
 .../pc/fieldtypes/FieldsOfSimpleClass-standard.orm |  6 ++--
 .../pc/fieldtypes/FieldsOfSimpleEnum-standard.orm  |  6 ++--
 .../pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm |  6 ++--
 .../FieldsOfSimpleInterface-standard.orm           |  6 ++--
 .../tck/pc/fieldtypes/FieldsOfString-standard.orm  |  6 ++--
 .../HashMapStringKeyCollections-standard.orm       |  6 ++--
 .../HashMapStringValueCollections-standard.orm     |  6 ++--
 .../pc/fieldtypes/HashSetCollections-standard.orm  |  6 ++--
 .../HashtableStringKeyCollections-standard.orm     |  6 ++--
 .../HashtableStringValueCollections-standard.orm   |  6 ++--
 .../fieldtypes/LinkedListCollections-standard.orm  |  6 ++--
 .../tck/pc/fieldtypes/ListCollections-standard.orm |  6 ++--
 .../MapStringKeyCollections-standard.orm           |  6 ++--
 .../MapStringValueCollections-standard.orm         |  6 ++--
 .../tck/pc/fieldtypes/SetCollections-standard.orm  |  6 ++--
 .../jdo/tck/pc/fieldtypes/SimpleClass-standard.orm |  6 ++--
 .../TreeMapStringKeyCollections-standard.orm       |  6 ++--
 .../TreeMapStringValueCollections-standard.orm     |  6 ++--
 .../pc/fieldtypes/TreeSetCollections-standard.orm  |  6 ++--
 .../pc/fieldtypes/VectorCollections-standard.orm   |  6 ++--
 .../jdo/tck/pc/inheritance/package-standard.orm    |  6 ++--
 .../tck/pc/instancecallbacks/package-standard.orm  |  6 ++--
 .../pc/lifecycle/StateTransitionObj-standard.orm   |  6 ++--
 .../apache/jdo/tck/pc/mylib/package-standard.orm   |  6 ++--
 .../apache/jdo/tck/pc/mylib/package-standard5.orm  |  6 ++--
 .../apache/jdo/tck/pc/mylib/package-standard6.orm  |  6 ++--
 .../apache/jdo/tck/pc/mylib/package-standard7.orm  |  6 ++--
 .../jdo/tck/pc/newInstance/package-standard.orm    |  6 ++--
 .../apache/jdo/tck/pc/query/package-standard.orm   |  6 ++--
 .../jdo/tck/pc/shoppingcart/package-standard8.orm  |  6 ++--
 321 files changed, 930 insertions(+), 923 deletions(-)

diff --git a/api/src/test/java/javax/jdo/util/XMLTestUtil.java b/api/src/test/java/javax/jdo/util/XMLTestUtil.java
index 3e9a9f3..0fcc8d4 100644
--- a/api/src/test/java/javax/jdo/util/XMLTestUtil.java
+++ b/api/src/test/java/javax/jdo/util/XMLTestUtil.java
@@ -36,10 +36,16 @@ import java.util.Map;
 import java.util.StringTokenizer;
 
 import javax.jdo.JDOFatalException;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 
-import javax.xml.parsers.*;
 import org.w3c.dom.Document;
-import org.xml.sax.*;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 
 /**
  * Tests schema files.
@@ -76,15 +82,15 @@ public class XMLTestUtil {
 
     /** jdo xsd file */
     protected static final File JDO_XSD_FILE = 
-        new File(BASEDIR + "/target/classes/javax/jdo/jdo_2_2.xsd");
+        new File(BASEDIR + "/target/classes/javax/jdo/jdo_3_2.xsd");
 
     /** orm xsd file */
     protected static final File ORM_XSD_FILE = 
-        new File(BASEDIR + "/target/classes/javax/jdo/orm_2_2.xsd");
+        new File(BASEDIR + "/target/classes/javax/jdo/orm_3_2.xsd");
 
     /** jdoquery xsd file */
     protected static final File JDOQUERY_XSD_FILE = 
-        new File(BASEDIR + "/target/classes/javax/jdo/jdoquery_2_2.xsd");
+        new File(BASEDIR + "/target/classes/javax/jdo/jdoquery_3_2.xsd");
 
     /** Entity resolver */
     protected static final EntityResolver resolver = new JDOEntityResolver();
@@ -107,7 +113,7 @@ public class XMLTestUtil {
     protected static final String NL = System.getProperty("line.separator");
 
     /** XSD builder for jdo namespace. */
-    private final DocumentBuilder jdoXsdBuilder = 
+    private final DocumentBuilder jdoXsdBuilder =
         createBuilder(JDO_XSD_NS + " " + JDO_XSD_FILE.toURI().toString());
     
     /** XSD builder for orm namespace. */
@@ -357,29 +363,29 @@ public class XMLTestUtil {
         implements EntityResolver {
 
         private static final String RECOGNIZED_JDO_PUBLIC_ID = 
-            "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.2//EN";
+            "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 3.2//EN";
         private static final String RECOGNIZED_JDO_SYSTEM_ID = 
-            "file:/javax/jdo/jdo_2_2.dtd";
+            "file:/javax/jdo/jdo_3_2.dtd";
         private static final String RECOGNIZED_JDO_SYSTEM_ID2 = 
-            "http://xmlns.jcp.org/dtd/jdo_2_2.dtd";
+            "http://xmlns.jcp.org/dtd/jdo_3_2.dtd";
         private static final String RECOGNIZED_ORM_PUBLIC_ID = 
-            "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN";
+            "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN";
         private static final String RECOGNIZED_ORM_SYSTEM_ID = 
-            "file:/javax/jdo/orm_2_2.dtd";
+            "file:/javax/jdo/orm_3_2.dtd";
         private static final String RECOGNIZED_ORM_SYSTEM_ID2 = 
-            "http://xmlns.jcp.org/dtd/orm_2_2.dtd";
+            "http://xmlns.jcp.org/dtd/orm_3_2.dtd";
         private static final String RECOGNIZED_JDOQUERY_PUBLIC_ID = 
-            "-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 2.2//EN";
+            "-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 3.2//EN";
         private static final String RECOGNIZED_JDOQUERY_SYSTEM_ID = 
-            "file:/javax/jdo/jdoquery_2_2.dtd";
+            "file:/javax/jdo/jdoquery_3_2.dtd";
         private static final String RECOGNIZED_JDOQUERY_SYSTEM_ID2 = 
-            "http://xmlns.jcp.org/dtd/jdoquery_2_2.dtd";
+            "http://xmlns.jcp.org/dtd/jdoquery_3_2.dtd";
         private static final String JDO_DTD_FILENAME = 
-            "javax/jdo/jdo_2_2.dtd";
+            "javax/jdo/jdo_3_2.dtd";
         private static final String ORM_DTD_FILENAME = 
-            "javax/jdo/orm_2_2.dtd";
+            "javax/jdo/orm_3_2.dtd";
         private static final String JDOQUERY_DTD_FILENAME = 
-            "javax/jdo/jdoquery_2_2.dtd";
+            "javax/jdo/jdoquery_3_2.dtd";
 
         static Map<String,String> publicIds = new HashMap<String,String>();
         static Map<String,String> systemIds = new HashMap<String,String>();
diff --git a/api/src/test/resources/Negative0-dtd.jdo b/api/src/test/resources/Negative0-dtd.jdo
index b732f34..5198a0d 100644
--- a/api/src/test/resources/Negative0-dtd.jdo
+++ b/api/src/test/resources/Negative0-dtd.jdo
@@ -17,7 +17,7 @@
 -->
 <!-- Negative test: empty jdo element --> 
 <!DOCTYPE jdo PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.2//EN"
-        "http://xmlns.jcp.org/dtd/jdo_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 3.2//EN"
+        "http://xmlns.jcp.org/dtd/jdo_3_2.dtd">
 <jdo>
 </jdo>
diff --git a/api/src/test/resources/Negative0-dtd.jdoquery b/api/src/test/resources/Negative0-dtd.jdoquery
index 8773dab..762d51f 100644
--- a/api/src/test/resources/Negative0-dtd.jdoquery
+++ b/api/src/test/resources/Negative0-dtd.jdoquery
@@ -17,7 +17,7 @@
 -->
 <!-- Negative test: empty jdoquery element --> 
 <!DOCTYPE jdo PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 2.2//EN"
-        "http://xmlns.jcp.org/dtd/jdoquery_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 3.2//EN"
+        "http://xmlns.jcp.org/dtd/jdoquery_3_2.dtd">
 <jdoquery>
 </jdoquery>
diff --git a/api/src/test/resources/Negative0-dtd.orm b/api/src/test/resources/Negative0-dtd.orm
index 334092d..e2e32fd 100644
--- a/api/src/test/resources/Negative0-dtd.orm
+++ b/api/src/test/resources/Negative0-dtd.orm
@@ -17,7 +17,7 @@
 -->
 <!-- Negative test: empty orm element --> 
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/dtd/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/dtd/orm_3_2.dtd">
 <orm>
 </orm>
diff --git a/api/src/test/resources/Negative0-xsd.jdo b/api/src/test/resources/Negative0-xsd.jdo
index 7258135..4aa78e5 100644
--- a/api/src/test/resources/Negative0-xsd.jdo
+++ b/api/src/test/resources/Negative0-xsd.jdo
@@ -18,6 +18,6 @@
 <!-- Negative test: empty jdo element --> 
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo 
-                         http://xmlns.jcp.org/xml/ns/jdo/jdo_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 </jdo>
diff --git a/api/src/test/resources/Negative0-xsd.jdoquery b/api/src/test/resources/Negative0-xsd.jdoquery
index 0785cce..32b015e 100644
--- a/api/src/test/resources/Negative0-xsd.jdoquery
+++ b/api/src/test/resources/Negative0-xsd.jdoquery
@@ -18,7 +18,7 @@
 <!-- Negative test: empty jdoquery element --> 
 <jdoquery xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoquery"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery 
-                         http://xmlns.jcp.org/xml/ns/jdo/jdoquery_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery
+     http://xmlns.jcp.org/xml/ns/jdo/jdoquery_3_2.xsd">
 
 </jdoquery>
diff --git a/api/src/test/resources/Negative0-xsd.orm b/api/src/test/resources/Negative0-xsd.orm
index 0facf2d..c8bf609 100644
--- a/api/src/test/resources/Negative0-xsd.orm
+++ b/api/src/test/resources/Negative0-xsd.orm
@@ -18,6 +18,6 @@
 <!-- Negative test: empty orm element --> 
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 </orm>
diff --git a/api/src/test/resources/Positive0-dtd.jdo b/api/src/test/resources/Positive0-dtd.jdo
index 41235ae..0d54a45 100644
--- a/api/src/test/resources/Positive0-dtd.jdo
+++ b/api/src/test/resources/Positive0-dtd.jdo
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE jdo PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.2//EN"
-        "http://xmlns.jcp.org/dtd/jdo_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 3.2//EN"
+        "http://xmlns.jcp.org/dtd/jdo_3_2.dtd">
 <jdo>
     <package name="simple">
         <class name="TestClass"/>
diff --git a/api/src/test/resources/Positive0-dtd.jdoquery b/api/src/test/resources/Positive0-dtd.jdoquery
index b1ca91b..f22b867 100644
--- a/api/src/test/resources/Positive0-dtd.jdoquery
+++ b/api/src/test/resources/Positive0-dtd.jdoquery
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE jdoquery  PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 2.2//EN"
-        "http://xmlns.jcp.org/dtd/jdoquery_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 3.2//EN"
+        "http://xmlns.jcp.org/dtd/jdoquery_3_2.dtd">
 <jdoquery>
     <package name="simple">
         <class name="TestClass">
diff --git a/api/src/test/resources/Positive0-dtd.orm b/api/src/test/resources/Positive0-dtd.orm
index 8ad3de0..9c6181e 100644
--- a/api/src/test/resources/Positive0-dtd.orm
+++ b/api/src/test/resources/Positive0-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
     <package name="simple">
         <class name="TestClass"/>
diff --git a/api/src/test/resources/Positive0-xsd.jdo b/api/src/test/resources/Positive0-xsd.jdo
index fc1c7b0..5c890b6 100644
--- a/api/src/test/resources/Positive0-xsd.jdo
+++ b/api/src/test/resources/Positive0-xsd.jdo
@@ -17,8 +17,8 @@
 -->
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo 
-                         http://xmlns.jcp.org/xml/ns/jdo/jdo_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
     <package name="simple">
         <class name="TestClass"/>
     </package>
diff --git a/api/src/test/resources/Positive0-xsd.jdoquery b/api/src/test/resources/Positive0-xsd.jdoquery
index 353be2f..dc8cf7b 100644
--- a/api/src/test/resources/Positive0-xsd.jdoquery
+++ b/api/src/test/resources/Positive0-xsd.jdoquery
@@ -17,8 +17,8 @@
 -->
 <jdoquery xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoquery"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery 
-                         http://xmlns.jcp.org/xml/ns/jdo/jdoquery_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery
+     http://xmlns.jcp.org/xml/ns/jdo/jdoquery_3_2.xsd">
     <package name="simple">
         <class name="TestClass">
             <query
diff --git a/api/src/test/resources/Positive0-xsd.orm b/api/src/test/resources/Positive0-xsd.orm
index de89690..c4a0f13 100644
--- a/api/src/test/resources/Positive0-xsd.orm
+++ b/api/src/test/resources/Positive0-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="simple">
         <class name="TestClass"/>
     </package>
diff --git a/api/src/test/resources/Positive1-dtd.jdo b/api/src/test/resources/Positive1-dtd.jdo
index 6b8f5f3..7638052 100644
--- a/api/src/test/resources/Positive1-dtd.jdo
+++ b/api/src/test/resources/Positive1-dtd.jdo
@@ -15,8 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE jdo PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.2//EN" 
-  "http://xmlns.jcp.org/dtd/jdo_2_2.dtd">
+<!DOCTYPE jdo PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 3.2//EN"
+  "http://xmlns.jcp.org/dtd/jdo_3_2.dtd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/api/src/test/resources/Positive1-dtd.orm b/api/src/test/resources/Positive1-dtd.orm
index 466804e..185f700 100644
--- a/api/src/test/resources/Positive1-dtd.orm
+++ b/api/src/test/resources/Positive1-dtd.orm
@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN" "http://xmlns.jcp.org/dtd/orm_2_2.dtd">
+<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+  "http://xmlns.jcp.org/dtd/orm_2_2.dtd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/api/src/test/resources/Positive1-xsd.jdo b/api/src/test/resources/Positive1-xsd.jdo
index 415709e..bbd1ef7 100644
--- a/api/src/test/resources/Positive1-xsd.jdo
+++ b/api/src/test/resources/Positive1-xsd.jdo
@@ -21,8 +21,8 @@ has application identity.
 -->
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo 
-                         http://xmlns.jcp.org/xml/ns/jdo/jdo_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Address" embedded-only="true" requires-extent="false"/>
diff --git a/api/src/test/resources/Positive1-xsd.orm b/api/src/test/resources/Positive1-xsd.orm
index 3c6f285..c8d1633 100644
--- a/api/src/test/resources/Positive1-xsd.orm
+++ b/api/src/test/resources/Positive1-xsd.orm
@@ -21,8 +21,8 @@ has application identity.
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Address"/>
diff --git a/api/src/test/resources/Positive15.1-dtd.orm b/api/src/test/resources/Positive15.1-dtd.orm
index 062aa74..a3428ab 100644
--- a/api/src/test/resources/Positive15.1-dtd.orm
+++ b/api/src/test/resources/Positive15.1-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
     <package name="com.xyz">
         <class name="Address" table="ADDR">
diff --git a/api/src/test/resources/Positive15.1-xsd.orm b/api/src/test/resources/Positive15.1-xsd.orm
index 1606879..3e2c551 100644
--- a/api/src/test/resources/Positive15.1-xsd.orm
+++ b/api/src/test/resources/Positive15.1-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="com.xyz">
         <class name="Address" table="ADDR">
             <field name="street" column="STREET"/>
diff --git a/api/src/test/resources/Positive15.2.1-dtd.orm b/api/src/test/resources/Positive15.2.1-dtd.orm
index e3ec016..e08d30b 100644
--- a/api/src/test/resources/Positive15.2.1-dtd.orm
+++ b/api/src/test/resources/Positive15.2.1-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Address" table="ADDR">
diff --git a/api/src/test/resources/Positive15.2.1-xsd.orm b/api/src/test/resources/Positive15.2.1-xsd.orm
index 27cbc2a..1280801 100644
--- a/api/src/test/resources/Positive15.2.1-xsd.orm
+++ b/api/src/test/resources/Positive15.2.1-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Address" table="ADDR">
 			<!-- shared join condition used by fields in DELIV -->
diff --git a/api/src/test/resources/Positive15.2.2-dtd.orm b/api/src/test/resources/Positive15.2.2-dtd.orm
index f518f4e..2180489 100644
--- a/api/src/test/resources/Positive15.2.2-dtd.orm
+++ b/api/src/test/resources/Positive15.2.2-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Address" table="ADDR">
diff --git a/api/src/test/resources/Positive15.2.2-xsd.orm b/api/src/test/resources/Positive15.2.2-xsd.orm
index cc62900..c791126 100644
--- a/api/src/test/resources/Positive15.2.2-xsd.orm
+++ b/api/src/test/resources/Positive15.2.2-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Address" table="ADDR">
 			<field name="street" column="STREET"/>
diff --git a/api/src/test/resources/Positive15.3.1-dtd.orm b/api/src/test/resources/Positive15.3.1-dtd.orm
index 29aca02..220ebf0 100644
--- a/api/src/test/resources/Positive15.3.1-dtd.orm
+++ b/api/src/test/resources/Positive15.3.1-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
diff --git a/api/src/test/resources/Positive15.3.1-xsd.orm b/api/src/test/resources/Positive15.3.1-xsd.orm
index 9238986..16c136d 100644
--- a/api/src/test/resources/Positive15.3.1-xsd.orm
+++ b/api/src/test/resources/Positive15.3.1-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
 			<field name="ssn" column="SSN"/>
diff --git a/api/src/test/resources/Positive15.3.2-dtd.orm b/api/src/test/resources/Positive15.3.2-dtd.orm
index 299033f..8b2993a 100644
--- a/api/src/test/resources/Positive15.3.2-dtd.orm
+++ b/api/src/test/resources/Positive15.3.2-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Department" table="DEP">
diff --git a/api/src/test/resources/Positive15.3.2-xsd.orm b/api/src/test/resources/Positive15.3.2-xsd.orm
index 290d51a..e176a4a 100644
--- a/api/src/test/resources/Positive15.3.2-xsd.orm
+++ b/api/src/test/resources/Positive15.3.2-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Department" table="DEP">
  			<field name="name" column="NAME"/>
diff --git a/api/src/test/resources/Positive15.3.3-dtd.orm b/api/src/test/resources/Positive15.3.3-dtd.orm
index 1816a2b..d168be2 100644
--- a/api/src/test/resources/Positive15.3.3-dtd.orm
+++ b/api/src/test/resources/Positive15.3.3-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
diff --git a/api/src/test/resources/Positive15.3.3-xsd.orm b/api/src/test/resources/Positive15.3.3-xsd.orm
index 9825d83..85d49ac 100644
--- a/api/src/test/resources/Positive15.3.3-xsd.orm
+++ b/api/src/test/resources/Positive15.3.3-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
 			<field name="ssn" column="SSN"/>
diff --git a/api/src/test/resources/Positive15.3.4-dtd.orm b/api/src/test/resources/Positive15.3.4-dtd.orm
index 902db7c..fa3fd3a 100644
--- a/api/src/test/resources/Positive15.3.4-dtd.orm
+++ b/api/src/test/resources/Positive15.3.4-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
diff --git a/api/src/test/resources/Positive15.3.4-xsd.orm b/api/src/test/resources/Positive15.3.4-xsd.orm
index 093e176..5a3a70f 100644
--- a/api/src/test/resources/Positive15.3.4-xsd.orm
+++ b/api/src/test/resources/Positive15.3.4-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
 			<field name="ssn" column="SSN"/>
diff --git a/api/src/test/resources/Positive15.3.5-dtd.orm b/api/src/test/resources/Positive15.3.5-dtd.orm
index d199efe..b8299f3 100644
--- a/api/src/test/resources/Positive15.3.5-dtd.orm
+++ b/api/src/test/resources/Positive15.3.5-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
diff --git a/api/src/test/resources/Positive15.3.5-xsd.orm b/api/src/test/resources/Positive15.3.5-xsd.orm
index 6a26867..05c61b8 100644
--- a/api/src/test/resources/Positive15.3.5-xsd.orm
+++ b/api/src/test/resources/Positive15.3.5-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
 			<field name="ssn" column="SSN"/>
diff --git a/api/src/test/resources/Positive15.3.6-dtd.orm b/api/src/test/resources/Positive15.3.6-dtd.orm
index 8236439..6cd5e43 100644
--- a/api/src/test/resources/Positive15.3.6-dtd.orm
+++ b/api/src/test/resources/Positive15.3.6-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
diff --git a/api/src/test/resources/Positive15.3.6-xsd.orm b/api/src/test/resources/Positive15.3.6-xsd.orm
index ed497c9..c6f5eb6 100644
--- a/api/src/test/resources/Positive15.3.6-xsd.orm
+++ b/api/src/test/resources/Positive15.3.6-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
         <package name="com.xyz">
                 <class name="Employee" table="EMP">
                         <field name="ssn" column="SSN"/>
diff --git a/api/src/test/resources/Positive15.4-dtd.orm b/api/src/test/resources/Positive15.4-dtd.orm
index 600a800..2061fd3 100644
--- a/api/src/test/resources/Positive15.4-dtd.orm
+++ b/api/src/test/resources/Positive15.4-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
diff --git a/api/src/test/resources/Positive15.4-xsd.orm b/api/src/test/resources/Positive15.4-xsd.orm
index 2585602..d3b29a2 100644
--- a/api/src/test/resources/Positive15.4-xsd.orm
+++ b/api/src/test/resources/Positive15.4-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
 			<field name="ssn" column="SSN"/>
diff --git a/api/src/test/resources/Positive15.5-dtd.orm b/api/src/test/resources/Positive15.5-dtd.orm
index 8a75444..1231e6e 100644
--- a/api/src/test/resources/Positive15.5-dtd.orm
+++ b/api/src/test/resources/Positive15.5-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
diff --git a/api/src/test/resources/Positive15.5-xsd.orm b/api/src/test/resources/Positive15.5-xsd.orm
index 47e320b..b5dd0ef 100644
--- a/api/src/test/resources/Positive15.5-xsd.orm
+++ b/api/src/test/resources/Positive15.5-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
 			<field name="ssn" column="SSN"/>
diff --git a/api/src/test/resources/Positive15.6-dtd.orm b/api/src/test/resources/Positive15.6-dtd.orm
index 04e88c3..adc321d 100644
--- a/api/src/test/resources/Positive15.6-dtd.orm
+++ b/api/src/test/resources/Positive15.6-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Address" table="ADDR">
diff --git a/api/src/test/resources/Positive15.6-xsd.orm b/api/src/test/resources/Positive15.6-xsd.orm
index 1302e94..059fc51 100644
--- a/api/src/test/resources/Positive15.6-xsd.orm
+++ b/api/src/test/resources/Positive15.6-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Address" table="ADDR">
 			<index name="ADDR_CITYSTATE_IDX">
diff --git a/api/src/test/resources/Positive15.8.1-dtd.orm b/api/src/test/resources/Positive15.8.1-dtd.orm
index 5a99706..142f849 100644
--- a/api/src/test/resources/Positive15.8.1-dtd.orm
+++ b/api/src/test/resources/Positive15.8.1-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
diff --git a/api/src/test/resources/Positive15.8.1-xsd.orm b/api/src/test/resources/Positive15.8.1-xsd.orm
index 954d7f6..0dc1160 100644
--- a/api/src/test/resources/Positive15.8.1-xsd.orm
+++ b/api/src/test/resources/Positive15.8.1-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
 			<inheritance strategy="new-table">
diff --git a/api/src/test/resources/Positive15.8.2-dtd.orm b/api/src/test/resources/Positive15.8.2-dtd.orm
index 7273a5f..fa33370 100644
--- a/api/src/test/resources/Positive15.8.2-dtd.orm
+++ b/api/src/test/resources/Positive15.8.2-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
diff --git a/api/src/test/resources/Positive15.8.2-xsd.orm b/api/src/test/resources/Positive15.8.2-xsd.orm
index 4f8fcb9..c17fa24 100644
--- a/api/src/test/resources/Positive15.8.2-xsd.orm
+++ b/api/src/test/resources/Positive15.8.2-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
 			<inheritance strategy="new-table">
diff --git a/api/src/test/resources/Positive15.8.3-dtd.orm b/api/src/test/resources/Positive15.8.3-dtd.orm
index ee32fb5..884795f 100644
--- a/api/src/test/resources/Positive15.8.3-dtd.orm
+++ b/api/src/test/resources/Positive15.8.3-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.2//EN"
-        "http://xmlns.jcp.org/schema/orm_2_2.dtd">
+    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
+        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Employee">
diff --git a/api/src/test/resources/Positive15.8.3-xsd.orm b/api/src/test/resources/Positive15.8.3-xsd.orm
index 91f2a97..d3e2c74 100644
--- a/api/src/test/resources/Positive15.8.3-xsd.orm
+++ b/api/src/test/resources/Positive15.8.3-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee">
 			<inheritance strategy="subclass-table"/>
diff --git a/api/src/test/resources/Positive99-dtd.jdo b/api/src/test/resources/Positive99-dtd.jdo
index d8432da..ea371c6 100644
--- a/api/src/test/resources/Positive99-dtd.jdo
+++ b/api/src/test/resources/Positive99-dtd.jdo
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo_2_2.dtd">
+<!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo_3_2.dtd">
 <jdo>
   <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
   <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
diff --git a/api/src/test/resources/Positive99-dtd.jdoquery b/api/src/test/resources/Positive99-dtd.jdoquery
index 6d194fe..f59176e 100644
--- a/api/src/test/resources/Positive99-dtd.jdoquery
+++ b/api/src/test/resources/Positive99-dtd.jdoquery
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE jdoquery SYSTEM "file:/javax/jdo/jdoquery_2_2.dtd">
+<!DOCTYPE jdoquery SYSTEM "file:/javax/jdo/jdoquery_3_2.dtd">
 <jdoquery>
   <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
   <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
diff --git a/api/src/test/resources/Positive99-dtd.orm b/api/src/test/resources/Positive99-dtd.orm
index c1467c6..b1b2600 100644
--- a/api/src/test/resources/Positive99-dtd.orm
+++ b/api/src/test/resources/Positive99-dtd.orm
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE orm SYSTEM "file:/javax/jdo/orm_2_2.dtd">
+<!DOCTYPE orm SYSTEM "file:/javax/jdo/orm_3_2.dtd">
 <orm>
   <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
   <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
diff --git a/api/src/test/resources/Positive99-xsd.jdo b/api/src/test/resources/Positive99-xsd.jdo
index 5fd755e..a165b03 100644
--- a/api/src/test/resources/Positive99-xsd.jdo
+++ b/api/src/test/resources/Positive99-xsd.jdo
@@ -17,8 +17,8 @@
 -->
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo 
-                         http://xmlns.jcp.org/xml/ns/jdo/jdo_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
   <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
   <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
   <package 
diff --git a/api/src/test/resources/Positive99-xsd.jdoquery b/api/src/test/resources/Positive99-xsd.jdoquery
index 42061a6..349e3d2 100644
--- a/api/src/test/resources/Positive99-xsd.jdoquery
+++ b/api/src/test/resources/Positive99-xsd.jdoquery
@@ -17,8 +17,8 @@
 -->
 <jdoquery xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoquery"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery 
-                         http://xmlns.jcp.org/xml/ns/jdo/jdoquery_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery
+     http://xmlns.jcp.org/xml/ns/jdo/jdoquery_3_2.xsd">
   <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
   <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
   <package 
diff --git a/api/src/test/resources/Positive99-xsd.orm b/api/src/test/resources/Positive99-xsd.orm
index 9a9d648..13be65e 100644
--- a/api/src/test/resources/Positive99-xsd.orm
+++ b/api/src/test/resources/Positive99-xsd.orm
@@ -17,8 +17,8 @@
 -->
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm 
-                         http://xmlns.jcp.org/xml/ns/jdo/orm_2_2.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
   <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
   <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
   <package 
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package.jdo
index e98350b..d48894d 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package.jdo
@@ -18,10 +18,10 @@
 <!--
 This file contains the persistence information for persistence-capable classes 
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.api.instancecallbacks">
         <class name="InstanceLifecycleListenerAttach$PC" detachable="true">
             <field name="id" primary-key="true"/>
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/package.jdo
index 97b6da7..e4fa51f 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/package.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/package.jdo
@@ -19,10 +19,10 @@
 This file contains the schema information for persistence-aware classes 
 and SimpleClass, which is needed for several fieldtypes tests.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.models.inheritance">
         <class name="FieldWithSameNameInSuperclass" persistence-modifier="persistence-aware"/>
         <class name="NonPersistentFieldsAreNonPersistentInSubclasses" persistence-modifier="persistence-aware"/>
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/building/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/building/package.jdo
index d51bccf..a0f18ed 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/building/package.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/building/package.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-    http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 
     <package name="org.apache.jdo.tck.pc.building">
 
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/company/Person.jdoquery b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/company/Person.jdoquery
index 43ba806..ecf931b 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/company/Person.jdoquery
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/company/Person.jdoquery
@@ -18,10 +18,10 @@
 <!--
 This file contains a named query for class Person.
 -->
-<jdoquery xmlns="http://java.sun.com/xml/ns/jdo/jdoquery"
+<jdoquery xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoquery"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdoquery 
-	http://java.sun.com/xml/ns/jdo/jdoquery_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery
+     http://xmlns.jcp.org/xml/ns/jdo/jdoquery_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Person">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
index f4780c0..21c150a 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package.jdo
index bb912c5..0abf368 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package.jdo
index e752e91..97b9439 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/converter/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/converter/package.jdo
index 304a5f4..fa5cacc 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/converter/package.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/converter/package.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.converter">
 
     <class name="PCRect"
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo
index cce98e9..e3674be 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="AllTypes" identity-type="application"
             objectid-class="org.apache.jdo.tck.pc.fieldtypes.AllTypes$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo
index 52f6ade..48c1414 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="ArrayCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.ArrayCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo
index ac58a14..19a4f47 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="ArrayListCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.ArrayListCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo
index 682b706..689402f 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="CollectionCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.CollectionCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo
index 6c1419c..d5b6566 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfBigDecimal" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfBigDecimal$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo
index 0f13279..bb493a6 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfBigInteger" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfBigInteger$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo
index 5e5d890..1c4744f 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfBoolean" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfBoolean$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo
index 7433e07..5f09ed5 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfByte" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfByte$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo
index 0bfdf46..590ec92 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfCharacter" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfCharacter$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo
index 7f7a7b5..65e0cf7 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfDate" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfDate$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo
index ce28750..a950276 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfDouble" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfDouble$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo
index e7aabbb..294d0b6 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfFloat" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfFloat$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo
index 0de2367..d8089f0 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfInteger" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfInteger$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo
index 93e66bc..ecf088c 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfLocale" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfLocale$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo
index 535c6a4..a147275 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfLong" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfLong$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo
index b87769f..ae99ddd 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfObject" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfObject$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo
index df4af19..5255545 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitiveboolean" identity-type="application" 
   objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitiveboolean$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo
index 946d10a..32d7a9c 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivebyte" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitivebyte$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo
index 1406292..ddfe3a6 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivechar" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitivechar$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo
index c1a5c87..6a24d08 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivedouble" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitivedouble$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo
index 87af1ed..265cc92 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivefloat" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitivefloat$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo
index 3a68271..f7e2fa8 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitiveint" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitiveint$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo
index 19bd61d..edca511 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivelong" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitivelong$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo
index cdea22f..8d08158 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitiveshort" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitiveshort$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo
index d6d8e63..7337b39 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfShort" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfShort$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo
index ed4366e..cff22a8 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfSimpleClass" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfSimpleClass$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo
index 3b6436f..8017782 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfSimpleEnum" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfSimpleEnum$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo
index b824bc2..e9357bf 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfSimpleInterface" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfSimpleInterface$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo
index 3c11da4..9b6116a 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfString" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfString$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo
index a9c6896..da970cd 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashMapStringKeyCollections" identity-type="application"
   objectid-class="org.apache.jdo.tck.pc.fieldtypes.HashMapStringKeyCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo
index c078b98..07df079 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashMapStringValueCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.HashMapStringValueCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo
index 24dcd22..62c88f2 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashSetCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.HashSetCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo
index 0f3cb21..1a147cb 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashtableStringKeyCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.HashtableStringKeyCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo
index d335494..600f139 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashtableStringValueCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.HashtableStringValueCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo
index 08b97e4..1ed0dd6 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="LinkedListCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.LinkedListCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo
index 975800f..1055108 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="ListCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.ListCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo
index 7736c02..3b714e6 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="MapStringKeyCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.MapStringKeyCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo
index 35cddb4..568064e 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="MapStringValueCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.MapStringValueCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo
index ff08de0..1afcdcb 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="SetCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.SetCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo
index bbc8a93..f9dbc9e 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="TreeMapStringKeyCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.TreeMapStringKeyCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo
index 937befa..f8be0a5 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="TreeMapStringValueCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.TreeMapStringValueCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo
index 1f7ccb0..c145ffc 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="TreeSetCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.TreeSetCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo
index 8648d26..f758267 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="VectorCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.VectorCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/package.jdo
index 1eb2022..91bbc04 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/package.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/package.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.inheritance">
         <class
             name="AllPersist"
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package.jdo
index 4171d2f..d6e6363 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.instancecallbacks">
         <class name="InstanceCallbackNonPersistFdsClass" 
             identity-type="application"
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo
index 88af32b..511ca98 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.lifecycle">
 
     <class name="StateTransitionObj" 
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/PCClass.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/PCClass.jdo
index bb5eea5..cc7fd19 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/PCClass.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/PCClass.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
     <class name="PCClass" 
            identity-type="application" objectid-class="org.apache.jdo.tck.pc.mylib.PCClass$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/package.jdo
index 0a4e695..3e6a62b 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/package.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/package.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint"
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo
index afa3a0c..d0efee7 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/AAddress_bad.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/AAddress_bad.jdo
index f35de0e..4b3a76a 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/AAddress_bad.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/AAddress_bad.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo
index 571b547..e155e52 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/Address_bad.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/Address_bad.jdo
index db47540..b11ae33 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/Address_bad.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/Address_bad.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo
index 8a82b23..e61c356 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/IAddress_bad.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/IAddress_bad.jdo
index 31257f9..99b91b4 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/IAddress_bad.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/IAddress_bad.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/order/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/order/package.jdo
index c7ac674..ebf08c9 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/order/package.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/order/package.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/query/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/query/package.jdo
index 828603e..fe1bd32 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/query/package.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/query/package.jdo
@@ -16,10 +16,10 @@
   limitations under the License.
 -->
 
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.query">
 
     <class name="JDOQLKeywordsAsFieldNames"
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo
index d2d688b..ce53626 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.shoppingcart">
 
         <class
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package.jdo
index e782171..310d808 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package.jdo
@@ -16,10 +16,10 @@
   limitations under the License.
 -->
 
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.singlefieldidentity">
 
     <class name="PCPointSingleFieldPrimitivebyte"
diff --git a/tck/src/main/resources/jdo/applicationidentity/package.jdo b/tck/src/main/resources/jdo/applicationidentity/package.jdo
index ccd7c42..e43be31 100644
--- a/tck/src/main/resources/jdo/applicationidentity/package.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/package.jdo
@@ -19,10 +19,10 @@
 This file contains a named query which may be found 
 calling pm.newNamedQuery(null, "packageJDOInDefaultPackage").
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
     <query name="packageJDOInDefaultPackage">
         SELECT FROM org.apache.jdo.tck.pc.company.Person
     </query>
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package.jdo
index 5c7ceb5..835b71a 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package.jdo
@@ -18,10 +18,10 @@
 <!--
 This file contains the persistence information for persistence-capable classes 
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.api.instancecallbacks">
         <class name="InstanceLifecycleListenerAttach$PC" 
                 identity-type="datastore" detachable="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/package.jdo
index 85c7df2..2d9649b 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/package.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/package.jdo
@@ -19,10 +19,10 @@
 This file contains the schema information for persistence-aware classes 
 and SimpleClass, which is needed for several fieldtypes tests.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.models.inheritance">
         <class name="FieldWithSameNameInSuperclass" persistence-modifier="persistence-aware"/>
         <class name="NonPersistentFieldsAreNonPersistentInSubclasses" persistence-modifier="persistence-aware"/>
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/building/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/building/package.jdo
index 3dcc13f..33abe10 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/building/package.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/building/package.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-    http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 
     <package name="org.apache.jdo.tck.pc.building">
 
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/Person.jdoquery b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/Person.jdoquery
index 43ba806..ecf931b 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/Person.jdoquery
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/Person.jdoquery
@@ -18,10 +18,10 @@
 <!--
 This file contains a named query for class Person.
 -->
-<jdoquery xmlns="http://java.sun.com/xml/ns/jdo/jdoquery"
+<jdoquery xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoquery"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdoquery 
-	http://java.sun.com/xml/ns/jdo/jdoquery_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery
+     http://xmlns.jcp.org/xml/ns/jdo/jdoquery_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Person">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
index 97c4353..9e35ba2 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package.jdo
index 2224043..cc75483 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package.jdo
index b514a8d..5307304 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/converter/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/converter/package.jdo
index 05a173c..6ac470d 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/converter/package.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/converter/package.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.converter">
 
     <class name="PCRect" identity-type="datastore">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo
index eb9e106..6252963 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="AllTypes">
         </class>
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo
index 4d3acf5..6dde6ee 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="ArrayCollections" identity-type="datastore">
 <field name="ArrayOfObject0" persistence-modifier="persistent">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo
index ca66615..b4ad61c 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="ArrayListCollections" identity-type="datastore">
 <field name="ArrayListOfObject0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo
index 574c124..7319d3c 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="CollectionCollections" identity-type="datastore">
 <field name="CollectionOfObject0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo
index c1bae1e..25b669f 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfBigDecimal" identity-type="datastore">
 <field name="BigDecimal1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo
index b9da777..7fa4d0b 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfBigInteger" identity-type="datastore">
 <field name="BigInteger1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo
index f975cfc..94bc95c 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfBoolean" identity-type="datastore">
 <field name="Boolean1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo
index 19b83fa..458aa5a 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfByte" identity-type="datastore">
 <field name="Byte1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo
index ecb535b..539d841 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfCharacter" identity-type="datastore">
 <field name="Character1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo
index dea0bf4..cd3b2ec 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfDate" identity-type="datastore">
 <field name="Date1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo
index f35b969..9ab80b8 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfDouble" identity-type="datastore">
 <field name="Double1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo
index 2dc4f62..7ef62e5 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfFloat" identity-type="datastore">
 <field name="Float1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo
index 2a66f44..f95a8e1 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfInteger" identity-type="datastore">
 <field name="identifier"  persistence-modifier="none"/>
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo
index fa82107..e0fff8d 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfLocale" identity-type="datastore">
 <field name="Locale1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo
index 3c03579..6290b53 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfLong" identity-type="datastore">
 <field name="Long1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo
index b2e70fb..43ec2d2 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfObject" identity-type="datastore">
 <field name="Object1"  serialized="true" persistence-modifier="persistent"
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo
index 8545576..206ed51 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitiveboolean" identity-type="datastore">
 <field name="boolean1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo
index 96f83d9..a2ec348 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivebyte" identity-type="datastore">
 <field name="byte1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo
index ac0a5f9..fd5e632 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivechar" identity-type="datastore">
 <field name="identifier"  persistence-modifier="none"/>
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo
index b33f4f3..c4e7117 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivedouble" identity-type="datastore">
 <field name="double1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo
index 2e3bf6c..98df7ac 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivefloat" identity-type="datastore">
 <field name="float1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo
index 7b3e4d8..d1695d8 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitiveint" identity-type="datastore">
 <field name="int1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo
index 7adf4b3..01d7bce 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivelong" identity-type="datastore">
 <field name="long1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo
index ca8ec6f..7b04224 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitiveshort" identity-type="datastore">
 <field name="short1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo
index e98374c..179a585 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfShort" identity-type="datastore">
 <field name="Short1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo
index a153617..671ceb5 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfSimpleClass" identity-type="datastore">
 <field name="SimpleClass1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo
index 49d243a..539c349 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfSimpleEnum" identity-type="datastore">
 <field name="identifier"  persistence-modifier="none"/>
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo
index 9d735e6..855c5c3 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfSimpleInterface" identity-type="datastore">
 <field name="SimpleInterface1"  serialized="true" persistence-modifier="persistent">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo
index fe7bdff..a98ad3d 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfString" identity-type="datastore">
 <field name="String1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo
index c74e2eb..b3389e3 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashMapStringKeyCollections" identity-type="datastore">
 <field name="HashMapOfString_Object0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo
index 9d77caa..4aab8ce 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashMapStringValueCollections" identity-type="datastore">
 <field name="HashMapOfObject_String0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo
index ecae693..c6bef6d 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashSetCollections" identity-type="datastore">
 <field name="HashSetOfObject0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo
index 18f9403..ebe10b3 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashtableStringKeyCollections" identity-type="datastore">
 <field name="HashtableOfString_Object0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo
index e4435ed..41ef739 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashtableStringValueCollections" identity-type="datastore">
 <field name="HashtableOfObject_String0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo
index d754ecd..814f719 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="LinkedListCollections" identity-type="datastore">
 <field name="LinkedListOfObject0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo
index c5bd034..c32812e 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="ListCollections" identity-type="datastore">
 <field name="ListOfObject0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo
index 0fe2830..d304f2e 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="MapStringKeyCollections" identity-type="datastore">
 <field name="MapOfString_Object0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo
index c7ef748..9482b64 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="MapStringValueCollections" identity-type="datastore">
 <field name="MapOfObject_String0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo
index 7170271..d277848 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="SetCollections" identity-type="datastore">
 <field name="SetOfObject0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo
index 7f3960b..5df7d7b 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="TreeMapStringKeyCollections" identity-type="datastore">
 <field name="TreeMapOfString_Object0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo
index 53aa4cd..7f379dd 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="TreeMapStringValueCollections" identity-type="datastore">
 <field name="TreeMapOfObject_String0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo
index ffbf997..1c859fb 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="TreeSetCollections" identity-type="datastore">
 <field name="TreeSetOfObject0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo
index 49df00d..e236f18 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="VectorCollections" identity-type="datastore">
 <field name="VectorOfObject0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package.jdo
index d8591e6..2a5f5f8 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.inheritance">
         <class 
             name="AllPersist" 
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package.jdo
index 9cea020..b1ebdde 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.instancecallbacks">
         <class name="InstanceCallbackNonPersistFdsClass" 
             identity-type="datastore">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo
index 32de6cf..584ed0c 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.lifecycle">
     <class name="StateTransitionObj" identity-type="datastore" detachable="true"/>
   </package>
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/PCClass.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/PCClass.jdo
index 21f29d8..b7f9593 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/PCClass.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/PCClass.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
     <class name="PCClass" identity-type="datastore">
       <field name="transientNumber1" persistence-modifier="none"/>
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/package.jdo
index 99e376f..d6a82ff 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/package.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/package.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" identity-type="datastore"/>
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo
index 5660264..4ea951c 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/AAddress_bad.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/AAddress_bad.jdo
index 1827339..6d2eb7a 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/AAddress_bad.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/AAddress_bad.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo
index a0d7b12..6c9ab4e 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/Address_bad.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/Address_bad.jdo
index 293f97e..cf746b7 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/Address_bad.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/Address_bad.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo
index 49d8626..1b7921e 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/IAddress_bad.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/IAddress_bad.jdo
index 62037ac..868f652 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/IAddress_bad.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/IAddress_bad.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/order/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/order/package.jdo
index 3cb4c7a..788ed22 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/order/package.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/order/package.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
 <!--
 This file is not used!! It exists here to satisfy build constraints.
 -->
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/query/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/query/package.jdo
index db6a181..1e80e41 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/query/package.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/query/package.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.query">
     <class name="JDOQLKeywordsAsFieldNames" identity-type="datastore"/>
 
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo
index 875a98e..f8304ae 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.shoppingcart">
 
         <class
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/singlefieldidentity/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/singlefieldidentity/package.jdo
index e601868..f04ef99 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/singlefieldidentity/package.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/singlefieldidentity/package.jdo
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.singlefieldidentity">
     <class name="PCPointSingleFieldPrimitivebyte" persistence-modifier="non-persistent"/>
     <class name="PCPointSingleFieldByte" persistence-modifier="non-persistent"/>
diff --git a/tck/src/main/resources/jdo/datastoreidentity/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/package.jdo
index 55150d0..ce46fc4 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/package.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/package.jdo
@@ -19,10 +19,10 @@
 This file contains a named query which may be found 
 calling pm.newNamedQuery(null, "packageJDOInDefaultPackage").
 -->
-<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
-	http://java.sun.com/xml/ns/jdo/jdo_3_0.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
     <query name="packageJDOInDefaultPackage">
         SELECT FROM org.apache.jdo.tck.pc.company.Person
     </query>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm
index e974b04..6fcc387 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm
@@ -19,10 +19,10 @@
 This file contains the schema information when an implementation
 has application identity.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.api.instancecallbacks">
 
         <class name="InstanceLifecycleListenerAttach$PC" 
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/building/package-standard12.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/building/package-standard12.orm
index 5ddd254..15dacec 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/building/package-standard12.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/building/package-standard12.orm
@@ -18,10 +18,10 @@
 <!--
 This file contains the schema information when an implementation has application-id.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.building">
         <class name="Kitchen" table="KITCHEN">
             <field name="id" column="KITCHEN_ID"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm
index 86abbfc..c9ba673 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
index 5cb2361..2ffc3de 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
index 97f2272..3891e53 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
index 43d35d2..76fda2c 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
index 75364b4..064d53f 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/companyAnnotatedFC/package-standard11.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/companyAnnotatedFC/package-standard11.orm
index fed0749..f2b7dfa 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/companyAnnotatedFC/package-standard11.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/companyAnnotatedFC/package-standard11.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm
index ecef08d..4bddfa8 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package-standard9.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package-standard9.orm
index 7bfb0da..c8bf259 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package-standard9.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package-standard9.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/converter/package-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/converter/package-standard.orm
index b134ba0..0047e3a 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/converter/package-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/converter/package-standard.orm
@@ -15,11 +15,11 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
-  <package name="org.apache.jdo.tck.pc.converter">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+<package name="org.apache.jdo.tck.pc.converter">
 
     <class name="PCRect" table="PCRectConv">
       <field name="id" column="ID"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm
index b9ede46..76e3f65 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="AllTypes" table="ALLTYPES">
             <field name="id" column="ID"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm
index 89903ac..c2a1770 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm
@@ -18,10 +18,10 @@
 <!--
 Metadata for application identity
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ArrayCollections" table="ARRAY_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm
index 29d4d09..6377226 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ArrayListCollections" table="ARRAYLIST_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm
index 5b3f9cd..5565039 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="CollectionCollections" table="COLLECTION_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm
index 1a968b1..6671d43 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBigDecimal" table="FIELDSOFBIGDECIMAL">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm
index 2a0cbf4..fd221c7 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBigInteger" table="FIELDSOFBIGINTEGER">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm
index 1b568c2..3ec7bbe 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBoolean" table="FIELDSOFBOOLEAN">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm
index f0f4560..4e0dd61 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfByte" table="FieldsOfByte">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm
index 23fd536..b5ca64b 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfCharacter" table="FIELDSOFCHARACTER">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm
index ba147b2..f2bdc97 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfDate" table="FIELDSOFDATE">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm
index 8c4f4f0..c06e4f3 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfDouble" table="FIELDSOFDOUBLE">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm
index ab82b52..6588d01 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfFloat" table="FIELDSOFFLOAT">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm
index 78193c8..420ca59 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfInteger" table="FIELDSOFINTEGER">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm
index ae1e13b..38df441 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfLocale" table="FIELDSOFLOCALE">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm
index 3069e19..636efb0 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfLong" table="FIELDSOFLONG">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm
index 8952f95..950a9ee 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfObject" table="FIELDSOFOBJECT">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm
index c63df9b..a7094a3 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveboolean" table="FIELDSOFPRIMITIVEBOOLEAN">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm
index 08987fe..02455d4 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivebyte" table="FIELDSOFPRIMITIVEBYTE">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm
index 956eec6..1cf2be8 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivechar" table="FIELDSOFPRIMITIVECHAR">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm
index 84aaa73..b60d33b 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivedouble" table="FIELDSOFPRIMITIVEDOUBLE">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm
index 75412d0..2b25e28 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivefloat" table="FIELDSOFPRIMITIVEFLOAT">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm
index ea82af0..ac98d51 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveint" table="FIELDSOFPRIMITIVEINT">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm
index 87cf303..504d7fc 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivelong" table="FIELDSOFPRIMITIVELONG">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm
index 90e2ee8..28e9245 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveshort" table="FIELDSOFPRIMITIVESHORT">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm
index 0437ecc..cf70e57 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
            <class name="FieldsOfShort" table="FIELDSOFSHORT">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm
index 1925f60..06e7935 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleClass" table="FIELDSOFSIMPLECLASS">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm
index 2f9cc6b..7199c40 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleEnum" table="FIELDSOFENUMNAME">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm
index 0a15bfa..edccc70 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleEnum" table="FIELDSOFENUMORDINAL">
             <field name="identifier">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm
index 9365a71..fd1dcee 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleInterface" table="FIELDSOFSIMPLEINTERFACE">
             <field name="identifier" column="IDENTIFIER">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm
index 08d1a9a..50cd830 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfString" table="FIELDSOFSTRING">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm
index b296532..8d9dcb4 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashMapStringKeyCollections"
                table="HASHMAPSTRINGKEY_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm
index 770408e..612c5df 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashMapStringValueCollections"
                table="HASHMAPSTRINGVALUE_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm
index 2fe1551..acd5f31 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashSetCollections" table="HASHSET_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm
index af041fa..8f97c16 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringKeyCollections"
                table="HASHTABLESTRINGKEY_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm
index ad6f4d6..e71b805 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringValueCollections"
                table="HASHTBLSTRINGVALUE_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm
index 178c528..4c569ec 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="LinkedListCollections" table="LINKEDLIST_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm
index c0b0860..4bb5b4d 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ListCollections" table="LIST_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm
index 26faab8..7375393 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="MapStringKeyCollections" table="MAPSTRINGKEY_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm
index 656874b..3d96bd7 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="MapStringValueCollections"
                table="MAPSTRINGVALUE_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm
index 3a9df26..fafaa82 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="SetCollections" table="SET_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm
index e549806..2485f97 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="SimpleClass" table="SIMPLE_CLASS">
             <field name="id" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm
index 25bf8d7..138ca58 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeMapStringKeyCollections"
                table="TREEMAPSTRINGKEY_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm
index 5b5afdb..dabb4ae 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeMapStringValueCollections"
                table="TREEMAPSTRINGVALUE_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm
index a273948..c5c30aa 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeSetCollections" table="TREESET_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm
index 54c6803..e4d17c8 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="VectorCollections" table="VECTOR_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm
index 373f1d5..6146410 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.inheritance">
         <class name="AllPersist" table="AllPersist">
             <inheritance strategy="new-table">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm
index f8e70f5..8c80786 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.instancecallbacks">
         <class name="InstanceCallbackNonPersistFdsClass" table="ICNonPersistFds">
             <field name="keyValue">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm
index a6dd48a..9eaacb3 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.lifecycle">
     <class name="StateTransitionObj" table="STATETRANSITIONOBJ">
        <field name="id" column="ID"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm
index 053bbc7..10cb9be 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm
index 63c67a3..abb56d5 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm
@@ -16,10 +16,10 @@
   limitations under the License.
 -->
 <orm schema="applicationidentity_orm"
-     xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm
index fee813f..ad3af2c 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib" schema="applicationidentity_pkg">
 
     <class name="PCPoint" table="PCPoint">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm
index fd7b591..6d28158 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint" schema="applicationidentity_cls">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm
index 4bc15f6..8c1f4e5 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/order/package-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/order/package-standard.orm
index d826c29..8e6c096 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/order/package-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/order/package-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/query/package-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/query/package-standard.orm
index 0ee5044..4472ad5 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/query/package-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/query/package-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.query">
 
     <class name="JDOQLKeywordsAsFieldNames" table="JDOQLKeywordsAsFieldNames">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm
index 5aa5a75..3fdea55 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm
@@ -19,10 +19,10 @@
 This file contains the schema information when an implementation
 has application identity.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.shoppingcart">
 
         <class name="Cart" table="CARTS">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package-standard.orm
index 64dffd8..a79d055 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.singlefieldidentity">
 
     <class name="PCPointSingleFieldPrimitivebyte" table="PCPointSingleFieldByte">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm
index e7fd814..3f575b3 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm
@@ -19,10 +19,10 @@
 This file contains the schema information when an implementation
 has datastore identity.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.api.instancecallbacks">
 
         <class name="InstanceLifecycleListenerAttach$PC" 
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/building/package-standard12.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/building/package-standard12.orm
index dffac6a..0c7dd97 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/building/package-standard12.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/building/package-standard12.orm
@@ -18,10 +18,10 @@
 <!--
 This file contains the schema information when an implementation has application-id.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.building" schema="datastoreidentity12">
 
         <sequence name="id_seq" datastore-sequence="DATASTORE_SEQ"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm
index 52e6057..ebee2ea 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
index 47fb6e1..4836c72 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
index a5bade9..cb3d077 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
index 1f1c343..03cf5e3 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
index 0b3381f..ad0f32c 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/companyAnnotatedFC/package-standard11.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/companyAnnotatedFC/package-standard11.orm
index c765768..854bc25 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/companyAnnotatedFC/package-standard11.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/companyAnnotatedFC/package-standard11.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm
index 4e1c1b4..fe4817a 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package-standard9.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package-standard9.orm
index 1073dd8..a38275f 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package-standard9.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package-standard9.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/converter/package-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/converter/package-standard.orm
index 18b43f6..38077d8 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/converter/package-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/converter/package-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.converter">
 
     <class name="PCRect" table="PCRectConv">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm
index c5353c4..67f32f6 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="AllTypes" table="ALLTYPES">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm
index 3f89fda..8f50980 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm
@@ -18,10 +18,10 @@
 <!--
 Metadata for datastore identity
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ArrayCollections" table="ARRAY_COLLECTIONS">
             <datastore-identity strategy="identity"
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm
index 4d31937..25a80d4 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ArrayListCollections" table="ARRAYLIST_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm
index e89930c..6de0b8a 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="CollectionCollections" table="COLLECTION_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm
index 748835c..d1c45f6 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBigDecimal" table="FIELDSOFBIGDECIMAL">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm
index 6da83d0..1c52241 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBigInteger" table="FIELDSOFBIGINTEGER">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm
index 52b812e..ba3db1e 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBoolean" table="FIELDSOFBOOLEAN">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm
index 9c251ef..26abf4b 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfByte" table="FieldsOfByte">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm
index 2d3a720..fb17cac 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfCharacter" table="FIELDSOFCHARACTER">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm
index b23993c..535c084 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfDate" table="FIELDSOFDATE">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm
index de06d43..a283cb9 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfDouble" table="FIELDSOFDOUBLE">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm
index 05958c8..e3c42cd 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfFloat" table="FIELDSOFFLOAT">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm
index 0e56439..422322e 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfInteger" table="FIELDSOFINTEGER">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm
index b9ab388..5523e1b 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfLocale" table="FIELDSOFLOCALE">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm
index e9b7542..df0a1d1 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfLong" table="FIELDSOFLONG">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm
index b8f2f74..c5818c9 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfObject" table="FIELDSOFOBJECT">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm
index a337eb2..ce85535 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveboolean" table="FIELDSOFPRIMITIVEBOOLEAN">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm
index caffe06..fc9e108 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivebyte" table="FIELDSOFPRIMITIVEBYTE">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm
index 5d9e389..681992d 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivechar" table="FIELDSOFPRIMITIVECHAR">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm
index 7abf76d..ea43720 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivedouble" table="FIELDSOFPRIMITIVEDOUBLE">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm
index c075d49..4f5c392 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivefloat" table="FIELDSOFPRIMITIVEFLOAT">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm
index d83397e..eca063b 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveint" table="FIELDSOFPRIMITIVEINT">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm
index d5de370..849578e 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivelong" table="FIELDSOFPRIMITIVELONG">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm
index a5c78fe..2cff2ea 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveshort" table="FIELDSOFPRIMITIVESHORT">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm
index 487177d..59aa2d1 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
            <class name="FieldsOfShort" table="FIELDSOFSHORT">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm
index 91fd9e8..1eb6a93 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleClass" table="FIELDSOFSIMPLECLASS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm
index cb55ec5..1c2b3b9 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleEnum" table="FIELDSOFENUMNAME">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm
index 2370b8d..ab450fb 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleEnum" table="FIELDSOFENUMORDINAL">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm
index 46b27ce..fc5c31e 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleInterface" table="FIELDSOFSIMPLEINTERFACE">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm
index 3d66a0b..c35c75b 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfString" table="FIELDSOFSTRING">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm
index 6a76e90..4ac6fe1 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashMapStringKeyCollections"
                table="HASHMAPSTRINGKEY_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm
index 2d3c4ca..1f7b3e4 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashMapStringValueCollections"
                table="HASHMAPSTRINGVALUE_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm
index 48230c1..5d56187 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashSetCollections" table="HASHSET_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm
index f7ed16d..1d571c2 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringKeyCollections"
                table="HASHTABLESTRINGKEY_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm
index d941a99..6c9adaa 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringValueCollections"
                table="HASHTBLSTRINGVALUE_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm
index 46d41fb..d1e60f4 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="LinkedListCollections" table="LINKEDLIST_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm
index 40962a6..8d11904 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ListCollections" table="LIST_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm
index cff7e96..2a70ba8 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="MapStringKeyCollections" table="MAPSTRINGKEY_COLLECTIONS">
             <datastore-identity strategy="identity"
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm
index c218f48..32182ca 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="MapStringValueCollections"
                table="MAPSTRINGVALUE_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm
index 491c49b..7ada628 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="SetCollections" table="SET_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm
index be33100..f3155b1 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="SimpleClass" table="SIMPLE_CLASS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm
index 29afa31..8b3a721 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeMapStringKeyCollections"
                table="TREEMAPSTRINGKEY_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm
index 520ea22..0cad049 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeMapStringValueCollections"
                table="TREEMAPSTRINGVALUE_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm
index 27570b5..5e73fa6 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeSetCollections" table="TREESET_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm
index 93599fd..035c215 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="VectorCollections" table="VECTOR_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm
index cdff31b..aa2276b 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.inheritance">
         <class name="AllPersist" table="AllPersist">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm
index 93283de..9c381fd 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.instancecallbacks">
         <class name="InstanceCallbackNonPersistFdsClass" table="ICNonPersistFds">
             <datastore-identity strategy="identity">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm
index c71bfeb..6c05273 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.lifecycle">
     <class name="StateTransitionObj" table="STATETRANSITIONOBJ">
        <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm
index 3ca561e..bf3b728 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm
index af4dec7..dd467cc 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm
@@ -16,10 +16,10 @@
   limitations under the License.
 -->
 <orm schema="datastoreidentity_orm"
-     xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm
index 63b6385..47f1abe 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib" schema="datastoreidentity_pkg" >
 
     <class name="PCPoint" table="PCPoint">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm
index a45ae00..0b9dda0 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint" schema="datastoreidentity_cls">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm
index 35ac939..48ab2f8 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/query/package-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/query/package-standard.orm
index da90ecd..509dc0a 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/query/package-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/query/package-standard.orm
@@ -18,10 +18,10 @@
 <!--
 This file contains the schema information when an implementation has datastore identity.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.query">
 
     <class name="JDOQLKeywordsAsFieldNames" table="JDOQLKeywordsAsFieldNames">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm
index e5b06e1..60a6641 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm
@@ -19,10 +19,10 @@
 This file contains the schema information when an implementation
 has datastore identity.
 -->
-<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
-	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.shoppingcart" schema="datastoreidentity8">
 
         <sequence name="id_seq" datastore-sequence="DATASTORE_SEQ"/>