Return-Path: 
 <jdo-commits-return-702-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org>
Delivered-To: apmail-db-jdo-commits-archive@www.apache.org
Received: (qmail 88634 invoked from network); 13 Jul 2005 00:15:43 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 13 Jul 2005 00:15:43 -0000
Received: (qmail 49746 invoked by uid 500); 13 Jul 2005 00:15:43 -0000
Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jdo-commits-help@db.apache.org>
List-Unsubscribe: <mailto:jdo-commits-unsubscribe@db.apache.org>
List-Post: <mailto:jdo-commits@db.apache.org>
List-Id: <jdo-commits.db.apache.org>
Reply-To: jdo-dev@db.apache.org
Delivered-To: mailing list jdo-commits@db.apache.org
Received: (qmail 49733 invoked by uid 99); 13 Jul 2005 00:15:43 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Tue, 12 Jul 2005 17:15:32 -0700
Received: (qmail 88619 invoked by uid 65534); 13 Jul 2005 00:15:30 -0000
Message-ID: <20050713001530.88618.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r216049 - in /incubator/jdo/trunk/tck20/test:
 jdo/applicationidentity/org/apache/jdo/tck/pc/company/
 orm/applicationidentity/org/apache/jdo/tck/pc/company/
 orm/datastoreidentity/org/apache/jdo/tck/pc/company/
 sql/derby/applicationidentity/ ...
Date: Wed, 13 Jul 2005 00:15:29 -0000
To: jdo-commits@db.apache.org
From: mcaisse@apache.org
X-Mailer: svnmailer-1.0.2
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: mcaisse
Date: Tue Jul 12 17:15:26 2005
New Revision: 216049

URL: http://svn.apache.org/viewcvs?rev=216049&view=rev
Log:
JDO-83 Persist application field addrid

Modified:
    incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm
    incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql
    incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql

Modified: incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo?rev=216049&r1=216048&r2=216049&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo Tue Jul 12 17:15:26 2005
@@ -7,9 +7,7 @@
 <jdo>
     <package name="org.apache.jdo.tck.pc.company">
 
-        <class name="Address" requires-extent="false">
-            <field name="addrid" persistence-modifier="none"/>
-        </class>
+        <class name="Address" requires-extent="false"/>
 
         <class name="Company"
             identity-type="application"

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm?rev=216049&r1=216048&r2=216049&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm Tue Jul 12 17:15:26 2005
@@ -7,20 +7,13 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.company">
 
-        <class name="Address">
-            <field name="street"/>
-            <field name="city"/>
-            <field name="state"/>
-            <field name="zipcode"/>
-            <field name="country"/>
-        </class>
-
         <class name="Company" table="companies">
             <field name="companyid" column="ID" primary-key="true"/>
             <field name="name" column="NAME"/>
             <field name="founded" column="FOUNDEDDATE"/>
             <field name="address">
                 <embedded null-indicator-column="COUNTRY">
+                    <field name="addrid" column="ADDRID"/>
                     <field name="street" column="STREET"/>
                     <field name="city" column="CITY"/>
                     <field name="state" column="STATE"/>
@@ -88,6 +81,7 @@
             <field name="middlename" column="MIDDLENAME"/>
             <field name="address">
                 <embedded>
+                    <field name="addrid" column="ADDRID"/>
                     <field name="street" column="STREET"/>
                     <field name="city" column="CITY"/>
                     <field name="state" column="STATE"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm?rev=216049&r1=216048&r2=216049&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm Tue Jul 12 17:15:26 2005
@@ -7,14 +7,6 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.company">
 
-        <class name="Address">
-            <field name="street"/>
-            <field name="city"/>
-            <field name="state"/>
-            <field name="zipcode"/>
-            <field name="country"/>
-        </class>
-
         <class name="Company" table="companies">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <field name="companyid" column="ID"/>
@@ -22,6 +14,7 @@
             <field name="founded" column="FOUNDEDDATE"/>
             <field name="address">
                 <embedded null-indicator-column="COUNTRY">
+                    <field name="addrid" column="ADDRID"/>
                     <field name="street" column="STREET"/>
                     <field name="city" column="CITY"/>
                     <field name="state" column="STATE"/>
@@ -91,6 +84,7 @@
             <field name="middlename" column="MIDDLENAME"/>
             <field name="address">
                 <embedded>
+                    <field name="addrid" column="ADDRID"/>
                     <field name="street" column="STREET"/>
                     <field name="city" column="CITY"/>
                     <field name="state" column="STATE"/>

Modified: incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql?rev=216049&r1=216048&r2=216049&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql Tue Jul 12 17:15:26 2005
@@ -79,6 +79,7 @@
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
     FOUNDEDDATE VARCHAR(32) NOT NULL,
+    ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
     STATE CHAR(2),
@@ -101,6 +102,7 @@
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
     BIRTHDATE VARCHAR(32) NOT NULL,
+    ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
     STATE CHAR(2),

Modified: incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql?rev=216049&r1=216048&r2=216049&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql Tue Jul 12 17:15:26 2005
@@ -84,6 +84,7 @@
     ID INTEGER,
     NAME VARCHAR(32) NOT NULL,
     FOUNDEDDATE VARCHAR(32) NOT NULL,
+    ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
     STATE CHAR(2),
@@ -108,6 +109,7 @@
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
     BIRTHDATE VARCHAR(32) NOT NULL,
+    ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
     STATE CHAR(2),