Index: jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
===================================================================
--- jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo	(revision 380222)
+++ jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo	(working copy)
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE jdo PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN" "http://java.sun.com/dtd/jdo_2_0.dtd">
+<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
+	http://java.sun.com/xml/ns/jdo/jdo_2_0.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
 -->
-<jdo>
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Address" embedded-only="true" requires-extent="false"/>
Index: jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
===================================================================
--- jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo	(revision 380222)
+++ jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo	(working copy)
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE jdo PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN" "http://java.sun.com/dtd/jdo_2_0.dtd">
+<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
+	http://java.sun.com/xml/ns/jdo/jdo_2_0.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
 -->
-<jdo>
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Address" embedded-only="true" requires-extent="false"/>
Index: orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm
===================================================================
--- orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm	(revision 380965)
+++ orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm	(working copy)
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+	http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
 -->
-<orm>
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Company" table="companies">
Index: orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
===================================================================
--- orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm	(revision 380965)
+++ orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm	(working copy)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+	http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
@@ -9,7 +12,6 @@
 Each table contains columns for the declared fields.
 Inheritance strategy: new-table for all classes.
 -->
-<orm>
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Company" table="companies">
Index: orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
===================================================================
--- orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm	(revision 380965)
+++ orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm	(working copy)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+	http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
@@ -18,7 +21,6 @@
     Employee, Insurance: subclass-table.
     all other classes:   new-table.
 -->
-<orm>
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Company" table="companies">
Index: orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
===================================================================
--- orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm	(revision 380965)
+++ orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm	(working copy)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+	http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
@@ -11,7 +14,6 @@
 Insurance has inheritance strategy "subclass-table".
 MedicalInsurance and DentalInsurance have inheritance strategy "new-table".
 -->
-<orm>
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Company" table="companies">
Index: orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
===================================================================
--- orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm	(revision 380965)
+++ orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm	(working copy)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+	http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
@@ -9,7 +12,6 @@
 PartTimeEmployee, FullTimeEmployee, MedicalInsurance, and DentalInsurance
 have inheritance strategy "superclass-table".
 -->
-<orm>
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Company" table="companies">
Index: orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm
===================================================================
--- orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm	(revision 380965)
+++ orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm	(working copy)
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+	http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
 -->
-<orm>
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Company" table="companies">
Index: orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
===================================================================
--- orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm	(revision 380965)
+++ orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm	(working copy)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+	http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
@@ -9,7 +12,6 @@
 Each table contains columns for the declared fields.
 Inheritance strategy: new-table for all classes.
 -->
-<orm>
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Company" table="companies">
Index: orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
===================================================================
--- orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm	(revision 380965)
+++ orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm	(working copy)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+	http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
@@ -18,7 +21,6 @@
     Employee, Insurance: subclass-table.
     all other classes:   new-table.
 -->
-<orm>
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Company" table="companies">
Index: orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
===================================================================
--- orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm	(revision 380965)
+++ orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm	(working copy)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+	http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
@@ -11,7 +14,6 @@
 Insurance has inheritance strategy "subclass-table".
 MedicalInsurance and DentalInsurance have inheritance strategy "new-table".
 -->
-<orm>
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Company" table="companies">
Index: orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
===================================================================
--- orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm	(revision 380965)
+++ orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm	(working copy)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+	http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
@@ -9,7 +12,6 @@
 PartTimeEmployee, FullTimeEmployee, MedicalInsurance, and DentalInsurance
 have inheritance strategy "superclass-table".
 -->
-<orm>
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Company" table="companies">