You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by cl...@apache.org on 2006/03/01 22:29:44 UTC
svn commit: r382164 - in /db/jdo/trunk/tck20/src/orm:
applicationidentity/org/apache/jdo/tck/pc/company/
datastoreidentity/org/apache/jdo/tck/pc/company/
Author: clr
Date: Wed Mar 1 13:29:41 2006
New Revision: 382164
URL: http://svn.apache.org/viewcvs?rev=382164&view=rev
Log:
JDO-318 Change some .jdo and .orm files to use xsd
Modified:
db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm
db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm
db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm?rev=382164&r1=382163&r2=382164&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm Wed Mar 1 13:29:41 2006
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm
+ http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
<!--
This file contains the schema information when an implementation
has application identity.
-->
-<orm>
<package name="org.apache.jdo.tck.pc.company">
<class name="Company" table="companies">
Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm?rev=382164&r1=382163&r2=382164&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm Wed Mar 1 13:29:41 2006
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm
+ http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
<!--
This file contains the schema information when an implementation
has application identity.
@@ -9,7 +12,6 @@
Each table contains columns for the declared fields.
Inheritance strategy: new-table for all classes.
-->
-<orm>
<package name="org.apache.jdo.tck.pc.company">
<class name="Company" table="companies">
Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm?rev=382164&r1=382163&r2=382164&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm Wed Mar 1 13:29:41 2006
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm
+ http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
<!--
This file contains the schema information when an implementation
has application identity.
@@ -18,7 +21,6 @@
Employee, Insurance: subclass-table.
all other classes: new-table.
-->
-<orm>
<package name="org.apache.jdo.tck.pc.company">
<class name="Company" table="companies">
Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm?rev=382164&r1=382163&r2=382164&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm Wed Mar 1 13:29:41 2006
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm
+ http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
<!--
This file contains the schema information when an implementation
has application identity.
@@ -11,7 +14,6 @@
Insurance has inheritance strategy "subclass-table".
MedicalInsurance and DentalInsurance have inheritance strategy "new-table".
-->
-<orm>
<package name="org.apache.jdo.tck.pc.company">
<class name="Company" table="companies">
Modified: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm?rev=382164&r1=382163&r2=382164&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm (original)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm Wed Mar 1 13:29:41 2006
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm
+ http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
<!--
This file contains the schema information when an implementation
has application identity.
@@ -9,7 +12,6 @@
PartTimeEmployee, FullTimeEmployee, MedicalInsurance, and DentalInsurance
have inheritance strategy "superclass-table".
-->
-<orm>
<package name="org.apache.jdo.tck.pc.company">
<class name="Company" table="companies">
Modified: db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm?rev=382164&r1=382163&r2=382164&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm (original)
+++ db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm Wed Mar 1 13:29:41 2006
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm
+ http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
<!--
This file contains the schema information when an implementation
has datastore identity.
-->
-<orm>
<package name="org.apache.jdo.tck.pc.company">
<class name="Company" table="companies">
Modified: db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm?rev=382164&r1=382163&r2=382164&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm (original)
+++ db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm Wed Mar 1 13:29:41 2006
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm
+ http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
<!--
This file contains the schema information when an implementation
has datastore identity.
@@ -9,7 +12,6 @@
Each table contains columns for the declared fields.
Inheritance strategy: new-table for all classes.
-->
-<orm>
<package name="org.apache.jdo.tck.pc.company">
<class name="Company" table="companies">
Modified: db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm?rev=382164&r1=382163&r2=382164&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm (original)
+++ db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm Wed Mar 1 13:29:41 2006
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm
+ http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
<!--
This file contains the schema information when an implementation
has datastore identity.
@@ -18,7 +21,6 @@
Employee, Insurance: subclass-table.
all other classes: new-table.
-->
-<orm>
<package name="org.apache.jdo.tck.pc.company">
<class name="Company" table="companies">
Modified: db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm?rev=382164&r1=382163&r2=382164&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm (original)
+++ db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm Wed Mar 1 13:29:41 2006
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm
+ http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
<!--
This file contains the schema information when an implementation
has datastore identity.
@@ -11,7 +14,6 @@
Insurance has inheritance strategy "subclass-table".
MedicalInsurance and DentalInsurance have inheritance strategy "new-table".
-->
-<orm>
<package name="org.apache.jdo.tck.pc.company">
<class name="Company" table="companies">
Modified: db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm?rev=382164&r1=382163&r2=382164&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm (original)
+++ db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm Wed Mar 1 13:29:41 2006
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm
+ http://java.sun.com/xml/ns/jdo/orm_2_0.xsd">
<!--
This file contains the schema information when an implementation
has datastore identity.
@@ -9,7 +12,6 @@
PartTimeEmployee, FullTimeEmployee, MedicalInsurance, and DentalInsurance
have inheritance strategy "superclass-table".
-->
-<orm>
<package name="org.apache.jdo.tck.pc.company">
<class name="Company" table="companies">