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/04 23:06:23 UTC

svn commit: r383210 - in /db/jdo/trunk/tck20/src/jdo: applicationidentity/org/apache/jdo/tck/pc/company/package.jdo datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo

Author: clr
Date: Sat Mar  4 14:06:22 2006
New Revision: 383210

URL: http://svn.apache.org/viewcvs?rev=383210&view=rev
Log:
JDO-296 Add persistent interfaces to package.jdo files

Modified:
    db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
    db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/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=383210&r1=383209&r2=383210&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 Sat Mar  4 14:06:22 2006
@@ -127,5 +127,113 @@
                 <collection element-type="org.apache.jdo.tck.pc.company.Employee"/>
             </field>
         </class>
+
+        <interface name="IAddress" embedded-only="true" requires-extent="false"/>
+
+        <interface name="ICompany"
+            identity-type="application">
+            <property name="companyid" primary-key="true"/>
+            <property name="address"
+                   persistence-modifier="persistent"/>
+            <property name="departments" persistence-modifier="persistent">
+                <collection element-type="org.apache.jdo.tck.pc.company.IDepartment"/>
+            </property>
+        </interface>
+
+        <interface name="IDentalInsurance"
+            identity-type="application"/>
+
+        <interface name="IDepartment"
+            identity-type="application">
+            <property name="deptid" primary-key="true"/>
+            <property name="employees" persistence-modifier="persistent">
+                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+            </property>
+            <property name="fundedEmps" persistence-modifier="persistent">
+                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+            </property>
+        </interface>
+
+        <interface name="IEmployee"
+            identity-type="application">
+            <property name="reviewedProjects" persistence-modifier="persistent">
+                <collection element-type="org.apache.jdo.tck.pc.company.Project"/>
+            </property>
+            <property name="projects" persistence-modifier="persistent">
+                <collection element-type="org.apache.jdo.tck.pc.company.IProject"/>
+            </property>
+            <property name="team" persistence-modifier="persistent">
+                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+            </property>
+            <property name="hradvisees" persistence-modifier="persistent">
+                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+            </property>
+        </interface>
+
+        <interface name="IFullTimeEmployee"
+            identity-type="application"/>
+
+        <interface name="IInsurance"
+            identity-type="application">
+            <property name="insid" primary-key="true"/>
+        </interface>
+
+        <interface name="IMedicalInsurance"
+            identity-type="application"/>
+
+        <interface name="IPartTimeEmployee"
+            identity-type="application"/>
+
+        <interface name="IPerson"
+            identity-type="application">
+            <property name="personid" primary-key="true"/>
+            <property name="middlename" default-fetch-group="false"/>
+            <property name="address"
+                   persistence-modifier="persistent"/>
+            <property name="phoneNumbers" persistence-modifier="persistent">
+                <map key-type="String" value-type="String"/>
+            </property>
+            <query name="validNotUnique">
+                SELECT firstname, lastname 
+                INTO org.apache.jdo.tck.query.result.classes.FullName 
+                FROM org.apache.jdo.tck.pc.company.IPerson
+            </query>
+            <query name="validUnique">
+                SELECT UNIQUE firstname, lastname 
+                INTO org.apache.jdo.tck.query.result.classes.FullName 
+                FROM org.apache.jdo.tck.pc.company.IPerson 
+                WHERE firstname == 'emp1First'
+            </query>
+            <query name="invalidUnique">
+                SELECT UNIQUE firstname, lastname 
+                INTO org.apache.jdo.tck.query.result.classes.FullName
+                FROM org.apache.jdo.tck.pc.company.IPerson
+            </query>
+            <query name="unmodifiable" unmodifiable="true">
+                SELECT firstname, lastname 
+                FROM org.apache.jdo.tck.pc.company.Person
+            </query>
+            <query name="packageJDO">
+                SELECT FROM org.apache.jdo.tck.pc.company.IPerson
+                WHERE personid > 1
+            </query>
+            <query name="changeQuery">
+                SELECT FROM org.apache.jdo.tck.pc.company.IPerson
+            </query>
+            <query name="invalidQuery">
+                SeLeCt FrOm org.apache.jdo.tck.pc.company.IPerson
+            </query>
+        </interface>
+
+        <interface name="IProject"
+            identity-type="application">
+            <property name="projid" primary-key="true"/>
+            <property name="reviewers" persistence-modifier="persistent">
+                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+            </property>
+            <property name="members" persistence-modifier="persistent">
+                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+            </property>
+        </interface>
     </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=383210&r1=383209&r2=383210&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 Sat Mar  4 14:06:22 2006
@@ -101,5 +101,112 @@
                 <collection element-type="org.apache.jdo.tck.pc.company.Employee"/>
             </field>
         </class>
+        <interface name="IAddress" embedded-only="true" requires-extent="false"/>
+
+        <interface name="ICompany"
+            identity-type="datastore">
+            <property name="companyid" primary-key="true"/>
+            <property name="address"
+                   persistence-modifier="persistent"/>
+            <property name="departments" persistence-modifier="persistent">
+                <collection element-type="org.apache.jdo.tck.pc.company.IDepartment"/>
+            </property>
+        </interface>
+
+        <interface name="IDentalInsurance"
+            identity-type="datastore"/>
+
+        <interface name="IDepartment"
+            identity-type="datastore">
+            <property name="deptid" primary-key="true"/>
+            <property name="employees" persistence-modifier="persistent">
+                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+            </property>
+            <property name="fundedEmps" persistence-modifier="persistent">
+                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+            </property>
+        </interface>
+
+        <interface name="IEmployee"
+            identity-type="datastore">
+            <property name="reviewedProjects" persistence-modifier="persistent">
+                <collection element-type="org.apache.jdo.tck.pc.company.Project"/>
+            </property>
+            <property name="projects" persistence-modifier="persistent">
+                <collection element-type="org.apache.jdo.tck.pc.company.IProject"/>
+            </property>
+            <property name="team" persistence-modifier="persistent">
+                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+            </property>
+            <property name="hradvisees" persistence-modifier="persistent">
+                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+            </property>
+        </interface>
+
+        <interface name="IFullTimeEmployee"
+            identity-type="datastore"/>
+
+        <interface name="IInsurance"
+            identity-type="datastore">
+            <property name="insid" primary-key="true"/>
+        </interface>
+
+        <interface name="IMedicalInsurance"
+            identity-type="datastore"/>
+
+        <interface name="IPartTimeEmployee"
+            identity-type="datastore"/>
+
+        <interface name="IPerson"
+            identity-type="datastore">
+            <property name="personid" primary-key="true"/>
+            <property name="middlename" default-fetch-group="false"/>
+            <property name="address"
+                   persistence-modifier="persistent"/>
+            <property name="phoneNumbers" persistence-modifier="persistent">
+                <map key-type="String" value-type="String"/>
+            </property>
+            <query name="validNotUnique">
+                SELECT firstname, lastname 
+                INTO org.apache.jdo.tck.query.result.classes.FullName 
+                FROM org.apache.jdo.tck.pc.company.IPerson
+            </query>
+            <query name="validUnique">
+                SELECT UNIQUE firstname, lastname 
+                INTO org.apache.jdo.tck.query.result.classes.FullName 
+                FROM org.apache.jdo.tck.pc.company.IPerson 
+                WHERE firstname == 'emp1First'
+            </query>
+            <query name="invalidUnique">
+                SELECT UNIQUE firstname, lastname 
+                INTO org.apache.jdo.tck.query.result.classes.FullName
+                FROM org.apache.jdo.tck.pc.company.IPerson
+            </query>
+            <query name="unmodifiable" unmodifiable="true">
+                SELECT firstname, lastname 
+                FROM org.apache.jdo.tck.pc.company.Person
+            </query>
+            <query name="packageJDO">
+                SELECT FROM org.apache.jdo.tck.pc.company.IPerson
+                WHERE personid > 1
+            </query>
+            <query name="changeQuery">
+                SELECT FROM org.apache.jdo.tck.pc.company.IPerson
+            </query>
+            <query name="invalidQuery">
+                SeLeCt FrOm org.apache.jdo.tck.pc.company.IPerson
+            </query>
+        </interface>
+
+        <interface name="IProject"
+            identity-type="datastore">
+            <property name="projid" primary-key="true"/>
+            <property name="reviewers" persistence-modifier="persistent">
+                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+            </property>
+            <property name="members" persistence-modifier="persistent">
+                <collection element-type="org.apache.jdo.tck.pc.company.IEmployee"/>
+            </property>
+        </interface>
     </package>
 </jdo>