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

[db-jdo] 01/01: JDO-806: Use apache URL for schemaLocation of JDO XSDs and DTDs

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

commit 593d3279a1b7b5cb8178b2ff82653d66147af1e7
Author: Michael Bouschen <mb...@apache.org>
AuthorDate: Sun Mar 27 17:34:34 2022 +0200

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

diff --git a/api/src/test/resources/Negative0-dtd.jdo b/api/src/test/resources/Negative0-dtd.jdo
index 5198a0d..1cc0d94 100644
--- a/api/src/test/resources/Negative0-dtd.jdo
+++ b/api/src/test/resources/Negative0-dtd.jdo
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!-- Negative test: empty jdo element --> 
-<!DOCTYPE jdo PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 3.2//EN"
-        "http://xmlns.jcp.org/dtd/jdo_3_2.dtd">
+<!DOCTYPE jdo PUBLIC
+    "-//The Apache Software Foundation//DTD Java Data Objects Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/jdo_3_2.dtd">
 <jdo>
 </jdo>
diff --git a/api/src/test/resources/Negative0-dtd.jdoquery b/api/src/test/resources/Negative0-dtd.jdoquery
index 762d51f..d3cd1f3 100644
--- a/api/src/test/resources/Negative0-dtd.jdoquery
+++ b/api/src/test/resources/Negative0-dtd.jdoquery
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!-- Negative test: empty jdoquery element --> 
-<!DOCTYPE jdo PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 3.2//EN"
-        "http://xmlns.jcp.org/dtd/jdoquery_3_2.dtd">
+<!DOCTYPE jdoquery PUBLIC
+    "-//The Apache Software Foundation//DTD Java Data Objects Query Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/jdoquery_3_2.dtd">
 <jdoquery>
 </jdoquery>
diff --git a/api/src/test/resources/Negative0-dtd.orm b/api/src/test/resources/Negative0-dtd.orm
index e2e32fd..c2303d9 100644
--- a/api/src/test/resources/Negative0-dtd.orm
+++ b/api/src/test/resources/Negative0-dtd.orm
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 <!-- Negative test: empty orm element --> 
-<!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
-        "http://xmlns.jcp.org/dtd/orm_3_2.dtd">
+<!DOCTYPE orm PUBLIC
+    "-//The Apache Software Foundation//DTD Java Data Objects Mapping Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/orm_3_2.dtd">
 <orm>
 </orm>
diff --git a/api/src/test/resources/Negative0-xsd.jdo b/api/src/test/resources/Negative0-xsd.jdo
index 4aa78e5..dcac582 100644
--- a/api/src/test/resources/Negative0-xsd.jdo
+++ b/api/src/test/resources/Negative0-xsd.jdo
@@ -19,5 +19,5 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     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 32b015e..776f941 100644
--- a/api/src/test/resources/Negative0-xsd.jdoquery
+++ b/api/src/test/resources/Negative0-xsd.jdoquery
@@ -17,8 +17,8 @@
 -->
 <!-- Negative test: empty jdoquery element --> 
 <jdoquery xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoquery"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery
-     http://xmlns.jcp.org/xml/ns/jdo/jdoquery_3_2.xsd">
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/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 c8bf609..2a05a0a 100644
--- a/api/src/test/resources/Negative0-xsd.orm
+++ b/api/src/test/resources/Negative0-xsd.orm
@@ -19,5 +19,5 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 </orm>
diff --git a/api/src/test/resources/Positive0-dtd.jdo b/api/src/test/resources/Positive0-dtd.jdo
index 0d54a45..94faba6 100644
--- a/api/src/test/resources/Positive0-dtd.jdo
+++ b/api/src/test/resources/Positive0-dtd.jdo
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE jdo PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 3.2//EN"
-        "http://xmlns.jcp.org/dtd/jdo_3_2.dtd">
+<!DOCTYPE jdo PUBLIC
+    "-//The Apache Software Foundation//DTD Java Data Objects Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/jdo_3_2.dtd">
 <jdo>
     <package name="simple">
         <class name="TestClass"/>
diff --git a/api/src/test/resources/Positive0-dtd.jdoquery b/api/src/test/resources/Positive0-dtd.jdoquery
index f22b867..1409c1a 100644
--- a/api/src/test/resources/Positive0-dtd.jdoquery
+++ b/api/src/test/resources/Positive0-dtd.jdoquery
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE jdoquery  PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Query Metadata 3.2//EN"
-        "http://xmlns.jcp.org/dtd/jdoquery_3_2.dtd">
+<!DOCTYPE jdoquery PUBLIC
+    "-//The Apache Software Foundation//DTD Java Data Objects Query Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/jdoquery_3_2.dtd">
 <jdoquery>
     <package name="simple">
         <class name="TestClass">
diff --git a/api/src/test/resources/Positive0-dtd.orm b/api/src/test/resources/Positive0-dtd.orm
index 9c6181e..355bdb5 100644
--- a/api/src/test/resources/Positive0-dtd.orm
+++ b/api/src/test/resources/Positive0-dtd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
-        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
+<!DOCTYPE orm PUBLIC
+    "-//The Apache Software Foundation//DTD Java Data Objects Mapping Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/orm_3_2.dtd">
 <orm>
     <package name="simple">
         <class name="TestClass"/>
diff --git a/api/src/test/resources/Positive0-xsd.jdo b/api/src/test/resources/Positive0-xsd.jdo
index 5c890b6..cda371d 100644
--- a/api/src/test/resources/Positive0-xsd.jdo
+++ b/api/src/test/resources/Positive0-xsd.jdo
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="simple">
         <class name="TestClass"/>
     </package>
diff --git a/api/src/test/resources/Positive0-xsd.jdoquery b/api/src/test/resources/Positive0-xsd.jdoquery
index dc8cf7b..5890ee8 100644
--- a/api/src/test/resources/Positive0-xsd.jdoquery
+++ b/api/src/test/resources/Positive0-xsd.jdoquery
@@ -16,9 +16,9 @@
   limitations under the License.
 -->
 <jdoquery xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoquery"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery
-     http://xmlns.jcp.org/xml/ns/jdo/jdoquery_3_2.xsd">
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery
+          https://db.apache.org/jdo/xmlns/jdoquery_3_2.xsd">
     <package name="simple">
         <class name="TestClass">
             <query
diff --git a/api/src/test/resources/Positive0-xsd.orm b/api/src/test/resources/Positive0-xsd.orm
index c4a0f13..f2a1a8f 100644
--- a/api/src/test/resources/Positive0-xsd.orm
+++ b/api/src/test/resources/Positive0-xsd.orm
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="simple">
         <class name="TestClass"/>
     </package>
diff --git a/api/src/test/resources/Positive1-dtd.jdo b/api/src/test/resources/Positive1-dtd.jdo
index 7638052..a509dc1 100644
--- a/api/src/test/resources/Positive1-dtd.jdo
+++ b/api/src/test/resources/Positive1-dtd.jdo
@@ -15,8 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE jdo PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 3.2//EN"
-  "http://xmlns.jcp.org/dtd/jdo_3_2.dtd">
+<!DOCTYPE jdo PUBLIC
+    "-//The Apache Software Foundation//DTD Java Data Objects Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/jdo_3_2.dtd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/api/src/test/resources/Positive1-dtd.orm b/api/src/test/resources/Positive1-dtd.orm
index 185f700..e5b6a55 100644
--- a/api/src/test/resources/Positive1-dtd.orm
+++ b/api/src/test/resources/Positive1-dtd.orm
@@ -15,8 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
-  "http://xmlns.jcp.org/dtd/orm_2_2.dtd">
+<!DOCTYPE orm PUBLIC
+    "-//The Apache Software Foundation//DTD Java Data Objects Mapping Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/orm_3_2.dtd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/api/src/test/resources/Positive1-xsd.jdo b/api/src/test/resources/Positive1-xsd.jdo
index bbd1ef7..df0f666 100644
--- a/api/src/test/resources/Positive1-xsd.jdo
+++ b/api/src/test/resources/Positive1-xsd.jdo
@@ -22,7 +22,7 @@ has application identity.
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Address" embedded-only="true" requires-extent="false"/>
diff --git a/api/src/test/resources/Positive1-xsd.orm b/api/src/test/resources/Positive1-xsd.orm
index c8d1633..8f20860 100644
--- a/api/src/test/resources/Positive1-xsd.orm
+++ b/api/src/test/resources/Positive1-xsd.orm
@@ -22,7 +22,7 @@ has application identity.
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Address"/>
diff --git a/api/src/test/resources/Positive15.1-dtd.orm b/api/src/test/resources/Positive15.1-dtd.orm
index a3428ab..719a7b9 100644
--- a/api/src/test/resources/Positive15.1-dtd.orm
+++ b/api/src/test/resources/Positive15.1-dtd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
-        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
+<!DOCTYPE orm PUBLIC
+    "-//The Apache Software Foundation//DTD Java Data Objects Mapping Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/orm_3_2.dtd">
 <orm>
     <package name="com.xyz">
         <class name="Address" table="ADDR">
diff --git a/api/src/test/resources/Positive15.1-xsd.orm b/api/src/test/resources/Positive15.1-xsd.orm
index 3e2c551..70d425a 100644
--- a/api/src/test/resources/Positive15.1-xsd.orm
+++ b/api/src/test/resources/Positive15.1-xsd.orm
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="com.xyz">
         <class name="Address" table="ADDR">
             <field name="street" column="STREET"/>
diff --git a/api/src/test/resources/Positive15.2.1-dtd.orm b/api/src/test/resources/Positive15.2.1-dtd.orm
index e08d30b..a4ad3fa 100644
--- a/api/src/test/resources/Positive15.2.1-dtd.orm
+++ b/api/src/test/resources/Positive15.2.1-dtd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
-        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
+<!DOCTYPE orm PUBLIC
+    "-//The Apache Software Foundation//DTD Java Data Objects Mapping Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Address" table="ADDR">
diff --git a/api/src/test/resources/Positive15.2.1-xsd.orm b/api/src/test/resources/Positive15.2.1-xsd.orm
index 1280801..d025fcf 100644
--- a/api/src/test/resources/Positive15.2.1-xsd.orm
+++ b/api/src/test/resources/Positive15.2.1-xsd.orm
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Address" table="ADDR">
 			<!-- shared join condition used by fields in DELIV -->
diff --git a/api/src/test/resources/Positive15.2.2-dtd.orm b/api/src/test/resources/Positive15.2.2-dtd.orm
index 2180489..fe93ac3 100644
--- a/api/src/test/resources/Positive15.2.2-dtd.orm
+++ b/api/src/test/resources/Positive15.2.2-dtd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
-        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
+<!DOCTYPE orm PUBLIC
+    "-//The Apache Software Foundation//DTD Java Data Objects Mapping Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Address" table="ADDR">
diff --git a/api/src/test/resources/Positive15.2.2-xsd.orm b/api/src/test/resources/Positive15.2.2-xsd.orm
index c791126..b1fa318 100644
--- a/api/src/test/resources/Positive15.2.2-xsd.orm
+++ b/api/src/test/resources/Positive15.2.2-xsd.orm
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Address" table="ADDR">
 			<field name="street" column="STREET"/>
diff --git a/api/src/test/resources/Positive15.3.1-dtd.orm b/api/src/test/resources/Positive15.3.1-dtd.orm
index 220ebf0..0b58ccd 100644
--- a/api/src/test/resources/Positive15.3.1-dtd.orm
+++ b/api/src/test/resources/Positive15.3.1-dtd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
-        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
+<!DOCTYPE orm PUBLIC
+    "-//The Apache Software Foundation//DTD Java Data Objects Mapping Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
diff --git a/api/src/test/resources/Positive15.3.1-xsd.orm b/api/src/test/resources/Positive15.3.1-xsd.orm
index 16c136d..4a1d4df 100644
--- a/api/src/test/resources/Positive15.3.1-xsd.orm
+++ b/api/src/test/resources/Positive15.3.1-xsd.orm
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
 			<field name="ssn" column="SSN"/>
diff --git a/api/src/test/resources/Positive15.3.2-dtd.orm b/api/src/test/resources/Positive15.3.2-dtd.orm
index 8b2993a..31e3651 100644
--- a/api/src/test/resources/Positive15.3.2-dtd.orm
+++ b/api/src/test/resources/Positive15.3.2-dtd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
-        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
+<!DOCTYPE orm PUBLIC
+    "-//The Apache Software Foundation//DTD Java Data Objects Mapping Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Department" table="DEP">
diff --git a/api/src/test/resources/Positive15.3.2-xsd.orm b/api/src/test/resources/Positive15.3.2-xsd.orm
index e176a4a..81df46c 100644
--- a/api/src/test/resources/Positive15.3.2-xsd.orm
+++ b/api/src/test/resources/Positive15.3.2-xsd.orm
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Department" table="DEP">
  			<field name="name" column="NAME"/>
diff --git a/api/src/test/resources/Positive15.3.3-dtd.orm b/api/src/test/resources/Positive15.3.3-dtd.orm
index d168be2..b43e757 100644
--- a/api/src/test/resources/Positive15.3.3-dtd.orm
+++ b/api/src/test/resources/Positive15.3.3-dtd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
-        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
+<!DOCTYPE orm PUBLIC
+    "-//The Apache Software Foundation//DTD Java Data Objects Mapping Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
diff --git a/api/src/test/resources/Positive15.3.3-xsd.orm b/api/src/test/resources/Positive15.3.3-xsd.orm
index 85d49ac..b091e0a 100644
--- a/api/src/test/resources/Positive15.3.3-xsd.orm
+++ b/api/src/test/resources/Positive15.3.3-xsd.orm
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
 			<field name="ssn" column="SSN"/>
diff --git a/api/src/test/resources/Positive15.3.4-dtd.orm b/api/src/test/resources/Positive15.3.4-dtd.orm
index fa3fd3a..debc980 100644
--- a/api/src/test/resources/Positive15.3.4-dtd.orm
+++ b/api/src/test/resources/Positive15.3.4-dtd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
-        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
+<!DOCTYPE orm PUBLIC
+    "-//The Apache Software Foundation//DTD Java Data Objects Mapping Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
diff --git a/api/src/test/resources/Positive15.3.4-xsd.orm b/api/src/test/resources/Positive15.3.4-xsd.orm
index 5a3a70f..3f46f32 100644
--- a/api/src/test/resources/Positive15.3.4-xsd.orm
+++ b/api/src/test/resources/Positive15.3.4-xsd.orm
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
 			<field name="ssn" column="SSN"/>
diff --git a/api/src/test/resources/Positive15.3.5-dtd.orm b/api/src/test/resources/Positive15.3.5-dtd.orm
index b8299f3..020d203 100644
--- a/api/src/test/resources/Positive15.3.5-dtd.orm
+++ b/api/src/test/resources/Positive15.3.5-dtd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
-        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
+<!DOCTYPE orm PUBLIC
+    "-//The Apache Software Foundation//DTD Java Data Objects Mapping Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
diff --git a/api/src/test/resources/Positive15.3.5-xsd.orm b/api/src/test/resources/Positive15.3.5-xsd.orm
index 05c61b8..2c3b992 100644
--- a/api/src/test/resources/Positive15.3.5-xsd.orm
+++ b/api/src/test/resources/Positive15.3.5-xsd.orm
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
 			<field name="ssn" column="SSN"/>
diff --git a/api/src/test/resources/Positive15.3.6-dtd.orm b/api/src/test/resources/Positive15.3.6-dtd.orm
index 6cd5e43..bb2191d 100644
--- a/api/src/test/resources/Positive15.3.6-dtd.orm
+++ b/api/src/test/resources/Positive15.3.6-dtd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
-        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
+<!DOCTYPE orm PUBLIC
+    "-//The Apache Software Foundation//DTD Java Data Objects Mapping Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
diff --git a/api/src/test/resources/Positive15.3.6-xsd.orm b/api/src/test/resources/Positive15.3.6-xsd.orm
index c6f5eb6..b32df50 100644
--- a/api/src/test/resources/Positive15.3.6-xsd.orm
+++ b/api/src/test/resources/Positive15.3.6-xsd.orm
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
         <package name="com.xyz">
                 <class name="Employee" table="EMP">
                         <field name="ssn" column="SSN"/>
diff --git a/api/src/test/resources/Positive15.4-dtd.orm b/api/src/test/resources/Positive15.4-dtd.orm
index 2061fd3..813c251 100644
--- a/api/src/test/resources/Positive15.4-dtd.orm
+++ b/api/src/test/resources/Positive15.4-dtd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
-        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
+<!DOCTYPE orm PUBLIC
+    "-//The Apache Software Foundation//DTD Java Data Objects Mapping Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
diff --git a/api/src/test/resources/Positive15.4-xsd.orm b/api/src/test/resources/Positive15.4-xsd.orm
index d3b29a2..9949661 100644
--- a/api/src/test/resources/Positive15.4-xsd.orm
+++ b/api/src/test/resources/Positive15.4-xsd.orm
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
 			<field name="ssn" column="SSN"/>
diff --git a/api/src/test/resources/Positive15.5-dtd.orm b/api/src/test/resources/Positive15.5-dtd.orm
index 1231e6e..692beb6 100644
--- a/api/src/test/resources/Positive15.5-dtd.orm
+++ b/api/src/test/resources/Positive15.5-dtd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
-        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
+<!DOCTYPE orm PUBLIC
+    "-//The Apache Software Foundation//DTD Java Data Objects Mapping Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
diff --git a/api/src/test/resources/Positive15.5-xsd.orm b/api/src/test/resources/Positive15.5-xsd.orm
index b5dd0ef..cd72244 100644
--- a/api/src/test/resources/Positive15.5-xsd.orm
+++ b/api/src/test/resources/Positive15.5-xsd.orm
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
 			<field name="ssn" column="SSN"/>
diff --git a/api/src/test/resources/Positive15.6-dtd.orm b/api/src/test/resources/Positive15.6-dtd.orm
index adc321d..3d2092c 100644
--- a/api/src/test/resources/Positive15.6-dtd.orm
+++ b/api/src/test/resources/Positive15.6-dtd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
-        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
+<!DOCTYPE orm PUBLIC
+    "-//The Apache Software Foundation//DTD Java Data Objects Mapping Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Address" table="ADDR">
diff --git a/api/src/test/resources/Positive15.6-xsd.orm b/api/src/test/resources/Positive15.6-xsd.orm
index 059fc51..22b3520 100644
--- a/api/src/test/resources/Positive15.6-xsd.orm
+++ b/api/src/test/resources/Positive15.6-xsd.orm
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Address" table="ADDR">
 			<index name="ADDR_CITYSTATE_IDX">
diff --git a/api/src/test/resources/Positive15.8.1-dtd.orm b/api/src/test/resources/Positive15.8.1-dtd.orm
index 142f849..fab1fe9 100644
--- a/api/src/test/resources/Positive15.8.1-dtd.orm
+++ b/api/src/test/resources/Positive15.8.1-dtd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
-        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
+<!DOCTYPE orm PUBLIC
+    "-//The Apache Software Foundation//DTD Java Data Objects Mapping Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
diff --git a/api/src/test/resources/Positive15.8.1-xsd.orm b/api/src/test/resources/Positive15.8.1-xsd.orm
index 0dc1160..c8c2b37 100644
--- a/api/src/test/resources/Positive15.8.1-xsd.orm
+++ b/api/src/test/resources/Positive15.8.1-xsd.orm
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
 			<inheritance strategy="new-table">
diff --git a/api/src/test/resources/Positive15.8.2-dtd.orm b/api/src/test/resources/Positive15.8.2-dtd.orm
index fa33370..1a5946c 100644
--- a/api/src/test/resources/Positive15.8.2-dtd.orm
+++ b/api/src/test/resources/Positive15.8.2-dtd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
-        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
+<!DOCTYPE orm PUBLIC
+    "-//The Apache Software Foundation//DTD Java Data Objects Mapping Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
diff --git a/api/src/test/resources/Positive15.8.2-xsd.orm b/api/src/test/resources/Positive15.8.2-xsd.orm
index c17fa24..5031428 100644
--- a/api/src/test/resources/Positive15.8.2-xsd.orm
+++ b/api/src/test/resources/Positive15.8.2-xsd.orm
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee" table="EMP">
 			<inheritance strategy="new-table">
diff --git a/api/src/test/resources/Positive15.8.3-dtd.orm b/api/src/test/resources/Positive15.8.3-dtd.orm
index 884795f..06b5e2f 100644
--- a/api/src/test/resources/Positive15.8.3-dtd.orm
+++ b/api/src/test/resources/Positive15.8.3-dtd.orm
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE orm PUBLIC 
-    "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 3.2//EN"
-        "http://xmlns.jcp.org/schema/orm_3_2.dtd">
+<!DOCTYPE orm PUBLIC
+    "-//The Apache Software Foundation//DTD Java Data Objects Mapping Metadata 3.2//EN"
+    "https://db.apache.org/jdo/xmlns/orm_3_2.dtd">
 <orm>
 	<package name="com.xyz">
 		<class name="Employee">
diff --git a/api/src/test/resources/Positive15.8.3-xsd.orm b/api/src/test/resources/Positive15.8.3-xsd.orm
index d3e2c74..74bfc24 100644
--- a/api/src/test/resources/Positive15.8.3-xsd.orm
+++ b/api/src/test/resources/Positive15.8.3-xsd.orm
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 	<package name="com.xyz">
 		<class name="Employee">
 			<inheritance strategy="subclass-table"/>
diff --git a/api/src/test/resources/Positive99-xsd.jdo b/api/src/test/resources/Positive99-xsd.jdo
index a165b03..5247823 100644
--- a/api/src/test/resources/Positive99-xsd.jdo
+++ b/api/src/test/resources/Positive99-xsd.jdo
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     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"/>
   <package 
diff --git a/api/src/test/resources/Positive99-xsd.jdoquery b/api/src/test/resources/Positive99-xsd.jdoquery
index 349e3d2..793b049 100644
--- a/api/src/test/resources/Positive99-xsd.jdoquery
+++ b/api/src/test/resources/Positive99-xsd.jdoquery
@@ -16,9 +16,9 @@
   limitations under the License.
 -->
 <jdoquery xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoquery"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery
-     http://xmlns.jcp.org/xml/ns/jdo/jdoquery_3_2.xsd">
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/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"/>
   <package 
diff --git a/api/src/test/resources/Positive99-xsd.orm b/api/src/test/resources/Positive99-xsd.orm
index 13be65e..26d9724 100644
--- a/api/src/test/resources/Positive99-xsd.orm
+++ b/api/src/test/resources/Positive99-xsd.orm
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     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"/>
   <package 
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 f60c4db..48f74a0 100644
--- a/api/src/test/resources/jdoconfig/Negative01/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Negative01/META-INF/jdoconfig.xml
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdoconfig
-        xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
     <!-- No PMFs defined -->
 </jdoconfig>
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 9027680..9f389f5 100644
--- a/api/src/test/resources/jdoconfig/Negative02/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Negative02/META-INF/jdoconfig.xml
@@ -15,9 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<jdoconfig
-        xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
     <!-- Duplicate anonymous PMFs present -->
     <persistence-manager-factory/>
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 eca35b8..3d57ef8 100644
--- a/api/src/test/resources/jdoconfig/Negative03/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Negative03/META-INF/jdoconfig.xml
@@ -19,10 +19,9 @@
     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"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig">
+<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
     <!-- Duplicate named PMF -->
     <persistence-manager-factory
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 dcb1882..efc5b25 100644
--- a/api/src/test/resources/jdoconfig/Negative04/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Negative04/META-INF/jdoconfig.xml
@@ -19,10 +19,9 @@
     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"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig">
+<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
     <!-- Duplicate PMF name property in attribute & element -->
     <persistence-manager-factory
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 2e903dd..7c3d985 100644
--- a/api/src/test/resources/jdoconfig/Negative05/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Negative05/META-INF/jdoconfig.xml
@@ -19,10 +19,9 @@
     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"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig">
+<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
     <!-- Duplicate property in attribute & element -->
     <persistence-manager-factory
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 1752087..f2a6146 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,10 +19,9 @@
     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"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig">
+<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
     <!-- Duplicate PMF in this file and another -->
     <persistence-manager-factory
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 1752087..f2a6146 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,10 +19,9 @@
     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"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig">
+<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
     <!-- Duplicate PMF in this file and another -->
     <persistence-manager-factory
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 beb2356..b6faeb9 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,10 +19,9 @@
     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"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig">
+<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
     <!-- Invalid PMFs in this file and another -->
     <persistence-manager-factory 
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 74f4139..7b3e5a5 100644
--- a/api/src/test/resources/jdoconfig/Pmfmapmap01/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Pmfmapmap01/META-INF/jdoconfig.xml
@@ -19,10 +19,9 @@
     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"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig">
+<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
     <!-- -->
     <persistence-manager-factory
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 09c4b86..3be851f 100644
--- a/api/src/test/resources/jdoconfig/Positive00/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive00/META-INF/jdoconfig.xml
@@ -19,10 +19,9 @@
     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"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig">
+<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
     <!--
         Basic PMF config using attributes & listeners with no nonstandard
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 060e57d..fd4d797 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,10 +19,9 @@
     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"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig">
+<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
     <!-- Duplicate PUs in this file and another, but not requested -->
     <persistence-manager-factory/>
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 16e7a1d..baca2d3 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,10 +19,9 @@
     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"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig">
+<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
     <!-- Duplicate PUs in this file and another, but not requested -->
     <persistence-manager-factory
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 4d414ff..93c260c 100644
--- a/api/src/test/resources/jdoconfig/Positive02/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive02/META-INF/jdoconfig.xml
@@ -19,10 +19,9 @@
     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"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig">
+<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
     <!-- Duplicate PUs in this file and another, but not requested -->
     <persistence-manager-factory/>
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 e16c1ec..f788420 100644
--- a/api/src/test/resources/jdoconfig/Positive03/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive03/META-INF/jdoconfig.xml
@@ -19,10 +19,9 @@
     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"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig">
+<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
     <!-- Anonymous PMF & with META-INF/services lookup for PMF class name -->
     <persistence-manager-factory/>
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 e16c1ec..f788420 100644
--- a/api/src/test/resources/jdoconfig/Positive04/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive04/META-INF/jdoconfig.xml
@@ -19,10 +19,9 @@
     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"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig">
+<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
     <!-- Anonymous PMF & with META-INF/services lookup for PMF class name -->
     <persistence-manager-factory/>
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 e16c1ec..f788420 100644
--- a/api/src/test/resources/jdoconfig/Positive05/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive05/META-INF/jdoconfig.xml
@@ -19,10 +19,9 @@
     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"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig">
+<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
     <!-- Anonymous PMF & with META-INF/services lookup for PMF class name -->
     <persistence-manager-factory/>
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 fb372bd..222a64d 100644
--- a/api/src/test/resources/jdoconfig/Positive06/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive06/META-INF/jdoconfig.xml
@@ -19,10 +19,9 @@
     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"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig">
+<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
     <!--
         Basic anonymous PMF config using attributes & listeners with no nonstandard
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 1401422..bcd72db 100644
--- a/api/src/test/resources/jdoconfig/Positive07/META-INF/jdoconfig.xml
+++ b/api/src/test/resources/jdoconfig/Positive07/META-INF/jdoconfig.xml
@@ -19,10 +19,9 @@
     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"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig">
+<jdoconfig xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoconfig"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="https://db.apache.org/jdo/xmlns/jdoconfig_3_2.xsd">
 
     <!--
         Basic anonymous PMF config using attributes & listeners with no nonstandard
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 d48894d..a38794a 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
@@ -21,7 +21,7 @@ This file contains the persistence information for persistence-capable classes
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.api.instancecallbacks">
         <class name="InstanceLifecycleListenerAttach$PC" detachable="true">
             <field name="id" primary-key="true"/>
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/package.jdo
index e4fa51f..f83222e 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
@@ -22,7 +22,7 @@ and SimpleClass, which is needed for several fieldtypes tests.
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     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"/>
         <class name="NonPersistentFieldsAreNonPersistentInSubclasses" persistence-modifier="persistence-aware"/>
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/building/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/building/package.jdo
index a0f18ed..c7a5869 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     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 ecf931b..67a8696 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
@@ -19,9 +19,9 @@
 This file contains a named query for class Person.
 -->
 <jdoquery xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoquery"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery
-     http://xmlns.jcp.org/xml/ns/jdo/jdoquery_3_2.xsd">
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery
+          https://db.apache.org/jdo/xmlns/jdoquery_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Person">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
index 21c150a..744bde4 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package.jdo
index 0abf368..5bf9d25 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package.jdo
index 97b9439..ee0e825 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/converter/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/converter/package.jdo
index fa5cacc..c90f021 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.converter">
 
     <class name="PCRect"
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo
index e3674be..23f11e7 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="AllTypes" identity-type="application"
             objectid-class="org.apache.jdo.tck.pc.fieldtypes.AllTypes$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo
index 48c1414..87a05a6 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="ArrayCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.ArrayCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo
index 19a4f47..f71651e 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="ArrayListCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.ArrayListCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo
index 689402f..0de8fc6 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="CollectionCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.CollectionCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo
index d5b6566..ec1c950 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfBigDecimal" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfBigDecimal$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo
index bb493a6..2dd7c96 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfBigInteger" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfBigInteger$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo
index 1c4744f..8381dbe 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfBoolean" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfBoolean$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo
index 5f09ed5..185cf44 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfByte" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfByte$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo
index 590ec92..510a07d 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfCharacter" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfCharacter$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo
index 65e0cf7..436e0ce 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfDate" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfDate$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo
index a950276..2f53cce 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfDouble" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfDouble$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo
index 294d0b6..e434c88 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfFloat" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfFloat$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo
index d8089f0..0e4f157 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfInteger" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfInteger$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo
index ecf088c..e4db637 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfLocale" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfLocale$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo
index a147275..2e254f7 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfLong" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfLong$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo
index ae99ddd..d709ba4 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfObject" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfObject$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo
index 5255545..3aa6568 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitiveboolean" identity-type="application" 
   objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitiveboolean$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo
index 32d7a9c..c443231 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivebyte" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitivebyte$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo
index ddfe3a6..646d653 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivechar" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitivechar$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo
index 6a24d08..5d2702e 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivedouble" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitivedouble$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo
index 265cc92..2d47087 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivefloat" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitivefloat$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo
index f7e2fa8..44e7f7f 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitiveint" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitiveint$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo
index edca511..0970468 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivelong" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitivelong$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo
index 8d08158..994c1c9 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitiveshort" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitiveshort$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo
index 7337b39..530e528 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfShort" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfShort$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo
index cff22a8..14fc02c 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfSimpleClass" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfSimpleClass$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo
index 8017782..ca74c91 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfSimpleEnum" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfSimpleEnum$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo
index e9357bf..9886b86 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfSimpleInterface" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfSimpleInterface$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo
index 9b6116a..444951d 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfString" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.FieldsOfString$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo
index da970cd..f685610 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashMapStringKeyCollections" identity-type="application"
   objectid-class="org.apache.jdo.tck.pc.fieldtypes.HashMapStringKeyCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo
index 07df079..aeadc6d 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashMapStringValueCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.HashMapStringValueCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo
index 62c88f2..39e5d5e 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashSetCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.HashSetCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo
index 1a147cb..999f54e 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashtableStringKeyCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.HashtableStringKeyCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo
index 600f139..77165c1 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashtableStringValueCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.HashtableStringValueCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo
index 1ed0dd6..de409f3 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="LinkedListCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.LinkedListCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo
index 1055108..372c560 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="ListCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.ListCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo
index 3b714e6..6e2bd69 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="MapStringKeyCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.MapStringKeyCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo
index 568064e..d9b1878 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="MapStringValueCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.MapStringValueCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo
index 1afcdcb..b444ae2 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="SetCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.SetCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo
index f9dbc9e..7c5bffd 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="TreeMapStringKeyCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.TreeMapStringKeyCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo
index f8be0a5..6468592 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="TreeMapStringValueCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.TreeMapStringValueCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo
index c145ffc..91519bf 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="TreeSetCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.TreeSetCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo
index f758267..e22c582 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="VectorCollections" identity-type="application"
     objectid-class="org.apache.jdo.tck.pc.fieldtypes.VectorCollections$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/package.jdo
index 91bbc04..ec6132e 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.inheritance">
         <class
             name="AllPersist"
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package.jdo
index d6e6363..34640f9 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.instancecallbacks">
         <class name="InstanceCallbackNonPersistFdsClass" 
             identity-type="application"
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo
index 511ca98..b9c066d 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.lifecycle">
 
     <class name="StateTransitionObj" 
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/PCClass.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/PCClass.jdo
index cc7fd19..98fbf67 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
     <class name="PCClass" 
            identity-type="application" objectid-class="org.apache.jdo.tck.pc.mylib.PCClass$Oid">
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/package.jdo
index 3e6a62b..cef4a89 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint"
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo
index d0efee7..9d084a3 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/AAddress_bad.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/AAddress_bad.jdo
index 4b3a76a..2dcba6b 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo
index e155e52..e68e15e 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/Address_bad.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/Address_bad.jdo
index b11ae33..acd9a0a 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo
index e61c356..8e2ad14 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/IAddress_bad.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/IAddress_bad.jdo
index 99b91b4..6d308c4 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/order/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/order/package.jdo
index ebf08c9..41dd9a2 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/query/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/query/package.jdo
index fe1bd32..908120e 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
@@ -19,7 +19,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.query">
 
     <class name="JDOQLKeywordsAsFieldNames"
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo
index ce53626..94542fd 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.shoppingcart">
 
         <class
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package.jdo
index 310d808..f7223fe 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
@@ -19,7 +19,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.singlefieldidentity">
 
     <class name="PCPointSingleFieldPrimitivebyte"
diff --git a/tck/src/main/resources/jdo/applicationidentity/package.jdo b/tck/src/main/resources/jdo/applicationidentity/package.jdo
index e43be31..f7d2c0d 100644
--- a/tck/src/main/resources/jdo/applicationidentity/package.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/package.jdo
@@ -22,7 +22,7 @@ calling pm.newNamedQuery(null, "packageJDOInDefaultPackage").
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <query name="packageJDOInDefaultPackage">
         SELECT FROM org.apache.jdo.tck.pc.company.Person
     </query>
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package.jdo
index 835b71a..ea07c7b 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
@@ -21,7 +21,7 @@ This file contains the persistence information for persistence-capable classes
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.api.instancecallbacks">
         <class name="InstanceLifecycleListenerAttach$PC" 
                 identity-type="datastore" detachable="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/package.jdo
index 2d9649b..b2006c3 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
@@ -22,7 +22,7 @@ and SimpleClass, which is needed for several fieldtypes tests.
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     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"/>
         <class name="NonPersistentFieldsAreNonPersistentInSubclasses" persistence-modifier="persistence-aware"/>
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/building/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/building/package.jdo
index 33abe10..5f4b6f1 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     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 ecf931b..67a8696 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
@@ -19,9 +19,9 @@
 This file contains a named query for class Person.
 -->
 <jdoquery xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdoquery"
-     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery
-     http://xmlns.jcp.org/xml/ns/jdo/jdoquery_3_2.xsd">
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdoquery
+          https://db.apache.org/jdo/xmlns/jdoquery_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Person">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
index 9e35ba2..edac1dc 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package.jdo
index cc75483..d70fc4c 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package.jdo
index 5307304..1845f2c 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/converter/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/converter/package.jdo
index 6ac470d..99f5db6 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.converter">
 
     <class name="PCRect" identity-type="datastore">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo
index 6252963..10a9e19 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="AllTypes">
         </class>
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo
index 6dde6ee..2985d6c 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="ArrayCollections" identity-type="datastore">
 <field name="ArrayOfObject0" persistence-modifier="persistent">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo
index b4ad61c..1e43929 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="ArrayListCollections" identity-type="datastore">
 <field name="ArrayListOfObject0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo
index 7319d3c..3643856 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="CollectionCollections" identity-type="datastore">
 <field name="CollectionOfObject0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo
index 25b669f..386caeb 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfBigDecimal" identity-type="datastore">
 <field name="BigDecimal1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo
index 7fa4d0b..c7ff4cd 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfBigInteger" identity-type="datastore">
 <field name="BigInteger1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo
index 94bc95c..69f55f0 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfBoolean" identity-type="datastore">
 <field name="Boolean1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo
index 458aa5a..8eae893 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfByte" identity-type="datastore">
 <field name="Byte1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo
index 539d841..df12cac 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfCharacter" identity-type="datastore">
 <field name="Character1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo
index cd3b2ec..b0fd9b8 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfDate" identity-type="datastore">
 <field name="Date1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo
index 9ab80b8..d9cb8c6 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfDouble" identity-type="datastore">
 <field name="Double1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo
index 7ef62e5..6d76487 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfFloat" identity-type="datastore">
 <field name="Float1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo
index f95a8e1..41eceda 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfInteger" identity-type="datastore">
 <field name="identifier"  persistence-modifier="none"/>
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo
index e0fff8d..9503924 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfLocale" identity-type="datastore">
 <field name="Locale1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo
index 6290b53..ffcac42 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfLong" identity-type="datastore">
 <field name="Long1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo
index 43ec2d2..5b8e0aa 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfObject" identity-type="datastore">
 <field name="Object1"  serialized="true" persistence-modifier="persistent"
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo
index 206ed51..7291e67 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitiveboolean" identity-type="datastore">
 <field name="boolean1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo
index a2ec348..718382f 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivebyte" identity-type="datastore">
 <field name="byte1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo
index fd5e632..dbc2d45 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivechar" identity-type="datastore">
 <field name="identifier"  persistence-modifier="none"/>
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo
index c4e7117..1f3b668 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivedouble" identity-type="datastore">
 <field name="double1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo
index 98df7ac..5102b3e 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivefloat" identity-type="datastore">
 <field name="float1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo
index d1695d8..4f9684f 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitiveint" identity-type="datastore">
 <field name="int1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo
index 01d7bce..e609db4 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivelong" identity-type="datastore">
 <field name="long1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo
index 7b04224..8b86582 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitiveshort" identity-type="datastore">
 <field name="short1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo
index 179a585..1bf39d4 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfShort" identity-type="datastore">
 <field name="Short1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo
index 671ceb5..2b6a9cb 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfSimpleClass" identity-type="datastore">
 <field name="SimpleClass1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo
index 539c349..1151f96 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfSimpleEnum" identity-type="datastore">
 <field name="identifier"  persistence-modifier="none"/>
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo
index 855c5c3..0dc42c1 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfSimpleInterface" identity-type="datastore">
 <field name="SimpleInterface1"  serialized="true" persistence-modifier="persistent">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo
index a98ad3d..572117d 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfString" identity-type="datastore">
 <field name="String1"  embedded="true">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo
index b3389e3..7292855 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashMapStringKeyCollections" identity-type="datastore">
 <field name="HashMapOfString_Object0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo
index 4aab8ce..9a3f21f 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashMapStringValueCollections" identity-type="datastore">
 <field name="HashMapOfObject_String0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo
index c6bef6d..528975f 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashSetCollections" identity-type="datastore">
 <field name="HashSetOfObject0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo
index ebe10b3..cb61b49 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashtableStringKeyCollections" identity-type="datastore">
 <field name="HashtableOfString_Object0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo
index 41ef739..cf1bbcc 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashtableStringValueCollections" identity-type="datastore">
 <field name="HashtableOfObject_String0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo
index 814f719..b8fe75e 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="LinkedListCollections" identity-type="datastore">
 <field name="LinkedListOfObject0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo
index c32812e..3803201 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="ListCollections" identity-type="datastore">
 <field name="ListOfObject0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo
index d304f2e..191ebfe 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="MapStringKeyCollections" identity-type="datastore">
 <field name="MapOfString_Object0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo
index 9482b64..6c5e503 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="MapStringValueCollections" identity-type="datastore">
 <field name="MapOfObject_String0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo
index d277848..693bece 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="SetCollections" identity-type="datastore">
 <field name="SetOfObject0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo
index 5df7d7b..e7a403d 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="TreeMapStringKeyCollections" identity-type="datastore">
 <field name="TreeMapOfString_Object0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo
index 7f379dd..0bd8ae2 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="TreeMapStringValueCollections" identity-type="datastore">
 <field name="TreeMapOfObject_String0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo
index 1c859fb..d5e4f10 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="TreeSetCollections" identity-type="datastore">
 <field name="TreeSetOfObject0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo
index e236f18..5697e0c 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="VectorCollections" identity-type="datastore">
 <field name="VectorOfObject0" >
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package.jdo
index 2a5f5f8..ed34254 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.inheritance">
         <class 
             name="AllPersist" 
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package.jdo
index b1ebdde..30cc23e 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.instancecallbacks">
         <class name="InstanceCallbackNonPersistFdsClass" 
             identity-type="datastore">
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo
index 584ed0c..fb874c4 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     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"/>
   </package>
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/PCClass.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/PCClass.jdo
index b7f9593..912f2e4 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
     <class name="PCClass" identity-type="datastore">
       <field name="transientNumber1" persistence-modifier="none"/>
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/package.jdo
index d6a82ff..d9b8d23 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" identity-type="datastore"/>
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo
index 4ea951c..7745cc2 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/AAddress_bad.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/AAddress_bad.jdo
index 6d2eb7a..e348647 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo
index 6c9ab4e..4944f30 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/Address_bad.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/Address_bad.jdo
index cf746b7..e72b605 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo
index 1b7921e..d12e5b1 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/IAddress_bad.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/IAddress_bad.jdo
index 868f652..4802e48 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/order/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/order/package.jdo
index 788ed22..1b1088b 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     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 1e80e41..c83e539 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     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 f8304ae..3f3bc94 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.shoppingcart">
 
         <class
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/singlefieldidentity/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/singlefieldidentity/package.jdo
index f04ef99..f348da7 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
@@ -18,7 +18,7 @@
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     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"/>
     <class name="PCPointSingleFieldByte" persistence-modifier="non-persistent"/>
diff --git a/tck/src/main/resources/jdo/datastoreidentity/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/package.jdo
index ce46fc4..10457d9 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/package.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/package.jdo
@@ -22,7 +22,7 @@ calling pm.newNamedQuery(null, "packageJDOInDefaultPackage").
 <jdo xmlns="http://xmlns.jcp.org/xml/ns/jdo/jdo"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/jdo
-     http://xmlns.jcp.org/xml/ns/jdo/jdo_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/jdo_3_2.xsd">
     <query name="packageJDOInDefaultPackage">
         SELECT FROM org.apache.jdo.tck.pc.company.Person
     </query>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm
index 6fcc387..679a135 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
@@ -22,7 +22,7 @@ has application identity.
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.api.instancecallbacks">
 
         <class name="InstanceLifecycleListenerAttach$PC" 
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/building/package-standard12.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/building/package-standard12.orm
index 15dacec..a0998b7 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
@@ -21,7 +21,7 @@ This file contains the schema information when an implementation has application
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.building">
         <class name="Kitchen" table="KITCHEN">
             <field name="id" column="KITCHEN_ID"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm
index c9ba673..b696915 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
index 2ffc3de..a9d6e58 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
index 3891e53..eeaa20c 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
index 76fda2c..f5ba28f 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
index 064d53f..f95c348 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/companyAnnotatedFC/package-standard11.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/companyAnnotatedFC/package-standard11.orm
index f2b7dfa..3dc1e64 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm
index 4bddfa8..5dcc5d2 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package-standard9.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package-standard9.orm
index c8bf259..9ee6806 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/converter/package-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/converter/package-standard.orm
index 0047e3a..89cb9c3 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <package name="org.apache.jdo.tck.pc.converter">
 
     <class name="PCRect" table="PCRectConv">
diff --git a/tck/src/main/resources/orm/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 76e3f65..6ddacbd 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="AllTypes" table="ALLTYPES">
             <field name="id" column="ID"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm
index c2a1770..732b510 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
@@ -21,7 +21,7 @@ Metadata for application identity
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ArrayCollections" table="ARRAY_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm
index 6377226..d8c039a 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ArrayListCollections" table="ARRAYLIST_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm
index 5565039..92fda9f 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="CollectionCollections" table="COLLECTION_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm
index 6671d43..879c023 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBigDecimal" table="FIELDSOFBIGDECIMAL">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm
index fd221c7..89d8e7f 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBigInteger" table="FIELDSOFBIGINTEGER">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm
index 3ec7bbe..dc98e8f 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBoolean" table="FIELDSOFBOOLEAN">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm
index 4e0dd61..63163bd 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfByte" table="FieldsOfByte">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm
index b5ca64b..fc6172a 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfCharacter" table="FIELDSOFCHARACTER">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm
index f2bdc97..06061ab 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfDate" table="FIELDSOFDATE">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm
index c06e4f3..2fbe1f4 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfDouble" table="FIELDSOFDOUBLE">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm
index 6588d01..cfded18 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfFloat" table="FIELDSOFFLOAT">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm
index 420ca59..f1b2464 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfInteger" table="FIELDSOFINTEGER">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm
index 38df441..e7cd09b 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfLocale" table="FIELDSOFLOCALE">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm
index 636efb0..ede5d49 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfLong" table="FIELDSOFLONG">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm
index 950a9ee..8bc958a 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfObject" table="FIELDSOFOBJECT">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm
index a7094a3..f67049d 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveboolean" table="FIELDSOFPRIMITIVEBOOLEAN">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm
index 02455d4..bdc6400 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivebyte" table="FIELDSOFPRIMITIVEBYTE">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm
index 1cf2be8..74a8ba7 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivechar" table="FIELDSOFPRIMITIVECHAR">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm
index b60d33b..f44c4a4 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivedouble" table="FIELDSOFPRIMITIVEDOUBLE">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm
index 2b25e28..2ffd13b 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivefloat" table="FIELDSOFPRIMITIVEFLOAT">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm
index ac98d51..e69be81 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveint" table="FIELDSOFPRIMITIVEINT">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm
index 504d7fc..64de7dd 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivelong" table="FIELDSOFPRIMITIVELONG">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm
index 28e9245..c8d864d 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveshort" table="FIELDSOFPRIMITIVESHORT">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm
index cf70e57..058c887 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
            <class name="FieldsOfShort" table="FIELDSOFSHORT">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm
index 06e7935..e5cc693 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleClass" table="FIELDSOFSIMPLECLASS">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm
index 7199c40..001c712 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleEnum" table="FIELDSOFENUMNAME">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm
index edccc70..fc6219d 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleEnum" table="FIELDSOFENUMORDINAL">
             <field name="identifier">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm
index fd1dcee..02d0c45 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleInterface" table="FIELDSOFSIMPLEINTERFACE">
             <field name="identifier" column="IDENTIFIER">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm
index 50cd830..7a99efd 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfString" table="FIELDSOFSTRING">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm
index 8d9dcb4..f15d5a9 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashMapStringKeyCollections"
                table="HASHMAPSTRINGKEY_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm
index 612c5df..2fe9e40 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashMapStringValueCollections"
                table="HASHMAPSTRINGVALUE_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm
index acd5f31..ea3dca5 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashSetCollections" table="HASHSET_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm
index 8f97c16..9e3a862 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringKeyCollections"
                table="HASHTABLESTRINGKEY_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm
index e71b805..812e0bd 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringValueCollections"
                table="HASHTBLSTRINGVALUE_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm
index 4c569ec..401168d 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="LinkedListCollections" table="LINKEDLIST_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm
index 4bb5b4d..6c4791b 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ListCollections" table="LIST_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm
index 7375393..4c35a4e 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="MapStringKeyCollections" table="MAPSTRINGKEY_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm
index 3d96bd7..d1934ea 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="MapStringValueCollections"
                table="MAPSTRINGVALUE_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm
index fafaa82..9079203 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="SetCollections" table="SET_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm
index 2485f97..de6d9c4 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="SimpleClass" table="SIMPLE_CLASS">
             <field name="id" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm
index 138ca58..480b0c9 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeMapStringKeyCollections"
                table="TREEMAPSTRINGKEY_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm
index dabb4ae..21f598a 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeMapStringValueCollections"
                table="TREEMAPSTRINGVALUE_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm
index c5c30aa..1aedbb1 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeSetCollections" table="TREESET_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm
index e4d17c8..be1bec6 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="VectorCollections" table="VECTOR_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm
index 6146410..c6b5ddc 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.inheritance">
         <class name="AllPersist" table="AllPersist">
             <inheritance strategy="new-table">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm
index 8c80786..ba0151f 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.instancecallbacks">
         <class name="InstanceCallbackNonPersistFdsClass" table="ICNonPersistFds">
             <field name="keyValue">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm
index 9eaacb3..c65e85c 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.lifecycle">
     <class name="StateTransitionObj" table="STATETRANSITIONOBJ">
        <field name="id" column="ID"/>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm
index 10cb9be..414117c 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm
index abb56d5..6efe10a 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
@@ -19,7 +19,7 @@
      xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm
index ad3af2c..db83058 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib" schema="applicationidentity_pkg">
 
     <class name="PCPoint" table="PCPoint">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm
index 6d28158..0b3a222 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint" schema="applicationidentity_cls">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm
index 8c1f4e5..f4f5c61 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/order/package-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/order/package-standard.orm
index 8e6c096..5822c4e 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/query/package-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/query/package-standard.orm
index 4472ad5..a6e56e2 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.query">
 
     <class name="JDOQLKeywordsAsFieldNames" table="JDOQLKeywordsAsFieldNames">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm
index 3fdea55..6856ded 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
@@ -22,7 +22,7 @@ has application identity.
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.shoppingcart">
 
         <class name="Cart" table="CARTS">
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package-standard.orm
index a79d055..a539e9f 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.singlefieldidentity">
 
     <class name="PCPointSingleFieldPrimitivebyte" table="PCPointSingleFieldByte">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm
index 3f575b3..cf0c12c 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
@@ -22,7 +22,7 @@ has datastore identity.
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.api.instancecallbacks">
 
         <class name="InstanceLifecycleListenerAttach$PC" 
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/building/package-standard12.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/building/package-standard12.orm
index 0c7dd97..e94324a 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
@@ -21,7 +21,7 @@ This file contains the schema information when an implementation has application
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.building" schema="datastoreidentity12">
 
         <sequence name="id_seq" datastore-sequence="DATASTORE_SEQ"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm
index ebee2ea..99d3b9f 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
index 4836c72..8023bf1 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
index cb3d077..608b43a 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
index 03cf5e3..39bfdac 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
index ad0f32c..2e90adc 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/companyAnnotatedFC/package-standard11.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/companyAnnotatedFC/package-standard11.orm
index 854bc25..5cfd7af 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm
index fe4817a..43a8884 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package-standard9.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package-standard9.orm
index a38275f..48131de 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/converter/package-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/converter/package-standard.orm
index 38077d8..74d49db 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.converter">
 
     <class name="PCRect" table="PCRectConv">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm
index 67f32f6..aa4d1ee 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="AllTypes" table="ALLTYPES">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm
index 8f50980..ef6f6e8 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
@@ -21,7 +21,7 @@ Metadata for datastore identity
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ArrayCollections" table="ARRAY_COLLECTIONS">
             <datastore-identity strategy="identity"
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm
index 25a80d4..fc102f7 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ArrayListCollections" table="ARRAYLIST_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm
index 6de0b8a..d033a45 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="CollectionCollections" table="COLLECTION_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm
index d1c45f6..ca74637 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBigDecimal" table="FIELDSOFBIGDECIMAL">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm
index 1c52241..762abaf 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBigInteger" table="FIELDSOFBIGINTEGER">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm
index ba3db1e..e957f3e 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBoolean" table="FIELDSOFBOOLEAN">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm
index 26abf4b..fddc358 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfByte" table="FieldsOfByte">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm
index fb17cac..f42e573 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfCharacter" table="FIELDSOFCHARACTER">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm
index 535c084..0c7ee88 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfDate" table="FIELDSOFDATE">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm
index a283cb9..65fdea9 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfDouble" table="FIELDSOFDOUBLE">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm
index e3c42cd..8843382 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfFloat" table="FIELDSOFFLOAT">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm
index 422322e..b5aa7f6 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfInteger" table="FIELDSOFINTEGER">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm
index 5523e1b..bdf01a4 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfLocale" table="FIELDSOFLOCALE">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm
index df0a1d1..c1ccf0e 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfLong" table="FIELDSOFLONG">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm
index c5818c9..9f8cfcd 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfObject" table="FIELDSOFOBJECT">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm
index ce85535..7d7d113 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveboolean" table="FIELDSOFPRIMITIVEBOOLEAN">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm
index fc9e108..a8a1c7e 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivebyte" table="FIELDSOFPRIMITIVEBYTE">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm
index 681992d..adc4442 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivechar" table="FIELDSOFPRIMITIVECHAR">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm
index ea43720..6957e8b 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivedouble" table="FIELDSOFPRIMITIVEDOUBLE">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm
index 4f5c392..fb40003 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivefloat" table="FIELDSOFPRIMITIVEFLOAT">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm
index eca063b..09b580f 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveint" table="FIELDSOFPRIMITIVEINT">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm
index 849578e..a196324 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivelong" table="FIELDSOFPRIMITIVELONG">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm
index 2cff2ea..9762d83 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveshort" table="FIELDSOFPRIMITIVESHORT">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm
index 59aa2d1..158576d 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
            <class name="FieldsOfShort" table="FIELDSOFSHORT">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm
index 1eb6a93..0c0022d 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleClass" table="FIELDSOFSIMPLECLASS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm
index 1c2b3b9..38c68bf 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleEnum" table="FIELDSOFENUMNAME">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm
index ab450fb..158c035 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleEnum" table="FIELDSOFENUMORDINAL">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm
index fc5c31e..20ca865 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleInterface" table="FIELDSOFSIMPLEINTERFACE">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm
index c35c75b..6d485df 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfString" table="FIELDSOFSTRING">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm
index 4ac6fe1..c3eb84f 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashMapStringKeyCollections"
                table="HASHMAPSTRINGKEY_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm
index 1f7b3e4..d5ddfc7 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashMapStringValueCollections"
                table="HASHMAPSTRINGVALUE_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm
index 5d56187..ebd0110 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashSetCollections" table="HASHSET_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm
index 1d571c2..952d8d6 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringKeyCollections"
                table="HASHTABLESTRINGKEY_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm
index 6c9adaa..26a1abf 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringValueCollections"
                table="HASHTBLSTRINGVALUE_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm
index d1e60f4..4a926e3 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="LinkedListCollections" table="LINKEDLIST_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm
index 8d11904..e41b995 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ListCollections" table="LIST_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm
index 2a70ba8..6d3d7f6 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="MapStringKeyCollections" table="MAPSTRINGKEY_COLLECTIONS">
             <datastore-identity strategy="identity"
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm
index 32182ca..d9ab8e0 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="MapStringValueCollections"
                table="MAPSTRINGVALUE_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm
index 7ada628..26fdc17 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="SetCollections" table="SET_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm
index f3155b1..a20ea23 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="SimpleClass" table="SIMPLE_CLASS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm
index 8b3a721..6a36c20 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeMapStringKeyCollections"
                table="TREEMAPSTRINGKEY_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm
index 0cad049..b04baa2 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeMapStringValueCollections"
                table="TREEMAPSTRINGVALUE_COLLECTIONS">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm
index 5e73fa6..72c991f 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeSetCollections" table="TREESET_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm
index 035c215..4695f87 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="VectorCollections" table="VECTOR_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm
index aa2276b..e935c16 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.inheritance">
         <class name="AllPersist" table="AllPersist">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm
index 9c381fd..29140e2 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.instancecallbacks">
         <class name="InstanceCallbackNonPersistFdsClass" table="ICNonPersistFds">
             <datastore-identity strategy="identity">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm
index 6c05273..39fa2ce 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.lifecycle">
     <class name="StateTransitionObj" table="STATETRANSITIONOBJ">
        <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm
index bf3b728..d59c299 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm
index dd467cc..e5602dc 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
@@ -19,7 +19,7 @@
      xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm
index 47f1abe..f848413 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib" schema="datastoreidentity_pkg" >
 
     <class name="PCPoint" table="PCPoint">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm
index 0b9dda0..e3129f2 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint" schema="datastoreidentity_cls">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm
index 48ab2f8..954ac1e 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
@@ -18,7 +18,7 @@
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/query/package-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/query/package-standard.orm
index 509dc0a..c3d958a 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
@@ -21,7 +21,7 @@ This file contains the schema information when an implementation has datastore i
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
   <package name="org.apache.jdo.tck.pc.query">
 
     <class name="JDOQLKeywordsAsFieldNames" table="JDOQLKeywordsAsFieldNames">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm
index 60a6641..cd74808 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
@@ -22,7 +22,7 @@ has datastore identity.
 <orm xmlns="http://xmlns.jcp.org/xml/ns/jdo/orm"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/jdo/orm
-     http://xmlns.jcp.org/xml/ns/jdo/orm_3_2.xsd">
+     https://db.apache.org/jdo/xmlns/orm_3_2.xsd">
     <package name="org.apache.jdo.tck.pc.shoppingcart" schema="datastoreidentity8">
 
         <sequence name="id_seq" datastore-sequence="DATASTORE_SEQ"/>