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/04/02 16:09:19 UTC

[db-jdo] branch JDO-806 updated: JDO-806: Use apache URL for xmlns namespace

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

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


The following commit(s) were added to refs/heads/JDO-806 by this push:
     new 343fb72  JDO-806: Use apache URL for xmlns namespace
343fb72 is described below

commit 343fb726d538323e2b7bfd467bead5f8234fb256
Author: Michael Bouschen <mb...@apache.org>
AuthorDate: Sat Apr 2 18:08:55 2022 +0200

    JDO-806: Use apache URL for xmlns namespace
---
 api/src/main/java/javax/jdo/Constants.java               | 16 ++++++++--------
 api/src/main/resources/javax/jdo/jdo_3_2.dtd             |  4 ++--
 api/src/main/resources/javax/jdo/jdo_3_2.xsd             |  4 ++--
 api/src/main/resources/javax/jdo/jdoconfig_3_2.dtd       |  4 ++--
 api/src/main/resources/javax/jdo/jdoconfig_3_2.xsd       |  6 +++---
 api/src/main/resources/javax/jdo/jdoquery_3_2.dtd        |  4 ++--
 api/src/main/resources/javax/jdo/jdoquery_3_2.xsd        |  4 ++--
 api/src/main/resources/javax/jdo/orm_3_2.dtd             |  4 ++--
 api/src/main/resources/javax/jdo/orm_3_2.xsd             |  4 ++--
 api/src/test/java/javax/jdo/util/XMLTestUtil.java        |  6 +++---
 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-xsd.jdo                 |  4 ++--
 api/src/test/resources/Positive0-xsd.jdoquery            |  4 ++--
 api/src/test/resources/Positive0-xsd.orm                 |  4 ++--
 api/src/test/resources/Positive1-xsd.jdo                 |  4 ++--
 api/src/test/resources/Positive1-xsd.orm                 |  4 ++--
 api/src/test/resources/Positive15.1-xsd.orm              |  4 ++--
 api/src/test/resources/Positive15.2.1-xsd.orm            |  4 ++--
 api/src/test/resources/Positive15.2.2-xsd.orm            |  4 ++--
 api/src/test/resources/Positive15.3.1-xsd.orm            |  4 ++--
 api/src/test/resources/Positive15.3.2-xsd.orm            |  4 ++--
 api/src/test/resources/Positive15.3.3-xsd.orm            |  4 ++--
 api/src/test/resources/Positive15.3.4-xsd.orm            |  4 ++--
 api/src/test/resources/Positive15.3.5-xsd.orm            |  4 ++--
 api/src/test/resources/Positive15.3.6-xsd.orm            |  4 ++--
 api/src/test/resources/Positive15.4-xsd.orm              |  4 ++--
 api/src/test/resources/Positive15.5-xsd.orm              |  4 ++--
 api/src/test/resources/Positive15.6-xsd.orm              |  4 ++--
 api/src/test/resources/Positive15.8.1-xsd.orm            |  4 ++--
 api/src/test/resources/Positive15.8.2-xsd.orm            |  4 ++--
 api/src/test/resources/Positive15.8.3-xsd.orm            |  4 ++--
 api/src/test/resources/Positive99-xsd.jdo                |  4 ++--
 api/src/test/resources/Positive99-xsd.jdoquery           |  4 ++--
 api/src/test/resources/Positive99-xsd.orm                |  4 ++--
 .../jdoconfig/Negative01/META-INF/jdoconfig.xml          |  2 +-
 .../jdoconfig/Negative02/META-INF/jdoconfig.xml          |  2 +-
 .../jdoconfig/Negative03/META-INF/jdoconfig.xml          |  2 +-
 .../jdoconfig/Negative04/META-INF/jdoconfig.xml          |  2 +-
 .../jdoconfig/Negative05/META-INF/jdoconfig.xml          |  2 +-
 .../jdoconfig/Negative06/6a/META-INF/jdoconfig.xml       |  2 +-
 .../jdoconfig/Negative06/6b/META-INF/jdoconfig.xml       |  2 +-
 .../jdoconfig/Negative09/9a/META-INF/jdoconfig.xml       |  2 +-
 .../jdoconfig/Pmfmapmap01/META-INF/jdoconfig.xml         |  2 +-
 .../jdoconfig/Positive00/META-INF/jdoconfig.xml          |  2 +-
 .../jdoconfig/Positive01/1a/META-INF/jdoconfig.xml       |  2 +-
 .../jdoconfig/Positive01/1b/META-INF/jdoconfig.xml       |  2 +-
 .../jdoconfig/Positive02/META-INF/jdoconfig.xml          |  2 +-
 .../jdoconfig/Positive03/META-INF/jdoconfig.xml          |  2 +-
 .../jdoconfig/Positive04/META-INF/jdoconfig.xml          |  2 +-
 .../jdoconfig/Positive05/META-INF/jdoconfig.xml          |  2 +-
 .../jdoconfig/Positive06/META-INF/jdoconfig.xml          |  2 +-
 .../jdoconfig/Positive07/META-INF/jdoconfig.xml          |  2 +-
 tck/src/main/resources/conf/jdo-signatures.txt           |  8 ++++----
 .../org/apache/jdo/tck/api/instancecallbacks/package.jdo |  4 ++--
 .../applicationidentity/org/apache/jdo/tck/package.jdo   |  4 ++--
 .../org/apache/jdo/tck/pc/building/package.jdo           |  4 ++--
 .../org/apache/jdo/tck/pc/company/Person.jdoquery        |  4 ++--
 .../org/apache/jdo/tck/pc/company/package.jdo            |  4 ++--
 .../apache/jdo/tck/pc/companyListWithoutJoin/package.jdo |  4 ++--
 .../apache/jdo/tck/pc/companyMapWithoutJoin/package.jdo  |  4 ++--
 .../org/apache/jdo/tck/pc/converter/package.jdo          |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo        |  4 ++--
 .../apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo    |  4 ++--
 .../jdo/tck/pc/fieldtypes/ArrayListCollections.jdo       |  4 ++--
 .../jdo/tck/pc/fieldtypes/CollectionCollections.jdo      |  4 ++--
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo  |  4 ++--
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo  |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo    |  4 ++--
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo   |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo    |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo  |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo   |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo  |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo    |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo  |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo   |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo      |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo      |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo    |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo     |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo       |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo      |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo     |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo   |  4 ++--
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo |  4 ++--
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo  |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo    |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo  |  4 ++--
 .../tck/pc/fieldtypes/HashMapStringKeyCollections.jdo    |  4 ++--
 .../tck/pc/fieldtypes/HashMapStringValueCollections.jdo  |  4 ++--
 .../apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo  |  4 ++--
 .../tck/pc/fieldtypes/HashtableStringKeyCollections.jdo  |  4 ++--
 .../pc/fieldtypes/HashtableStringValueCollections.jdo    |  4 ++--
 .../jdo/tck/pc/fieldtypes/LinkedListCollections.jdo      |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo |  4 ++--
 .../jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo    |  4 ++--
 .../jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo  |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo  |  4 ++--
 .../tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo    |  4 ++--
 .../tck/pc/fieldtypes/TreeMapStringValueCollections.jdo  |  4 ++--
 .../apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo  |  4 ++--
 .../apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo   |  4 ++--
 .../org/apache/jdo/tck/pc/inheritance/package.jdo        |  4 ++--
 .../org/apache/jdo/tck/pc/instancecallbacks/package.jdo  |  4 ++--
 .../apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo   |  4 ++--
 .../org/apache/jdo/tck/pc/mylib/PCClass.jdo              |  4 ++--
 .../org/apache/jdo/tck/pc/mylib/package.jdo              |  4 ++--
 .../org/apache/jdo/tck/pc/newInstance/AAddress.jdo       |  4 ++--
 .../org/apache/jdo/tck/pc/newInstance/AAddress_bad.jdo   |  4 ++--
 .../org/apache/jdo/tck/pc/newInstance/Address.jdo        |  4 ++--
 .../org/apache/jdo/tck/pc/newInstance/Address_bad.jdo    |  4 ++--
 .../org/apache/jdo/tck/pc/newInstance/IAddress.jdo       |  4 ++--
 .../org/apache/jdo/tck/pc/newInstance/IAddress_bad.jdo   |  4 ++--
 .../org/apache/jdo/tck/pc/order/package.jdo              |  4 ++--
 .../org/apache/jdo/tck/pc/query/package.jdo              |  4 ++--
 .../org/apache/jdo/tck/pc/shoppingcart/package.jdo       |  4 ++--
 .../apache/jdo/tck/pc/singlefieldidentity/package.jdo    |  4 ++--
 .../main/resources/jdo/applicationidentity/package.jdo   |  4 ++--
 .../org/apache/jdo/tck/api/instancecallbacks/package.jdo |  4 ++--
 .../jdo/datastoreidentity/org/apache/jdo/tck/package.jdo |  4 ++--
 .../org/apache/jdo/tck/pc/building/package.jdo           |  4 ++--
 .../org/apache/jdo/tck/pc/company/Person.jdoquery        |  4 ++--
 .../org/apache/jdo/tck/pc/company/package.jdo            |  4 ++--
 .../apache/jdo/tck/pc/companyListWithoutJoin/package.jdo |  4 ++--
 .../apache/jdo/tck/pc/companyMapWithoutJoin/package.jdo  |  4 ++--
 .../org/apache/jdo/tck/pc/converter/package.jdo          |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo        |  4 ++--
 .../apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo    |  4 ++--
 .../jdo/tck/pc/fieldtypes/ArrayListCollections.jdo       |  4 ++--
 .../jdo/tck/pc/fieldtypes/CollectionCollections.jdo      |  4 ++--
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo  |  4 ++--
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo  |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo    |  4 ++--
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo   |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo    |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo  |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo   |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo  |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo    |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo  |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo   |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo      |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo      |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo    |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo     |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo       |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo      |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo     |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo   |  4 ++--
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo |  4 ++--
 .../apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo  |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo    |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo  |  4 ++--
 .../tck/pc/fieldtypes/HashMapStringKeyCollections.jdo    |  4 ++--
 .../tck/pc/fieldtypes/HashMapStringValueCollections.jdo  |  4 ++--
 .../apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo  |  4 ++--
 .../tck/pc/fieldtypes/HashtableStringKeyCollections.jdo  |  4 ++--
 .../pc/fieldtypes/HashtableStringValueCollections.jdo    |  4 ++--
 .../jdo/tck/pc/fieldtypes/LinkedListCollections.jdo      |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo |  4 ++--
 .../jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo    |  4 ++--
 .../jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo  |  4 ++--
 .../org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo  |  4 ++--
 .../tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo    |  4 ++--
 .../tck/pc/fieldtypes/TreeMapStringValueCollections.jdo  |  4 ++--
 .../apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo  |  4 ++--
 .../apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo   |  4 ++--
 .../org/apache/jdo/tck/pc/inheritance/package.jdo        |  4 ++--
 .../org/apache/jdo/tck/pc/instancecallbacks/package.jdo  |  4 ++--
 .../apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo   |  4 ++--
 .../org/apache/jdo/tck/pc/mylib/PCClass.jdo              |  4 ++--
 .../org/apache/jdo/tck/pc/mylib/package.jdo              |  4 ++--
 .../org/apache/jdo/tck/pc/newInstance/AAddress.jdo       |  4 ++--
 .../org/apache/jdo/tck/pc/newInstance/AAddress_bad.jdo   |  4 ++--
 .../org/apache/jdo/tck/pc/newInstance/Address.jdo        |  4 ++--
 .../org/apache/jdo/tck/pc/newInstance/Address_bad.jdo    |  4 ++--
 .../org/apache/jdo/tck/pc/newInstance/IAddress.jdo       |  4 ++--
 .../org/apache/jdo/tck/pc/newInstance/IAddress_bad.jdo   |  4 ++--
 .../org/apache/jdo/tck/pc/order/package.jdo              |  4 ++--
 .../org/apache/jdo/tck/pc/query/package.jdo              |  4 ++--
 .../org/apache/jdo/tck/pc/shoppingcart/package.jdo       |  4 ++--
 .../apache/jdo/tck/pc/singlefieldidentity/package.jdo    |  4 ++--
 tck/src/main/resources/jdo/datastoreidentity/package.jdo |  4 ++--
 .../jdo/tck/api/instancecallbacks/package-standard.orm   |  4 ++--
 .../apache/jdo/tck/pc/building/package-standard12.orm    |  4 ++--
 .../org/apache/jdo/tck/pc/company/package-standard.orm   |  4 ++--
 .../org/apache/jdo/tck/pc/company/package-standard1.orm  |  4 ++--
 .../org/apache/jdo/tck/pc/company/package-standard2.orm  |  4 ++--
 .../org/apache/jdo/tck/pc/company/package-standard3.orm  |  4 ++--
 .../org/apache/jdo/tck/pc/company/package-standard4.orm  |  4 ++--
 .../jdo/tck/pc/companyAnnotatedFC/package-standard11.orm |  4 ++--
 .../tck/pc/companyListWithoutJoin/package-standard10.orm |  4 ++--
 .../tck/pc/companyMapWithoutJoin/package-standard9.orm   |  4 ++--
 .../org/apache/jdo/tck/pc/converter/package-standard.orm |  4 ++--
 .../apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm   |  4 ++--
 .../jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm  |  4 ++--
 .../tck/pc/fieldtypes/ArrayListCollections-standard.orm  |  4 ++--
 .../tck/pc/fieldtypes/CollectionCollections-standard.orm |  4 ++--
 .../tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm    |  4 ++--
 .../tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm    |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm   |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm      |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm      |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm    |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm     |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm   |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm    |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm      |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm    |  4 ++--
 .../pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm  |  4 ++--
 .../tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm |  4 ++--
 .../tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm |  4 ++--
 .../pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm   |  4 ++--
 .../pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm    |  4 ++--
 .../tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm  |  4 ++--
 .../tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm |  4 ++--
 .../pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm    |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm     |  4 ++--
 .../tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm   |  4 ++--
 .../tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm    |  4 ++--
 .../tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm   |  4 ++--
 .../pc/fieldtypes/FieldsOfSimpleInterface-standard.orm   |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm    |  4 ++--
 .../fieldtypes/HashMapStringKeyCollections-standard.orm  |  4 ++--
 .../HashMapStringValueCollections-standard.orm           |  4 ++--
 .../tck/pc/fieldtypes/HashSetCollections-standard.orm    |  4 ++--
 .../HashtableStringKeyCollections-standard.orm           |  4 ++--
 .../HashtableStringValueCollections-standard.orm         |  4 ++--
 .../tck/pc/fieldtypes/LinkedListCollections-standard.orm |  4 ++--
 .../jdo/tck/pc/fieldtypes/ListCollections-standard.orm   |  4 ++--
 .../pc/fieldtypes/MapStringKeyCollections-standard.orm   |  4 ++--
 .../pc/fieldtypes/MapStringValueCollections-standard.orm |  4 ++--
 .../jdo/tck/pc/fieldtypes/SetCollections-standard.orm    |  4 ++--
 .../jdo/tck/pc/fieldtypes/SimpleClass-standard.orm       |  4 ++--
 .../fieldtypes/TreeMapStringKeyCollections-standard.orm  |  4 ++--
 .../TreeMapStringValueCollections-standard.orm           |  4 ++--
 .../tck/pc/fieldtypes/TreeSetCollections-standard.orm    |  4 ++--
 .../jdo/tck/pc/fieldtypes/VectorCollections-standard.orm |  4 ++--
 .../apache/jdo/tck/pc/inheritance/package-standard.orm   |  4 ++--
 .../jdo/tck/pc/instancecallbacks/package-standard.orm    |  4 ++--
 .../jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm |  4 ++--
 .../org/apache/jdo/tck/pc/mylib/package-standard.orm     |  4 ++--
 .../org/apache/jdo/tck/pc/mylib/package-standard5.orm    |  4 ++--
 .../org/apache/jdo/tck/pc/mylib/package-standard6.orm    |  4 ++--
 .../org/apache/jdo/tck/pc/mylib/package-standard7.orm    |  4 ++--
 .../apache/jdo/tck/pc/newInstance/package-standard.orm   |  4 ++--
 .../org/apache/jdo/tck/pc/order/package-standard.orm     |  4 ++--
 .../org/apache/jdo/tck/pc/query/package-standard.orm     |  4 ++--
 .../apache/jdo/tck/pc/shoppingcart/package-standard8.orm |  4 ++--
 .../jdo/tck/pc/singlefieldidentity/package-standard.orm  |  4 ++--
 .../jdo/tck/api/instancecallbacks/package-standard.orm   |  4 ++--
 .../apache/jdo/tck/pc/building/package-standard12.orm    |  4 ++--
 .../org/apache/jdo/tck/pc/company/package-standard.orm   |  4 ++--
 .../org/apache/jdo/tck/pc/company/package-standard1.orm  |  4 ++--
 .../org/apache/jdo/tck/pc/company/package-standard2.orm  |  4 ++--
 .../org/apache/jdo/tck/pc/company/package-standard3.orm  |  4 ++--
 .../org/apache/jdo/tck/pc/company/package-standard4.orm  |  4 ++--
 .../jdo/tck/pc/companyAnnotatedFC/package-standard11.orm |  4 ++--
 .../tck/pc/companyListWithoutJoin/package-standard10.orm |  4 ++--
 .../tck/pc/companyMapWithoutJoin/package-standard9.orm   |  4 ++--
 .../org/apache/jdo/tck/pc/converter/package-standard.orm |  4 ++--
 .../apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm   |  4 ++--
 .../jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm  |  4 ++--
 .../tck/pc/fieldtypes/ArrayListCollections-standard.orm  |  4 ++--
 .../tck/pc/fieldtypes/CollectionCollections-standard.orm |  4 ++--
 .../tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm    |  4 ++--
 .../tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm    |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm   |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm      |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm      |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm    |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm     |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm   |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm    |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm      |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm    |  4 ++--
 .../pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm  |  4 ++--
 .../tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm |  4 ++--
 .../tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm |  4 ++--
 .../pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm   |  4 ++--
 .../pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm    |  4 ++--
 .../tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm  |  4 ++--
 .../tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm |  4 ++--
 .../pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm    |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm     |  4 ++--
 .../tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm   |  4 ++--
 .../tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm    |  4 ++--
 .../tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm   |  4 ++--
 .../pc/fieldtypes/FieldsOfSimpleInterface-standard.orm   |  4 ++--
 .../jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm    |  4 ++--
 .../fieldtypes/HashMapStringKeyCollections-standard.orm  |  4 ++--
 .../HashMapStringValueCollections-standard.orm           |  4 ++--
 .../tck/pc/fieldtypes/HashSetCollections-standard.orm    |  4 ++--
 .../HashtableStringKeyCollections-standard.orm           |  4 ++--
 .../HashtableStringValueCollections-standard.orm         |  4 ++--
 .../tck/pc/fieldtypes/LinkedListCollections-standard.orm |  4 ++--
 .../jdo/tck/pc/fieldtypes/ListCollections-standard.orm   |  4 ++--
 .../pc/fieldtypes/MapStringKeyCollections-standard.orm   |  4 ++--
 .../pc/fieldtypes/MapStringValueCollections-standard.orm |  4 ++--
 .../jdo/tck/pc/fieldtypes/SetCollections-standard.orm    |  4 ++--
 .../jdo/tck/pc/fieldtypes/SimpleClass-standard.orm       |  4 ++--
 .../fieldtypes/TreeMapStringKeyCollections-standard.orm  |  4 ++--
 .../TreeMapStringValueCollections-standard.orm           |  4 ++--
 .../tck/pc/fieldtypes/TreeSetCollections-standard.orm    |  4 ++--
 .../jdo/tck/pc/fieldtypes/VectorCollections-standard.orm |  4 ++--
 .../apache/jdo/tck/pc/inheritance/package-standard.orm   |  4 ++--
 .../jdo/tck/pc/instancecallbacks/package-standard.orm    |  4 ++--
 .../jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm |  4 ++--
 .../org/apache/jdo/tck/pc/mylib/package-standard.orm     |  4 ++--
 .../org/apache/jdo/tck/pc/mylib/package-standard5.orm    |  4 ++--
 .../org/apache/jdo/tck/pc/mylib/package-standard6.orm    |  4 ++--
 .../org/apache/jdo/tck/pc/mylib/package-standard7.orm    |  4 ++--
 .../apache/jdo/tck/pc/newInstance/package-standard.orm   |  4 ++--
 .../org/apache/jdo/tck/pc/query/package-standard.orm     |  4 ++--
 .../apache/jdo/tck/pc/shoppingcart/package-standard8.orm |  4 ++--
 323 files changed, 638 insertions(+), 638 deletions(-)

diff --git a/api/src/main/java/javax/jdo/Constants.java b/api/src/main/java/javax/jdo/Constants.java
index 3400fd1..8a04a63 100644
--- a/api/src/main/java/javax/jdo/Constants.java
+++ b/api/src/main/java/javax/jdo/Constants.java
@@ -66,39 +66,39 @@ public interface Constants {
 
     /**
      * The standard JDO configuration schema namespace.
-     * Constant value is <code>http://xmlns.jcp.org/xml/ns/jdo/jdoconfig</code>.
+     * Constant value is <code>https://db.apache.org/jdo/xmlns/jdoconfig</code>.
      *
      * @since 2.1
      */
     static String JDOCONFIG_XSD_NS
-        = "http://xmlns.jcp.org/xml/ns/jdo/jdoconfig";
+        = "https://db.apache.org/jdo/xmlns/jdoconfig";
 
     /**
      * The standard JDO metadata schema namespace.
-     * Constant value is <code>http://xmlns.jcp.org/xml/ns/jdo/jdo</code>.
+     * Constant value is <code>https://db.apache.org/jdo/xmlns/jdo</code>.
      *
      * @since 2.1
      */
     static String JDO_XSD_NS
-        = "http://xmlns.jcp.org/xml/ns/jdo/jdo";
+        = "https://db.apache.org/jdo/xmlns/jdo";
 
     /**
      * The standard JDO object-repository mapping schema namespace.
-     * Constant value is <code>http://xmlns.jcp.org/xml/ns/jdo/orm</code>.
+     * Constant value is <code>https://db.apache.org/jdo/xmlns/orm</code>.
      *
      * @since 2.1
      */
     static String ORM_XSD_NS
-        = "http://xmlns.jcp.org/xml/ns/jdo/orm";
+        = "https://db.apache.org/jdo/xmlns/orm";
 
     /**
      * The standard JDO query schema namespace.
-     * Constant value is <code>http://xmlns.jcp.org/xml/ns/jdo/jdoquery</code>.
+     * Constant value is <code>https://db.apache.org/jdo/xmlns/jdoquery</code>.
      *
      * @since 2.1
      */
     static String JDOQUERY_XSD_NS
-        = "http://xmlns.jcp.org/xml/ns/jdo/jdoquery";
+        = "https://db.apache.org/jdo/xmlns/jdoquery";
 
     /**
      * The name of the persistence manager factory element in the JDO
diff --git a/api/src/main/resources/javax/jdo/jdo_3_2.dtd b/api/src/main/resources/javax/jdo/jdo_3_2.dtd
index e59fcf0..9ab6041 100755
--- a/api/src/main/resources/javax/jdo/jdo_3_2.dtd
+++ b/api/src/main/resources/javax/jdo/jdo_3_2.dtd
@@ -16,8 +16,8 @@
 -->
 <!-- The DOCTYPE should be as follows for metadata documents.
 <!DOCTYPE jdo
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 3.2//EN"
-    "http://xmlns.jcp.org/dtd/jdo_3_2.dtd">
+    PUBLIC "-//The Apache Software Foundation//DTD Java Data Objects Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/jdo_3_2.dtd">
 -->
 <!ELEMENT jdo (extension*, (package|query|fetch-plan)+, extension*)>
 <!ATTLIST jdo catalog CDATA #IMPLIED>
diff --git a/api/src/main/resources/javax/jdo/jdo_3_2.xsd b/api/src/main/resources/javax/jdo/jdo_3_2.xsd
index bc9fbc1..9fff4a2 100755
--- a/api/src/main/resources/javax/jdo/jdo_3_2.xsd
+++ b/api/src/main/resources/javax/jdo/jdo_3_2.xsd
@@ -15,8 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xs:schema targetNamespace="http://xmlns.jcp.org/xml/ns/jdo/jdo"
-           xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<xs:schema targetNamespace="https://db.apache.org/jdo/xmlns/jdo"
+           xmlns="https://db.apache.org/jdo/xmlns/jdo"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            version="3.2">
     <xs:element name="jdo">
diff --git a/api/src/main/resources/javax/jdo/jdoconfig_3_2.dtd b/api/src/main/resources/javax/jdo/jdoconfig_3_2.dtd
index 4ae002a..f65216a 100644
--- a/api/src/main/resources/javax/jdo/jdoconfig_3_2.dtd
+++ b/api/src/main/resources/javax/jdo/jdoconfig_3_2.dtd
@@ -16,8 +16,8 @@
 -->
 <!--
 <!DOCTYPE jdoconfig
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Configuration 3.2//EN"
-    "http://xmlns.jcp.org/dtd/jdoconfig_3_2.dtd">
+    PUBLIC "-//The Apache Software Foundation//DTD Java Data Objects Configuration 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/jdoconfig_3_2.dtd">
 -->
 <!ELEMENT jdoconfig (persistence-manager-factory+)>
 
diff --git a/api/src/main/resources/javax/jdo/jdoconfig_3_2.xsd b/api/src/main/resources/javax/jdo/jdoconfig_3_2.xsd
index 9d468fa..eadf1f7 100644
--- a/api/src/main/resources/javax/jdo/jdoconfig_3_2.xsd
+++ b/api/src/main/resources/javax/jdo/jdoconfig_3_2.xsd
@@ -17,10 +17,10 @@
 -->
 
 <xs:schema
-  targetNamespace="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
-  xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+  targetNamespace="https://db.apache.org/jdo/xmlns/jdoconfig"
+  xmlns="https://db.apache.org/jdo/xmlns/jdoconfig"
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jdoconfig="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+  xmlns:jdoconfig="https://db.apache.org/jdo/xmlns/jdoconfig"
   elementFormDefault="qualified"
   attributeFormDefault="unqualified"
   version="3.2">
diff --git a/api/src/main/resources/javax/jdo/jdoquery_3_2.dtd b/api/src/main/resources/javax/jdo/jdoquery_3_2.dtd
index 05d8e5f..7a52939 100644
--- a/api/src/main/resources/javax/jdo/jdoquery_3_2.dtd
+++ b/api/src/main/resources/javax/jdo/jdoquery_3_2.dtd
@@ -16,8 +16,8 @@
 -->
 <!-- The DOCTYPE should be as follows for jdoquery documents.
 <!DOCTYPE jdoquery
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 3.2//EN"
-    "http://xmlns.jcp.org/dtd/jdoquery_3_2.dtd">
+    PUBLIC "-//The Apache Software Foundation//DTD Java Data Objects Query Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/jdoquery_3_2.dtd">
 -->
 <!ELEMENT jdoquery (extension*, (package|query)+, (extension)*)>
 
diff --git a/api/src/main/resources/javax/jdo/jdoquery_3_2.xsd b/api/src/main/resources/javax/jdo/jdoquery_3_2.xsd
index e25c1cb..e66e773 100644
--- a/api/src/main/resources/javax/jdo/jdoquery_3_2.xsd
+++ b/api/src/main/resources/javax/jdo/jdoquery_3_2.xsd
@@ -15,8 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xs:schema targetNamespace="http://xmlns.jcp.org/xml/ns/jdo/jdoquery"
-           xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoquery"
+<xs:schema targetNamespace="https://db.apache.org/jdo/xmlns/jdoquery"
+           xmlns="https://db.apache.org/jdo/xmlns/jdoquery"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            version="3.2">
     <xs:element name="jdoquery">
diff --git a/api/src/main/resources/javax/jdo/orm_3_2.dtd b/api/src/main/resources/javax/jdo/orm_3_2.dtd
index ac20dc9..e6caabb 100755
--- a/api/src/main/resources/javax/jdo/orm_3_2.dtd
+++ b/api/src/main/resources/javax/jdo/orm_3_2.dtd
@@ -16,8 +16,8 @@
 -->
 <!-- The DOCTYPE should be as follows for metadata documents.
 <!DOCTYPE orm
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
-    "http://xmlns.jcp.org/dtd/orm_3_2.dtd">
+    PUBLIC "-//The Apache Software Foundation//DTD Java Data Objects Mapping Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/orm_3_2.dtd">
 -->
 <!ELEMENT orm (extension*, (package|query)+, extension*)>
 <!ATTLIST orm catalog CDATA #IMPLIED>
diff --git a/api/src/main/resources/javax/jdo/orm_3_2.xsd b/api/src/main/resources/javax/jdo/orm_3_2.xsd
index 0764572..9c1572a 100755
--- a/api/src/main/resources/javax/jdo/orm_3_2.xsd
+++ b/api/src/main/resources/javax/jdo/orm_3_2.xsd
@@ -15,8 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xs:schema targetNamespace="http://xmlns.jcp.org/xml/ns/jdo/orm"
-           xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<xs:schema targetNamespace="https://db.apache.org/jdo/xmlns/orm"
+           xmlns="https://db.apache.org/jdo/xmlns/orm"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            version="3.2">
     <xs:element name="orm">
diff --git a/api/src/test/java/javax/jdo/util/XMLTestUtil.java b/api/src/test/java/javax/jdo/util/XMLTestUtil.java
index 0fcc8d4..7a54737 100644
--- a/api/src/test/java/javax/jdo/util/XMLTestUtil.java
+++ b/api/src/test/java/javax/jdo/util/XMLTestUtil.java
@@ -70,15 +70,15 @@ public class XMLTestUtil {
     
     /** jdo namespace */
     protected static final String JDO_XSD_NS = 
-        "http://xmlns.jcp.org/xml/ns/jdo/jdo";
+        "https://db.apache.org/jdo/xmlns/jdo";
 
     /** orm namespace */
     protected static final String ORM_XSD_NS = 
-        "http://xmlns.jcp.org/xml/ns/jdo/orm";
+        "https://db.apache.org/jdo/xmlns/orm";
 
     /** jdoquery namespace */
     protected static final String JDOQUERY_XSD_NS = 
-        "http://xmlns.jcp.org/xml/ns/jdo/jdoquery";
+        "https://db.apache.org/jdo/xmlns/jdoquery";
 
     /** jdo xsd file */
     protected static final File JDO_XSD_FILE = 
diff --git a/api/src/test/resources/Negative0-xsd.jdo b/api/src/test/resources/Negative0-xsd.jdo
index dcac582..b360e5d 100644
--- a/api/src/test/resources/Negative0-xsd.jdo
+++ b/api/src/test/resources/Negative0-xsd.jdo
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!-- Negative test: empty jdo element --> 
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 </jdo>
diff --git a/api/src/test/resources/Negative0-xsd.jdoquery b/api/src/test/resources/Negative0-xsd.jdoquery
index 776f941..03fc644 100644
--- a/api/src/test/resources/Negative0-xsd.jdoquery
+++ b/api/src/test/resources/Negative0-xsd.jdoquery
@@ -16,9 +16,9 @@
   limitations under the License.
 -->
 <!-- Negative test: empty jdoquery element --> 
-<jdoquery xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoquery"
+<jdoquery xmlns="https://db.apache.org/jdo/xmlns/jdoquery"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery
+          xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdoquery
           https://db.apache.org/jdo/xmlns/jdoquery_3_2.xsd">
 
 </jdoquery>
diff --git a/api/src/test/resources/Negative0-xsd.orm b/api/src/test/resources/Negative0-xsd.orm
index 2a05a0a..63b5cdf 100644
--- a/api/src/test/resources/Negative0-xsd.orm
+++ b/api/src/test/resources/Negative0-xsd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!-- Negative test: empty orm element --> 
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 </orm>
diff --git a/api/src/test/resources/Positive0-xsd.jdo b/api/src/test/resources/Positive0-xsd.jdo
index cda371d..2598743 100644
--- a/api/src/test/resources/Positive0-xsd.jdo
+++ b/api/src/test/resources/Positive0-xsd.jdo
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="simple">
         <class name="TestClass"/>
diff --git a/api/src/test/resources/Positive0-xsd.jdoquery b/api/src/test/resources/Positive0-xsd.jdoquery
index 5890ee8..f012c3f 100644
--- a/api/src/test/resources/Positive0-xsd.jdoquery
+++ b/api/src/test/resources/Positive0-xsd.jdoquery
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdoquery xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoquery"
+<jdoquery xmlns="https://db.apache.org/jdo/xmlns/jdoquery"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery
+          xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdoquery
           https://db.apache.org/jdo/xmlns/jdoquery_3_2.xsd">
     <package name="simple">
         <class name="TestClass">
diff --git a/api/src/test/resources/Positive0-xsd.orm b/api/src/test/resources/Positive0-xsd.orm
index f2a1a8f..1995c92 100644
--- a/api/src/test/resources/Positive0-xsd.orm
+++ b/api/src/test/resources/Positive0-xsd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="simple">
         <class name="TestClass"/>
diff --git a/api/src/test/resources/Positive1-xsd.jdo b/api/src/test/resources/Positive1-xsd.jdo
index df0f666..08574ec 100644
--- a/api/src/test/resources/Positive1-xsd.jdo
+++ b/api/src/test/resources/Positive1-xsd.jdo
@@ -19,9 +19,9 @@
 This file contains the schema information when an implementation
 has application identity.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.company">
 
diff --git a/api/src/test/resources/Positive1-xsd.orm b/api/src/test/resources/Positive1-xsd.orm
index 8f20860..a478989 100644
--- a/api/src/test/resources/Positive1-xsd.orm
+++ b/api/src/test/resources/Positive1-xsd.orm
@@ -19,9 +19,9 @@
 This file contains the schema information when an implementation
 has application identity.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.company">
 
diff --git a/api/src/test/resources/Positive15.1-xsd.orm b/api/src/test/resources/Positive15.1-xsd.orm
index 70d425a..3161c48 100644
--- a/api/src/test/resources/Positive15.1-xsd.orm
+++ b/api/src/test/resources/Positive15.1-xsd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <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 d025fcf..cbea922 100644
--- a/api/src/test/resources/Positive15.2.1-xsd.orm
+++ b/api/src/test/resources/Positive15.2.1-xsd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<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 b1fa318..899d277 100644
--- a/api/src/test/resources/Positive15.2.2-xsd.orm
+++ b/api/src/test/resources/Positive15.2.2-xsd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Address" table="ADDR">
diff --git a/api/src/test/resources/Positive15.3.1-xsd.orm b/api/src/test/resources/Positive15.3.1-xsd.orm
index 4a1d4df..cf5e4aa 100644
--- a/api/src/test/resources/Positive15.3.1-xsd.orm
+++ b/api/src/test/resources/Positive15.3.1-xsd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
diff --git a/api/src/test/resources/Positive15.3.2-xsd.orm b/api/src/test/resources/Positive15.3.2-xsd.orm
index 81df46c..59051d9 100644
--- a/api/src/test/resources/Positive15.3.2-xsd.orm
+++ b/api/src/test/resources/Positive15.3.2-xsd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Department" table="DEP">
diff --git a/api/src/test/resources/Positive15.3.3-xsd.orm b/api/src/test/resources/Positive15.3.3-xsd.orm
index b091e0a..3087218 100644
--- a/api/src/test/resources/Positive15.3.3-xsd.orm
+++ b/api/src/test/resources/Positive15.3.3-xsd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<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 3f46f32..1cdec0c 100644
--- a/api/src/test/resources/Positive15.3.4-xsd.orm
+++ b/api/src/test/resources/Positive15.3.4-xsd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<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 2c3b992..c1eba42 100644
--- a/api/src/test/resources/Positive15.3.5-xsd.orm
+++ b/api/src/test/resources/Positive15.3.5-xsd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<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 b32df50..63e3635 100644
--- a/api/src/test/resources/Positive15.3.6-xsd.orm
+++ b/api/src/test/resources/Positive15.3.6-xsd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
         <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 9949661..29dc134 100644
--- a/api/src/test/resources/Positive15.4-xsd.orm
+++ b/api/src/test/resources/Positive15.4-xsd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<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 cd72244..660ebd1 100644
--- a/api/src/test/resources/Positive15.5-xsd.orm
+++ b/api/src/test/resources/Positive15.5-xsd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
diff --git a/api/src/test/resources/Positive15.6-xsd.orm b/api/src/test/resources/Positive15.6-xsd.orm
index 22b3520..d16d9fb 100644
--- a/api/src/test/resources/Positive15.6-xsd.orm
+++ b/api/src/test/resources/Positive15.6-xsd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Address" table="ADDR">
diff --git a/api/src/test/resources/Positive15.8.1-xsd.orm b/api/src/test/resources/Positive15.8.1-xsd.orm
index c8c2b37..0801a68 100644
--- a/api/src/test/resources/Positive15.8.1-xsd.orm
+++ b/api/src/test/resources/Positive15.8.1-xsd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<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 5031428..476fa35 100644
--- a/api/src/test/resources/Positive15.8.2-xsd.orm
+++ b/api/src/test/resources/Positive15.8.2-xsd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
diff --git a/api/src/test/resources/Positive15.8.3-xsd.orm b/api/src/test/resources/Positive15.8.3-xsd.orm
index 74bfc24..17aad11 100644
--- a/api/src/test/resources/Positive15.8.3-xsd.orm
+++ b/api/src/test/resources/Positive15.8.3-xsd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee">
diff --git a/api/src/test/resources/Positive99-xsd.jdo b/api/src/test/resources/Positive99-xsd.jdo
index 5247823..77750dd 100644
--- a/api/src/test/resources/Positive99-xsd.jdo
+++ b/api/src/test/resources/Positive99-xsd.jdo
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
   <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.jdoquery b/api/src/test/resources/Positive99-xsd.jdoquery
index 793b049..e92be0f 100644
--- a/api/src/test/resources/Positive99-xsd.jdoquery
+++ b/api/src/test/resources/Positive99-xsd.jdoquery
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdoquery xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoquery"
+<jdoquery xmlns="https://db.apache.org/jdo/xmlns/jdoquery"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery
+          xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdoquery
           https://db.apache.org/jdo/xmlns/jdoquery_3_2.xsd">
   <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.orm b/api/src/test/resources/Positive99-xsd.orm
index 26d9724..d094e84 100644
--- a/api/src/test/resources/Positive99-xsd.orm
+++ b/api/src/test/resources/Positive99-xsd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
   <extension vendor-name="SUNW" key="KEY" value="VALUE"/>
diff --git a/api/src/test/resources/jdoconfig/Negative01/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Negative01/META-INF/jdoconfig.xml
index 48f74a0..36e6c87 100644
--- a/api/src/test/resources/jdoconfig/Negative01/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Negative01/META-INF/jdoconfig.xml
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+<jdoconfig xmlns="https://db.apache.org/jdo/xmlns/jdoconfig"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
diff --git a/api/src/test/resources/jdoconfig/Negative02/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Negative02/META-INF/jdoconfig.xml
index 9f389f5..76cf474 100644
--- a/api/src/test/resources/jdoconfig/Negative02/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Negative02/META-INF/jdoconfig.xml
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+<jdoconfig xmlns="https://db.apache.org/jdo/xmlns/jdoconfig"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
diff --git a/api/src/test/resources/jdoconfig/Negative03/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Negative03/META-INF/jdoconfig.xml
index 3d57ef8..4a7b874 100644
--- a/api/src/test/resources/jdoconfig/Negative03/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Negative03/META-INF/jdoconfig.xml
@@ -19,7 +19,7 @@
     Do not change any values in this file without also making changes to
     JDOHelperConfigTest.java, as that file depends on the values in this one!
 -->
-<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+<jdoconfig xmlns="https://db.apache.org/jdo/xmlns/jdoconfig"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
diff --git a/api/src/test/resources/jdoconfig/Negative04/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Negative04/META-INF/jdoconfig.xml
index efc5b25..ad1d7a2 100644
--- a/api/src/test/resources/jdoconfig/Negative04/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Negative04/META-INF/jdoconfig.xml
@@ -19,7 +19,7 @@
     Do not change any values in this file without also making changes to
     JDOHelperConfigTest.java, as that file depends on the values in this one!
 -->
-<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+<jdoconfig xmlns="https://db.apache.org/jdo/xmlns/jdoconfig"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
diff --git a/api/src/test/resources/jdoconfig/Negative05/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Negative05/META-INF/jdoconfig.xml
index 7c3d985..1e09c70 100644
--- a/api/src/test/resources/jdoconfig/Negative05/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Negative05/META-INF/jdoconfig.xml
@@ -19,7 +19,7 @@
     Do not change any values in this file without also making changes to
     JDOHelperConfigTest.java, as that file depends on the values in this one!
 -->
-<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+<jdoconfig xmlns="https://db.apache.org/jdo/xmlns/jdoconfig"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
diff --git a/api/src/test/resources/jdoconfig/Negative06/6a/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Negative06/6a/META-INF/jdoconfig.xml
index f2a6146..b378b84 100644
--- a/api/src/test/resources/jdoconfig/Negative06/6a/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Negative06/6a/META-INF/jdoconfig.xml
@@ -19,7 +19,7 @@
     Do not change any values in this file without also making changes to
     JDOHelperConfigTest.java, as that file depends on the values in this one!
 -->
-<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+<jdoconfig xmlns="https://db.apache.org/jdo/xmlns/jdoconfig"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
diff --git a/api/src/test/resources/jdoconfig/Negative06/6b/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Negative06/6b/META-INF/jdoconfig.xml
index f2a6146..b378b84 100644
--- a/api/src/test/resources/jdoconfig/Negative06/6b/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Negative06/6b/META-INF/jdoconfig.xml
@@ -19,7 +19,7 @@
     Do not change any values in this file without also making changes to
     JDOHelperConfigTest.java, as that file depends on the values in this one!
 -->
-<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+<jdoconfig xmlns="https://db.apache.org/jdo/xmlns/jdoconfig"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
diff --git a/api/src/test/resources/jdoconfig/Negative09/9a/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Negative09/9a/META-INF/jdoconfig.xml
index b6faeb9..ec3d415 100644
--- a/api/src/test/resources/jdoconfig/Negative09/9a/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Negative09/9a/META-INF/jdoconfig.xml
@@ -19,7 +19,7 @@
     Do not change any values in this file without also making changes to
     JDOHelperConfigTest.java, as that file depends on the values in this one!
 -->
-<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+<jdoconfig xmlns="https://db.apache.org/jdo/xmlns/jdoconfig"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
diff --git a/api/src/test/resources/jdoconfig/Pmfmapmap01/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Pmfmapmap01/META-INF/jdoconfig.xml
index 7b3e5a5..91c9998 100644
--- a/api/src/test/resources/jdoconfig/Pmfmapmap01/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Pmfmapmap01/META-INF/jdoconfig.xml
@@ -19,7 +19,7 @@
     Do not change any values in this file without also making changes to
     JDOHelperConfigTest.java, as that file depends on the values in this one!
 -->
-<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+<jdoconfig xmlns="https://db.apache.org/jdo/xmlns/jdoconfig"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
diff --git a/api/src/test/resources/jdoconfig/Positive00/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Positive00/META-INF/jdoconfig.xml
index 3be851f..424b53c 100644
--- a/api/src/test/resources/jdoconfig/Positive00/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive00/META-INF/jdoconfig.xml
@@ -19,7 +19,7 @@
     Do not change any values in this file without also making changes to
     JDOHelperConfigTest.java, as that file depends on the values in this one!
 -->
-<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+<jdoconfig xmlns="https://db.apache.org/jdo/xmlns/jdoconfig"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
diff --git a/api/src/test/resources/jdoconfig/Positive01/1a/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Positive01/1a/META-INF/jdoconfig.xml
index fd4d797..17ea27c 100644
--- a/api/src/test/resources/jdoconfig/Positive01/1a/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive01/1a/META-INF/jdoconfig.xml
@@ -19,7 +19,7 @@
     Do not change any values in this file without also making changes to
     JDOHelperConfigTest.java, as that file depends on the values in this one!
 -->
-<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+<jdoconfig xmlns="https://db.apache.org/jdo/xmlns/jdoconfig"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
diff --git a/api/src/test/resources/jdoconfig/Positive01/1b/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Positive01/1b/META-INF/jdoconfig.xml
index baca2d3..f70900a 100644
--- a/api/src/test/resources/jdoconfig/Positive01/1b/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive01/1b/META-INF/jdoconfig.xml
@@ -19,7 +19,7 @@
     Do not change any values in this file without also making changes to
     JDOHelperConfigTest.java, as that file depends on the values in this one!
 -->
-<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+<jdoconfig xmlns="https://db.apache.org/jdo/xmlns/jdoconfig"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
diff --git a/api/src/test/resources/jdoconfig/Positive02/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Positive02/META-INF/jdoconfig.xml
index 93c260c..97bb113 100644
--- a/api/src/test/resources/jdoconfig/Positive02/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive02/META-INF/jdoconfig.xml
@@ -19,7 +19,7 @@
     Do not change any values in this file without also making changes to
     JDOHelperConfigTest.java, as that file depends on the values in this one!
 -->
-<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+<jdoconfig xmlns="https://db.apache.org/jdo/xmlns/jdoconfig"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
diff --git a/api/src/test/resources/jdoconfig/Positive03/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Positive03/META-INF/jdoconfig.xml
index f788420..5fc3bee 100644
--- a/api/src/test/resources/jdoconfig/Positive03/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive03/META-INF/jdoconfig.xml
@@ -19,7 +19,7 @@
     Do not change any values in this file without also making changes to
     JDOHelperConfigTest.java, as that file depends on the values in this one!
 -->
-<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+<jdoconfig xmlns="https://db.apache.org/jdo/xmlns/jdoconfig"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
diff --git a/api/src/test/resources/jdoconfig/Positive04/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Positive04/META-INF/jdoconfig.xml
index f788420..5fc3bee 100644
--- a/api/src/test/resources/jdoconfig/Positive04/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive04/META-INF/jdoconfig.xml
@@ -19,7 +19,7 @@
     Do not change any values in this file without also making changes to
     JDOHelperConfigTest.java, as that file depends on the values in this one!
 -->
-<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+<jdoconfig xmlns="https://db.apache.org/jdo/xmlns/jdoconfig"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
diff --git a/api/src/test/resources/jdoconfig/Positive05/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Positive05/META-INF/jdoconfig.xml
index f788420..5fc3bee 100644
--- a/api/src/test/resources/jdoconfig/Positive05/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive05/META-INF/jdoconfig.xml
@@ -19,7 +19,7 @@
     Do not change any values in this file without also making changes to
     JDOHelperConfigTest.java, as that file depends on the values in this one!
 -->
-<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+<jdoconfig xmlns="https://db.apache.org/jdo/xmlns/jdoconfig"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
diff --git a/api/src/test/resources/jdoconfig/Positive06/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Positive06/META-INF/jdoconfig.xml
index 222a64d..91fc579 100644
--- a/api/src/test/resources/jdoconfig/Positive06/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive06/META-INF/jdoconfig.xml
@@ -19,7 +19,7 @@
     Do not change any values in this file without also making changes to
     JDOHelperConfigTest.java, as that file depends on the values in this one!
 -->
-<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+<jdoconfig xmlns="https://db.apache.org/jdo/xmlns/jdoconfig"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
diff --git a/api/src/test/resources/jdoconfig/Positive07/META-INF/jdoconfig.xml b/api/src/test/resources/jdoconfig/Positive07/META-INF/jdoconfig.xml
index bcd72db..9a79231 100644
--- a/api/src/test/resources/jdoconfig/Positive07/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive07/META-INF/jdoconfig.xml
@@ -19,7 +19,7 @@
     Do not change any values in this file without also making changes to
     JDOHelperConfigTest.java, as that file depends on the values in this one!
 -->
-<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+<jdoconfig xmlns="https://db.apache.org/jdo/xmlns/jdoconfig"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
diff --git a/tck/src/main/resources/conf/jdo-signatures.txt b/tck/src/main/resources/conf/jdo-signatures.txt
index dccc5e8..6844ef7 100644
--- a/tck/src/main/resources/conf/jdo-signatures.txt
+++ b/tck/src/main/resources/conf/jdo-signatures.txt
@@ -25,13 +25,13 @@ public interface javax.jdo.Constants {
     static String JDOCONFIG_RESOURCE_NAME
         = "META-INF/jdoconfig.xml";
     static String JDOCONFIG_XSD_NS
-        = "http://xmlns.jcp.org/xml/ns/jdo/jdoconfig";
+        = "https://db.apache.org/jdo/xmlns/jdoconfig";
     static String JDO_XSD_NS
-        = "http://xmlns.jcp.org/xml/ns/jdo/jdo";
+        = "https://db.apache.org/jdo/xmlns/jdo";
     static String ORM_XSD_NS
-        = "http://xmlns.jcp.org/xml/ns/jdo/orm";
+        = "https://db.apache.org/jdo/xmlns/orm";
     static String JDOQUERY_XSD_NS
-        = "http://xmlns.jcp.org/xml/ns/jdo/jdoquery";
+        = "https://db.apache.org/jdo/xmlns/jdoquery";
     static String ELEMENT_PERSISTENCE_MANAGER_FACTORY
         = "persistence-manager-factory";
     static String PMF_ATTRIBUTE_CLASS
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 a38794a..32ee5d4 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,9 +18,9 @@
 <!--
 This file contains the persistence information for persistence-capable classes 
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.api.instancecallbacks">
         <class name="InstanceLifecycleListenerAttach$PC" detachable="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 f83222e..a2ce490 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,9 +19,9 @@
 This file contains the schema information for persistence-aware classes 
 and SimpleClass, which is needed for several fieldtypes tests.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.models.inheritance">
         <class name="FieldWithSameNameInSuperclass" 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 c7a5869..050fc72 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/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 67a8696..64506fd 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,9 +18,9 @@
 <!--
 This file contains a named query for class Person.
 -->
-<jdoquery xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoquery"
+<jdoquery xmlns="https://db.apache.org/jdo/xmlns/jdoquery"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery
+          xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdoquery
           https://db.apache.org/jdo/xmlns/jdoquery_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.company">
 
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 744bde4..62bf2e2 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 5bf9d25..b08e03c 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 ee0e825..769564b 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 c90f021..b0a627f 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.converter">
 
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 23f11e7..8d69198 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="AllTypes" identity-type="application"
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 87a05a6..3a04445 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="ArrayCollections" identity-type="application"
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 f71651e..00b9db5 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="ArrayListCollections" identity-type="application"
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 0de8fc6..8677694 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="CollectionCollections" identity-type="application"
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 ec1c950..6512a8b 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfBigDecimal" identity-type="application"
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 2dd7c96..904ca29 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfBigInteger" identity-type="application"
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 8381dbe..e51e97b 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfBoolean" identity-type="application"
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 185cf44..783ebb1 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfByte" identity-type="application"
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 510a07d..c000ddf 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfCharacter" identity-type="application"
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 436e0ce..ee2424f 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfDate" identity-type="application"
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 2f53cce..c84e0b6 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfDouble" identity-type="application"
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 e434c88..cd4fbb6 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfFloat" identity-type="application"
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 0e4f157..2d646b6 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfInteger" identity-type="application"
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 e4db637..8bf42b0 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfLocale" identity-type="application"
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 2e254f7..13169cb 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfLong" identity-type="application"
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 d709ba4..db3669b 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfObject" identity-type="application"
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 3aa6568..e39c964 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitiveboolean" identity-type="application" 
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 c443231..36b1d00 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivebyte" identity-type="application"
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 646d653..89f3c50 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivechar" identity-type="application"
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 5d2702e..b0783c0 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivedouble" identity-type="application"
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 2d47087..b17b04c 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivefloat" identity-type="application"
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 44e7f7f..759b48f 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitiveint" identity-type="application"
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 0970468..297686b 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivelong" identity-type="application"
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 994c1c9..6d4655a 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitiveshort" identity-type="application"
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 530e528..a2eac0c 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfShort" identity-type="application"
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 14fc02c..97e91ee 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfSimpleClass" identity-type="application"
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 ca74c91..6df2ce8 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfSimpleEnum" identity-type="application"
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 9886b86..8a2a7e3 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfSimpleInterface" identity-type="application"
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 444951d..7bb1df5 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfString" identity-type="application"
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 f685610..d2f4bb3 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashMapStringKeyCollections" identity-type="application"
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 aeadc6d..c8002e9 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashMapStringValueCollections" identity-type="application"
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 39e5d5e..6b56ad1 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashSetCollections" identity-type="application"
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 999f54e..7861c57 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashtableStringKeyCollections" identity-type="application"
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 77165c1..799ae96 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashtableStringValueCollections" identity-type="application"
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 de409f3..7099d0a 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="LinkedListCollections" identity-type="application"
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 372c560..5fb88bd 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="ListCollections" identity-type="application"
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 6e2bd69..55d7455 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="MapStringKeyCollections" identity-type="application"
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 d9b1878..e05f52b 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="MapStringValueCollections" identity-type="application"
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 b444ae2..4e2fcc1 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="SetCollections" identity-type="application"
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 7c5bffd..701cc5c 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="TreeMapStringKeyCollections" identity-type="application"
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 6468592..cf5bec1 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="TreeMapStringValueCollections" identity-type="application"
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 91519bf..54cf597 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="TreeSetCollections" identity-type="application"
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 e22c582..2a1edf5 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="VectorCollections" identity-type="application"
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 ec6132e..5bb525d 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.inheritance">
         <class
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 34640f9..6b0d244 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.instancecallbacks">
         <class name="InstanceCallbackNonPersistFdsClass" 
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 b9c066d..49c8a60 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.lifecycle">
 
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 98fbf67..b0ff3bc 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
     <class name="PCClass" 
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 cef4a89..ee58691 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
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 9d084a3..a7a8e4d 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 2dcba6b..5e597a2 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 e68e15e..fc27e0f 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 acd9a0a..b08d91e 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 8e2ad14..1c7f939 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 6d308c4..7cab554 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 41dd9a2..0a0c152 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 908120e..e2d65d6 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,9 +16,9 @@
   limitations under the License.
 -->
 
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.query">
 
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 94542fd..6381b91 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.shoppingcart">
 
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 f7223fe..24b6ad5 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,9 +16,9 @@
   limitations under the License.
 -->
 
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.singlefieldidentity">
 
diff --git a/tck/src/main/resources/jdo/applicationidentity/package.jdo b/tck/src/main/resources/jdo/applicationidentity/package.jdo
index f7d2c0d..e401369 100644
--- a/tck/src/main/resources/jdo/applicationidentity/package.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/package.jdo
@@ -19,9 +19,9 @@
 This file contains a named query which may be found 
 calling pm.newNamedQuery(null, "packageJDOInDefaultPackage").
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <query name="packageJDOInDefaultPackage">
         SELECT FROM org.apache.jdo.tck.pc.company.Person
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 ea07c7b..d12c1d9 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,9 +18,9 @@
 <!--
 This file contains the persistence information for persistence-capable classes 
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.api.instancecallbacks">
         <class name="InstanceLifecycleListenerAttach$PC" 
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 b2006c3..e04e7fe 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,9 +19,9 @@
 This file contains the schema information for persistence-aware classes 
 and SimpleClass, which is needed for several fieldtypes tests.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.models.inheritance">
         <class name="FieldWithSameNameInSuperclass" 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 5f4b6f1..4d7bd66 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/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 67a8696..64506fd 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,9 +18,9 @@
 <!--
 This file contains a named query for class Person.
 -->
-<jdoquery xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoquery"
+<jdoquery xmlns="https://db.apache.org/jdo/xmlns/jdoquery"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery
+          xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdoquery
           https://db.apache.org/jdo/xmlns/jdoquery_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.company">
 
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 edac1dc..ae37bf1 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 d70fc4c..df78030 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 1845f2c..3f0cd23 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 99f5db6..297e742 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.converter">
 
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 10a9e19..4edc4c8 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="AllTypes">
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 2985d6c..df9c5a9 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="ArrayCollections" identity-type="datastore">
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 1e43929..619f1e3 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="ArrayListCollections" identity-type="datastore">
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 3643856..286ab21 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="CollectionCollections" identity-type="datastore">
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 386caeb..c1803cf 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfBigDecimal" identity-type="datastore">
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 c7ff4cd..0abb6a6 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfBigInteger" identity-type="datastore">
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 69f55f0..dbaeb84 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfBoolean" identity-type="datastore">
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 8eae893..ef456b7 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfByte" identity-type="datastore">
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 df12cac..40b4237 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfCharacter" identity-type="datastore">
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 b0fd9b8..3d95a94 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfDate" identity-type="datastore">
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 d9cb8c6..f792537 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfDouble" identity-type="datastore">
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 6d76487..768a94c 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfFloat" identity-type="datastore">
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 41eceda..29d6b5c 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfInteger" identity-type="datastore">
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 9503924..305400c 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfLocale" identity-type="datastore">
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 ffcac42..7f5c422 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfLong" identity-type="datastore">
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 5b8e0aa..bad86b0 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfObject" identity-type="datastore">
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 7291e67..c8e504f 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitiveboolean" identity-type="datastore">
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 718382f..66a644b 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivebyte" identity-type="datastore">
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 dbc2d45..240121b 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivechar" identity-type="datastore">
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 1f3b668..3337baf 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivedouble" identity-type="datastore">
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 5102b3e..26bfacf 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivefloat" identity-type="datastore">
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 4f9684f..517ff4b 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitiveint" identity-type="datastore">
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 e609db4..b86da66 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivelong" identity-type="datastore">
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 8b86582..309b6d2 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitiveshort" identity-type="datastore">
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 1bf39d4..77a0e5d 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfShort" identity-type="datastore">
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 2b6a9cb..4539e9b 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfSimpleClass" identity-type="datastore">
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 1151f96..b41b39c 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfSimpleEnum" identity-type="datastore">
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 0dc42c1..76c6ee6 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfSimpleInterface" identity-type="datastore">
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 572117d..92d13cf 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfString" identity-type="datastore">
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 7292855..c60b125 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashMapStringKeyCollections" identity-type="datastore">
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 9a3f21f..752c736 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashMapStringValueCollections" identity-type="datastore">
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 528975f..2abeef8 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashSetCollections" identity-type="datastore">
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 cb61b49..b981f71 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashtableStringKeyCollections" identity-type="datastore">
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 cf1bbcc..e8a9b64 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashtableStringValueCollections" identity-type="datastore">
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 b8fe75e..bf93c0d 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="LinkedListCollections" identity-type="datastore">
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 3803201..269ee49 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="ListCollections" identity-type="datastore">
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 191ebfe..ae92bb9 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="MapStringKeyCollections" identity-type="datastore">
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 6c5e503..6167392 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="MapStringValueCollections" identity-type="datastore">
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 693bece..137c6e9 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="SetCollections" identity-type="datastore">
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 e7a403d..6a7d483 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="TreeMapStringKeyCollections" identity-type="datastore">
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 0bd8ae2..be93981 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="TreeMapStringValueCollections" identity-type="datastore">
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 d5e4f10..2988a61 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="TreeSetCollections" identity-type="datastore">
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 5697e0c..8858140 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="VectorCollections" identity-type="datastore">
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 ed34254..de4d60f 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.inheritance">
         <class 
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 30cc23e..d6eb7fc 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.instancecallbacks">
         <class name="InstanceCallbackNonPersistFdsClass" 
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 fb874c4..ff431c7 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.lifecycle">
     <class name="StateTransitionObj" identity-type="datastore" detachable="true"/>
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 912f2e4..18bcf42 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
     <class name="PCClass" identity-type="datastore">
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 d9b8d23..ce68180 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
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 7745cc2..acfbbd3 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 e348647..cdac964 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 4944f30..b12303f 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 e72b605..f3fd8a0 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 d12e5b1..9d80f24 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 4802e48..24a2eee 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 1b1088b..461f89d 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/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 c83e539..b6921bd 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/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 3f3bc94..0914e6b 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.shoppingcart">
 
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 f348da7..497b133 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.singlefieldidentity">
     <class name="PCPointSingleFieldPrimitivebyte" 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 10457d9..a547a26 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/package.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/package.jdo
@@ -19,9 +19,9 @@
 This file contains a named query which may be found 
 calling pm.newNamedQuery(null, "packageJDOInDefaultPackage").
 -->
-<jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
+<jdo xmlns="https://db.apache.org/jdo/xmlns/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/jdo
      https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <query name="packageJDOInDefaultPackage">
         SELECT FROM org.apache.jdo.tck.pc.company.Person
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 679a135..81cdf1a 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,9 +19,9 @@
 This file contains the schema information when an implementation
 has application identity.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.api.instancecallbacks">
 
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 a0998b7..c1d7d77 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,9 +18,9 @@
 <!--
 This file contains the schema information when an implementation has application-id.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.building">
         <class name="Kitchen" table="KITCHEN">
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 b696915..564d670 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 a9d6e58..debe1e7 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 eeaa20c..6c73d70 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 f5ba28f..f374d55 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 f95c348..60efbbf 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 3dc1e64..517be26 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 5dcc5d2..dbb520a 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 9ee6806..a5b0d56 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 89cb9c3..2e8d2e8 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.converter">
 
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 6ddacbd..5aa4f91 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="AllTypes" table="ALLTYPES">
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 732b510..d327f71 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,9 +18,9 @@
 <!--
 Metadata for application identity
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ArrayCollections" table="ARRAY_COLLECTIONS">
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 d8c039a..70d0cf3 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ArrayListCollections" table="ARRAYLIST_COLLECTIONS">
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 92fda9f..0231199 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="CollectionCollections" table="COLLECTION_COLLECTIONS">
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 879c023..ed08c5d 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBigDecimal" table="FIELDSOFBIGDECIMAL">
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 89d8e7f..31551f8 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBigInteger" table="FIELDSOFBIGINTEGER">
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 dc98e8f..afdb15a 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBoolean" table="FIELDSOFBOOLEAN">
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 63163bd..0e7a7c9 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfByte" table="FieldsOfByte">
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 fc6172a..e1a3481 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfCharacter" table="FIELDSOFCHARACTER">
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 06061ab..2f849c3 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfDate" table="FIELDSOFDATE">
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 2fbe1f4..0bcfe9a 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfDouble" table="FIELDSOFDOUBLE">
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 cfded18..29c8ce0 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfFloat" table="FIELDSOFFLOAT">
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 f1b2464..8c30c2f 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfInteger" table="FIELDSOFINTEGER">
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 e7cd09b..3c59a3b 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfLocale" table="FIELDSOFLOCALE">
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 ede5d49..7ae582a 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfLong" table="FIELDSOFLONG">
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 8bc958a..8c41f2e 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfObject" table="FIELDSOFOBJECT">
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 f67049d..0999d8d 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveboolean" table="FIELDSOFPRIMITIVEBOOLEAN">
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 bdc6400..bd1b5e6 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivebyte" table="FIELDSOFPRIMITIVEBYTE">
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 74a8ba7..c77f109 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivechar" table="FIELDSOFPRIMITIVECHAR">
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 f44c4a4..5459026 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivedouble" table="FIELDSOFPRIMITIVEDOUBLE">
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 2ffd13b..1a2820a 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivefloat" table="FIELDSOFPRIMITIVEFLOAT">
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 e69be81..335f707 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveint" table="FIELDSOFPRIMITIVEINT">
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 64de7dd..24fd141 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivelong" table="FIELDSOFPRIMITIVELONG">
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 c8d864d..25b507c 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveshort" table="FIELDSOFPRIMITIVESHORT">
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 058c887..2b72951 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
            <class name="FieldsOfShort" table="FIELDSOFSHORT">
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 e5cc693..2f84bee 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleClass" table="FIELDSOFSIMPLECLASS">
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 001c712..883c914 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleEnum" table="FIELDSOFENUMNAME">
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 fc6219d..a429791 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleEnum" table="FIELDSOFENUMORDINAL">
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 02d0c45..2c2654a 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleInterface" table="FIELDSOFSIMPLEINTERFACE">
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 7a99efd..3e1e73c 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfString" table="FIELDSOFSTRING">
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 f15d5a9..1d765ea 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashMapStringKeyCollections"
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 2fe9e40..adac0d4 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashMapStringValueCollections"
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 ea3dca5..a1a9a8a 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashSetCollections" table="HASHSET_COLLECTIONS">
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 9e3a862..abc2233 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringKeyCollections"
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 812e0bd..427a832 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringValueCollections"
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 401168d..7251660 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="LinkedListCollections" table="LINKEDLIST_COLLECTIONS">
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 6c4791b..3e6e4d5 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ListCollections" table="LIST_COLLECTIONS">
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 4c35a4e..85a120c 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="MapStringKeyCollections" table="MAPSTRINGKEY_COLLECTIONS">
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 d1934ea..27e5c98 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="MapStringValueCollections"
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 9079203..81776e6 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="SetCollections" table="SET_COLLECTIONS">
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 de6d9c4..8c70917 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="SimpleClass" table="SIMPLE_CLASS">
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 480b0c9..140f141 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeMapStringKeyCollections"
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 21f598a..581f324 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeMapStringValueCollections"
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 1aedbb1..58c9dae 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeSetCollections" table="TREESET_COLLECTIONS">
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 be1bec6..94564a7 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="VectorCollections" table="VECTOR_COLLECTIONS">
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 c6b5ddc..e5a128a 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.inheritance">
         <class name="AllPersist" table="AllPersist">
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 ba0151f..c290054 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.instancecallbacks">
         <class name="InstanceCallbackNonPersistFdsClass" table="ICNonPersistFds">
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 c65e85c..6f26c6d 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.lifecycle">
     <class name="StateTransitionObj" table="STATETRANSITIONOBJ">
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 414117c..6290d82 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
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 6efe10a..f998d08 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,9 +16,9 @@
   limitations under the License.
 -->
 <orm schema="applicationidentity_orm"
-     xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+     xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
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 db83058..322609f 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib" schema="applicationidentity_pkg">
 
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 0b3a222..dc03861 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
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 f4f5c61..12f46a2 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 5822c4e..4e6db99 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 a6e56e2..cc8bfc4 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.query">
 
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 6856ded..78accda 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,9 +19,9 @@
 This file contains the schema information when an implementation
 has application identity.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.shoppingcart">
 
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 a539e9f..92f8e17 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.singlefieldidentity">
 
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 cf0c12c..b1a74b9 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,9 +19,9 @@
 This file contains the schema information when an implementation
 has datastore identity.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.api.instancecallbacks">
 
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 e94324a..bff0148 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,9 +18,9 @@
 <!--
 This file contains the schema information when an implementation has application-id.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.building" schema="datastoreidentity12">
 
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 99d3b9f..f4f49c8 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 8023bf1..e5c6351 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 608b43a..5b86677 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 39bfdac..c56aea4 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 2e90adc..557611a 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 5cfd7af..46d360a 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 43a8884..77bfc90 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 48131de..7b6e4b0 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 74d49db..39f3b3c 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.converter">
 
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 aa4d1ee..ed51da4 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="AllTypes" table="ALLTYPES">
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 ef6f6e8..28375d1 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,9 +18,9 @@
 <!--
 Metadata for datastore identity
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ArrayCollections" table="ARRAY_COLLECTIONS">
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 fc102f7..624b476 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ArrayListCollections" table="ARRAYLIST_COLLECTIONS">
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 d033a45..8330c4e 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="CollectionCollections" table="COLLECTION_COLLECTIONS">
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 ca74637..5f92135 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBigDecimal" table="FIELDSOFBIGDECIMAL">
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 762abaf..a1f8714 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBigInteger" table="FIELDSOFBIGINTEGER">
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 e957f3e..b6939fb 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBoolean" table="FIELDSOFBOOLEAN">
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 fddc358..b2c8d03 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfByte" table="FieldsOfByte">
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 f42e573..48f7aea 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfCharacter" table="FIELDSOFCHARACTER">
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 0c7ee88..a436c39 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfDate" table="FIELDSOFDATE">
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 65fdea9..042af3f 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfDouble" table="FIELDSOFDOUBLE">
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 8843382..5eba898 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfFloat" table="FIELDSOFFLOAT">
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 b5aa7f6..d657549 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfInteger" table="FIELDSOFINTEGER">
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 bdf01a4..969e0f0 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfLocale" table="FIELDSOFLOCALE">
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 c1ccf0e..59b5685 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfLong" table="FIELDSOFLONG">
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 9f8cfcd..dc95434 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfObject" table="FIELDSOFOBJECT">
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 7d7d113..af2363c 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveboolean" table="FIELDSOFPRIMITIVEBOOLEAN">
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 a8a1c7e..77163da 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivebyte" table="FIELDSOFPRIMITIVEBYTE">
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 adc4442..c8fa5b8 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivechar" table="FIELDSOFPRIMITIVECHAR">
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 6957e8b..4fb1c36 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivedouble" table="FIELDSOFPRIMITIVEDOUBLE">
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 fb40003..0e3660e 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivefloat" table="FIELDSOFPRIMITIVEFLOAT">
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 09b580f..0d2cd48 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveint" table="FIELDSOFPRIMITIVEINT">
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 a196324..bc99b1e 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivelong" table="FIELDSOFPRIMITIVELONG">
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 9762d83..be216bc 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveshort" table="FIELDSOFPRIMITIVESHORT">
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 158576d..642840b 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
            <class name="FieldsOfShort" table="FIELDSOFSHORT">
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 0c0022d..ba5d625 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleClass" table="FIELDSOFSIMPLECLASS">
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 38c68bf..9a833fd 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleEnum" table="FIELDSOFENUMNAME">
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 158c035..c6ea641 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleEnum" table="FIELDSOFENUMORDINAL">
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 20ca865..7225092 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleInterface" table="FIELDSOFSIMPLEINTERFACE">
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 6d485df..2d0921d 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfString" table="FIELDSOFSTRING">
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 c3eb84f..3de11ad 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashMapStringKeyCollections"
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 d5ddfc7..1c719b7 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashMapStringValueCollections"
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 ebd0110..6e355b0 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashSetCollections" table="HASHSET_COLLECTIONS">
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 952d8d6..a0559bd 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringKeyCollections"
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 26a1abf..048bc52 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringValueCollections"
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 4a926e3..c53be06 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="LinkedListCollections" table="LINKEDLIST_COLLECTIONS">
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 e41b995..01c32fc 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ListCollections" table="LIST_COLLECTIONS">
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 6d3d7f6..17c718e 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="MapStringKeyCollections" table="MAPSTRINGKEY_COLLECTIONS">
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 d9ab8e0..75f6794 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="MapStringValueCollections"
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 26fdc17..bce7eea 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="SetCollections" table="SET_COLLECTIONS">
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 a20ea23..84054cf 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="SimpleClass" table="SIMPLE_CLASS">
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 6a36c20..dd11cfd 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeMapStringKeyCollections"
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 b04baa2..f1d2fa8 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeMapStringValueCollections"
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 72c991f..0d25b52 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeSetCollections" table="TREESET_COLLECTIONS">
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 4695f87..d84a6ee 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="VectorCollections" table="VECTOR_COLLECTIONS">
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 e935c16..1f73035 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.inheritance">
         <class name="AllPersist" table="AllPersist">
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 29140e2..cf34999 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.instancecallbacks">
         <class name="InstanceCallbackNonPersistFdsClass" table="ICNonPersistFds">
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 39fa2ce..7d3721a 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.lifecycle">
     <class name="StateTransitionObj" table="STATETRANSITIONOBJ">
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 d59c299..bbe3b9d 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
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 e5602dc..4261e82 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,9 +16,9 @@
   limitations under the License.
 -->
 <orm schema="datastoreidentity_orm"
-     xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+     xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
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 f848413..1131270 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib" schema="datastoreidentity_pkg" >
 
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 e3129f2..0a461d3 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
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 954ac1e..092b060 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,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
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 c3d958a..0d308f5 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,9 +18,9 @@
 <!--
 This file contains the schema information when an implementation has datastore identity.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.query">
 
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 cd74808..2d1fb92 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,9 +19,9 @@
 This file contains the schema information when an implementation
 has datastore identity.
 -->
-<orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
+<orm xmlns="https://db.apache.org/jdo/xmlns/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
+     xsi:schemaLocation="https://db.apache.org/jdo/xmlns/orm
      https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.shoppingcart" schema="datastoreidentity8">