db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r559609 - in /db/jdo/trunk/tck2/src: java/org/apache/jdo/tck/pc/companyAnnotatedPI/ jdo/applicationidentity/org/apache/jdo/tck/pc/company/ jdo/datastoreidentity/org/apache/jdo/tck/pc/company/
Date Wed, 25 Jul 2007 21:14:45 GMT
Author: mcaisse
Date: Wed Jul 25 14:14:44 2007
New Revision: 559609

URL: http://svn.apache.org/viewvc?view=rev&rev=559609
Log:
JDO-509 Added field-type, fieldType to metadata for embedded IAddress field where missing.

Modified:
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java
    db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java
    db/jdo/trunk/tck2/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
    db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java?view=diff&rev=559609&r1=559608&r2=559609
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java
(original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java
Wed Jul 25 14:14:44 2007
@@ -36,15 +36,16 @@
         column="DISCRIMINATOR")
 public interface PIAppCompany extends ICompany {
     
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+            fieldType=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppAddress.class)
     @Embedded(nullIndicatorColumn="COUNTRY",
-        fields={
-            @Field(name="addrid", columns=@Column(name="ADDRID")),
-            @Field(name="street", columns=@Column(name="STREET")),
-            @Field(name="city", columns=@Column(name="CITY")),
-            @Field(name="state", columns=@Column(name="STATE")),
-            @Field(name="zipcode", columns=@Column(name="ZIPCODE")),
-            @Field(name="country", columns=@Column(name="COUNTRY"))
+        properties={
+            @Property(name="addrid", columns=@Column(name="ADDRID")),
+            @Property(name="street", columns=@Column(name="STREET")),
+            @Property(name="city", columns=@Column(name="CITY")),
+            @Property(name="state", columns=@Column(name="STATE")),
+            @Property(name="zipcode", columns=@Column(name="ZIPCODE")),
+            @Property(name="country", columns=@Column(name="COUNTRY"))
     })
     IAddress getAddress();
     @Property(primaryKey="true")

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java?view=diff&rev=559609&r1=559608&r2=559609
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java Wed
Jul 25 14:14:44 2007
@@ -47,15 +47,16 @@
     @Property(defaultFetchGroup="false")
     @Column(name="MIDDLENAME", allowsNull="true")
     String getMiddlename();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+            fieldType=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppAddress.class)
     @Embedded(nullIndicatorColumn="COUNTRY",
-        fields={
-            @Field(name="addrid", columns=@Column(name="ADDRID")),
-            @Field(name="street", columns=@Column(name="STREET")),
-            @Field(name="city", columns=@Column(name="CITY")),
-            @Field(name="state", columns=@Column(name="STATE")),
-            @Field(name="zipcode", columns=@Column(name="ZIPCODE")),
-            @Field(name="country", columns=@Column(name="COUNTRY"))
+        properties={
+            @Property(name="addrid", columns=@Column(name="ADDRID")),
+            @Property(name="street", columns=@Column(name="STREET")),
+            @Property(name="city", columns=@Column(name="CITY")),
+            @Property(name="state", columns=@Column(name="STATE")),
+            @Property(name="zipcode", columns=@Column(name="ZIPCODE")),
+            @Property(name="country", columns=@Column(name="COUNTRY"))
     })
     IAddress getAddress();
     Date getBirthdate();

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java?view=diff&rev=559609&r1=559608&r2=559609
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java Wed
Jul 25 14:14:44 2007
@@ -38,15 +38,16 @@
         column="DATASTORE_IDENTITY")
 public interface PIDSCompany extends ICompany {
     
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+            fieldType=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppAddress.class)
     @Embedded(nullIndicatorColumn="COUNTRY",
-        fields={
-            @Field(name="addrid", columns=@Column(name="ADDRID")),
-            @Field(name="street", columns=@Column(name="STREET")),
-            @Field(name="city", columns=@Column(name="CITY")),
-            @Field(name="state", columns=@Column(name="STATE")),
-            @Field(name="zipcode", columns=@Column(name="ZIPCODE")),
-            @Field(name="country", columns=@Column(name="COUNTRY"))
+        properties={
+            @Property(name="addrid", columns=@Column(name="ADDRID")),
+            @Property(name="street", columns=@Column(name="STREET")),
+            @Property(name="city", columns=@Column(name="CITY")),
+            @Property(name="state", columns=@Column(name="STATE")),
+            @Property(name="zipcode", columns=@Column(name="ZIPCODE")),
+            @Property(name="country", columns=@Column(name="COUNTRY"))
     })
     IAddress getAddress();
     @Column(name="ID")

Modified: db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java?view=diff&rev=559609&r1=559608&r2=559609
==============================================================================
--- db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java (original)
+++ db/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java Wed
Jul 25 14:14:44 2007
@@ -47,15 +47,16 @@
     @Property(defaultFetchGroup="false")
     @Column(name="MIDDLENAME", allowsNull="true")
     String getMiddlename();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
+            fieldType=org.apache.jdo.tck.pc.companyAnnotatedPI.PIAppAddress.class)
     @Embedded(nullIndicatorColumn="COUNTRY",
-        fields={
-            @Field(name="addrid", columns=@Column(name="ADDRID")),
-            @Field(name="street", columns=@Column(name="STREET")),
-            @Field(name="city", columns=@Column(name="CITY")),
-            @Field(name="state", columns=@Column(name="STATE")),
-            @Field(name="zipcode", columns=@Column(name="ZIPCODE")),
-            @Field(name="country", columns=@Column(name="COUNTRY"))
+        properties={
+            @Property(name="addrid", columns=@Column(name="ADDRID")),
+            @Property(name="street", columns=@Column(name="STREET")),
+            @Property(name="city", columns=@Column(name="CITY")),
+            @Property(name="state", columns=@Column(name="STATE")),
+            @Property(name="zipcode", columns=@Column(name="ZIPCODE")),
+            @Property(name="country", columns=@Column(name="COUNTRY"))
     })
     IAddress getAddress();
     Date getBirthdate();

Modified: db/jdo/trunk/tck2/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo?view=diff&rev=559609&r1=559608&r2=559609
==============================================================================
--- db/jdo/trunk/tck2/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
(original)
+++ db/jdo/trunk/tck2/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
Wed Jul 25 14:14:44 2007
@@ -32,6 +32,7 @@
             objectid-class="org.apache.jdo.tck.pc.company.Company$Oid">
             <field name="companyid" primary-key="true"/>
             <field name="address"
+                   field-type="org.apache.jdo.tck.pc.company.Address"
                    persistence-modifier="persistent"/>
             <field name="departments" persistence-modifier="persistent">
                 <collection element-type="org.apache.jdo.tck.pc.company.Department"/>
@@ -96,6 +97,7 @@
             <field name="personid" primary-key="true"/>
             <field name="middlename" default-fetch-group="false"/>
             <field name="address"
+                   field-type="org.apache.jdo.tck.pc.company.Address"
                    persistence-modifier="persistent"/>
             <field name="phoneNumbers" persistence-modifier="persistent">
                 <map key-type="String" value-type="String"/>
@@ -206,6 +208,7 @@
             <property name="personid" primary-key="true"/>
             <property name="middlename" default-fetch-group="false"/>
             <property name="address"
+                   field-type="org.apache.jdo.tck.pc.company.PIAddress"
                    persistence-modifier="persistent"/>
             <property name="phoneNumbers" persistence-modifier="persistent">
                 <map key-type="String" value-type="String"/>

Modified: db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo?view=diff&rev=559609&r1=559608&r2=559609
==============================================================================
--- db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
(original)
+++ db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
Wed Jul 25 14:14:44 2007
@@ -29,6 +29,7 @@
 
         <class name="Company" identity-type="datastore">
             <field name="address"
+                   field-type="org.apache.jdo.tck.pc.company.Address"
                    persistence-modifier="persistent"/>
             <field name="departments" persistence-modifier="persistent">
                 <collection element-type="org.apache.jdo.tck.pc.company.Department"/>
@@ -73,6 +74,7 @@
         <class name="Person" identity-type="datastore">
             <field name="middlename" default-fetch-group="false"/>
             <field name="address"
+                   field-type="org.apache.jdo.tck.pc.company.Address"
                    persistence-modifier="persistent"/>
             <field name="phoneNumbers" persistence-modifier="persistent">
                 <map key-type="String" value-type="String"/>
@@ -176,6 +178,7 @@
             identity-type="datastore">
             <property name="middlename" default-fetch-group="false"/>
             <property name="address"
+                   field-type="org.apache.jdo.tck.pc.company.PIAddress"
                    persistence-modifier="persistent"/>
             <property name="phoneNumbers" persistence-modifier="persistent">
                 <map key-type="String" value-type="String"/>



Mime
View raw message