Author: clr
Date: Wed Mar 1 13:30:26 2006
New Revision: 382165
URL: http://svn.apache.org/viewcvs?rev=382165&view=rev
Log:
JDO-318 Change some .jdo and .orm files to use xsd
Modified:
db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/package.jdo
db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo
db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/package.jdo
db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo
Modified: db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo?rev=382165&r1=382164&r2=382165&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
(original)
+++ db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
Wed Mar 1 13:30:26 2006
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE jdo PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN"
"http://java.sun.com/dtd/jdo_2_0.dtd">
+<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo
+ http://java.sun.com/xml/ns/jdo/jdo_2_0.xsd">
<!--
This file contains the schema information when an implementation
has application identity.
-->
-<jdo>
<package name="org.apache.jdo.tck.pc.company">
<class name="Address" embedded-only="true" requires-extent="false"/>
Modified: db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/package.jdo
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/package.jdo?rev=382165&r1=382164&r2=382165&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/package.jdo
(original)
+++ db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/mylib/package.jdo
Wed Mar 1 13:30:26 2006
@@ -26,6 +26,12 @@
<class name="PCRect"
identity-type="application" objectid-class="org.apache.jdo.tck.pc.mylib.PCRect$Oid">
<field name="id" primary-key="true"/>
+ <fetch-group name="PCRect.upperLeft">
+ <field name="upperLeft"/>
+ </fetch-group>
+ <fetch-group name="PCRect.lowerRight">
+ <field name="lowerRight"/>
+ </fetch-group>
</class>
<class name="PrimitiveTypes"
Modified: db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo?rev=382165&r1=382164&r2=382165&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo
(original)
+++ db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo
Wed Mar 1 13:30:26 2006
@@ -31,6 +31,9 @@
<field name="entries">
<collection element-type="CartEntry"/>
</field>
+ <fetch-group name="Cart.entries">
+ <field name="entries"/>
+ </fetch-group>
</class>
<class
@@ -40,6 +43,12 @@
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>
Modified: db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo?rev=382165&r1=382164&r2=382165&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
(original)
+++ db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
Wed Mar 1 13:30:26 2006
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE jdo PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN"
"http://java.sun.com/dtd/jdo_2_0.dtd">
+<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo
+ http://java.sun.com/xml/ns/jdo/jdo_2_0.xsd">
<!--
This file contains the schema information when an implementation
has datastore identity.
-->
-<jdo>
<package name="org.apache.jdo.tck.pc.company">
<class name="Address" embedded-only="true" requires-extent="false"/>
Modified: db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/package.jdo
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/package.jdo?rev=382165&r1=382164&r2=382165&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/package.jdo (original)
+++ db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/package.jdo Wed
Mar 1 13:30:26 2006
@@ -16,7 +16,14 @@
<field name="deleteCalled" persistence-modifier="none"/>
</class>
- <class name="PCRect" identity-type="datastore"/>
+ <class name="PCRect" identity-type="datastore">
+ <fetch-group name="PCRect.upperLeft">
+ <field name="upperLeft"/>
+ </fetch-group>
+ <fetch-group name="PCRect.lowerRight">
+ <field name="lowerRight"/>
+ </fetch-group>
+ </class>
<class name="PrimitiveTypes" identity-type="datastore"/>
Modified: db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo?rev=382165&r1=382164&r2=382165&view=diff
==============================================================================
--- db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo
(original)
+++ db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package.jdo
Wed Mar 1 13:30:26 2006
@@ -23,12 +23,22 @@
<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>
|