Index: src/jdo/datastoreidentity/package.jdo
===================================================================
--- src/jdo/datastoreidentity/package.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/package.jdo	(Arbeitskopie)
@@ -22,7 +22,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
     <query name="packageJDOInDefaultPackage">
         SELECT FROM org.apache.jdo.tck.pc.company.Person
     </query>
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
   <package name="org.apache.jdo.tck.pc.lifecycle">
     <class name="StateTransitionObj" identity-type="datastore" detachable="true"/>
   </package>
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/singlefieldidentity/package.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/singlefieldidentity/package.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/singlefieldidentity/package.jdo	(Arbeitskopie)
@@ -15,11 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
      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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
   <package name="org.apache.jdo.tck.pc.singlefieldidentity">
     <class name="PCPointSingleFieldPrimitivebyte" persistence-modifier="non-persistent"/>
     <class name="PCPointSingleFieldByte" persistence-modifier="non-persistent"/>
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo	(Arbeitskopie)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -18,45 +18,45 @@
 <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">
-    <package name="org.apache.jdo.tck.pc.shoppingcart">
-
-        <class
-                name="Undetachable"
-                identity-type="datastore"
-                detachable="false"
-                />
-
-        <class
-                name="Product"
-                identity-type="datastore"
-                detachable="true"
-                />
-
-        <class
-                name="Cart"
-                identity-type="datastore"
-                detachable="true"
-                >
-            <field name="entries">
-                <collection element-type="CartEntry"/>
-            </field>
-            <fetch-group name="Cart.entries">
-                <field name="entries"/>
-            </fetch-group>
-        </class>
-
-        <class
-                name="CartEntry"
-                identity-type="datastore"
-                detachable="true"
-                >
-            <fetch-group name="CartEntry.cart">
-                <field name="cart"/>
-            </fetch-group>
-            <fetch-group name="CartEntry.product">
-                <field name="product"/>
-            </fetch-group>
-        </class>
-    </package>
-</jdo>
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
+    <package name="org.apache.jdo.tck.pc.shoppingcart">
+
+        <class
+                name="Undetachable"
+                identity-type="datastore"
+                detachable="false"
+                />
+
+        <class
+                name="Product"
+                identity-type="datastore"
+                detachable="true"
+                />
+
+        <class
+                name="Cart"
+                identity-type="datastore"
+                detachable="true"
+                >
+            <field name="entries">
+                <collection element-type="CartEntry"/>
+            </field>
+            <fetch-group name="Cart.entries">
+                <field name="entries"/>
+            </fetch-group>
+        </class>
+
+        <class
+                name="CartEntry"
+                identity-type="datastore"
+                detachable="true"
+                >
+            <fetch-group name="CartEntry.cart">
+                <field name="cart"/>
+            </fetch-group>
+            <fetch-group name="CartEntry.product">
+                <field name="product"/>
+            </fetch-group>
+        </class>
+    </package>
+</jdo>
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.instancecallbacks">
         <class name="InstanceCallbackNonPersistFdsClass" 
             identity-type="datastore">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/query/package.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/query/package.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/query/package.jdo	(Arbeitskopie)
@@ -15,11 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
      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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
   <package name="org.apache.jdo.tck.pc.query">
     <class name="JDOQLKeywordsAsFieldNames" identity-type="datastore"/>
     <class name="NoExtent" requires-extent="false" identity-type="datastore"/>
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/Person.jdoquery
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/Person.jdoquery	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/Person.jdoquery	(Arbeitskopie)
@@ -21,7 +21,7 @@
 <jdoquery xmlns="http://java.sun.com/xml/ns/jdo/jdoquery"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdoquery 
-	http://java.sun.com/xml/ns/jdo/jdoquery_2_0.xsd">
+	http://java.sun.com/xml/ns/jdo/jdoquery_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Person">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivelong" identity-type="datastore">
 <field name="long1"  embedded="true">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivebyte" identity-type="datastore">
 <field name="byte1"  embedded="true">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfCharacter" identity-type="datastore">
 <field name="Character1"  embedded="true">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="ArrayListCollections" identity-type="datastore">
 <field name="ArrayListOfObject0" >
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfInteger" identity-type="datastore">
 <field name="identifier"  persistence-modifier="none"/>
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="ListCollections" identity-type="datastore">
 <field name="ListOfObject0" >
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="TreeSetCollections" identity-type="datastore">
 <field name="TreeSetOfObject0" >
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfShort" identity-type="datastore">
 <field name="Short1"  embedded="true">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfLong" identity-type="datastore">
 <field name="Long1"  embedded="true">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="MapStringKeyCollections" identity-type="datastore">
 <field name="MapOfString_Object0" >
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="ArrayCollections" identity-type="datastore">
 <field name="ArrayOfObject0" persistence-modifier="persistent">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashtableStringValueCollections" identity-type="datastore">
 <field name="HashtableOfObject_String0" >
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfByte" identity-type="datastore">
 <field name="Byte1"  embedded="true">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfFloat" identity-type="datastore">
 <field name="Float1"  embedded="true">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfString" identity-type="datastore">
 <field name="String1"  embedded="true">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfObject" identity-type="datastore">
 <field name="Object1"  serialized="true" persistence-modifier="persistent"
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitiveboolean" identity-type="datastore">
 <field name="boolean1"  embedded="true">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashtableStringKeyCollections" identity-type="datastore">
 <field name="HashtableOfString_Object0" >
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="SetCollections" identity-type="datastore">
 <field name="SetOfObject0" >
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="LinkedListCollections" identity-type="datastore">
 <field name="LinkedListOfObject0" >
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="VectorCollections" identity-type="datastore">
 <field name="VectorOfObject0" >
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashMapStringValueCollections" identity-type="datastore">
 <field name="HashMapOfObject_String0" >
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitiveshort" identity-type="datastore">
 <field name="short1"  embedded="true">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivefloat" identity-type="datastore">
 <field name="float1"  embedded="true">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfLocale" identity-type="datastore">
 <field name="Locale1"  embedded="true">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivedouble" identity-type="datastore">
 <field name="double1"  embedded="true">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashMapStringKeyCollections" identity-type="datastore">
 <field name="HashMapOfString_Object0" >
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="TreeMapStringValueCollections" identity-type="datastore">
 <field name="TreeMapOfObject_String0" >
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitivechar" identity-type="datastore">
 <field name="identifier"  persistence-modifier="none"/>
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfSimpleInterface" identity-type="datastore">
 <field name="SimpleInterface1"  serialized="true" persistence-modifier="persistent">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfDouble" identity-type="datastore">
 <field name="Double1"  embedded="true">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfDate" identity-type="datastore">
 <field name="Date1"  embedded="true">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="CollectionCollections" identity-type="datastore">
 <field name="CollectionOfObject0" >
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfSimpleClass" identity-type="datastore">
 <field name="SimpleClass1"  embedded="true">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfBigInteger" identity-type="datastore">
 <field name="BigInteger1"  embedded="true">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfBoolean" identity-type="datastore">
 <field name="Boolean1"  embedded="true">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfBigDecimal" identity-type="datastore">
 <field name="BigDecimal1"  embedded="true">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="TreeMapStringKeyCollections" identity-type="datastore">
 <field name="TreeMapOfString_Object0" >
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="AllTypes">
         </class>
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="HashSetCollections" identity-type="datastore">
 <field name="HashSetOfObject0" >
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="FieldsOfPrimitiveint" identity-type="datastore">
 <field name="int1"  embedded="true">
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <package name="org.apache.jdo.tck.pc.fieldtypes">
 <class name="MapStringValueCollections" identity-type="datastore">
 <field name="MapOfObject_String0" >
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.inheritance">
         <class 
             name="AllPersist" 
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/order/package.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/order/package.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/order/package.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <!--
 This file is not used!! It exists here to satisfy build constraints.
 -->
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/PCClass.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/PCClass.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/PCClass.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
     <class name="PCClass" identity-type="datastore">
       <field name="transientNumber1" persistence-modifier="none"/>
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/package.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/package.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/package.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" identity-type="datastore"/>
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/package.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/package.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/package.jdo	(Arbeitskopie)
@@ -22,7 +22,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
     <package name="org.apache.jdo.tck.models.inheritance">
         <class name="FieldWithSameNameInSuperclass" persistence-modifier="persistence-aware"/>
         <class name="NonPersistentFieldsAreNonPersistentInSubclasses" persistence-modifier="persistence-aware"/>
Index: src/jdo/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package.jdo
===================================================================
--- src/jdo/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package.jdo	(Revision 547349)
+++ src/jdo/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package.jdo	(Arbeitskopie)
@@ -21,7 +21,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
     <package name="org.apache.jdo.tck.api.instancecallbacks">
         <class name="InstanceLifecycleListenerAttach$PC" 
                 identity-type="datastore" detachable="true">
Index: src/jdo/applicationidentity/package.jdo
===================================================================
--- src/jdo/applicationidentity/package.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/package.jdo	(Arbeitskopie)
@@ -22,7 +22,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
     <query name="packageJDOInDefaultPackage">
         SELECT FROM org.apache.jdo.tck.pc.company.Person
     </query>
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
   <package name="org.apache.jdo.tck.pc.lifecycle">
 
     <class name="StateTransitionObj" 
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package.jdo	(Arbeitskopie)
@@ -19,7 +19,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
   <package name="org.apache.jdo.tck.pc.singlefieldidentity">
 
     <class name="PCPointSingleFieldPrimitivebyte"
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo	(Arbeitskopie)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -18,55 +18,55 @@
 <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">
-    <package name="org.apache.jdo.tck.pc.shoppingcart">
-
-        <class
-                name="Undetachable"
-                identity-type="application"
-                objectid-class="org.apache.jdo.tck.pc.shoppingcart.Undetachable$Oid"
-                detachable="false"
-                >
-            <field name="id" primary-key="true"/>
-        </class>
-
-        <class
-                name="Product"
-                identity-type="application"
-                objectid-class="org.apache.jdo.tck.pc.shoppingcart.Product$Oid"
-                detachable="true"
-                >
-            <field name="sku" primary-key="true"/>
-        </class>
-
-        <class
-                name="Cart"
-                identity-type="application"
-                objectid-class="org.apache.jdo.tck.pc.shoppingcart.Cart$Oid"
-                detachable="true"
-                >
-            <field name="id" primary-key="true"/>
-            <field name="entries">
-                <collection element-type="CartEntry"/>
-            </field>
-            <fetch-group name="Cart.entries">
-                <field name="entries"/>
-            </fetch-group>
-        </class>
-
-        <class
-                name="CartEntry"
-                identity-type="application"
-                objectid-class="org.apache.jdo.tck.pc.shoppingcart.CartEntry$Oid"
-                detachable="true"
-                >
-            <field name="id" primary-key="true"/>
-            <fetch-group name="CartEntry.cart">
-                <field name="cart"/>
-            </fetch-group>
-            <fetch-group name="CartEntry.product">
-                <field name="product"/>
-            </fetch-group>
-        </class>
-    </package>
-</jdo>
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
+    <package name="org.apache.jdo.tck.pc.shoppingcart">
+
+        <class
+                name="Undetachable"
+                identity-type="application"
+                objectid-class="org.apache.jdo.tck.pc.shoppingcart.Undetachable$Oid"
+                detachable="false"
+                >
+            <field name="id" primary-key="true"/>
+        </class>
+
+        <class
+                name="Product"
+                identity-type="application"
+                objectid-class="org.apache.jdo.tck.pc.shoppingcart.Product$Oid"
+                detachable="true"
+                >
+            <field name="sku" primary-key="true"/>
+        </class>
+
+        <class
+                name="Cart"
+                identity-type="application"
+                objectid-class="org.apache.jdo.tck.pc.shoppingcart.Cart$Oid"
+                detachable="true"
+                >
+            <field name="id" primary-key="true"/>
+            <field name="entries">
+                <collection element-type="CartEntry"/>
+            </field>
+            <fetch-group name="Cart.entries">
+                <field name="entries"/>
+            </fetch-group>
+        </class>
+
+        <class
+                name="CartEntry"
+                identity-type="application"
+                objectid-class="org.apache.jdo.tck.pc.shoppingcart.CartEntry$Oid"
+                detachable="true"
+                >
+            <field name="id" primary-key="true"/>
+            <fetch-group name="CartEntry.cart">
+                <field name="cart"/>
+            </fetch-group>
+            <fetch-group name="CartEntry.product">
+                <field name="product"/>
+            </fetch-group>
+        </class>
+    </package>
+</jdo>
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.instancecallbacks">
         <class name="InstanceCallbackNonPersistFdsClass" 
             identity-type="application"
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/query/package.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/query/package.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/query/package.jdo	(Arbeitskopie)
@@ -19,7 +19,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
   <package name="org.apache.jdo.tck.pc.query">
 
     <class name="JDOQLKeywordsAsFieldNames"
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/Person.jdoquery
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/Person.jdoquery	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/Person.jdoquery	(Arbeitskopie)
@@ -21,7 +21,7 @@
 <jdoquery xmlns="http://java.sun.com/xml/ns/jdo/jdoquery"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdoquery 
-	http://java.sun.com/xml/ns/jdo/jdoquery_2_0.xsd">
+	http://java.sun.com/xml/ns/jdo/jdoquery_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.company">
 
         <class name="Person">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/package.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/package.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/inheritance/package.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.inheritance">
         <class
             name="AllPersist"
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/order/package.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/order/package.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/order/package.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/PCClass.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/PCClass.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/PCClass.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.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">
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/package.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/package.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/package.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint"
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
Index: src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
Index: src/jdo/applicationidentity/org/apache/jdo/tck/package.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/package.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/package.jdo	(Arbeitskopie)
@@ -22,7 +22,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
     <package name="org.apache.jdo.tck.models.inheritance">
         <class name="FieldWithSameNameInSuperclass" persistence-modifier="persistence-aware"/>
         <class name="NonPersistentFieldsAreNonPersistentInSubclasses" persistence-modifier="persistence-aware"/>
Index: src/jdo/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package.jdo
===================================================================
--- src/jdo/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package.jdo	(Revision 547349)
+++ src/jdo/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package.jdo	(Arbeitskopie)
@@ -21,7 +21,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
     <package name="org.apache.jdo.tck.api.instancecallbacks">
         <class name="InstanceLifecycleListenerAttach$PC" detachable="true">
             <field name="id" primary-key="true"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
   <package name="org.apache.jdo.tck.pc.lifecycle">
     <class name="StateTransitionObj" table="STATETRANSITIONOBJ">
        <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm	(Arbeitskopie)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,51 +15,51 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!--
-This file contains the schema information when an implementation
-has datastore identity.
--->
+<!--
+This file contains the schema information when an implementation
+has datastore identity.
+-->
 <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">
-    <package name="org.apache.jdo.tck.pc.shoppingcart">
-
-        <class name="Cart" table="CARTS">
-            <datastore-identity strategy="increment" column="DATASTORE_ID"/>
-            <version strategy="version-number" column="VERSION"/>
-
-            <field name="id" column="CART_ID"/>
-            <field name="customerId" column="CUSTOMER_ID"/>
-            <field name="entries" mapped-by="cart"/>
-        </class>
-
-        <class name="CartEntry" table="CART_ENTRIES">
-            <datastore-identity strategy="increment" column="DATASTORE_ID"/>
-            <version strategy="version-number" column="VERSION"/>
-
-            <field name="id" column="ID"/>
-            <field name="quantity" column="QUANTITY"/>
-            <field name="product" column="SKU"/>
-            <field name="cart" column="CART_ID"/>
-        </class>
-
-        <class name="Product" table="PRODUCTS">
-            <datastore-identity strategy="uuid-hex" column="DATASTORE_ID"/>
-            <version strategy="version-number" column="VERSION"/>
-
-            <field name="sku" column="SKU"/>
-            <field name="description" column="DESCRIPTION"/>
-        </class>
-
-        <class name="Undetachable" table="UNDETACHABLES">
-            <datastore-identity strategy="increment" column="DATASTORE_ID"/>
-            <version strategy="version-number" column="VERSION"/>
-
-            <field name="id" column="ID"/>
-            <field name="foo" column="FOO"/>
-            <field name="bar" column="BAR"/>
-        </class>
-
-    </package>
-</orm>
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+    <package name="org.apache.jdo.tck.pc.shoppingcart">
+
+        <class name="Cart" table="CARTS">
+            <datastore-identity strategy="increment" column="DATASTORE_ID"/>
+            <version strategy="version-number" column="VERSION"/>
+
+            <field name="id" column="CART_ID"/>
+            <field name="customerId" column="CUSTOMER_ID"/>
+            <field name="entries" mapped-by="cart"/>
+        </class>
+
+        <class name="CartEntry" table="CART_ENTRIES">
+            <datastore-identity strategy="increment" column="DATASTORE_ID"/>
+            <version strategy="version-number" column="VERSION"/>
+
+            <field name="id" column="ID"/>
+            <field name="quantity" column="QUANTITY"/>
+            <field name="product" column="SKU"/>
+            <field name="cart" column="CART_ID"/>
+        </class>
+
+        <class name="Product" table="PRODUCTS">
+            <datastore-identity strategy="uuid-hex" column="DATASTORE_ID"/>
+            <version strategy="version-number" column="VERSION"/>
+
+            <field name="sku" column="SKU"/>
+            <field name="description" column="DESCRIPTION"/>
+        </class>
+
+        <class name="Undetachable" table="UNDETACHABLES">
+            <datastore-identity strategy="increment" column="DATASTORE_ID"/>
+            <version strategy="version-number" column="VERSION"/>
+
+            <field name="id" column="ID"/>
+            <field name="foo" column="FOO"/>
+            <field name="bar" column="BAR"/>
+        </class>
+
+    </package>
+</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.instancecallbacks">
         <class name="InstanceCallbackNonPersistFdsClass" table="ICNonPersistFds">
             <datastore-identity strategy="identity">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/query/package-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/query/package-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/query/package-standard.orm	(Arbeitskopie)
@@ -22,7 +22,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.query">
 
         <class name="JDOQLKeywordsAsFieldNames" table="JDOQLKeywordsAsFieldNames">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfDate" table="FIELDSOFDATE">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringKeyCollections"
                table="HASHTABLESTRINGKEY_COLLECTIONS">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="SetCollections" table="SET_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleClass" table="FIELDSOFSIMPLECLASS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBigInteger" table="FIELDSOFBIGINTEGER">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBoolean" table="FIELDSOFBOOLEAN">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="AllTypes" table="ALLTYPES">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveint" table="FIELDSOFPRIMITIVEINT">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashMapStringValueCollections"
                table="HASHMAPSTRINGVALUE_COLLECTIONS">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveshort" table="FIELDSOFPRIMITIVESHORT">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ArrayListCollections" table="ARRAYLIST_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfInteger" table="FIELDSOFINTEGER">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivefloat" table="FIELDSOFPRIMITIVEFLOAT">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
            <class name="FieldsOfShort" table="FIELDSOFSHORT">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfLong" table="FIELDSOFLONG">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm	(Arbeitskopie)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,116 +15,116 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!--
-Metadata for datastore identity
--->
+<!--
+Metadata for datastore identity
+-->
 <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">
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="ArrayCollections" table="ARRAY_COLLECTIONS">
-            <datastore-identity strategy="identity"
-                                column="DATASTORE_IDENTITY"/>
-            <field name="identifier" column="IDENTIFIER"/>
-           <field name="ArrayOfObject0" table="ARRAY_OF_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <element column="OBJVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfObject1" table="ARRAY_OF_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfSimpleClass2" table="ARRAY_OF_SIMPLE_CLASS2">
-                <join column="IDENTIFIER"/>
-                <element column="OBJVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfSimpleClass3" table="ARRAY_OF_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfSimpleInterface4"
-                   table="ARRAY_OF_SIMPLE_INTERFACE4">
-                <join column="IDENTIFIER"/>
-                <element column="OBJVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfSimpleInterface5"
-                   table="ARRAY_OF_SIMPLE_INTERFACE5">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfString6" column="ARRAY_OF_STRING6"/>
-            <field name="ArrayOfString7" table="ARRAY_OF_STRING7">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfDate8" column="ARRAY_OF_DATE8"/>
-            <field name="ArrayOfDate9" table="ARRAY_OF_DATE9">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfLocale10" column="ARRAY_OF_LOCALE10"/>
-            <field name="ArrayOfLocale11" table="ARRAY_OF_LOCALE11">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfBigDecimal12" column="ARRAY_OF_BIG_DECIMAL12"/>
-            <field name="ArrayOfBigDecimal13" table="ARRAY_OF_BIG_DECIMAL13">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfBigInteger14" column="ARRAY_OF_BIG_INTEGER14"/>
-            <field name="ArrayOfBigInteger15" table="ARRAY_OF_BIG_INTEGER15">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfByte16" column="ARRAY_OF_BYTE16"/>
-            <field name="ArrayOfByte17" table="ARRAY_OF_BYTE17">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfDouble18" column="ARRAY_OF_DOUBLE18"/>
-            <field name="ArrayOfDouble19" table="ARRAY_OF_DOUBLE19">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfFloat20" column="ARRAY_OF_FLOAT20"/>
-            <field name="ArrayOfFloat21" table="ARRAY_OF_FLOAT21">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfInteger22" column="ARRAY_OF_INTEGER22"/>
-            <field name="ArrayOfInteger23" table="ARRAY_OF_INTEGER23">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfLong24" column="ARRAY_OF_LONG24"/>
-            <field name="ArrayOfLong25" table="ARRAY_OF_LONG25">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-            <field name="ArrayOfShort26" column="ARRAY_OF_SHORT26"/>
-            <field name="ArrayOfShort27" table="ARRAY_OF_SHORT27">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="ORDER_COL"/>
-            </field>
-        </class>
-    </package>
-</orm>
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+    <package name="org.apache.jdo.tck.pc.fieldtypes">
+        <class name="ArrayCollections" table="ARRAY_COLLECTIONS">
+            <datastore-identity strategy="identity"
+                                column="DATASTORE_IDENTITY"/>
+            <field name="identifier" column="IDENTIFIER"/>
+           <field name="ArrayOfObject0" table="ARRAY_OF_OBJECT0">
+                <join column="IDENTIFIER"/>
+                <element column="OBJVAL"/>
+                <order column="ORDER_COL"/>
+            </field>
+            <field name="ArrayOfObject1" table="ARRAY_OF_OBJECT1">
+                <join column="IDENTIFIER"/>
+                <element column="OBJREF"/>
+                <order column="ORDER_COL"/>
+            </field>
+            <field name="ArrayOfSimpleClass2" table="ARRAY_OF_SIMPLE_CLASS2">
+                <join column="IDENTIFIER"/>
+                <element column="OBJVAL"/>
+                <order column="ORDER_COL"/>
+            </field>
+            <field name="ArrayOfSimpleClass3" table="ARRAY_OF_SIMPLE_CLASS3">
+                <join column="IDENTIFIER"/>
+                <element column="OBJREF"/>
+                <order column="ORDER_COL"/>
+            </field>
+            <field name="ArrayOfSimpleInterface4"
+                   table="ARRAY_OF_SIMPLE_INTERFACE4">
+                <join column="IDENTIFIER"/>
+                <element column="OBJVAL"/>
+                <order column="ORDER_COL"/>
+            </field>
+            <field name="ArrayOfSimpleInterface5"
+                   table="ARRAY_OF_SIMPLE_INTERFACE5">
+                <join column="IDENTIFIER"/>
+                <element column="OBJREF"/>
+                <order column="ORDER_COL"/>
+            </field>
+            <field name="ArrayOfString6" column="ARRAY_OF_STRING6"/>
+            <field name="ArrayOfString7" table="ARRAY_OF_STRING7">
+                <join column="IDENTIFIER"/>
+                <element column="STRINGVAL"/>
+                <order column="ORDER_COL"/>
+            </field>
+            <field name="ArrayOfDate8" column="ARRAY_OF_DATE8"/>
+            <field name="ArrayOfDate9" table="ARRAY_OF_DATE9">
+                <join column="IDENTIFIER"/>
+                <element column="DATEVAL"/>
+                <order column="ORDER_COL"/>
+            </field>
+            <field name="ArrayOfLocale10" column="ARRAY_OF_LOCALE10"/>
+            <field name="ArrayOfLocale11" table="ARRAY_OF_LOCALE11">
+                <join column="IDENTIFIER"/>
+                <element column="LOCALEVAL"/>
+                <order column="ORDER_COL"/>
+            </field>
+            <field name="ArrayOfBigDecimal12" column="ARRAY_OF_BIG_DECIMAL12"/>
+            <field name="ArrayOfBigDecimal13" table="ARRAY_OF_BIG_DECIMAL13">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_DECIMALVAL"/>
+                <order column="ORDER_COL"/>
+            </field>
+            <field name="ArrayOfBigInteger14" column="ARRAY_OF_BIG_INTEGER14"/>
+            <field name="ArrayOfBigInteger15" table="ARRAY_OF_BIG_INTEGER15">
+                <join column="IDENTIFIER"/>
+                <element column="BIG_INTEGERVAL"/>
+                <order column="ORDER_COL"/>
+            </field>
+            <field name="ArrayOfByte16" column="ARRAY_OF_BYTE16"/>
+            <field name="ArrayOfByte17" table="ARRAY_OF_BYTE17">
+                <join column="IDENTIFIER"/>
+                <element column="BYTEVAL"/>
+                <order column="ORDER_COL"/>
+            </field>
+            <field name="ArrayOfDouble18" column="ARRAY_OF_DOUBLE18"/>
+            <field name="ArrayOfDouble19" table="ARRAY_OF_DOUBLE19">
+                <join column="IDENTIFIER"/>
+                <element column="DOUBLEVAL"/>
+                <order column="ORDER_COL"/>
+            </field>
+            <field name="ArrayOfFloat20" column="ARRAY_OF_FLOAT20"/>
+            <field name="ArrayOfFloat21" table="ARRAY_OF_FLOAT21">
+                <join column="IDENTIFIER"/>
+                <element column="FLOATVAL"/>
+                <order column="ORDER_COL"/>
+            </field>
+            <field name="ArrayOfInteger22" column="ARRAY_OF_INTEGER22"/>
+            <field name="ArrayOfInteger23" table="ARRAY_OF_INTEGER23">
+                <join column="IDENTIFIER"/>
+                <element column="INTEGERVAL"/>
+                <order column="ORDER_COL"/>
+            </field>
+            <field name="ArrayOfLong24" column="ARRAY_OF_LONG24"/>
+            <field name="ArrayOfLong25" table="ARRAY_OF_LONG25">
+                <join column="IDENTIFIER"/>
+                <element column="LONGVAL"/>
+                <order column="ORDER_COL"/>
+            </field>
+            <field name="ArrayOfShort26" column="ARRAY_OF_SHORT26"/>
+            <field name="ArrayOfShort27" table="ARRAY_OF_SHORT27">
+                <join column="IDENTIFIER"/>
+                <element column="SHORTVAL"/>
+                <order column="ORDER_COL"/>
+            </field>
+        </class>
+    </package>
+</orm>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfByte" table="FieldsOfByte">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashMapStringKeyCollections"
                table="HASHMAPSTRINGKEY_COLLECTIONS">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeMapStringValueCollections"
                table="TREEMAPSTRINGVALUE_COLLECTIONS">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfFloat" table="FIELDSOFFLOAT">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivechar" table="FIELDSOFPRIMITIVECHAR">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleInterface" table="FIELDSOFSIMPLEINTERFACE">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfDouble" table="FIELDSOFDOUBLE">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="CollectionCollections" table="COLLECTION_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBigDecimal" table="FIELDSOFBIGDECIMAL">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeMapStringKeyCollections"
                table="TREEMAPSTRINGKEY_COLLECTIONS">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashSetCollections" table="HASHSET_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="MapStringValueCollections"
                table="MAPSTRINGVALUE_COLLECTIONS">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="LinkedListCollections" table="LINKEDLIST_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="VectorCollections" table="VECTOR_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivelong" table="FIELDSOFPRIMITIVELONG">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivebyte" table="FIELDSOFPRIMITIVEBYTE">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfCharacter" table="FIELDSOFCHARACTER">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ListCollections" table="LIST_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeSetCollections" table="TREESET_COLLECTIONS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfLocale" table="FIELDSOFLOCALE">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="MapStringKeyCollections" table="MAPSTRINGKEY_COLLECTIONS">
             <datastore-identity strategy="identity"
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringValueCollections"
                table="HASHTBLSTRINGVALUE_COLLECTIONS">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivedouble" table="FIELDSOFPRIMITIVEDOUBLE">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="SimpleClass" table="SIMPLE_CLASS">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfString" table="FIELDSOFSTRING">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfObject" table="FIELDSOFOBJECT">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveboolean" table="FIELDSOFPRIMITIVEBOOLEAN">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package-standard9.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package-standard9.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package-standard9.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.inheritance">
         <class name="AllPersist" table="AllPersist">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm	(Arbeitskopie)
@@ -19,7 +19,7 @@
      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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
   <package name="org.apache.jdo.tck.pc.mylib" schema="datastoreidentity_pkg" >
 
     <class name="PCPoint" table="PCPoint">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint" schema="datastoreidentity_cls">
Index: src/orm/datastoreidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has datastore identity.
Index: src/orm/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm
===================================================================
--- src/orm/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm	(Revision 547349)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm	(Arbeitskopie)
@@ -22,7 +22,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.api.instancecallbacks">
 
         <class name="InstanceLifecycleListenerAttach$PC" 
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/lifecycle/StateTransitionObj-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
   <package name="org.apache.jdo.tck.pc.lifecycle">
     <class name="StateTransitionObj" table="STATETRANSITIONOBJ">
        <field name="id" column="ID"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
   <package name="org.apache.jdo.tck.pc.singlefieldidentity">
 
     <class name="PCPointSingleFieldPrimitivebyte" table="PCPointSingleFieldByte">
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm	(Arbeitskopie)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,47 +15,47 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!--
-This file contains the schema information when an implementation
-has application identity.
--->
+<!--
+This file contains the schema information when an implementation
+has application identity.
+-->
 <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">
-    <package name="org.apache.jdo.tck.pc.shoppingcart">
-
-        <class name="Cart" table="CARTS">
-            <version strategy="version-number" column="VERSION"/>
-
-            <field name="id" column="CART_ID"/>
-            <field name="customerId" column="CUSTOMER_ID"/>
-            <field name="entries" mapped-by="cart"/>
-        </class>
-
-        <class name="CartEntry" table="CART_ENTRIES">
-            <version strategy="version-number" column="VERSION"/>
-
-            <field name="id" column="ID"/>
-            <field name="quantity" column="QUANTITY"/>
-            <field name="product" column="SKU"/>
-            <field name="cart" column="CART_ID"/>
-        </class>
-
-        <class name="Product" table="PRODUCTS">
-            <version strategy="version-number" column="VERSION"/>
-
-            <field name="sku" column="SKU"/>
-            <field name="description" column="DESCRIPTION"/>
-        </class>
-
-        <class name="Undetachable" table="UNDETACHABLES">
-            <version strategy="version-number" column="VERSION"/>
-
-            <field name="id" column="ID"/>
-            <field name="foo" column="FOO"/>
-            <field name="bar" column="BAR"/>
-        </class>
-
-    </package>
-</orm>
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+    <package name="org.apache.jdo.tck.pc.shoppingcart">
+
+        <class name="Cart" table="CARTS">
+            <version strategy="version-number" column="VERSION"/>
+
+            <field name="id" column="CART_ID"/>
+            <field name="customerId" column="CUSTOMER_ID"/>
+            <field name="entries" mapped-by="cart"/>
+        </class>
+
+        <class name="CartEntry" table="CART_ENTRIES">
+            <version strategy="version-number" column="VERSION"/>
+
+            <field name="id" column="ID"/>
+            <field name="quantity" column="QUANTITY"/>
+            <field name="product" column="SKU"/>
+            <field name="cart" column="CART_ID"/>
+        </class>
+
+        <class name="Product" table="PRODUCTS">
+            <version strategy="version-number" column="VERSION"/>
+
+            <field name="sku" column="SKU"/>
+            <field name="description" column="DESCRIPTION"/>
+        </class>
+
+        <class name="Undetachable" table="UNDETACHABLES">
+            <version strategy="version-number" column="VERSION"/>
+
+            <field name="id" column="ID"/>
+            <field name="foo" column="FOO"/>
+            <field name="bar" column="BAR"/>
+        </class>
+
+    </package>
+</orm>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/instancecallbacks/package-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.instancecallbacks">
         <class name="InstanceCallbackNonPersistFdsClass" table="ICNonPersistFds">
             <field name="keyValue">
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/query/package-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/query/package-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/query/package-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
   <package name="org.apache.jdo.tck.pc.query">
 
     <class name="JDOQLKeywordsAsFieldNames" table="JDOQLKeywordsAsFieldNames">
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/companyListWithoutJoin/package-standard10.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDate-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfDate" table="FIELDSOFDATE">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringKeyCollections"
                table="HASHTABLESTRINGKEY_COLLECTIONS">
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="SetCollections" table="SET_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleClass" table="FIELDSOFSIMPLECLASS">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigInteger-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBigInteger" table="FIELDSOFBIGINTEGER">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBoolean-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBoolean" table="FIELDSOFBOOLEAN">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="AllTypes" table="ALLTYPES">
             <field name="id" column="ID"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveint-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveint" table="FIELDSOFPRIMITIVEINT">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashMapStringValueCollections"
                table="HASHMAPSTRINGVALUE_COLLECTIONS">
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveshort-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveshort" table="FIELDSOFPRIMITIVESHORT">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ArrayListCollections" table="ARRAYLIST_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfInteger-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfInteger" table="FIELDSOFINTEGER">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivefloat-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivefloat" table="FIELDSOFPRIMITIVEFLOAT">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfShort-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
            <class name="FieldsOfShort" table="FIELDSOFSHORT">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLong-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfLong" table="FIELDSOFLONG">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm	(Arbeitskopie)
@@ -21,7 +21,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ArrayCollections" table="ARRAY_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfByte-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfByte" table="FieldsOfByte">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeMapStringValueCollections"
                table="TREEMAPSTRINGVALUE_COLLECTIONS">
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashMapStringKeyCollections"
                table="HASHMAPSTRINGKEY_COLLECTIONS">
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfFloat-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfFloat" table="FIELDSOFFLOAT">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivechar-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivechar" table="FIELDSOFPRIMITIVECHAR">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfDouble-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfDouble" table="FIELDSOFDOUBLE">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleInterface-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfSimpleInterface" table="FIELDSOFSIMPLEINTERFACE">
             <field name="identifier" column="IDENTIFIER">
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="CollectionCollections" table="COLLECTION_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeMapStringKeyCollections"
                table="TREEMAPSTRINGKEY_COLLECTIONS">
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBigDecimal" table="FIELDSOFBIGDECIMAL">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashSetCollections" table="HASHSET_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="MapStringValueCollections"
                table="MAPSTRINGVALUE_COLLECTIONS">
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="VectorCollections" table="VECTOR_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="LinkedListCollections" table="LINKEDLIST_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivelong-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivelong" table="FIELDSOFPRIMITIVELONG">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivebyte-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivebyte" table="FIELDSOFPRIMITIVEBYTE">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfCharacter-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfCharacter" table="FIELDSOFCHARACTER">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="ListCollections" table="LIST_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="TreeSetCollections" table="TREESET_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfLocale-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfLocale" table="FIELDSOFLOCALE">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="MapStringKeyCollections" table="MAPSTRINGKEY_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringValueCollections"
                table="HASHTBLSTRINGVALUE_COLLECTIONS">
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitivedouble-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitivedouble" table="FIELDSOFPRIMITIVEDOUBLE">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="SimpleClass" table="SIMPLE_CLASS">
             <field name="id" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfString" table="FIELDSOFSTRING">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfObject" table="FIELDSOFOBJECT">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfPrimitiveboolean-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfPrimitiveboolean" table="FIELDSOFPRIMITIVEBOOLEAN">
             <field name="identifier" column="IDENTIFIER"/>
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package-standard9.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package-standard9.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/companyMapWithoutJoin/package-standard9.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.inheritance">
         <class name="AllPersist" table="AllPersist">
             <inheritance strategy="new-table">
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/order/package-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/order/package-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/order/package-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint">
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm	(Arbeitskopie)
@@ -19,7 +19,7 @@
      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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint">
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
   <package name="org.apache.jdo.tck.pc.mylib" schema="applicationidentity_pkg">
 
     <class name="PCPoint" table="PCPoint">
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
   <package name="org.apache.jdo.tck.pc.mylib">
 
     <class name="PCPoint" table="PCPoint" schema="applicationidentity_cls">
Index: src/orm/applicationidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm	(Arbeitskopie)
@@ -18,7 +18,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
 <!--
 This file contains the schema information when an implementation
 has application identity.
Index: src/orm/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm
===================================================================
--- src/orm/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm	(Revision 547349)
+++ src/orm/applicationidentity/org/apache/jdo/tck/api/instancecallbacks/package-standard.orm	(Arbeitskopie)
@@ -22,7 +22,7 @@
 <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">
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.api.instancecallbacks">
 
         <class name="InstanceLifecycleListenerAttach$PC"