Index: src/sql/derby/datastoreidentity/schema5.sql
===================================================================
--- src/sql/derby/datastoreidentity/schema5.sql	(Revision 389821)
+++ src/sql/derby/datastoreidentity/schema5.sql	(Arbeitskopie)
@@ -9,7 +9,6 @@
 -- mylib
 -------------------------
 
-DROP TABLE PCRect;
 DROP TABLE PCPoint;
 
 CREATE TABLE PCPoint (
@@ -20,10 +19,3 @@
     CONSTRAINT PCPNT_CONST PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
-CREATE TABLE PCRect (
-    DATASTORE_IDENTITY BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
-    ID BIGINT,
-    UPPER_LEFT BIGINT REFERENCES PCPoint NOT NULL,
-    LOWER_RIGHT BIGINT REFERENCES PCPoint NOT NULL,
-    CONSTRAINT PCRCT_CONST PRIMARY KEY (DATASTORE_IDENTITY)
-);
Index: src/sql/derby/datastoreidentity/schema6.sql
===================================================================
--- src/sql/derby/datastoreidentity/schema6.sql	(Revision 389821)
+++ src/sql/derby/datastoreidentity/schema6.sql	(Arbeitskopie)
@@ -9,7 +9,6 @@
 -- mylib
 -------------------------
 
-DROP TABLE PCRect;
 DROP TABLE PCPoint;
 
 CREATE TABLE PCPoint (
@@ -20,10 +19,3 @@
     CONSTRAINT PCPNT_CONST PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
-CREATE TABLE PCRect (
-    DATASTORE_IDENTITY BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
-    ID BIGINT,
-    UPPER_LEFT BIGINT REFERENCES PCPoint NOT NULL,
-    LOWER_RIGHT BIGINT REFERENCES PCPoint NOT NULL,
-    CONSTRAINT PCRCT_CONST PRIMARY KEY (DATASTORE_IDENTITY)
-);
Index: src/sql/derby/datastoreidentity/schema7.sql
===================================================================
--- src/sql/derby/datastoreidentity/schema7.sql	(Revision 389821)
+++ src/sql/derby/datastoreidentity/schema7.sql	(Arbeitskopie)
@@ -9,7 +9,6 @@
 -- mylib
 -------------------------
 
-DROP TABLE PCRect;
 DROP TABLE PCPoint;
 
 CREATE TABLE PCPoint (
@@ -20,10 +19,3 @@
     CONSTRAINT PCPNT_CONST PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
-CREATE TABLE PCRect (
-    DATASTORE_IDENTITY BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
-    ID BIGINT,
-    UPPER_LEFT BIGINT REFERENCES PCPoint NOT NULL,
-    LOWER_RIGHT BIGINT REFERENCES PCPoint NOT NULL,
-    CONSTRAINT PCRCT_CONST PRIMARY KEY (DATASTORE_IDENTITY)
-);
Index: src/sql/derby/applicationidentity/schema5.sql
===================================================================
--- src/sql/derby/applicationidentity/schema5.sql	(Revision 389821)
+++ src/sql/derby/applicationidentity/schema5.sql	(Arbeitskopie)
@@ -9,7 +9,6 @@
 -- mylib
 -------------------------
 
-DROP TABLE PCRect;
 DROP TABLE PCPoint;
 
 CREATE TABLE PCPoint (
@@ -19,9 +18,3 @@
     CONSTRAINT PCPNT_CONST PRIMARY KEY (ID)
 );
 
-CREATE TABLE PCRect (
-    ID BIGINT NOT NULL,
-    UPPER_LEFT BIGINT REFERENCES PCPoint NOT NULL,
-    LOWER_RIGHT BIGINT REFERENCES PCPoint NOT NULL,
-    CONSTRAINT PCRCT_CONST PRIMARY KEY (ID)
-);
Index: src/sql/derby/applicationidentity/schema6.sql
===================================================================
--- src/sql/derby/applicationidentity/schema6.sql	(Revision 389821)
+++ src/sql/derby/applicationidentity/schema6.sql	(Arbeitskopie)
@@ -9,7 +9,6 @@
 -- mylib
 -------------------------
 
-DROP TABLE PCRect;
 DROP TABLE PCPoint;
 
 CREATE TABLE PCPoint (
@@ -19,9 +18,3 @@
     CONSTRAINT PCPNT_CONST PRIMARY KEY (ID)
 );
 
-CREATE TABLE PCRect (
-    ID BIGINT NOT NULL,
-    UPPER_LEFT BIGINT REFERENCES PCPoint NOT NULL,
-    LOWER_RIGHT BIGINT REFERENCES PCPoint NOT NULL,
-    CONSTRAINT PCRCT_CONST PRIMARY KEY (ID)
-);
Index: src/sql/derby/applicationidentity/schema7.sql
===================================================================
--- src/sql/derby/applicationidentity/schema7.sql	(Revision 389821)
+++ src/sql/derby/applicationidentity/schema7.sql	(Arbeitskopie)
@@ -9,7 +9,6 @@
 -- mylib
 -------------------------
 
-DROP TABLE PCRect;
 DROP TABLE PCPoint;
 
 CREATE TABLE PCPoint (
@@ -19,9 +18,3 @@
     CONSTRAINT PCPNT_CONST PRIMARY KEY (ID)
 );
 
-CREATE TABLE PCRect (
-    ID BIGINT NOT NULL,
-    UPPER_LEFT BIGINT REFERENCES PCPoint NOT NULL,
-    LOWER_RIGHT BIGINT REFERENCES PCPoint NOT NULL,
-    CONSTRAINT PCRCT_CONST PRIMARY KEY (ID)
-);
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 389821)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm	(Arbeitskopie)
@@ -13,50 +13,6 @@
       <field name="y" column="Y"/>
     </class>
 
-    <class name="PCPoint2" table="PCPoint2">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCRect" table="PCRect">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="lowerRight" column="LOWER_RIGHT">
-        <foreign-key/>
-      </field>
-      <field name="upperLeft" column="UPPER_LEFT">
-        <foreign-key/>
-      </field>
-    </class>
-
-    <class name="PrimitiveTypes" table="PrimitiveTypes">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="booleanNotNull" column="booleanNotNull"/>
-      <field name="booleanNull" column="booleanNull"/>
-      <field name="byteNotNull" column="byteNotNull"/>
-      <field name="byteNull" column="byteNull"/>
-      <field name="shortNotNull" column="shortNotNull"/>
-      <field name="shortNull" column="shortNull"/>
-      <field name="intNotNull" column="intNotNull"/>
-      <field name="intNull" column="intNull"/>
-      <field name="longNotNull" column="longNotNull"/>
-      <field name="longNull" column="longNull"/>
-      <field name="floatNotNull" column="floatNotNull"/>
-      <field name="floatNull" column="floatNull"/>
-      <field name="doubleNotNull" column="doubleNotNull"/>
-      <field name="doubleNull" column="doubleNull"/>
-      <field name="charNotNull" column="charNotNull"/>
-      <field name="charNull" column="charNull"/>
-      <field name="dateNull" column="dateNull"/>
-      <field name="stringNull" column="stringNull"/>
-      <field name="bigDecimal" column="bigDecimal"/>
-      <field name="bigInteger" column="bigInteger"/>
-      <field name="PrimitiveTypes" column="PrimitiveTypes"/>
-    </class>
-
   </package>
 </orm>
 
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 389821)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm	(Arbeitskopie)
@@ -12,50 +12,6 @@
       <field name="y" column="Y"/>
     </class>
 
-    <class name="PCPoint2" table="PCPoint2">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCRect" table="PCRect">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="lowerRight" column="LOWER_RIGHT">
-        <foreign-key/>
-      </field>
-      <field name="upperLeft" column="UPPER_LEFT">
-        <foreign-key/>
-      </field>
-    </class>
-
-    <class name="PrimitiveTypes" table="PrimitiveTypes">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="booleanNotNull" column="booleanNotNull"/>
-      <field name="booleanNull" column="booleanNull"/>
-      <field name="byteNotNull" column="byteNotNull"/>
-      <field name="byteNull" column="byteNull"/>
-      <field name="shortNotNull" column="shortNotNull"/>
-      <field name="shortNull" column="shortNull"/>
-      <field name="intNotNull" column="intNotNull"/>
-      <field name="intNull" column="intNull"/>
-      <field name="longNotNull" column="longNotNull"/>
-      <field name="longNull" column="longNull"/>
-      <field name="floatNotNull" column="floatNotNull"/>
-      <field name="floatNull" column="floatNull"/>
-      <field name="doubleNotNull" column="doubleNotNull"/>
-      <field name="doubleNull" column="doubleNull"/>
-      <field name="charNotNull" column="charNotNull"/>
-      <field name="charNull" column="charNull"/>
-      <field name="dateNull" column="dateNull"/>
-      <field name="stringNull" column="stringNull"/>
-      <field name="bigDecimal" column="bigDecimal"/>
-      <field name="bigInteger" column="bigInteger"/>
-      <field name="PrimitiveTypes" column="PrimitiveTypes"/>
-    </class>
-
   </package>
 </orm>
 
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 389821)
+++ src/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm	(Arbeitskopie)
@@ -12,50 +12,6 @@
       <field name="y" column="Y"/>
     </class>
 
-    <class name="PCPoint2" table="PCPoint2" schema="datastoreidentity_cls">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCRect" table="PCRect" schema="datastoreidentity_cls">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="lowerRight" column="LOWER_RIGHT">
-        <foreign-key/>
-      </field>
-      <field name="upperLeft" column="UPPER_LEFT">
-        <foreign-key/>
-      </field>
-    </class>
-
-    <class name="PrimitiveTypes" table="PrimitiveTypes" schema="datastoreidentity_cls">
-      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
-      <field name="id" column="ID"/>
-      <field name="booleanNotNull" column="booleanNotNull"/>
-      <field name="booleanNull" column="booleanNull"/>
-      <field name="byteNotNull" column="byteNotNull"/>
-      <field name="byteNull" column="byteNull"/>
-      <field name="shortNotNull" column="shortNotNull"/>
-      <field name="shortNull" column="shortNull"/>
-      <field name="intNotNull" column="intNotNull"/>
-      <field name="intNull" column="intNull"/>
-      <field name="longNotNull" column="longNotNull"/>
-      <field name="longNull" column="longNull"/>
-      <field name="floatNotNull" column="floatNotNull"/>
-      <field name="floatNull" column="floatNull"/>
-      <field name="doubleNotNull" column="doubleNotNull"/>
-      <field name="doubleNull" column="doubleNull"/>
-      <field name="charNotNull" column="charNotNull"/>
-      <field name="charNull" column="charNull"/>
-      <field name="dateNull" column="dateNull"/>
-      <field name="stringNull" column="stringNull"/>
-      <field name="bigDecimal" column="bigDecimal"/>
-      <field name="bigInteger" column="bigInteger"/>
-      <field name="PrimitiveTypes" column="PrimitiveTypes"/>
-    </class>
-
   </package>
 </orm>
 
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 389821)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard5.orm	(Arbeitskopie)
@@ -12,47 +12,6 @@
       <field name="y" column="Y"/>
     </class>
 
-    <class name="PCPoint2" table="PCPoint2">
-      <field name="id" column="ID"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCRect" table="PCRect">
-      <field name="id" column="ID"/>
-      <field name="lowerRight" column="LOWER_RIGHT">
-        <foreign-key/>
-      </field>
-      <field name="upperLeft" column="UPPER_LEFT">
-        <foreign-key/>
-      </field>
-    </class>
-
-    <class name="PrimitiveTypes" table="PrimitiveTypes">
-      <field name="id" column="ID"/>
-      <field name="booleanNotNull" column="booleanNotNull"/>
-      <field name="booleanNull" column="booleanNull"/>
-      <field name="byteNotNull" column="byteNotNull"/>
-      <field name="byteNull" column="byteNull"/>
-      <field name="shortNotNull" column="shortNotNull"/>
-      <field name="shortNull" column="shortNull"/>
-      <field name="intNotNull" column="intNotNull"/>
-      <field name="intNull" column="intNull"/>
-      <field name="longNotNull" column="longNotNull"/>
-      <field name="longNull" column="longNull"/>
-      <field name="floatNotNull" column="floatNotNull"/>
-      <field name="floatNull" column="floatNull"/>
-      <field name="doubleNotNull" column="doubleNotNull"/>
-      <field name="doubleNull" column="doubleNull"/>
-      <field name="charNotNull" column="charNotNull"/>
-      <field name="charNull" column="charNull"/>
-      <field name="dateNull" column="dateNull"/>
-      <field name="stringNull" column="stringNull"/>
-      <field name="bigDecimal" column="bigDecimal"/>
-      <field name="bigInteger" column="bigInteger"/>
-      <field name="PrimitiveTypes" column="PrimitiveTypes"/>
-    </class>
-
   </package>
 </orm>
 
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 389821)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard6.orm	(Arbeitskopie)
@@ -11,47 +11,6 @@
       <field name="y" column="Y"/>
     </class>
 
-    <class name="PCPoint2" table="PCPoint2">
-      <field name="id" column="ID"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCRect" table="PCRect">
-      <field name="id" column="ID"/>
-      <field name="lowerRight" column="LOWER_RIGHT">
-        <foreign-key/>
-      </field>
-      <field name="upperLeft" column="UPPER_LEFT">
-        <foreign-key/>
-      </field>
-    </class>
-
-    <class name="PrimitiveTypes" table="PrimitiveTypes">
-      <field name="id" column="ID"/>
-      <field name="booleanNotNull" column="booleanNotNull"/>
-      <field name="booleanNull" column="booleanNull"/>
-      <field name="byteNotNull" column="byteNotNull"/>
-      <field name="byteNull" column="byteNull"/>
-      <field name="shortNotNull" column="shortNotNull"/>
-      <field name="shortNull" column="shortNull"/>
-      <field name="intNotNull" column="intNotNull"/>
-      <field name="intNull" column="intNull"/>
-      <field name="longNotNull" column="longNotNull"/>
-      <field name="longNull" column="longNull"/>
-      <field name="floatNotNull" column="floatNotNull"/>
-      <field name="floatNull" column="floatNull"/>
-      <field name="doubleNotNull" column="doubleNotNull"/>
-      <field name="doubleNull" column="doubleNull"/>
-      <field name="charNotNull" column="charNotNull"/>
-      <field name="charNull" column="charNull"/>
-      <field name="dateNull" column="dateNull"/>
-      <field name="stringNull" column="stringNull"/>
-      <field name="bigDecimal" column="bigDecimal"/>
-      <field name="bigInteger" column="bigInteger"/>
-      <field name="PrimitiveTypes" column="PrimitiveTypes"/>
-    </class>
-
   </package>
 </orm>
 
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 389821)
+++ src/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-standard7.orm	(Arbeitskopie)
@@ -11,47 +11,6 @@
       <field name="y" column="Y"/>
     </class>
 
-    <class name="PCPoint2" table="PCPoint2" schema="applicationidentity_cls">
-      <field name="id" column="ID"/>
-      <field name="x" column="X"/>
-      <field name="y" column="Y"/>
-    </class>
-
-    <class name="PCRect" table="PCRect" schema="applicationidentity_cls">
-      <field name="id" column="ID"/>
-      <field name="lowerRight" column="LOWER_RIGHT">
-        <foreign-key/>
-      </field>
-      <field name="upperLeft" column="UPPER_LEFT">
-        <foreign-key/>
-      </field>
-    </class>
-
-    <class name="PrimitiveTypes" table="PrimitiveTypes" schema="applicationidentity_cls">
-      <field name="id" column="ID"/>
-      <field name="booleanNotNull" column="booleanNotNull"/>
-      <field name="booleanNull" column="booleanNull"/>
-      <field name="byteNotNull" column="byteNotNull"/>
-      <field name="byteNull" column="byteNull"/>
-      <field name="shortNotNull" column="shortNotNull"/>
-      <field name="shortNull" column="shortNull"/>
-      <field name="intNotNull" column="intNotNull"/>
-      <field name="intNull" column="intNull"/>
-      <field name="longNotNull" column="longNotNull"/>
-      <field name="longNull" column="longNull"/>
-      <field name="floatNotNull" column="floatNotNull"/>
-      <field name="floatNull" column="floatNull"/>
-      <field name="doubleNotNull" column="doubleNotNull"/>
-      <field name="doubleNull" column="doubleNull"/>
-      <field name="charNotNull" column="charNotNull"/>
-      <field name="charNull" column="charNull"/>
-      <field name="dateNull" column="dateNull"/>
-      <field name="stringNull" column="stringNull"/>
-      <field name="bigDecimal" column="bigDecimal"/>
-      <field name="bigInteger" column="bigInteger"/>
-      <field name="PrimitiveTypes" column="PrimitiveTypes"/>
-    </class>
-
   </package>
 </orm>