db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From an...@apache.org
Subject svn commit: r1022008 [1/2] - in /db/jdo/trunk/tck/src: conf/ java/org/apache/jdo/tck/pc/company/ java/org/apache/jdo/tck/pc/companyAnnotatedFC/ java/org/apache/jdo/tck/pc/companyAnnotatedJPA/ java/org/apache/jdo/tck/pc/companyAnnotatedPC/ java/org/apac...
Date Wed, 13 Oct 2010 06:43:03 GMT
Author: andyj
Date: Wed Oct 13 06:43:01 2010
New Revision: 1022008

URL: http://svn.apache.org/viewvc?rev=1022008&view=rev
Log:
JDO-633 New tests for List.get. Added MeetingRoom class to company model and Department has List<MeetingRoom>. Includes some TODOs if MeetingRoom is ever to be used in other tests/schemas

Added:
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/IMeetingRoom.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/MeetingRoom.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/PIMeetingRoom.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java   (with props)
Modified:
    db/jdo/trunk/tck/src/conf/jdoql.conf
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactory.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryAbstractImpl.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryAnnotatedAbstractDelegator.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryConcreteClass.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryNewInstance.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMInterface.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/Department.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/IDepartment.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppConcrete.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppPM.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSConcrete.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSPM.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedPMFieldClass.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDepartment.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDepartment.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppConcrete.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppPM.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedPMFieldClassJPA.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDepartment.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppConcrete.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppPM.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSConcrete.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSPM.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDepartment.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDepartment.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIAppPM.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIDSPM.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPMInterface.java
    db/jdo/trunk/tck/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
    db/jdo/trunk/tck/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
    db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm
    db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
    db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
    db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
    db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
    db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm
    db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
    db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
    db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
    db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
    db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema.sql
    db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema1.sql
    db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema2.sql
    db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema3.sql
    db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema4.sql
    db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema.sql
    db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema1.sql
    db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema2.sql
    db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema3.sql
    db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema4.sql
    db/jdo/trunk/tck/src/testdata/org/apache/jdo/tck/pc/company/companyForQueryTests.xml

Modified: db/jdo/trunk/tck/src/conf/jdoql.conf
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/conf/jdoql.conf?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/conf/jdoql.conf (original)
+++ db/jdo/trunk/tck/src/conf/jdoql.conf Wed Oct 13 06:43:01 2010
@@ -61,6 +61,7 @@ org.apache.jdo.tck.query.jdoql.methods.M
 org.apache.jdo.tck.query.jdoql.methods.StartsWithAndEndsWith \
 org.apache.jdo.tck.query.jdoql.methods.SupportedCollectionMethods \
 org.apache.jdo.tck.query.jdoql.methods.SupportedJDOHelperMethods \
+org.apache.jdo.tck.query.jdoql.methods.SupportedListMethods \
 org.apache.jdo.tck.query.jdoql.methods.SupportedMapMethods \
 org.apache.jdo.tck.query.jdoql.methods.SupportedMathMethods \
 org.apache.jdo.tck.query.jdoql.methods.SupportedStringMethods \

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactory.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactory.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactory.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactory.java Wed Oct 13 06:43:01 2010
@@ -37,6 +37,7 @@ public interface CompanyFactory {
             IAddress addr);
     IAddress newAddress(long addrid, String street, String city, 
             String state, String zipcode, String country);
+    IMeetingRoom newMeetingRoom(long roomid, String name);
     IDentalInsurance newDentalInsurance(long insid, String carrier, 
             BigDecimal lifetimeOrthoBenefit);
     IDentalInsurance newDentalInsurance(long insid, String carrier, 

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryAbstractImpl.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryAbstractImpl.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryAbstractImpl.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryAbstractImpl.java Wed Oct 13 06:43:01 2010
@@ -53,6 +53,7 @@ public abstract class CompanyFactoryAbst
     public boolean isAppIdentity = "applicationidentity".equals(identitytype);
 
     abstract public IAddress newAddress();
+    abstract public IMeetingRoom newMeetingRoom();
     abstract public ICompany newCompany();
     abstract public IDentalInsurance newDentalInsurance();
     abstract public IDepartment newDepartment();
@@ -74,6 +75,14 @@ public abstract class CompanyFactoryAbst
         return result;
     }
 
+    public IMeetingRoom newMeetingRoom(long roomid, String name) {
+        IMeetingRoom result = newMeetingRoom();
+        result.setRoomid(roomid);
+        result.setName(name);
+        if (debug) logger.debug("newMeetingRoom returned" + result);
+        return result;
+    }
+
     public ICompany newCompany(long companyid, String name,
             java.util.Date founded) {
         ICompany result = newCompany();

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryAnnotatedAbstractDelegator.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryAnnotatedAbstractDelegator.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryAnnotatedAbstractDelegator.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryAnnotatedAbstractDelegator.java Wed Oct 13 06:43:01 2010
@@ -44,7 +44,11 @@ public abstract class CompanyFactoryAnno
     public IAddress newAddress() {
         return (IAddress)delegate.newAddress();
     }
-    
+
+    public IMeetingRoom newMeetingRoom() {
+        return (IMeetingRoom)delegate.newMeetingRoom();
+    }
+
     public ICompany newCompany() {
         return (ICompany)delegate.newCompany();
     }

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryConcreteClass.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryConcreteClass.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryConcreteClass.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryConcreteClass.java Wed Oct 13 06:43:01 2010
@@ -33,7 +33,7 @@ public  class CompanyFactoryConcreteClas
     public static final Class[] tearDownClasses = new Class[] {
         DentalInsurance.class, MedicalInsurance.class,
         PartTimeEmployee.class, FullTimeEmployee.class,  
-        Project.class, Department.class, Company.class
+        Project.class, Department.class, Company.class, MeetingRoom.class
     };
 
     public CompanyFactoryConcreteClass(PersistenceManager pm) {
@@ -58,6 +58,10 @@ public  class CompanyFactoryConcreteClas
         return new Address(addrid, street, city, state, zipcode, country);
     }
 
+    public IMeetingRoom newMeetingRoom(long roomid, String name) {
+        return new MeetingRoom(roomid, name);
+    }
+
     public IDentalInsurance newDentalInsurance(long insid, 
             String carrier, BigDecimal lifetimeOrthoBenefit) {
         return new DentalInsurance(insid, carrier, lifetimeOrthoBenefit);

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryNewInstance.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryNewInstance.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryNewInstance.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryNewInstance.java Wed Oct 13 06:43:01 2010
@@ -21,8 +21,9 @@ package org.apache.jdo.tck.pc.company;
  *
  */
 public interface CompanyFactoryNewInstance {
-    
+
     abstract public IAddress newAddress();
+    abstract public IMeetingRoom newMeetingRoom();
     abstract public ICompany newCompany();
     abstract public IDentalInsurance newDentalInsurance();
     abstract public IDepartment newDepartment();

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java Wed Oct 13 06:43:01 2010
@@ -32,7 +32,7 @@ public class CompanyFactoryPMClass 
     public static final Class[] tearDownClasses = new Class[] {
         DentalInsurance.class, MedicalInsurance.class,
         PartTimeEmployee.class, FullTimeEmployee.class,  
-        Project.class, Department.class, Company.class
+        Project.class, Department.class, Company.class, MeetingRoom.class
     };
 
     /**
@@ -45,6 +45,10 @@ public class CompanyFactoryPMClass 
     public IAddress newAddress() {
         return (IAddress)pm.newInstance(Address.class);
     }
+
+    public IMeetingRoom newMeetingRoom() {
+        return (IMeetingRoom)pm.newInstance(MeetingRoom.class);
+    }
     
     public ICompany newCompany() {
         return (ICompany)pm.newInstance(Company.class);

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMInterface.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMInterface.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMInterface.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMInterface.java Wed Oct 13 06:43:01 2010
@@ -46,6 +46,10 @@ public class CompanyFactoryPMInterface 
         return pm.newInstance(PIAddress.class);
     }
     
+    public IMeetingRoom newMeetingRoom() {
+        return pm.newInstance(PIMeetingRoom.class);
+    }
+    
     public ICompany newCompany() {
         return pm.newInstance(PICompany.class);
     }

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java Wed Oct 13 06:43:01 2010
@@ -135,6 +135,18 @@ public class CompanyModelReader extends 
     }
 
     /** 
+     * Convenience method returning a MeetingRoom instance for the specified
+     * name. The method returns <code>null</code> if there is no MeetingRoom
+     * bean with the specified name. 
+     * @param name the name of the bean to return.
+     * @return the instance of the bean or <code>null</code> if there no
+     * MeetingRoom bean.
+     */
+    public IMeetingRoom getMeetingRoom(String name) {
+        return (IMeetingRoom)getBean(name, MeetingRoom.class);
+    }
+
+    /** 
      * Convenience method returning a Company instance for the specified 
      * name. The method returns <code>null</code> if there is no Company
      * bean with the specified name. 

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/Department.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/Department.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/Department.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/Department.java Wed Oct 13 06:43:01 2010
@@ -21,9 +21,11 @@ import java.io.Serializable;
 import java.io.ObjectInputStream;
 import java.io.IOException;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import org.apache.jdo.tck.util.DeepEquality;
@@ -43,6 +45,7 @@ public class Department
     private Employee employeeOfTheMonth;
     private transient Set employees = new HashSet(); // element type is Employee
     private transient Set fundedEmps = new HashSet(); // element type is Employee
+    private transient List meetingRooms = new ArrayList(); // element type is MeetingRoom
 
     /** This is the JDO-required no-args constructor. The TCK relies on
      * this constructor for testing PersistenceManager.newInstance(PCClass).
@@ -226,12 +229,45 @@ public class Department
         this.fundedEmps = (fundedEmps != null) ? new HashSet(employees) : null;
     }
 
+    /**
+     * Get the meeting rooms in the department as an unmodifiable list.
+     * @return List of meeting rooms in the department, as an unmodifiable list.
+     */
+    public List getMeetingRooms() {
+        return Collections.unmodifiableList(meetingRooms);
+    }
+
+    /**
+     * Add a meeting room to the department.
+     * @param room Meeting room to add to the department.
+     */
+    public void addMeetingRoom(MeetingRoom room) {
+        meetingRooms.add(room);
+    }
+
+    /**
+     * Remove a meeting room from the department.
+     * @param room Meeting room to remove from the department.
+     */
+    public void removeMeetingRoom(MeetingRoom room) {
+        meetingRooms.remove(room);
+    }
+
+    /**
+     * Set the rooms for this department.
+     * @param rooms The rooms for this department.
+     */
+    public void setMeetingRooms(List rooms) {
+        this.meetingRooms = (rooms != null) ? new ArrayList(rooms) : null;
+    }
+
     /** Serialization support: initialize transient fields. */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
         employees = new HashSet();
         fundedEmps = new HashSet();
+        meetingRooms = new ArrayList();
     }
 
     /** 
@@ -256,6 +292,7 @@ public class Department
             helper.deepEquals(employeeOfTheMonth, otherDept.getEmployeeOfTheMonth(), where + ".employeeOfTheMonth") &
             helper.deepEquals(employees, otherDept.getEmployees(), where + ".employees") &
             helper.deepEquals(fundedEmps, otherDept.getFundedEmps(), where + ".fundedEmps");
+        // TODO Add meetingRooms to comparison
     }
     
     /**

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/IDepartment.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/IDepartment.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/IDepartment.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/IDepartment.java Wed Oct 13 06:43:01 2010
@@ -17,6 +17,7 @@
  
 package org.apache.jdo.tck.pc.company;
 
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -32,12 +33,13 @@ public interface IDepartment {
     IEmployee getEmployeeOfTheMonth();
     Set getEmployees();
     Set getFundedEmps();
-    
+    List getMeetingRooms();
+
     void setDeptid(long deptid);
     void setName(String name);
     void setCompany(ICompany company);
     void setEmployeeOfTheMonth(IEmployee employeeOfTheMonth);
     void setEmployees(Set employees);
     void setFundedEmps(Set employees);
-
+    void setMeetingRooms(List rooms);
 }

Added: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/IMeetingRoom.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/IMeetingRoom.java?rev=1022008&view=auto
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/IMeetingRoom.java (added)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/IMeetingRoom.java Wed Oct 13 06:43:01 2010
@@ -0,0 +1,32 @@
+/*
+ * 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.company;
+
+/**
+ * This interface represents the persistent state of MeetingRoom.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+public interface IMeetingRoom {
+
+    long getRoomid();
+    String getName();
+
+    void setRoomid(long roomid);
+    void setName(String name);
+}
\ No newline at end of file

Added: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/MeetingRoom.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/MeetingRoom.java?rev=1022008&view=auto
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/MeetingRoom.java (added)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/MeetingRoom.java Wed Oct 13 06:43:01 2010
@@ -0,0 +1,252 @@
+/*
+ * 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.company;
+
+import java.io.Serializable;
+import java.util.Comparator;
+
+import org.apache.jdo.tck.util.DeepEquality;
+import org.apache.jdo.tck.util.EqualityHelper;
+
+/**
+ * This class represents a meeting room.
+ */
+public class MeetingRoom 
+    implements IMeetingRoom, Serializable, Comparable, Comparator, DeepEquality {
+
+    private long    roomid;
+    private String  name;
+
+    /** This is the JDO-required no-args constructor. The TCK relies on
+     * this constructor for testing PersistenceManager.newInstance(PCClass).
+     */
+    public MeetingRoom() {}
+
+    /**
+     * This constructor initializes the <code>MeetingRoom</code> components.
+     * @param roomid The room ID.
+     * @param name The name of the room
+     */
+    public MeetingRoom(long roomid, String name)
+    {
+        this.roomid = roomid;
+        this.name = name;
+    }
+
+    /**
+     * Get the room id associated with this object.
+     * @return the room id.
+     */
+    public long getRoomid() {
+        return roomid;
+    }
+
+    /**
+     * Set the id associated with this object.
+     * @param id the id.
+     */
+    public void setRoomid(long id) {
+        if (this.roomid != 0)
+            throw new IllegalStateException("Id is already set.");
+        this.roomid = id;
+    }
+
+    /** 
+     * Get the name of the meeting room.
+     * @return The name of the meeting room.
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Set the name of the meeting room.
+     * @param name The name.
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * Returns a String representation of a <code>Address</code> object.
+     * @return a String representation of a <code>MeetingRoom</code> object.
+     */
+    public String toString() {
+        return "MeetingRoom(" + 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(roomid);
+        rc.append(", name ").append(name);
+        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) {
+        IMeetingRoom otherMeetingRoom = (IMeetingRoom)other;
+        String where = "MeetingRoom<" + roomid + ">";
+        return
+            helper.equals(roomid, otherMeetingRoom.getRoomid(), where + ".roomid") &
+            helper.equals(name, otherMeetingRoom.getName(), where + ".name");
+    }
+    
+    /** 
+     * 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((IMeetingRoom)o);
+    }
+
+    /** 
+     * Compare two instances. This is a method in Comparator.
+     */
+    public int compare(Object o1, Object o2) {
+        return compare((IMeetingRoom)o1, (IMeetingRoom)o2);
+    }
+
+    /** 
+     * Compares this object with the specified MeetingRoom 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 MeetingRoom 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 MeetingRoom
+     * object. 
+     */
+    public int compareTo(IMeetingRoom other) {
+        return compare(this, other);
+    }
+    
+    /**
+     * Compares its two IMeetingRoom 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 IMeetingRoom object to be compared. 
+     * @param o2 the second IMeetingRoom 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(IMeetingRoom o1, IMeetingRoom o2) {
+        return EqualityHelper.compare(o1.getRoomid(), o2.getRoomid());
+    }
+
+    /** 
+     * 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 IMeetingRoom) {
+            return compareTo((IMeetingRoom)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)roomid;
+    }
+    
+    /**
+     * This class is used to represent the application identifier 
+     * for the <code>MeetingRoom</code> class.
+     */
+    public static class Oid implements Serializable, Comparable {
+
+        /**
+         * This is the identifier field for <code>MeetingRoom</code> and must
+         * correspond in type and name to the field in
+         * <code>MeetingRoom</code>. 
+         */
+        public long roomid;
+        
+        /** The required public, no-arg constructor. */
+        public Oid()
+        {
+            roomid = 0;
+        }
+
+        /**
+         * A constructor to initialize the identifier field.
+         * @param roomid the id of the MeetingRoom.
+         */
+        public Oid(long roomid) {
+            this.roomid = roomid;
+        }
+        
+        public Oid(String s) { roomid = Long.parseLong(justTheId(s)); }
+
+        public String toString() { return this.getClass().getName() + ": "  + roomid;}
+
+
+        /** */
+        public boolean equals(java.lang.Object obj) {
+            if( obj==null || !this.getClass().equals(obj.getClass()) )
+                return( false );
+            Oid o = (Oid) obj;
+            if( this.roomid != o.roomid ) return( false );
+            return( true );
+        }
+
+        /** */
+        public int hashCode() {
+            return( (int) roomid );
+        }
+        
+        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( roomid < other.roomid ) return -1;
+            if( roomid > other.roomid ) return 1;
+            return 0;
+        }
+    }
+}

Added: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/PIMeetingRoom.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/PIMeetingRoom.java?rev=1022008&view=auto
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/PIMeetingRoom.java (added)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/PIMeetingRoom.java Wed Oct 13 06:43:01 2010
@@ -0,0 +1,32 @@
+/*
+ * 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.company;
+
+/**
+ * This interface represents the persistent state of MeetingRoom.
+ * Javadoc was deliberately omitted because it would distract from
+ * the purpose of the interface.
+ */
+public interface PIMeetingRoom extends IMeetingRoom {
+
+    long getRoomid();
+    String getName();
+    
+    void setRoomid(long roomid);
+    void setName(String name);
+}

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppConcrete.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppConcrete.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppConcrete.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppConcrete.java Wed Oct 13 06:43:01 2010
@@ -54,6 +54,10 @@ public class CompanyFactoryAnnotatedFCAp
     public IAddress newAddress() {
         return (IAddress) new FCAppAddress();
     }
+
+    public IMeetingRoom newMeetingRoom() {
+        return (IMeetingRoom) null;
+    }
     
     public ICompany newCompany() {
         return (ICompany) new FCAppCompany();

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppPM.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppPM.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppPM.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppPM.java Wed Oct 13 06:43:01 2010
@@ -54,6 +54,10 @@ public class CompanyFactoryAnnotatedFCAp
     public IAddress newAddress() {
         return (IAddress)pm.newInstance(FCAppAddress.class);
     }
+
+    public IMeetingRoom newMeetingRoom() {
+        return (IMeetingRoom)null;
+    }
     
     public ICompany newCompany() {
         return (ICompany)pm.newInstance(FCAppCompany.class);

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSConcrete.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSConcrete.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSConcrete.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSConcrete.java Wed Oct 13 06:43:01 2010
@@ -54,6 +54,10 @@ public class CompanyFactoryAnnotatedFCDS
     public IAddress newAddress() {
         return (IAddress) new FCDSAddress();
     }
+
+    public IMeetingRoom newMeetingRoom() {
+        return (IMeetingRoom)null;
+    }
     
     public ICompany newCompany() {
         return (ICompany) new FCDSCompany();

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSPM.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSPM.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSPM.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSPM.java Wed Oct 13 06:43:01 2010
@@ -54,6 +54,10 @@ public class CompanyFactoryAnnotatedFCDS
     public IAddress newAddress() {
         return (IAddress)pm.newInstance(FCDSAddress.class);
     }
+
+    public IMeetingRoom newMeetingRoom() {
+        return (IMeetingRoom)null;
+    }
     
     public ICompany newCompany() {
         return (ICompany)pm.newInstance(FCDSCompany.class);

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedPMFieldClass.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedPMFieldClass.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedPMFieldClass.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedPMFieldClass.java Wed Oct 13 06:43:01 2010
@@ -96,6 +96,10 @@ public class CompanyFactoryAnnotatedPMFi
     public IAddress newAddress() {
         return (IAddress)pm.newInstance(addressClass);
     }
+
+    public IMeetingRoom newMeetingRoom() {
+        return (IMeetingRoom)null;
+    }
     
     public ICompany newCompany() {
         return (ICompany)pm.newInstance(companyClass);

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDepartment.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDepartment.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDepartment.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDepartment.java Wed Oct 13 06:43:01 2010
@@ -26,6 +26,7 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import org.apache.jdo.tck.pc.company.ICompany;
 
@@ -244,7 +245,19 @@ public class FCAppDepartment
         this.fundedEmps = (fundedEmps != null) ? new HashSet(employees) : null;
     }
 
-    /** Serialization support: initialize transient fields. */
+    @Override
+	public List getMeetingRooms() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void setMeetingRooms(List rooms) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	/** Serialization support: initialize transient fields. */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDepartment.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDepartment.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDepartment.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDepartment.java Wed Oct 13 06:43:01 2010
@@ -26,6 +26,7 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import org.apache.jdo.tck.pc.company.ICompany;
 import org.apache.jdo.tck.pc.company.IDepartment;
@@ -245,7 +246,19 @@ public class FCDSDepartment
         this.fundedEmps = (fundedEmps != null) ? new HashSet(employees) : null;
     }
 
-    /** Serialization support: initialize transient fields. */
+    @Override
+	public List getMeetingRooms() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void setMeetingRooms(List rooms) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	/** Serialization support: initialize transient fields. */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppConcrete.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppConcrete.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppConcrete.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppConcrete.java Wed Oct 13 06:43:01 2010
@@ -55,6 +55,10 @@ public class CompanyFactoryAnnotatedJPAA
     public IAddress newAddress() {
         return (IAddress) new JPAAppAddress();
     }
+
+    public IMeetingRoom newMeetingRoom() {
+        return (IMeetingRoom)null;
+    }
     
     public ICompany newCompany() {
         return (ICompany) new JPAAppCompany();

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppPM.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppPM.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppPM.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppPM.java Wed Oct 13 06:43:01 2010
@@ -53,6 +53,10 @@ public class CompanyFactoryAnnotatedJPAA
     public IAddress newAddress() {
         return (IAddress)pm.newInstance(JPAAppAddress.class);
     }
+
+    public IMeetingRoom newMeetingRoom() {
+        return (IMeetingRoom)null;
+    }
     
     public ICompany newCompany() {
         return (ICompany)pm.newInstance(JPAAppCompany.class);

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedPMFieldClassJPA.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedPMFieldClassJPA.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedPMFieldClassJPA.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedPMFieldClassJPA.java Wed Oct 13 06:43:01 2010
@@ -76,6 +76,10 @@ public class CompanyFactoryAnnotatedPMFi
     public IAddress newAddress() {
         return (IAddress)pm.newInstance(addressClass);
     }
+
+    public IMeetingRoom newMeetingRoom() {
+        return (IMeetingRoom)null;
+    }
     
     public ICompany newCompany() {
         return (ICompany)pm.newInstance(companyClass);

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDepartment.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDepartment.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDepartment.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDepartment.java Wed Oct 13 06:43:01 2010
@@ -26,6 +26,7 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import org.apache.jdo.tck.pc.company.ICompany;
 
@@ -245,7 +246,19 @@ public class JPAAppDepartment
         this.fundedEmps = (fundedEmps != null) ? new HashSet(employees) : null;
     }
 
-    /** Serialization support: initialize transient fields. */
+    @Override
+	public List getMeetingRooms() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void setMeetingRooms(List rooms) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	/** Serialization support: initialize transient fields. */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppConcrete.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppConcrete.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppConcrete.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppConcrete.java Wed Oct 13 06:43:01 2010
@@ -54,6 +54,10 @@ public class CompanyFactoryAnnotatedPCAp
     public IAddress newAddress() {
         return (IAddress) new PCAppAddress();
     }
+
+    public IMeetingRoom newMeetingRoom() {
+        return (IMeetingRoom)null;
+    }
     
     public ICompany newCompany() {
         return (ICompany) new PCAppCompany();

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppPM.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppPM.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppPM.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppPM.java Wed Oct 13 06:43:01 2010
@@ -54,6 +54,10 @@ public class CompanyFactoryAnnotatedPCAp
     public IAddress newAddress() {
         return (IAddress)pm.newInstance(PCAppAddress.class);
     }
+
+    public IMeetingRoom newMeetingRoom() {
+        return (IMeetingRoom)null;
+    }
     
     public ICompany newCompany() {
         return (ICompany)pm.newInstance(PCAppCompany.class);

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSConcrete.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSConcrete.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSConcrete.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSConcrete.java Wed Oct 13 06:43:01 2010
@@ -54,6 +54,10 @@ public class CompanyFactoryAnnotatedPCDS
     public IAddress newAddress() {
         return (IAddress) new PCDSAddress();
     }
+
+    public IMeetingRoom newMeetingRoom() {
+        return (IMeetingRoom)null;
+    }
     
     public ICompany newCompany() {
         return (ICompany) new PCDSCompany();

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSPM.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSPM.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSPM.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSPM.java Wed Oct 13 06:43:01 2010
@@ -54,6 +54,10 @@ public class CompanyFactoryAnnotatedPCDS
     public IAddress newAddress() {
         return (IAddress)pm.newInstance(PCDSAddress.class);
     }
+
+    public IMeetingRoom newMeetingRoom() {
+        return (IMeetingRoom)null;
+    }
     
     public ICompany newCompany() {
         return (ICompany)pm.newInstance(PCDSCompany.class);

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDepartment.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDepartment.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDepartment.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDepartment.java Wed Oct 13 06:43:01 2010
@@ -26,6 +26,7 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import org.apache.jdo.tck.pc.company.ICompany;
 
@@ -251,7 +252,19 @@ public class PCAppDepartment
         this._fundedEmps = (employees != null) ? new HashSet(employees) : null;
     }
 
-    /** Serialization support: initialize transient fields. */
+    @Override
+	public List getMeetingRooms() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void setMeetingRooms(List rooms) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	/** Serialization support: initialize transient fields. */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDepartment.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDepartment.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDepartment.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDepartment.java Wed Oct 13 06:43:01 2010
@@ -26,6 +26,7 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import org.apache.jdo.tck.pc.company.ICompany;
 import org.apache.jdo.tck.pc.company.IDepartment;
@@ -253,7 +254,19 @@ public class PCDSDepartment
         this._fundedEmps = (employees != null) ? new HashSet(employees) : null;
     }
 
-    /** Serialization support: initialize transient fields. */
+    @Override
+	public List getMeetingRooms() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void setMeetingRooms(List rooms) {
+		// TODO Auto-generated method stub
+		
+	}
+
+	/** Serialization support: initialize transient fields. */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIAppPM.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIAppPM.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIAppPM.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIAppPM.java Wed Oct 13 06:43:01 2010
@@ -54,6 +54,10 @@ public class CompanyFactoryAnnotatedPIAp
     public IAddress newAddress() {
         return (IAddress)pm.newInstance(PIAppAddress.class);
     }
+
+    public IMeetingRoom newMeetingRoom() {
+        return (IMeetingRoom)null;
+    }
     
     public ICompany newCompany() {
         return (ICompany)pm.newInstance(PIAppCompany.class);

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIDSPM.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIDSPM.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIDSPM.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIDSPM.java Wed Oct 13 06:43:01 2010
@@ -54,6 +54,10 @@ public class CompanyFactoryAnnotatedPIDS
     public IAddress newAddress() {
         return (IAddress)pm.newInstance(PIDSAddress.class);
     }
+
+    public IMeetingRoom newMeetingRoom() {
+        return (IMeetingRoom)null;
+    }
     
     public ICompany newCompany() {
         return (ICompany)pm.newInstance(PIDSCompany.class);

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPMInterface.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPMInterface.java?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPMInterface.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPMInterface.java Wed Oct 13 06:43:01 2010
@@ -93,6 +93,10 @@ public class CompanyFactoryAnnotatedPMIn
     public IAddress newAddress() {
         return (IAddress)pm.newInstance(addressClass);
     }
+
+    public IMeetingRoom newMeetingRoom() {
+        return (IMeetingRoom)null;
+    }
     
     public ICompany newCompany() {
         return (ICompany)pm.newInstance(companyClass);

Added: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java?rev=1022008&view=auto
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java (added)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java Wed Oct 13 06:43:01 2010
@@ -0,0 +1,160 @@
+/*
+ * 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.query.jdoql.methods;
+
+import javax.jdo.PersistenceManager;
+import javax.jdo.Query;
+import javax.jdo.Transaction;
+
+import org.apache.jdo.tck.JDO_Test;
+import org.apache.jdo.tck.pc.company.CompanyModelReader;
+import org.apache.jdo.tck.pc.company.Department;
+import org.apache.jdo.tck.pc.company.MeetingRoom;
+import org.apache.jdo.tck.query.QueryElementHolder;
+import org.apache.jdo.tck.query.QueryTest;
+import org.apache.jdo.tck.util.BatchTestRunner;
+
+/**
+ *<B>Title:</B>Supported list methods
+ *<BR>
+ *<B>Keywords:</B> query list
+ *<BR>
+ *<B>Assertion ID:</B> A14.6.????.
+ *<BR>
+ *<B>Assertion Description: </B>
+ * Supported list methods:
+ * <UL>
+ * <LI>get</LI>
+ * </UL>
+ */
+
+public class SupportedListMethods extends QueryTest {
+
+    /** */
+    private static final String ASSERTION_FAILED = 
+        "Assertion A14.6.2-36 (SupportedListMethods) failed: ";
+    
+    /** 
+     * The array of valid queries which may be executed as 
+     * single string queries and as API queries.
+     */
+    private static final QueryElementHolder[] VALID_QUERIES = {
+        // get(PARAMETER) in filter
+        new QueryElementHolder(
+                /*UNIQUE*/      null,
+                /*RESULT*/      null,
+                /*INTO*/        null,
+                /*FROM*/        Department.class,
+                /*EXCLUDE*/     null,
+                /*WHERE*/       "meetingRooms.get(pos) == room1",
+                /*VARIABLES*/   null,
+                /*PARAMETERS*/  "int pos, MeetingRoom room1",
+                /*IMPORTS*/     null,
+                /*GROUP BY*/    null,
+                /*ORDER BY*/    null,
+                /*FROM*/        null,
+                /*TO*/          null),
+        // get(LITERAL) in result
+        new QueryElementHolder(
+                /*UNIQUE*/      null,
+                /*RESULT*/      "meetingRooms.get(1)",
+                /*INTO*/        null,
+                /*FROM*/        Department.class,
+                /*EXCLUDE*/     null,
+                /*WHERE*/       "deptid == 1",
+                /*VARIABLES*/   null,
+                /*PARAMETERS*/  null,
+                /*IMPORTS*/     null,
+                /*GROUP BY*/    null,
+                /*ORDER BY*/    null,
+                /*FROM*/        null,
+                /*TO*/          null)
+    };
+
+    /** 
+     * The expected results of valid queries.
+     */
+    private Object[] expectedResult = {
+        // get(PARAMETER) in filter
+        getTransientCompanyModelInstancesAsList(new String[]{"dept1"}),
+        // get(LITERAL) in result
+        getTransientCompanyModelInstancesAsList(new String[]{"room2"})
+    };
+
+    /**
+     * 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(SupportedListMethods.class);
+    }
+
+    /** */
+    public void testGetInFilter() {
+        int index = 0;
+        Object[] parameters = new Object[]{1, 
+                getParameter(MeetingRoom.class, "roomid == 2", true)};
+        executeAPIQuery(ASSERTION_FAILED, VALID_QUERIES[index], 
+                parameters, expectedResult[index]);
+        executeSingleStringQuery(ASSERTION_FAILED, VALID_QUERIES[index], 
+                parameters, expectedResult[index]);
+    }
+
+    /** */
+    public void testGetInResult() {
+        int index = 1;
+        executeAPIQuery(ASSERTION_FAILED, VALID_QUERIES[index], 
+                expectedResult[index]);
+        executeSingleStringQuery(ASSERTION_FAILED, VALID_QUERIES[index], 
+                expectedResult[index]);
+    }
+
+    /**
+     * @see JDO_Test#localSetUp()
+     */
+    protected void localSetUp() {
+        addTearDownClass(CompanyModelReader.getTearDownClasses());
+        loadAndPersistCompanyModel(getPM());
+    }
+    
+    /** */
+    private Object getParameter(Class candidateClass, String filter, boolean unique) {
+        Object result;
+        PersistenceManager pm = getPM();
+        Transaction transaction = pm.currentTransaction();
+        transaction.begin();
+        try {
+            Query query = filter == null ? pm.newQuery(candidateClass) :
+                pm.newQuery(candidateClass, filter);
+            if (unique) {
+                query.setUnique(unique);
+            }
+            try {
+                result = query.execute();
+            } finally {
+                query.closeAll();
+            }
+        } finally {
+            if (transaction.isActive()) {
+                transaction.rollback();
+            }
+        }
+        return result;
+    }
+}

Propchange: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java
------------------------------------------------------------------------------
    svn:executable = *

Modified: db/jdo/trunk/tck/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo (original)
+++ db/jdo/trunk/tck/src/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo Wed Oct 13 06:43:01 2010
@@ -27,6 +27,11 @@ has application identity.
 
         <class name="Address" embedded-only="true" requires-extent="false"/>
 
+        <class name="MeetingRoom" identity-type="application"
+            objectid-class="org.apache.jdo.tck.pc.company.MeetingRoom$Oid">
+            <field name="roomid" primary-key="true"/>
+        </class>
+
         <class name="Company"
             identity-type="application"
             objectid-class="org.apache.jdo.tck.pc.company.Company$Oid">
@@ -53,6 +58,10 @@ has application identity.
             <field name="fundedEmps" persistence-modifier="persistent">
                 <collection element-type="org.apache.jdo.tck.pc.company.Employee"/>
             </field>
+            <field name="meetingRooms" persistence-modifier="persistent">
+                <collection element-type="org.apache.jdo.tck.pc.company.MeetingRoom"/>
+                <join/>
+            </field>
         </class>
 
         <class name="Employee"

Modified: db/jdo/trunk/tck/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo (original)
+++ db/jdo/trunk/tck/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo Wed Oct 13 06:43:01 2010
@@ -27,6 +27,9 @@ has datastore identity.
 
         <class name="Address" embedded-only="true" requires-extent="false"/>
 
+        <class name="MeetingRoom" identity-type="datastore">
+        </class>
+
         <class name="Company" identity-type="datastore">
             <field name="address"
                    field-type="org.apache.jdo.tck.pc.company.Address"
@@ -45,6 +48,10 @@ has datastore identity.
             <field name="fundedEmps" persistence-modifier="persistent">
                 <collection element-type="org.apache.jdo.tck.pc.company.Employee"/>
             </field>
+            <field name="meetingRooms" persistence-modifier="persistent">
+                <collection element-type="org.apache.jdo.tck.pc.company.MeetingRoom"/>
+                <join/>
+            </field>
         </class>
 
         <class name="Employee" identity-type="datastore">

Modified: db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm (original)
+++ db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm Wed Oct 13 06:43:01 2010
@@ -47,6 +47,11 @@ has application identity.
             <field name="departments" mapped-by="company"/>
         </class>
 
+        <class name="MeetingRoom" table="meetingrooms">
+            <field name="roomid" column="ID"/>
+            <field name="name" column="NAME"/>
+        </class>
+
         <class name="Department" table="departments">
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR"/>
@@ -57,6 +62,11 @@ has application identity.
             <field name="employees" mapped-by="department"/>
             <field name="fundedEmps" mapped-by="fundingDept"/>
             <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
+            <field name="meetingRooms" table="department_rooms">
+                <join column="DEPTID"/>
+                <element column="ROOMID"/>
+                <order column="ROOM_ORDER"/>
+            </field>
         </class>
 
         <class name="PartTimeEmployee">

Modified: db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm (original)
+++ db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm Wed Oct 13 06:43:01 2010
@@ -47,6 +47,11 @@ Inheritance strategy: new-table for all 
             <field name="departments" mapped-by="company"/>
         </class>
 
+        <class name="MeetingRoom" table="meetingrooms">
+            <field name="roomid" column="ID"/>
+            <field name="name" column="NAME"/>
+        </class>
+
         <class name="Department" table="departments">
             <field name="deptid" column="ID"/>
             <field name="name" column="NAME"/>
@@ -54,6 +59,11 @@ Inheritance strategy: new-table for all 
             <field name="employees" mapped-by="department"/>
             <field name="fundedEmps" mapped-by="fundingDept"/>
             <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
+            <field name="meetingRooms" table="department_rooms">
+                <join column="DEPTID"/>
+                <element column="ROOMID"/>
+                <order column="ROOM_ORDER"/>
+            </field>
         </class>
 
         <class name="PartTimeEmployee" table="parttimeemployees">

Modified: db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm (original)
+++ db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm Wed Oct 13 06:43:01 2010
@@ -56,6 +56,11 @@ Inheritance strategy: 
             <field name="departments" mapped-by="company"/>
         </class>
 
+        <class name="MeetingRoom" table="meetingrooms">
+            <field name="roomid" column="ID"/>
+            <field name="name" column="NAME"/>
+        </class>
+
         <class name="Department" table="departments">
             <field name="deptid" column="ID"/>
             <field name="name" column="NAME"/>
@@ -63,6 +68,11 @@ Inheritance strategy: 
             <field name="employees" mapped-by="department"/>
             <field name="fundedEmps" mapped-by="fundingDept"/>
             <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
+            <field name="meetingRooms" table="department_rooms">
+                <join column="DEPTID"/>
+                <element column="ROOMID"/>
+                <order column="ROOM_ORDER"/>
+            </field>
         </class>
 
         <class name="PartTimeEmployee" table="parttimeemployees">

Modified: db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm (original)
+++ db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm Wed Oct 13 06:43:01 2010
@@ -49,6 +49,11 @@ MedicalInsurance and DentalInsurance hav
             <field name="departments" mapped-by="company"/>
         </class>
 
+        <class name="MeetingRoom" table="meetingrooms">
+            <field name="roomid" column="ID"/>
+            <field name="name" column="NAME"/>
+        </class>
+
         <class name="Department" table="departments">
             <field name="deptid" column="ID"/>
             <field name="name" column="NAME"/>
@@ -56,6 +61,11 @@ MedicalInsurance and DentalInsurance hav
             <field name="employees" mapped-by="department"/>
             <field name="fundedEmps" mapped-by="fundingDept"/>
             <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
+            <field name="meetingRooms" table="department_rooms">
+                <join column="DEPTID"/>
+                <element column="ROOMID"/>
+                <order column="ROOM_ORDER"/>
+            </field>
         </class>
 
         <class name="PartTimeEmployee" table="parttimeemployees">

Modified: db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm (original)
+++ db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm Wed Oct 13 06:43:01 2010
@@ -47,6 +47,11 @@ have inheritance strategy "superclass-ta
             <field name="departments" mapped-by="company"/>
         </class>
 
+        <class name="MeetingRoom" table="meetingrooms">
+            <field name="roomid" column="ID"/>
+            <field name="name" column="NAME"/>
+        </class>
+
         <class name="Department" table="departments">
             <field name="deptid" column="ID"/>
             <field name="name" column="NAME"/>
@@ -54,6 +59,11 @@ have inheritance strategy "superclass-ta
             <field name="employees" mapped-by="department"/>
             <field name="fundedEmps" mapped-by="fundingDept"/>
             <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
+            <field name="meetingRooms" table="department_rooms">
+                <join column="DEPTID"/>
+                <element column="ROOMID"/>
+                <order column="ROOM_ORDER"/>
+            </field>
         </class>
 
         <class name="PartTimeEmployee">

Modified: db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm (original)
+++ db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm Wed Oct 13 06:43:01 2010
@@ -60,6 +60,12 @@ has datastore identity.
             <field name="departments" mapped-by="company"/>
         </class>
 
+        <class name="MeetingRoom" table="meetingrooms">
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="roomid" column="ID"/>
+            <field name="name" column="NAME"/>
+        </class>
+
         <class name="Department" table="departments">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <inheritance strategy="new-table">
@@ -71,6 +77,11 @@ has datastore identity.
             <field name="employees" mapped-by="department"/>
             <field name="fundedEmps" mapped-by="fundingDept"/>
             <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
+            <field name="meetingRooms" table="department_rooms">
+                <join column="DEPTID"/>
+                <element column="ROOMID"/>
+                <order column="ROOM_ORDER"/>
+            </field>
         </class>
 
         <class name="PartTimeEmployee">

Modified: db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm (original)
+++ db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm Wed Oct 13 06:43:01 2010
@@ -48,6 +48,12 @@ Inheritance strategy: new-table for all 
             <field name="departments" mapped-by="company"/>
         </class>
 
+        <class name="MeetingRoom" table="meetingrooms">
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="roomid" column="ID"/>
+            <field name="name" column="NAME"/>
+        </class>
+
         <class name="Department" table="departments">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <field name="deptid" column="ID"/>
@@ -56,6 +62,11 @@ Inheritance strategy: new-table for all 
             <field name="employees" mapped-by="department"/>
             <field name="fundedEmps" mapped-by="fundingDept"/>
             <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
+            <field name="meetingRooms" table="department_rooms">
+                <join column="DEPTID"/>
+                <element column="ROOMID"/>
+                <order column="ROOM_ORDER"/>
+            </field>
         </class>
 
         <class name="PartTimeEmployee" table="parttimeemployees">

Modified: db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm (original)
+++ db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm Wed Oct 13 06:43:01 2010
@@ -57,6 +57,12 @@ Inheritance strategy: 
             <field name="departments" mapped-by="company"/>
         </class>
 
+        <class name="MeetingRoom" table="meetingrooms">
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="roomid" column="ID"/>
+            <field name="name" column="NAME"/>
+        </class>
+
         <class name="Department" table="departments">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <field name="deptid" column="ID"/>
@@ -65,6 +71,11 @@ Inheritance strategy: 
             <field name="employees" mapped-by="department"/>
             <field name="fundedEmps" mapped-by="fundingDept"/>
             <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
+            <field name="meetingRooms" table="department_rooms">
+                <join column="DEPTID"/>
+                <element column="ROOMID"/>
+                <order column="ROOM_ORDER"/>
+            </field>
         </class>
 
         <class name="PartTimeEmployee" table="parttimeemployees">

Modified: db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm (original)
+++ db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm Wed Oct 13 06:43:01 2010
@@ -50,6 +50,12 @@ MedicalInsurance and DentalInsurance hav
             <field name="departments" mapped-by="company"/>
         </class>
 
+        <class name="MeetingRoom" table="meetingrooms">
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="roomid" column="ID"/>
+            <field name="name" column="NAME"/>
+        </class>
+
         <class name="Department" table="departments">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <field name="deptid" column="ID"/>
@@ -58,6 +64,11 @@ MedicalInsurance and DentalInsurance hav
             <field name="employees" mapped-by="department"/>
             <field name="fundedEmps" mapped-by="fundingDept"/>
             <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
+            <field name="meetingRooms" table="department_rooms">
+                <join column="DEPTID"/>
+                <element column="ROOMID"/>
+                <order column="ROOM_ORDER"/>
+            </field>
         </class>
 
         <class name="PartTimeEmployee" table="parttimeemployees">

Modified: db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm (original)
+++ db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm Wed Oct 13 06:43:01 2010
@@ -48,6 +48,12 @@ have inheritance strategy "superclass-ta
             <field name="departments" mapped-by="company"/>
         </class>
 
+        <class name="MeetingRoom" table="meetingrooms">
+            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+            <field name="roomid" column="ID"/>
+            <field name="name" column="NAME"/>
+        </class>
+
         <class name="Department" table="departments">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <field name="deptid" column="ID"/>
@@ -56,6 +62,11 @@ have inheritance strategy "superclass-ta
             <field name="employees" mapped-by="department"/>
             <field name="fundedEmps" mapped-by="fundingDept"/>
             <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>
+            <field name="meetingRooms" table="department_rooms">
+                <join column="DEPTID"/>
+                <element column="ROOMID"/>
+                <order column="ROOM_ORDER"/>
+            </field>
         </class>
 
         <class name="PartTimeEmployee">

Modified: db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema.sql?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema.sql Wed Oct 13 06:43:01 2010
@@ -230,6 +230,8 @@ DROP TABLE persons;
 DROP TABLE projects;
 DROP TABLE departments;
 DROP TABLE companies;
+DROP TABLE meetingrooms;
+DROP TABLE department_rooms;
 
 CREATE TABLE companies (
     ID INTEGER NOT NULL,
@@ -255,6 +257,18 @@ CREATE TABLE departments (
     CONSTRAINT DEPTS_PK PRIMARY KEY (ID)
 );
 
+CREATE TABLE department_rooms (
+    DEPTID INTEGER NOT NULL,
+    ROOMID INTEGER NOT NULL,
+    ROOM_ORDER INTEGER NOT NULL
+);
+
+CREATE TABLE meetingrooms (
+    ID INTEGER NOT NULL,
+    NAME VARCHAR(32) NOT NULL,
+    CONSTRAINT ROOMS_PK PRIMARY KEY (ID)
+);
+
 CREATE TABLE persons (
     PERSONID INTEGER NOT NULL,
     FIRSTNAME VARCHAR(32) NOT NULL,

Modified: db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema1.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema1.sql?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema1.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema1.sql Wed Oct 13 06:43:01 2010
@@ -46,6 +46,8 @@ DROP TABLE persons;
 DROP TABLE projects;
 DROP TABLE departments;
 DROP TABLE companies;
+DROP TABLE meetingrooms;
+DROP TABLE department_rooms;
 
 CREATE TABLE companies (
     ID INTEGER NOT NULL,
@@ -68,6 +70,18 @@ CREATE TABLE departments (
     CONSTRAINT DEPTS_PK PRIMARY KEY (ID)
 );
 
+CREATE TABLE department_rooms (
+    DEPTID INTEGER NOT NULL,
+    ROOMID INTEGER NOT NULL,
+    ROOM_ORDER INTEGER NOT NULL
+);
+
+CREATE TABLE meetingrooms (
+    ID INTEGER NOT NULL,
+    NAME VARCHAR(32) NOT NULL,
+    CONSTRAINT ROOMS_PK PRIMARY KEY (ID)
+);
+
 CREATE TABLE persons (
     PERSONID INTEGER NOT NULL,
     FIRSTNAME VARCHAR(32) NOT NULL,

Modified: db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema2.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema2.sql?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema2.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema2.sql Wed Oct 13 06:43:01 2010
@@ -54,6 +54,8 @@ DROP TABLE persons;
 DROP TABLE projects;
 DROP TABLE departments;
 DROP TABLE companies;
+DROP TABLE meetingrooms;
+DROP TABLE department_rooms;
 
 CREATE TABLE companies (
     ID INTEGER NOT NULL,
@@ -76,6 +78,18 @@ CREATE TABLE departments (
     CONSTRAINT DEPTS_PK PRIMARY KEY (ID)
 );
 
+CREATE TABLE department_rooms (
+    DEPTID INTEGER NOT NULL,
+    ROOMID INTEGER NOT NULL,
+    ROOM_ORDER INTEGER NOT NULL
+);
+
+CREATE TABLE meetingrooms (
+    ID INTEGER NOT NULL,
+    NAME VARCHAR(32) NOT NULL,
+    CONSTRAINT ROOMS_PK PRIMARY KEY (ID)
+);
+
 CREATE TABLE persons (
     PERSONID INTEGER NOT NULL,
     FIRSTNAME VARCHAR(32) NOT NULL,

Modified: db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema3.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema3.sql?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema3.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema3.sql Wed Oct 13 06:43:01 2010
@@ -47,6 +47,8 @@ DROP TABLE persons;
 DROP TABLE projects;
 DROP TABLE departments;
 DROP TABLE companies;
+DROP TABLE meetingrooms;
+DROP TABLE department_rooms;
 
 CREATE TABLE companies (
     ID INTEGER NOT NULL,
@@ -69,6 +71,18 @@ CREATE TABLE departments (
     CONSTRAINT DEPTS_PK PRIMARY KEY (ID)
 );
 
+CREATE TABLE department_rooms (
+    DEPTID INTEGER NOT NULL,
+    ROOMID INTEGER NOT NULL,
+    ROOM_ORDER INTEGER NOT NULL
+);
+
+CREATE TABLE meetingrooms (
+    ID INTEGER NOT NULL,
+    NAME VARCHAR(32) NOT NULL,
+    CONSTRAINT ROOMS_PK PRIMARY KEY (ID)
+);
+
 CREATE TABLE persons (
     PERSONID INTEGER NOT NULL,
     FIRSTNAME VARCHAR(32) NOT NULL,

Modified: db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema4.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema4.sql?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema4.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema4.sql Wed Oct 13 06:43:01 2010
@@ -42,6 +42,8 @@ DROP TABLE persons;
 DROP TABLE projects;
 DROP TABLE departments;
 DROP TABLE companies;
+DROP TABLE meetingrooms;
+DROP TABLE department_rooms;
 
 CREATE TABLE companies (
     ID INTEGER NOT NULL,
@@ -64,6 +66,18 @@ CREATE TABLE departments (
     CONSTRAINT DEPTS_PK PRIMARY KEY (ID)
 );
 
+CREATE TABLE department_rooms (
+    DEPTID INTEGER NOT NULL,
+    ROOMID INTEGER NOT NULL,
+    ROOM_ORDER INTEGER NOT NULL
+);
+
+CREATE TABLE meetingrooms (
+    ID INTEGER NOT NULL,
+    NAME VARCHAR(32) NOT NULL,
+    CONSTRAINT ROOMS_PK PRIMARY KEY (ID)
+);
+
 CREATE TABLE persons (
     PERSONID INTEGER NOT NULL,
     FIRSTNAME VARCHAR(32) NOT NULL,

Modified: db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema.sql?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema.sql Wed Oct 13 06:43:01 2010
@@ -156,6 +156,8 @@ DROP TABLE persons;
 DROP TABLE projects;
 DROP TABLE departments;
 DROP TABLE companies;
+DROP TABLE meetingrooms;
+DROP TABLE department_rooms;
 
 CREATE TABLE companies (
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
@@ -183,6 +185,19 @@ CREATE TABLE departments (
     CONSTRAINT DEPTS_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
+CREATE TABLE department_rooms (
+    DEPTID INTEGER NOT NULL,
+    ROOMID INTEGER NOT NULL,
+    ROOM_ORDER INTEGER NOT NULL
+);
+
+CREATE TABLE meetingrooms (
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    ID INTEGER NOT NULL,
+    NAME VARCHAR(32) NOT NULL,
+    CONSTRAINT ROOMS_PK PRIMARY KEY (DATASTORE_IDENTITY)
+);
+
 CREATE TABLE persons (
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     PERSONID INTEGER NOT NULL,

Modified: db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema1.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema1.sql?rev=1022008&r1=1022007&r2=1022008&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema1.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema1.sql Wed Oct 13 06:43:01 2010
@@ -46,6 +46,8 @@ DROP TABLE persons;
 DROP TABLE projects;
 DROP TABLE departments;
 DROP TABLE companies;
+DROP TABLE meetingrooms;
+DROP TABLE department_rooms;
 
 CREATE TABLE companies (
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
@@ -72,6 +74,19 @@ CREATE TABLE departments (
         REFERENCES companies (DATASTORE_IDENTITY)
 );
 
+CREATE TABLE department_rooms (
+    DEPTID INTEGER NOT NULL,
+    ROOMID INTEGER NOT NULL,
+    ROOM_ORDER INTEGER NOT NULL
+);
+
+CREATE TABLE meetingrooms (
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    ID INTEGER NOT NULL,
+    NAME VARCHAR(32) NOT NULL,
+    CONSTRAINT ROOMS_PK PRIMARY KEY (DATASTORE_IDENTITY)
+);
+
 CREATE TABLE persons (
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     PERSONID INTEGER NOT NULL,



Mime
View raw message