db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r526946 - in /db/jdo/trunk/tck20: ./ src/conf/ src/java/org/apache/jdo/tck/api/persistencemanager/ src/java/org/apache/jdo/tck/pc/newInstance/ src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/ src/jdo/datastoreidentity/org/apac...
Date Mon, 09 Apr 2007 23:08:11 GMT
Author: mcaisse
Date: Mon Apr  9 16:08:09 2007
New Revision: 526946

URL: http://svn.apache.org/viewvc?view=rev&rev=526946
Log:
JDO-453 Preliminary check-in, incomplete

Added:
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/NewInstance.java   (with props)
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/newInstance/
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/newInstance/AAddress.java   (with props)
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/newInstance/Address.java   (with props)
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/newInstance/IAddress.java   (with props)
    db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/
    db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo   (with props)
    db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo   (with props)
    db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo   (with props)
    db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/
    db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo   (with props)
    db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo   (with props)
    db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo   (with props)
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/newInstance/
    db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm   (with props)
    db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/newInstance/
    db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm   (with props)
Modified:
    db/jdo/trunk/tck20/project.properties
    db/jdo/trunk/tck20/src/conf/pm.conf
    db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java
    db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema.sql
    db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema.sql

Modified: db/jdo/trunk/tck20/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/project.properties?view=diff&rev=526946&r1=526945&r2=526946
==============================================================================
--- db/jdo/trunk/tck20/project.properties (original)
+++ db/jdo/trunk/tck20/project.properties Mon Apr  9 16:08:09 2007
@@ -143,6 +143,9 @@
     org/apache/jdo/tck/pc/companyListWithoutJoin/IFullTimeEmployee.java \
     org/apache/jdo/tck/pc/companyListWithoutJoin/IInsurance.java \
     org/apache/jdo/tck/pc/companyListWithoutJoin/IPartTimeEmployee.java \
+    org/apache/jdo/tck/pc/newInstance/Address.java \
+    org/apache/jdo/tck/pc/newInstance/AAddress.java \
+    org/apache/jdo/tck/pc/newInstance/IAddress.java \
     org/apache/jdo/tck/pc/order/Order.java \
     org/apache/jdo/tck/pc/order/OrderItem.java \
     org/apache/jdo/tck/pc/fieldtypes/AllTypes.java \
@@ -285,6 +288,9 @@
     org/apache/jdo/tck/pc/companyListWithoutJoin/IEmployee.class \
     org/apache/jdo/tck/pc/companyListWithoutJoin/IFullTimeEmployee.class \
     org/apache/jdo/tck/pc/companyListWithoutJoin/IPartTimeEmployee.class \
+    org/apache/jdo/tck/pc/newInstance/Address.class \
+    org/apache/jdo/tck/pc/newInstance/AAddress.class \
+    org/apache/jdo/tck/pc/newInstance/IAddress.class \
     org/apache/jdo/tck/pc/order/Order.class \
     org/apache/jdo/tck/pc/order/OrderItem.class \
     org/apache/jdo/tck/pc/fieldtypes/AllTypes.class \
@@ -463,6 +469,9 @@
     org/apache/jdo/tck/pc/lifecycle/StateTransitionObj.jdo \
     org/apache/jdo/tck/pc/mylib/package.jdo \
     org/apache/jdo/tck/pc/mylib/PCClass.jdo \
+    org/apache/jdo/tck/pc/newInstance/Address.jdo \
+    org/apache/jdo/tck/pc/newInstance/AAddress.jdo \
+    org/apache/jdo/tck/pc/newInstance/IAddress.jdo \
     org/apache/jdo/tck/pc/query/package.jdo \
     org/apache/jdo/tck/pc/singlefieldidentity/package.jdo \
     org/apache/jdo/tck/pc/shoppingcart/package.jdo \

Modified: db/jdo/trunk/tck20/src/conf/pm.conf
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/conf/pm.conf?view=diff&rev=526946&r1=526945&r2=526946
==============================================================================
--- db/jdo/trunk/tck20/src/conf/pm.conf (original)
+++ db/jdo/trunk/tck20/src/conf/pm.conf Mon Apr  9 16:08:09 2007
@@ -36,6 +36,7 @@
 org.apache.jdo.tck.api.persistencemanager.GetSetUserObject \
 org.apache.jdo.tck.api.persistencemanager.GetTransactionalObjectIdWhenObjectIdBeingChanged \
 org.apache.jdo.tck.api.persistencemanager.GetTransactionalObjectIdWithNoTransaction \
+org.apache.jdo.tck.api.persistencemanager.NewInstance \
 org.apache.jdo.tck.api.persistencemanager.NoPersistenceManagerIfTransient \
 org.apache.jdo.tck.api.persistencemanager.ObjectIdUniqueAmongInstances \
 org.apache.jdo.tck.api.persistencemanager.OneInstanceOfObjectPerPersistenceManager \

Added: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/NewInstance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/NewInstance.java?view=auto&rev=526946
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/NewInstance.java (added)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/NewInstance.java Mon Apr  9 16:08:09 2007
@@ -0,0 +1,122 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ */
+
+
+package org.apache.jdo.tck.api.persistencemanager;
+
+import javax.jdo.PersistenceManager;
+import javax.jdo.Transaction;
+import org.apache.jdo.tck.pc.newInstance.AAddress;
+import org.apache.jdo.tck.pc.newInstance.Address;
+import org.apache.jdo.tck.pc.newInstance.IAddress;
+import org.apache.jdo.tck.util.BatchTestRunner;
+
+/**
+ *<B>Title:</B> Delete Persistent
+ *<BR>
+ *<B>Keywords:</B>
+ *<BR>
+ *<B>Assertion IDs:</B> A12.6.6-1
+ *<BR>
+ *<B>Assertion Description: </B>
+[The parameter must be one of the following:
+- an abstract class that is declared in the metadata as persistence-capable, in which all abstract methods are declared as persistent properties, or
+- an interface that is declared in the metadata as persistence-capable, in which all methods are declared as persistent properties, or
+- a concrete class that is declared in the metadata as persistence-capable. In this case, the concrete class must declare a public no-args constructor.
+If the parameter does not satisfy the above requirements, JDOUserException is thrown.
+ */
+
+public class NewInstance extends PersistenceManagerTest {
+    
+    /** */
+    private static final String ASSERTION_FAILED = 
+        "Assertion A12.5.7-9 (NewInstance) failed: ";
+    
+    /**
+     * The <code>main</code> is called when the class
+     * is directly executed from the command line.
+     * @param args The arguments passed to the program.
+     */
+    public static void main(String[] args) {
+        BatchTestRunner.run(NewInstance.class);
+    }
+    
+    /** */
+    public void testNewInstance() {
+        pm = getPM();   
+
+        /* positive tests */
+        runTestNewInstanceInterface(pm);
+        runTestNewInstanceAbstractClass(pm);
+        runTestNewInstanceClass(pm);
+
+        /* negative tests */
+
+        pm.close();
+        pm = null;
+    }
+
+    /** test newInstance (Class pcInterface) */
+    private void runTestNewInstanceInterface(PersistenceManager pm) {
+            IAddress iaddress = (IAddress)pm.newInstance(IAddress.class);
+//        Transaction tx = pm.currentTransaction();
+//        try {
+//            tx = pm.currentTransaction();
+//            tx.begin();
+//            tx.commit();
+            if (debug) logger.debug(" \nPASSED in testNewInstance()");
+//        }
+//        finally {
+//            if (tx.isActive())
+//                tx.rollback();
+//        }        
+    }
+
+    /** test newInstance (Class pcAbstractClass) */
+    private void runTestNewInstanceAbstractClass(PersistenceManager pm) {
+        pm.newInstance(AAddress.class);
+        Transaction tx = pm.currentTransaction();
+ //       try {
+ //           tx.begin();
+//
+//
+//            tx.commit();
+//            if (debug) logger.debug(" \nPASSED in testNewInstance()");
+//        } 
+//        finally {
+//            if (tx.isActive())
+//                tx.rollback();
+//        }   
+    }
+
+        /** test newInstance (Class pcClass) */
+    private void runTestNewInstanceClass(PersistenceManager pm) {
+        pm.newInstance(Address.class);
+        Transaction tx = pm.currentTransaction();
+//        try {
+//            tx.begin();
+//
+//            tx.commit();
+//            if (debug) logger.debug(" \nPASSED in testNewInstance()");
+//        }
+//        finally {
+//            if (tx.isActive())
+//                tx.rollback();
+//        }
+    }
+
+}

Propchange: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/NewInstance.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java?view=diff&rev=526946&r1=526945&r2=526946
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java (original)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java Mon Apr  9 16:08:09 2007
@@ -27,6 +27,9 @@
 import org.apache.jdo.tck.pc.mylib.PCPoint;
 import org.apache.jdo.tck.pc.mylib.PCPoint2;
 import org.apache.jdo.tck.pc.mylib.PCRect;
+import org.apache.jdo.tck.pc.newInstance.Address;
+import org.apache.jdo.tck.pc.newInstance.AAddress;
+import org.apache.jdo.tck.pc.newInstance.IAddress;
 
 public abstract class PersistenceManagerTest extends JDO_Test {
     
@@ -43,6 +46,9 @@
         addTearDownClass(PCPoint.class);
         addTearDownClass(Department.class);
         addTearDownClass(Company.class);
+        addTearDownClass(Address.class);
+        addTearDownClass(AAddress.class);
+        addTearDownClass(IAddress.class);
     }
     
     /** */

Added: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/newInstance/AAddress.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/newInstance/AAddress.java?view=auto&rev=526946
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/newInstance/AAddress.java (added)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/newInstance/AAddress.java Mon Apr  9 16:08:09 2007
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ */
+
+package org.apache.jdo.tck.pc.newInstance;
+
+/**
+ * This interface represents the persistent state of Address.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+public abstract class AAddress implements IAddress {
+
+    public abstract long getAddrid();
+    public abstract String getStreet();
+    public abstract String getCity();
+    public abstract String getState();
+    public abstract String getZipcode();
+    public abstract String getCountry();
+    
+    public abstract void setAddrid(long addrid);
+    public abstract void setStreet(String street);
+    public abstract void setCity(String city);
+    public abstract void setState(String state);
+    public abstract void setZipcode(String zipcode);
+    public abstract void setCountry(String country);
+}

Propchange: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/newInstance/AAddress.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/newInstance/Address.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/newInstance/Address.java?view=auto&rev=526946
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/newInstance/Address.java (added)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/newInstance/Address.java Mon Apr  9 16:08:09 2007
@@ -0,0 +1,338 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ */
+ 
+package org.apache.jdo.tck.pc.newInstance;
+
+import java.io.Serializable;
+
+
+/**
+ * This class represents a postal address.
+ */
+public class Address 
+    implements IAddress
+//        , Serializable, Comparable, Comparator, DeepEquality
+{
+
+    private long    addrid;
+    private String  street;
+    private String  city;
+    private String  state;
+    private String  zipcode;
+    private String  country;
+
+    /** This is the JDO-required no-args constructor. The TCK relies on
+     * this constructor for testing PersistenceManager.newInstance(PCClass).
+     */
+    public Address() {}
+
+    /**
+     * This constructor initializes the <code>Address</code> components.
+     * @param addrid The address ID.
+     * @param street The street address.
+     * @param city The city.
+     * @param state The state.
+     * @param zipcode The zip code.
+     * @param country The zip country.
+     */
+    public Address(long addrid, String street, String city, 
+                   String state, String zipcode, String country)
+    {
+        this.addrid = addrid;
+        this.street = street;
+        this.city = city;
+        this.state = state;
+        this.zipcode = zipcode;
+        this.country = country;
+    }
+
+    /**
+     * Get the addrid associated with this object.
+     * @return the addrid.
+     */
+    public long getAddrid() {
+        return addrid;
+    }
+
+    /**
+     * Set the id associated with this object.
+     * @param id the id.
+     */
+    public void setAddrid(long id) {
+        if (this.addrid != 0)
+            throw new IllegalStateException("Id is already set.");
+        this.addrid = id;
+    }
+
+    /** 
+     * Get the street component of the address.
+     * @return The street component of the address.
+     */
+    public String getStreet() {
+        return street;
+    }
+
+    /**
+     * Set the street component of the address.
+     * @param street The street component.
+     */
+    public void setStreet(String street) {
+        this.street = street;
+    }
+
+    /**
+     * Get the city.
+     * @return The city component of the address.
+     */
+    public String getCity() {
+        return city;
+    }
+
+    /**
+     * Set the city component of the address.
+     * @param city The city.
+     */
+    public void setCity(String city) {
+        this.city = city;
+    }
+    
+    /**
+     * Get the state component of the address.
+     * @return The state.
+     */
+    public String getState() {
+        return state;
+    }
+
+    /**
+     * Set the state component of the address.
+     * @param state The state.
+     */
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    /**
+     * Get the zipcode component of the address.
+     * @return The zipcode.
+     */
+    public String getZipcode() {
+        return zipcode;
+    }
+
+    /**
+     * Set the zip code component of the address.
+     * @param zipcode The zipcode.
+     */
+    public void setZipcode(String zipcode) {
+        this.zipcode = zipcode;
+    }
+
+    /**
+     * Get the country component of the address.
+     * @return The country.
+     */
+    public String getCountry() {
+        return country;
+    }
+
+    /**
+     * Set the country component of the address.
+     * @param country The country.
+     */
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    /**
+     * Returns a String representation of a <code>Address</code> object.
+     * @return a String representation of a <code>Address</code> object.
+     */
+    public String toString() {
+        return "Address(" + getFieldRepr() + ")";
+    }
+    
+    /**
+     * Returns a String representation of the non-relationship fields.
+     * @return a String representation of the non-relationship fields.
+     */
+    protected String getFieldRepr() {
+        StringBuffer rc = new StringBuffer();
+        rc.append(addrid);
+        rc.append(", street ").append(street);
+        rc.append(", city ").append(city);
+        rc.append(", state ").append(state);
+        rc.append(", zipcode ").append(zipcode);
+        rc.append(", country ").append(country);
+        return rc.toString();
+    }
+
+//    /** 
+//     * Returns <code>true</code> if all the fields of this instance are
+//     * deep equal to the coresponding fields of the specified Person.
+//     * @param other the object with which to compare.
+//     * @param helper EqualityHelper to keep track of instances that have
+//     * already been processed. 
+//     * @return <code>true</code> if all the fields are deep equal;
+//     * <code>false</code> otherwise.  
+//     * @throws ClassCastException if the specified instances' type prevents
+//     * it from being compared to this instance. 
+//     */
+//    public boolean deepCompareFields(Object other, 
+//                                     EqualityHelper helper) {
+//        IAddress otherAddress = (IAddress)other;
+//        String where = "Address<" + addrid + ">";
+//        return
+//            helper.equals(addrid, otherAddress.getAddrid(), where + ".addrid") &
+//            helper.equals(street, otherAddress.getStreet(), where + ".street") &
+//            helper.equals(city, otherAddress.getCity(), where + ".city") &
+//            helper.equals(state, otherAddress.getState(), where + ".state") &
+//            helper.equals(zipcode, otherAddress.getZipcode(), where + ".zipcode") &
+//            helper.equals(country, otherAddress.getCountry(), where + ".country");
+//    }
+//    
+//    /** 
+//     * Compares this object with the specified object for order. Returns a
+//     * negative integer, zero, or a positive integer as this object is less
+//     * than, equal to, or greater than the specified object. 
+//     * @param o The Object to be compared. 
+//     * @return a negative integer, zero, or a positive integer as this 
+//     * object is less than, equal to, or greater than the specified object. 
+//     * @throws ClassCastException - if the specified object's type prevents
+//     * it from being compared to this Object. 
+//     */
+//    public int compareTo(Object o) {
+//        return compareTo((IAddress)o);
+//    }
+//
+//    /** 
+//     * Compare two instances. This is a method in Comparator.
+//     */
+//    public int compare(Object o1, Object o2) {
+//        return compare((IAddress)o1, (IAddress)o2);
+//    }
+//
+//    /** 
+//     * Compares this object with the specified Address object for
+//     * order. Returns a negative integer, zero, or a positive integer as
+//     * this object is less than, equal to, or greater than the specified
+//     * object.  
+//     * @param other The Address object to be compared. 
+//     * @return a negative integer, zero, or a positive integer as this
+//     * object is less than, equal to, or greater than the specified Address
+//     * object. 
+//     */
+//    public int compareTo(IAddress other) {
+//        return compare(this, other);
+//    }
+//    
+//    /**
+//     * Compares its two IAddress arguments for order. Returns a negative
+//     * integer, zero, or a positive integer as the first argument is less
+//     * than, equal to, or greater than the second. 
+//     * @param o1 the first IAddress object to be compared. 
+//     * @param o2 the second IAddress object to be compared. 
+//     * @return a negative integer, zero, or a positive integer as the first
+//     * object is less than, equal to, or greater than the second object. 
+//     */
+//    public static int compare(IAddress o1, IAddress o2) {
+//        return EqualityHelper.compare(o1.getAddrid(), o2.getAddrid());
+//    }
+//
+//    /** 
+//     * Indicates whether some other object is "equal to" this one.
+//     * @param obj the object with which to compare.
+//     * @return <code>true</code> if this object is the same as the obj
+//     * argument; <code>false</code> otherwise. 
+//     */
+//    public boolean equals(Object obj) {
+//        if (obj instanceof IAddress) {
+//            return compareTo((IAddress)obj) == 0;
+//        }
+//        return false;
+//    }
+
+    /**
+     * Returns a hash code value for the object. 
+     * @return a hash code value for this object.
+     */
+    public int hashCode() {
+        return (int)addrid;
+    }
+    
+    /**
+     * This class is used to represent the application identifier 
+     * for the <code>Address</code> class.
+     */
+    public static class Oid implements Serializable, Comparable {
+
+        /**
+         * This is the identifier field for <code>Address</code> and must
+         * correspond in type and name to the field in
+         * <code>Address</code>. 
+         */
+        public long addrid;
+        
+        /** The required public, no-arg constructor. */
+        public Oid()
+        {
+            addrid = 0;
+        }
+
+        /**
+         * A constructor to initialize the identifier field.
+         * @param addrid the id of the Address.
+         */
+        public Oid(long addrid) {
+            this.addrid = addrid;
+        }
+        
+        public Oid(String s) { addrid = Long.parseLong(justTheId(s)); }
+
+        public String toString() { return this.getClass().getName() + ": "  + addrid;}
+
+
+        /** */
+        public boolean equals(java.lang.Object obj) {
+            if( obj==null || !this.getClass().equals(obj.getClass()) )
+                return( false );
+            Oid o = (Oid) obj;
+            if( this.addrid != o.addrid ) return( false );
+            return( true );
+        }
+
+        /** */
+        public int hashCode() {
+            return( (int) addrid );
+        }
+        
+        protected static String justTheId(String str) {
+            return str.substring(str.indexOf(':') + 1);
+        }
+
+        /** */
+        public int compareTo(Object obj) {
+            // may throw ClassCastException which the user must handle
+            Oid other = (Oid) obj;
+            if( addrid < other.addrid ) return -1;
+            if( addrid > other.addrid ) return 1;
+            return 0;
+        }
+
+    }
+
+}

Propchange: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/newInstance/Address.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/newInstance/IAddress.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/newInstance/IAddress.java?view=auto&rev=526946
==============================================================================
--- db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/newInstance/IAddress.java (added)
+++ db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/newInstance/IAddress.java Mon Apr  9 16:08:09 2007
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ */
+
+package org.apache.jdo.tck.pc.newInstance;
+
+/**
+ * This interface represents the persistent state of Address.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+public interface IAddress {
+
+    long getAddrid();
+    String getStreet();
+    String getCity();
+    String getState();
+    String getZipcode();
+    String getCountry();
+    
+    void setAddrid(long addrid);
+    void setStreet(String street);
+    void setCity(String city);
+    void setState(String state);
+    void setZipcode(String zipcode);
+    void setCountry(String country);
+}

Propchange: db/jdo/trunk/tck20/src/java/org/apache/jdo/tck/pc/newInstance/IAddress.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo?view=auto&rev=526946
==============================================================================
--- db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo (added)
+++ db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo Mon Apr  9 16:08:09 2007
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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.
+-->
+    <package name="org.apache.jdo.tck.pc.newInstance">
+
+        <class name="AAddress" persistence-modifier="persistence-capable"
+            identity-type="application"
+            objectid-class="org.apache.jdo.tck.pc.newInstance.Address$Oid">
+            <property name="addrid" persistence-modifier="persistent"
+                    primary-key="true"/>
+            <property name="street" persistence-modifier="persistent"/>
+            <property name="city" persistence-modifier="persistent"/>
+            <property name="state" persistence-modifier="persistent"/>
+            <property name="zipcode" persistence-modifier="persistent"/>
+            <property name="country" persistence-modifier="persistent"/>
+        </class>
+    </package>
+</jdo>

Propchange: db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo?view=auto&rev=526946
==============================================================================
--- db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo (added)
+++ db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo Mon Apr  9 16:08:09 2007
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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.
+-->
+    <package name="org.apache.jdo.tck.pc.newInstance">
+
+        <class name="Address"
+            identity-type="application"
+            objectid-class="org.apache.jdo.tck.pc.newInstance.Address$Oid">
+            <field name="addrid" primary-key="true"/>
+        </class>
+
+    </package>
+</jdo>

Propchange: db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo?view=auto&rev=526946
==============================================================================
--- db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo (added)
+++ db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo Mon Apr  9 16:08:09 2007
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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.
+-->
+    <package name="org.apache.jdo.tck.pc.newInstance">
+
+        <interface name="IAddress"
+            identity-type="application"
+            objectid-class="org.apache.jdo.tck.pc.newInstance.Address$Oid">
+            <property name="addrid" persistence-modifier="persistent"
+                    primary-key="true"/>
+            <property name="street" persistence-modifier="persistent"/>
+            <property name="city" persistence-modifier="persistent"/>
+            <property name="state" persistence-modifier="persistent"/>
+            <property name="zipcode" persistence-modifier="persistent"/>
+            <property name="country" persistence-modifier="persistent"/>
+        </interface>
+    </package>
+</jdo>

Propchange: db/jdo/trunk/tck20/src/jdo/applicationidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo?view=auto&rev=526946
==============================================================================
--- db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo (added)
+++ db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo Mon Apr  9 16:08:09 2007
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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.
+-->
+    <package name="org.apache.jdo.tck.pc.newInstance">
+
+         <class name="AAddress" persistence-modifier="persistence-capable"
+            identity-type="datastore">
+            <property name="addrid" persistence-modifier="persistent"/>
+            <property name="street" persistence-modifier="persistent"/>
+            <property name="city" persistence-modifier="persistent"/>
+            <property name="state" persistence-modifier="persistent"/>
+            <property name="zipcode" persistence-modifier="persistent"/>
+            <property name="country" persistence-modifier="persistent"/>
+        </class>
+
+    </package>
+</jdo>

Propchange: db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/AAddress.jdo
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo?view=auto&rev=526946
==============================================================================
--- db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo (added)
+++ db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo Mon Apr  9 16:08:09 2007
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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.
+-->
+    <package name="org.apache.jdo.tck.pc.newInstance">
+
+        <class name="Address" identity-type="datastore">
+            <field name="addrid" persistence-modifier="persistent"/>
+            <field name="street" persistence-modifier="persistent"/>
+            <field name="city" persistence-modifier="persistent"/>
+            <field name="state" persistence-modifier="persistent"/>
+            <field name="zipcode" persistence-modifier="persistent"/>
+            <field name="country" persistence-modifier="persistent"/>
+        </class>
+
+    </package>
+</jdo>

Propchange: db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/Address.jdo
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo?view=auto&rev=526946
==============================================================================
--- db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo (added)
+++ db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo Mon Apr  9 16:08:09 2007
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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.
+-->
+    <package name="org.apache.jdo.tck.pc.newInstance">
+
+        <interface name="IAddress" identity-type="datastore">
+            <property name="addrid" persistence-modifier="persistent"/>
+            <property name="street" persistence-modifier="persistent"/>
+            <property name="city" persistence-modifier="persistent"/>
+            <property name="state" persistence-modifier="persistent"/>
+            <property name="zipcode" persistence-modifier="persistent"/>
+            <property name="country" persistence-modifier="persistent"/>
+        </interface>
+
+    </package>
+</jdo>

Propchange: db/jdo/trunk/tck20/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/newInstance/IAddress.jdo
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm?view=auto&rev=526946
==============================================================================
--- db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm (added)
+++ db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm Mon Apr  9 16:08:09 2007
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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.
+-->
+    <package name="org.apache.jdo.tck.pc.newInstance">
+
+        <class name="Address" table="address">
+            <field name="addrid">
+              <column name="ADDRID" allows-null="true"/>
+            </field>
+            <field name="street">
+              <column name="STREET" allows-null="true"/>
+            </field>
+            <field name="city">
+              <column name="CITY" allows-null="true"/>
+            </field>
+            <field name="state">
+              <column name="STATE" allows-null="true"/>
+            </field>
+            <field name="zipcode">
+              <column name="ZIPCODE" allows-null="true"/>
+            </field>
+            <field name="country">
+              <column name="COUNTRY" allows-null="true"/>
+            </field>
+        </class>
+
+        <interface name="IAddress" table="address">
+            <property name="addrid">
+              <column name="ADDRID" allows-null="true"/>
+            </property>
+            <property name="street">
+              <column name="STREET" allows-null="true"/>
+            </property>
+            <property name="city">
+              <column name="CITY" allows-null="true"/>
+            </property>
+            <property name="state">
+              <column name="STATE" allows-null="true"/>
+            </property>
+            <property name="zipcode">
+              <column name="ZIPCODE" allows-null="true"/>
+            </property>
+            <property name="country">
+              <column name="COUNTRY" allows-null="true"/>
+            </property>
+         </interface>
+            
+         <interface name="AAddress" table="address">
+            <property name="addrid">
+              <column name="ADDRID" allows-null="true"/>
+            </property>
+            <property name="street">
+              <column name="STREET" allows-null="true"/>
+            </property>
+            <property name="city">
+              <column name="CITY" allows-null="true"/>
+            </property>
+            <property name="state">
+              <column name="STATE" allows-null="true"/>
+            </property>
+            <property name="zipcode">
+              <column name="ZIPCODE" allows-null="true"/>
+            </property>
+            <property name="country">
+              <column name="COUNTRY" allows-null="true"/>
+            </property>
+        </interface>
+
+    </package>
+</orm>

Propchange: db/jdo/trunk/tck20/src/orm/applicationidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm?view=auto&rev=526946
==============================================================================
--- db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm (added)
+++ db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm Mon Apr  9 16:08:09 2007
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<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.
+-->
+    <package name="org.apache.jdo.tck.pc.newInstance">
+
+        <class name="Address" table="address">
+            <datastore-identity strategy="identity"
+                column="DATASTORE_IDENTITY"/>
+            <field name="addrid" column="ADDRID"/>
+            <field name="street" column="STREET"/>
+            <field name="city" column="CITY"/>
+            <field name="state" column="STATE"/>
+            <field name="zipcode" column="ZIPCODE"/>
+            <field name="country" column="COUNTRY"/>
+        </class>
+
+        <interface name="IAddress" table="address">
+            <datastore-identity strategy="identity"
+                column="DATASTORE_IDENTITY"/>
+            <property name="addrid">
+              <column name="ADDRID" allows-null="true"/>
+            </property>
+            <property name="street">
+              <column name="STREET" allows-null="true"/>
+            </property>
+            <property name="city">
+              <column name="CITY" allows-null="true"/>
+            </property>
+            <property name="state">
+              <column name="STATE" allows-null="true"/>
+            </property>
+            <property name="zipcode">
+              <column name="ZIPCODE" allows-null="true"/>
+            </property>
+            <property name="country">
+              <column name="COUNTRY" allows-null="true"/>
+            </property>
+        </interface>
+            
+        <interface name="AAddress" table="address">
+            <datastore-identity strategy="identity"
+                column="DATASTORE_IDENTITY"/>
+            <property name="addrid">
+              <column name="ADDRID" allows-null="true"/>
+            </property>
+            <property name="street">
+              <column name="STREET" allows-null="true"/>
+            </property>
+            <property name="city">
+              <column name="CITY" allows-null="true"/>
+            </property>
+            <property name="state">
+              <column name="STATE" allows-null="true"/>
+            </property>
+            <property name="zipcode">
+              <column name="ZIPCODE" allows-null="true"/>
+            </property>
+            <property name="country">
+              <column name="COUNTRY" allows-null="true"/>
+            </property>
+        </interface>
+
+    </package>
+</orm>

Propchange: db/jdo/trunk/tck20/src/orm/datastoreidentity/org/apache/jdo/tck/pc/newInstance/package-standard.orm
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema.sql?view=diff&rev=526946&r1=526945&r2=526946
==============================================================================
--- db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema.sql (original)
+++ db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema.sql Mon Apr  9 16:08:09 2007
@@ -21,6 +21,21 @@
 SET SCHEMA applicationidentity0;
 
 -------------------------
+-- newInstance
+-------------------------
+DROP TABLE address;
+
+CREATE TABLE address (
+    ADDRID INTEGER,
+    STREET VARCHAR(64),
+    CITY VARCHAR(64),
+    STATE CHAR(2),
+    ZIPCODE CHAR(5),
+    COUNTRY VARCHAR(64),
+    CONSTRAINT ADDR_PK PRIMARY KEY (ADDRID)
+);
+
+-------------------------
 -- order
 -------------------------
 DROP TABLE Item;

Modified: db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema.sql?view=diff&rev=526946&r1=526945&r2=526946
==============================================================================
--- db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema.sql (original)
+++ db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema.sql Mon Apr  9 16:08:09 2007
@@ -21,6 +21,22 @@
 SET SCHEMA datastoreidentity0;
 
 -------------------------
+-- newInstance
+-------------------------
+DROP TABLE address;
+
+CREATE TABLE address (
+    DATASTORE_IDENTITY BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
+    ADDRID INTEGER,
+    STREET VARCHAR(64),
+    CITY VARCHAR(64),
+    STATE CHAR(2),
+    ZIPCODE CHAR(5),
+    COUNTRY VARCHAR(64),
+    CONSTRAINT ADDR_PK PRIMARY KEY (ADDRID)
+);
+
+-------------------------
 -- mylib
 -------------------------
 



Mime
View raw message