Index: tck/src/java/org/apache/jdo/tck/pc/company/Person.java
===================================================================
--- tck/src/java/org/apache/jdo/tck/pc/company/Person.java	(revision 1811281)
+++ tck/src/java/org/apache/jdo/tck/pc/company/Person.java	(working copy)
@@ -49,7 +49,7 @@
     private Map phoneNumbers = new HashMap();
     
     protected static SimpleDateFormat formatter =
-        new SimpleDateFormat("d/MMM/yyyy");
+        new SimpleDateFormat("d/MMM/yyyy HH:MM:SS");
 
     /** This is the JDO-required no-args constructor. */
     protected Person() {}
Index: tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceNew.java
===================================================================
--- tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceNew.java	(nonexistent)
+++ tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceNew.java	(working copy)
@@ -0,0 +1,36 @@
+/*
+ * 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.companyAnnotatedFC;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.IdGeneratorStrategy;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@javax.jdo.annotations.PersistenceCapable(detachable="true", identityType=IdentityType.DATASTORE)
+@javax.jdo.annotations.DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="DATASTORE_IDENTITY")
+@javax.jdo.annotations.Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME, column="DISCRIMINATOR", indexed="true")
+@javax.jdo.annotations.Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
+
+public @interface DatastoreIdDiscriminatorClassNameInheritanceNew { }
+

Property changes on: tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceNew.java
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Index: tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceSuperclass.java
===================================================================
--- tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceSuperclass.java	(nonexistent)
+++ tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceSuperclass.java	(working copy)
@@ -0,0 +1,36 @@
+/*
+ * 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.companyAnnotatedFC;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.IdGeneratorStrategy;
+
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@javax.jdo.annotations.PersistenceCapable(detachable="true", identityType=IdentityType.DATASTORE)
+@javax.jdo.annotations.DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="DATASTORE_IDENTITY")
+@javax.jdo.annotations.Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME, column="DISCRIMINATOR", indexed="true")
+@javax.jdo.annotations.Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
+
+public @interface DatastoreIdDiscriminatorClassNameInheritanceSuperclass { }
+

Property changes on: tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceSuperclass.java
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Index: tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java
===================================================================
--- tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java	(revision 1811281)
+++ tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java	(working copy)
@@ -40,11 +40,7 @@
  * This class represents information about a company.
  */
 @PersistenceCapable(table="companies")
-@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
-@Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
-        column="DISCRIMINATOR")
-@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, 
-        column="DATASTORE_IDENTITY")
+@DatastoreIdDiscriminatorClassNameInheritanceNew
 public class FCDSCompany 
     implements ICompany, Serializable, Comparable, Comparator, DeepEquality {
 
Index: tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDepartment.java
===================================================================
--- tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDepartment.java	(revision 1811281)
+++ tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDepartment.java	(working copy)
@@ -39,11 +39,7 @@
  * This class represents a department within a company.
  */
 @PersistenceCapable(table="departments")
-@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
-@Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
-        column="DISCRIMINATOR")
-@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, 
-        column="DATASTORE_IDENTITY")
+@DatastoreIdDiscriminatorClassNameInheritanceNew
 public class FCDSDepartment
     implements IDepartment, Serializable, Comparable, Comparator, DeepEquality {
 
Index: tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java
===================================================================
--- tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java	(revision 1811281)
+++ tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java	(working copy)
@@ -35,9 +35,8 @@
 /**
  * This class represents an employee.
  */
-@PersistenceCapable
-@Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
-@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="DATASTORE_IDENTITY")
+@DatastoreIdDiscriminatorClassNameInheritanceSuperclass
+@PersistenceCapable(table="persons")
 public abstract class FCDSEmployee extends FCDSPerson implements IEmployee {
 
     @Column(name="HIREDATE")
Index: tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSFullTimeEmployee.java
===================================================================
--- tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSFullTimeEmployee.java	(revision 1811281)
+++ tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSFullTimeEmployee.java	(working copy)
@@ -27,9 +27,8 @@
 /**
  * This class represents a full-time employee.
  */
-@PersistenceCapable
-@Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
-@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="DATASTORE_IDENTITY")
+@DatastoreIdDiscriminatorClassNameInheritanceSuperclass
+@PersistenceCapable(table="persons")
 public class FCDSFullTimeEmployee extends FCDSEmployee
         implements IFullTimeEmployee {
 
Index: tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSInsurance.java
===================================================================
--- tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSInsurance.java	(revision 1811281)
+++ tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSInsurance.java	(working copy)
@@ -32,14 +32,10 @@
  * This class represents an insurance carrier selection for a particular
  * <code>FCDSEmployee</code>.
  */
+@DatastoreIdDiscriminatorClassNameInheritanceNew
 @PersistenceCapable(table="insuranceplans")
-@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
-@Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
-        column="DISCRIMINATOR", indexed="true")
 @Index(name="INS_DISCRIMINATOR_INDEX", unique="false",
         columns=@Column(name="DISCRIMINATOR"))
-@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, 
-        column="DATASTORE_IDENTITY")
 public class FCDSInsurance 
     implements IInsurance, Serializable, Comparable, Comparator, DeepEquality  {
 
Index: tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMeetingRoom.java
===================================================================
--- tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMeetingRoom.java	(revision 1811281)
+++ tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMeetingRoom.java	(working copy)
@@ -30,11 +30,7 @@
  * This class represents a meeting room.
  */
 @PersistenceCapable(table="meetingrooms")
-@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
-@Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
-        column="DISCRIMINATOR")
-@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, 
-        column="DATASTORE_IDENTITY")
+@DatastoreIdDiscriminatorClassNameInheritanceNew
 public class FCDSMeetingRoom 
     implements IMeetingRoom, Serializable, Comparable, Comparator, DeepEquality {
 
Index: tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPartTimeEmployee.java
===================================================================
--- tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPartTimeEmployee.java	(revision 1811281)
+++ tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPartTimeEmployee.java	(working copy)
@@ -27,9 +27,8 @@
 /**
  * This class represents a part-time employee.
  */
-@PersistenceCapable
-@Inheritance(strategy=InheritanceStrategy.SUPERCLASS_TABLE)
-@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="DATASTORE_IDENTITY")
+@DatastoreIdDiscriminatorClassNameInheritanceSuperclass
+@PersistenceCapable(table="persons")
 public class FCDSPartTimeEmployee extends FCDSEmployee implements IPartTimeEmployee {
 
     @Column(name="WAGE")
Index: tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java
===================================================================
--- tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java	(revision 1811281)
+++ tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java	(working copy)
@@ -39,11 +39,7 @@
  * This class represents a person.
  */
 @PersistenceCapable(table="persons")
-@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
-@Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
-        column="DISCRIMINATOR", indexed="true")
-@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, 
-        column="DATASTORE_IDENTITY")
+@DatastoreIdDiscriminatorClassNameInheritanceNew
 public class FCDSPerson 
     implements IPerson, Serializable, Comparable, Comparator, DeepEquality  {
 
Index: tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.java
===================================================================
--- tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.java	(revision 1811281)
+++ tck/src/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.java	(working copy)
@@ -38,10 +38,7 @@
  * employees working on it.
  */
 @PersistenceCapable(table="projects")
-@Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
-@Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
-        column="DISCRIMINATOR")
-@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="DATASTORE_IDENTITY")
+@DatastoreIdDiscriminatorClassNameInheritanceNew
 public class FCDSProject 
     implements IProject, Serializable, Comparable, Comparator, DeepEquality  {