Index: tck/src/sql/derby/datastoreidentity/schema1.sql =================================================================== --- tck/src/sql/derby/datastoreidentity/schema1.sql (revision 1484152) +++ tck/src/sql/derby/datastoreidentity/schema1.sql (working copy) @@ -53,7 +53,7 @@ DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY, ID INTEGER, NAME VARCHAR(32) NOT NULL, - FOUNDEDDATE TIMESTAMP NOT NULL, + FOUNDEDDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), @@ -93,7 +93,7 @@ FIRSTNAME VARCHAR(32) NOT NULL, LASTNAME VARCHAR(32) NOT NULL, MIDDLENAME VARCHAR(32), - BIRTHDATE TIMESTAMP NOT NULL, + BIRTHDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), @@ -106,7 +106,7 @@ CREATE TABLE employees ( DATASTORE_IDENTITY INTEGER NOT NULL, - HIREDATE TIMESTAMP, + HIREDATE DATE, WEEKLYHOURS DOUBLE, DEPARTMENT INTEGER, FUNDINGDEPT INTEGER, Index: tck/src/sql/derby/datastoreidentity/schema10.sql =================================================================== --- tck/src/sql/derby/datastoreidentity/schema10.sql (revision 1484152) +++ tck/src/sql/derby/datastoreidentity/schema10.sql (working copy) @@ -39,7 +39,7 @@ DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY, ID INTEGER NOT NULL, NAME VARCHAR(32) NOT NULL, - FOUNDEDDATE TIMESTAMP NOT NULL, + FOUNDEDDATE DATE NOT NULL, CONSTRAINT COMPS_PK PRIMARY KEY (DATASTORE_IDENTITY) ); @@ -60,10 +60,10 @@ FIRSTNAME VARCHAR(32) NOT NULL, LASTNAME VARCHAR(32) NOT NULL, MIDDLENAME VARCHAR(32), - BIRTHDATE TIMESTAMP NOT NULL, + BIRTHDATE DATE NOT NULL, DISCRIMINATOR varchar(64) NOT NULL, ORDER_COL INTEGER NOT NULL, - HIREDATE TIMESTAMP, + HIREDATE DATE, WEEKLYHOURS REAL, DEPARTMENT INTEGER, FUNDINGDEPT INTEGER, Index: tck/src/sql/derby/datastoreidentity/schema11.sql =================================================================== --- tck/src/sql/derby/datastoreidentity/schema11.sql (revision 1484152) +++ tck/src/sql/derby/datastoreidentity/schema11.sql (working copy) @@ -49,7 +49,7 @@ DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY, ID INTEGER, NAME VARCHAR(32) NOT NULL, - FOUNDEDDATE TIMESTAMP NOT NULL, + FOUNDEDDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), @@ -91,14 +91,14 @@ FIRSTNAME VARCHAR(32) NOT NULL, LASTNAME VARCHAR(32) NOT NULL, MIDDLENAME VARCHAR(32), - BIRTHDATE TIMESTAMP NOT NULL, + BIRTHDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), STATE CHAR(2), ZIPCODE CHAR(5), COUNTRY VARCHAR(64), - HIREDATE TIMESTAMP, + HIREDATE DATE, WEEKLYHOURS REAL, DEPARTMENT INTEGER, FUNDINGDEPT INTEGER, Index: tck/src/sql/derby/datastoreidentity/schema2.sql =================================================================== --- tck/src/sql/derby/datastoreidentity/schema2.sql (revision 1484152) +++ tck/src/sql/derby/datastoreidentity/schema2.sql (working copy) @@ -61,7 +61,7 @@ DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY, ID INTEGER, NAME VARCHAR(32) NOT NULL, - FOUNDEDDATE TIMESTAMP NOT NULL, + FOUNDEDDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), @@ -101,7 +101,7 @@ FIRSTNAME VARCHAR(32) NOT NULL, LASTNAME VARCHAR(32) NOT NULL, MIDDLENAME VARCHAR(32), - BIRTHDATE TIMESTAMP NOT NULL, + BIRTHDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), @@ -118,14 +118,14 @@ FIRSTNAME VARCHAR(32) NOT NULL, LASTNAME VARCHAR(32) NOT NULL, MIDDLENAME VARCHAR(32), - BIRTHDATE TIMESTAMP NOT NULL, + BIRTHDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), STATE CHAR(2), ZIPCODE CHAR(5), COUNTRY VARCHAR(64), - HIREDATE TIMESTAMP, + HIREDATE DATE, WEEKLYHOURS DOUBLE, DEPARTMENT INTEGER, FUNDINGDEPT INTEGER, @@ -153,14 +153,14 @@ FIRSTNAME VARCHAR(32) NOT NULL, LASTNAME VARCHAR(32) NOT NULL, MIDDLENAME VARCHAR(32), - BIRTHDATE TIMESTAMP NOT NULL, + BIRTHDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), STATE CHAR(2), ZIPCODE CHAR(5), COUNTRY VARCHAR(64), - HIREDATE TIMESTAMP, + HIREDATE DATE, WEEKLYHOURS DOUBLE, DEPARTMENT INTEGER, FUNDINGDEPT INTEGER, Index: tck/src/sql/derby/datastoreidentity/schema3.sql =================================================================== --- tck/src/sql/derby/datastoreidentity/schema3.sql (revision 1484152) +++ tck/src/sql/derby/datastoreidentity/schema3.sql (working copy) @@ -54,7 +54,7 @@ DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY, ID INTEGER, NAME VARCHAR(32) NOT NULL, - FOUNDEDDATE TIMESTAMP NOT NULL, + FOUNDEDDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), @@ -94,7 +94,7 @@ FIRSTNAME VARCHAR(32) NOT NULL, LASTNAME VARCHAR(32) NOT NULL, MIDDLENAME VARCHAR(32), - BIRTHDATE TIMESTAMP NOT NULL, + BIRTHDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), @@ -107,7 +107,7 @@ CREATE TABLE parttimeemployees ( DATASTORE_IDENTITY INTEGER NOT NULL, - HIREDATE TIMESTAMP, + HIREDATE DATE, WEEKLYHOURS DOUBLE, DEPARTMENT INTEGER, FUNDINGDEPT INTEGER, @@ -132,7 +132,7 @@ CREATE TABLE fulltimeemployees ( DATASTORE_IDENTITY INTEGER NOT NULL, - HIREDATE TIMESTAMP, + HIREDATE DATE, WEEKLYHOURS DOUBLE, DEPARTMENT INTEGER REFERENCES departments, FUNDINGDEPT INTEGER REFERENCES departments, Index: tck/src/sql/derby/datastoreidentity/schema4.sql =================================================================== --- tck/src/sql/derby/datastoreidentity/schema4.sql (revision 1484152) +++ tck/src/sql/derby/datastoreidentity/schema4.sql (working copy) @@ -49,7 +49,7 @@ DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY, ID INTEGER, NAME VARCHAR(32) NOT NULL, - FOUNDEDDATE TIMESTAMP NOT NULL, + FOUNDEDDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), @@ -89,7 +89,7 @@ FIRSTNAME VARCHAR(32) NOT NULL, LASTNAME VARCHAR(32) NOT NULL, MIDDLENAME VARCHAR(32), - BIRTHDATE TIMESTAMP NOT NULL, + BIRTHDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), @@ -102,7 +102,7 @@ CREATE TABLE employees ( DATASTORE_IDENTITY INTEGER NOT NULL, - HIREDATE TIMESTAMP, + HIREDATE DATE, WEEKLYHOURS DOUBLE, DEPARTMENT INTEGER, FUNDINGDEPT INTEGER, Index: tck/src/sql/derby/datastoreidentity/schema9.sql =================================================================== --- tck/src/sql/derby/datastoreidentity/schema9.sql (revision 1484152) +++ tck/src/sql/derby/datastoreidentity/schema9.sql (working copy) @@ -39,7 +39,7 @@ DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY, ID INTEGER NOT NULL, NAME VARCHAR(32) NOT NULL, - FOUNDEDDATE TIMESTAMP NOT NULL, + FOUNDEDDATE DATE NOT NULL, CONSTRAINT COMPS_PK PRIMARY KEY (DATASTORE_IDENTITY) ); @@ -60,10 +60,10 @@ FIRSTNAME VARCHAR(32) NOT NULL, LASTNAME VARCHAR(32) NOT NULL, MIDDLENAME VARCHAR(32), - BIRTHDATE TIMESTAMP NOT NULL, + BIRTHDATE DATE NOT NULL, DISCRIMINATOR varchar(64) NOT NULL, ROLE VARCHAR(32), - HIREDATE TIMESTAMP, + HIREDATE DATE, WEEKLYHOURS REAL, DEPARTMENT INTEGER, FUNDINGDEPT INTEGER, Index: tck/src/sql/derby/datastoreidentity/schema.sql =================================================================== --- tck/src/sql/derby/datastoreidentity/schema.sql (revision 1484152) +++ tck/src/sql/derby/datastoreidentity/schema.sql (working copy) @@ -179,7 +179,7 @@ DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY, ID INTEGER, NAME VARCHAR(32) NOT NULL, - FOUNDEDDATE TIMESTAMP NOT NULL, + FOUNDEDDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), @@ -221,14 +221,14 @@ FIRSTNAME VARCHAR(32) NOT NULL, LASTNAME VARCHAR(32) NOT NULL, MIDDLENAME VARCHAR(32), - BIRTHDATE TIMESTAMP NOT NULL, + BIRTHDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), STATE CHAR(2), ZIPCODE CHAR(5), COUNTRY VARCHAR(64), - HIREDATE TIMESTAMP, + HIREDATE DATE, WEEKLYHOURS REAL, DEPARTMENT INTEGER, FUNDINGDEPT INTEGER, Index: tck/src/sql/derby/applicationidentity/schema1.sql =================================================================== --- tck/src/sql/derby/applicationidentity/schema1.sql (revision 1484152) +++ tck/src/sql/derby/applicationidentity/schema1.sql (working copy) @@ -52,7 +52,7 @@ CREATE TABLE companies ( ID INTEGER NOT NULL, NAME VARCHAR(32) NOT NULL, - FOUNDEDDATE TIMESTAMP NOT NULL, + FOUNDEDDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), @@ -87,7 +87,7 @@ FIRSTNAME VARCHAR(32) NOT NULL, LASTNAME VARCHAR(32) NOT NULL, MIDDLENAME VARCHAR(32), - BIRTHDATE TIMESTAMP NOT NULL, + BIRTHDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), @@ -99,7 +99,7 @@ CREATE TABLE employees ( PERSONID INTEGER NOT NULL, - HIREDATE TIMESTAMP, + HIREDATE DATE, WEEKLYHOURS DOUBLE, DEPARTMENT INTEGER REFERENCES departments, FUNDINGDEPT INTEGER REFERENCES departments, Index: tck/src/sql/derby/applicationidentity/schema10.sql =================================================================== --- tck/src/sql/derby/applicationidentity/schema10.sql (revision 1484152) +++ tck/src/sql/derby/applicationidentity/schema10.sql (working copy) @@ -38,7 +38,7 @@ CREATE TABLE companies ( ID INTEGER NOT NULL, NAME VARCHAR(32) NOT NULL, - FOUNDEDDATE TIMESTAMP NOT NULL, + FOUNDEDDATE DATE NOT NULL, CONSTRAINT COMPS_PK PRIMARY KEY (ID) ); @@ -57,10 +57,10 @@ FIRSTNAME VARCHAR(32) NOT NULL, LASTNAME VARCHAR(32) NOT NULL, MIDDLENAME VARCHAR(32), - BIRTHDATE TIMESTAMP NOT NULL, + BIRTHDATE DATE NOT NULL, DISCRIMINATOR varchar(64) NOT NULL, ORDER_COL INTEGER NOT NULL, - HIREDATE TIMESTAMP, + HIREDATE DATE, WEEKLYHOURS REAL, DEPARTMENT INTEGER, FUNDINGDEPT INTEGER, Index: tck/src/sql/derby/applicationidentity/schema11.sql =================================================================== --- tck/src/sql/derby/applicationidentity/schema11.sql (revision 1484152) +++ tck/src/sql/derby/applicationidentity/schema11.sql (working copy) @@ -48,7 +48,7 @@ CREATE TABLE companies ( ID INTEGER NOT NULL, NAME VARCHAR(32) NOT NULL, - FOUNDEDDATE TIMESTAMP NOT NULL, + FOUNDEDDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), @@ -87,14 +87,14 @@ FIRSTNAME VARCHAR(32) NOT NULL, LASTNAME VARCHAR(32) NOT NULL, MIDDLENAME VARCHAR(32), - BIRTHDATE TIMESTAMP NOT NULL, + BIRTHDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), STATE CHAR(2), ZIPCODE CHAR(5), COUNTRY VARCHAR(64), - HIREDATE TIMESTAMP, + HIREDATE DATE, WEEKLYHOURS REAL, DEPARTMENT INTEGER, FUNDINGDEPT INTEGER, Index: tck/src/sql/derby/applicationidentity/schema2.sql =================================================================== --- tck/src/sql/derby/applicationidentity/schema2.sql (revision 1484152) +++ tck/src/sql/derby/applicationidentity/schema2.sql (working copy) @@ -60,7 +60,7 @@ CREATE TABLE companies ( ID INTEGER NOT NULL, NAME VARCHAR(32) NOT NULL, - FOUNDEDDATE TIMESTAMP NOT NULL, + FOUNDEDDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), @@ -95,7 +95,7 @@ FIRSTNAME VARCHAR(32) NOT NULL, LASTNAME VARCHAR(32) NOT NULL, MIDDLENAME VARCHAR(32), - BIRTHDATE TIMESTAMP NOT NULL, + BIRTHDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), @@ -110,14 +110,14 @@ FIRSTNAME VARCHAR(32) NOT NULL, LASTNAME VARCHAR(32) NOT NULL, MIDDLENAME VARCHAR(32), - BIRTHDATE TIMESTAMP NOT NULL, + BIRTHDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), STATE CHAR(2), ZIPCODE CHAR(5), COUNTRY VARCHAR(64), - HIREDATE TIMESTAMP, + HIREDATE DATE, WEEKLYHOURS DOUBLE, DEPARTMENT INTEGER REFERENCES departments, FUNDINGDEPT INTEGER REFERENCES departments, @@ -133,14 +133,14 @@ FIRSTNAME VARCHAR(32) NOT NULL, LASTNAME VARCHAR(32) NOT NULL, MIDDLENAME VARCHAR(32), - BIRTHDATE TIMESTAMP NOT NULL, + BIRTHDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), STATE CHAR(2), ZIPCODE CHAR(5), COUNTRY VARCHAR(64), - HIREDATE TIMESTAMP, + HIREDATE DATE, WEEKLYHOURS DOUBLE, DEPARTMENT INTEGER REFERENCES departments, FUNDINGDEPT INTEGER REFERENCES departments, Index: tck/src/sql/derby/applicationidentity/schema3.sql =================================================================== --- tck/src/sql/derby/applicationidentity/schema3.sql (revision 1484152) +++ tck/src/sql/derby/applicationidentity/schema3.sql (working copy) @@ -53,7 +53,7 @@ CREATE TABLE companies ( ID INTEGER NOT NULL, NAME VARCHAR(32) NOT NULL, - FOUNDEDDATE TIMESTAMP NOT NULL, + FOUNDEDDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), @@ -88,7 +88,7 @@ FIRSTNAME VARCHAR(32) NOT NULL, LASTNAME VARCHAR(32) NOT NULL, MIDDLENAME VARCHAR(32), - BIRTHDATE TIMESTAMP NOT NULL, + BIRTHDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), @@ -100,7 +100,7 @@ CREATE TABLE parttimeemployees ( PERSONID INTEGER NOT NULL, - HIREDATE TIMESTAMP, + HIREDATE DATE, WEEKLYHOURS DOUBLE, DEPARTMENT INTEGER REFERENCES departments, FUNDINGDEPT INTEGER REFERENCES departments, @@ -114,7 +114,7 @@ CREATE TABLE fulltimeemployees ( PERSONID INTEGER NOT NULL, - HIREDATE TIMESTAMP, + HIREDATE DATE, WEEKLYHOURS DOUBLE, DEPARTMENT INTEGER REFERENCES departments, FUNDINGDEPT INTEGER REFERENCES departments, Index: tck/src/sql/derby/applicationidentity/schema4.sql =================================================================== --- tck/src/sql/derby/applicationidentity/schema4.sql (revision 1484152) +++ tck/src/sql/derby/applicationidentity/schema4.sql (working copy) @@ -48,7 +48,7 @@ CREATE TABLE companies ( ID INTEGER NOT NULL, NAME VARCHAR(32) NOT NULL, - FOUNDEDDATE TIMESTAMP NOT NULL, + FOUNDEDDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), @@ -83,7 +83,7 @@ FIRSTNAME VARCHAR(32) NOT NULL, LASTNAME VARCHAR(32) NOT NULL, MIDDLENAME VARCHAR(32), - BIRTHDATE TIMESTAMP NOT NULL, + BIRTHDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), @@ -95,7 +95,7 @@ CREATE TABLE employees ( PERSONID INTEGER NOT NULL, - HIREDATE TIMESTAMP, + HIREDATE DATE, WEEKLYHOURS DOUBLE, DEPARTMENT INTEGER REFERENCES departments, FUNDINGDEPT INTEGER REFERENCES departments, Index: tck/src/sql/derby/applicationidentity/schema9.sql =================================================================== --- tck/src/sql/derby/applicationidentity/schema9.sql (revision 1484152) +++ tck/src/sql/derby/applicationidentity/schema9.sql (working copy) @@ -38,7 +38,7 @@ CREATE TABLE companies ( ID INTEGER NOT NULL, NAME VARCHAR(32) NOT NULL, - FOUNDEDDATE TIMESTAMP NOT NULL, + FOUNDEDDATE DATE NOT NULL, CONSTRAINT COMPS_PK PRIMARY KEY (ID) ); @@ -57,10 +57,10 @@ FIRSTNAME VARCHAR(32) NOT NULL, LASTNAME VARCHAR(32) NOT NULL, MIDDLENAME VARCHAR(32), - BIRTHDATE TIMESTAMP NOT NULL, + BIRTHDATE DATE Not NULL, DISCRIMINATOR varchar(64) NOT NULL, ROLE VARCHAR(32), - HIREDATE TIMESTAMP, + HIREDATE DATE, WEEKLYHOURS REAL, DEPARTMENT INTEGER, FUNDINGDEPT INTEGER, Index: tck/src/sql/derby/applicationidentity/schema.sql =================================================================== --- tck/src/sql/derby/applicationidentity/schema.sql (revision 1484152) +++ tck/src/sql/derby/applicationidentity/schema.sql (working copy) @@ -250,7 +250,7 @@ CREATE TABLE companies ( ID INTEGER NOT NULL, NAME VARCHAR(32) NOT NULL, - FOUNDEDDATE TIMESTAMP NOT NULL, + FOUNDEDDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), @@ -289,14 +289,14 @@ FIRSTNAME VARCHAR(32) NOT NULL, LASTNAME VARCHAR(32) NOT NULL, MIDDLENAME VARCHAR(32), - BIRTHDATE TIMESTAMP NOT NULL, + BIRTHDATE DATE NOT NULL, ADDRID INTEGER, STREET VARCHAR(64), CITY VARCHAR(64), STATE CHAR(2), ZIPCODE CHAR(5), COUNTRY VARCHAR(64), - HIREDATE TIMESTAMP, + HIREDATE DATE, WEEKLYHOURS REAL, DEPARTMENT INTEGER, FUNDINGDEPT INTEGER, Index: tck/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyModelReader.java =================================================================== --- tck/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyModelReader.java (revision 1484152) +++ tck/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyModelReader.java (working copy) @@ -94,8 +94,7 @@ */ private void configureFactory() { SimpleDateFormat formatter = new SimpleDateFormat(DATE_PATTERN, Locale.US); - formatter.setTimeZone(TimeZone.getTimeZone("America/New_York")); - CustomDateEditor dateEditor = + CustomDateEditor dateEditor = new CustomDateEditor(formatter, true); registerCustomEditor(Date.class, dateEditor); companyFactory = CompanyFactoryRegistry.getInstance(); @@ -191,7 +190,7 @@ } public static Date stringToUtilDate(String value) { - return ConversionHelper.toUtilDate(DATE_PATTERN, "America/New_York", Locale.US, value); + return ConversionHelper.toUtilDate(DATE_PATTERN, Locale.US, value); } } Index: tck/src/java/org/apache/jdo/tck/pc/company/Person.java =================================================================== --- tck/src/java/org/apache/jdo/tck/pc/company/Person.java (revision 1484152) +++ 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"); /** This is the JDO-required no-args constructor. */ protected Person() {} Index: tck/src/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java =================================================================== --- tck/src/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java (revision 1484152) +++ tck/src/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java (working copy) @@ -94,8 +94,7 @@ */ private void configureFactory() { SimpleDateFormat formatter = new SimpleDateFormat(DATE_PATTERN, Locale.US); - formatter.setTimeZone(TimeZone.getTimeZone("America/New_York")); - CustomDateEditor dateEditor = + CustomDateEditor dateEditor = new CustomDateEditor(formatter, true); registerCustomEditor(Date.class, dateEditor); companyFactory = CompanyFactoryRegistry.getInstance(); @@ -117,7 +116,7 @@ } public static Date stringToUtilDate(String value) { - return ConversionHelper.toUtilDate(DATE_PATTERN, "America/New_York", Locale.US, value); + return ConversionHelper.toUtilDate(DATE_PATTERN, Locale.US, value); } // Convenience methods Index: tck/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyModelReader.java =================================================================== --- tck/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyModelReader.java (revision 1484152) +++ tck/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyModelReader.java (working copy) @@ -94,8 +94,7 @@ */ private void configureFactory() { SimpleDateFormat formatter = new SimpleDateFormat(DATE_PATTERN, Locale.US); - formatter.setTimeZone(TimeZone.getTimeZone("America/New_York")); - CustomDateEditor dateEditor = + CustomDateEditor dateEditor = new CustomDateEditor(formatter, true); registerCustomEditor(Date.class, dateEditor); companyFactory = CompanyFactoryRegistry.getInstance(); @@ -191,7 +190,7 @@ } public static Date stringToUtilDate(String value) { - return ConversionHelper.toUtilDate(DATE_PATTERN, "America/New_York", Locale.US, value); + return ConversionHelper.toUtilDate(DATE_PATTERN, Locale.US, value); } } Index: tck/src/java/org/apache/jdo/tck/pc/order/OrderModelReader.java =================================================================== --- tck/src/java/org/apache/jdo/tck/pc/order/OrderModelReader.java (revision 1484152) +++ tck/src/java/org/apache/jdo/tck/pc/order/OrderModelReader.java (working copy) @@ -94,8 +94,7 @@ private void configureFactory() { SimpleDateFormat formatter = new SimpleDateFormat(DATE_PATTERN, Locale.US); - formatter.setTimeZone(TimeZone.getTimeZone("America/New_York")); - CustomDateEditor dateEditor = + CustomDateEditor dateEditor = new CustomDateEditor(formatter, true); registerCustomEditor(Date.class, dateEditor); orderFactory = OrderFactoryRegistry.getInstance(); @@ -143,8 +142,7 @@ } public static Date stringToUtilDate(String value) { - return ConversionHelper.toUtilDate(DATE_PATTERN, "America/New_York", - Locale.US, value); + return ConversionHelper.toUtilDate(DATE_PATTERN, Locale.US, value); } } Index: tck/src/java/org/apache/jdo/tck/pc/mylib/MylibReader.java =================================================================== --- tck/src/java/org/apache/jdo/tck/pc/mylib/MylibReader.java (revision 1484152) +++ tck/src/java/org/apache/jdo/tck/pc/mylib/MylibReader.java (working copy) @@ -90,8 +90,7 @@ */ private void configureFactory() { SimpleDateFormat formatter = new SimpleDateFormat(DATE_PATTERN, Locale.US); - formatter.setTimeZone(TimeZone.getTimeZone("America/New_York")); - CustomDateEditor dateEditor = + CustomDateEditor dateEditor = new CustomDateEditor(formatter, true); registerCustomEditor(Date.class, dateEditor); } Index: tck/src/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java =================================================================== --- tck/src/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java (revision 1484152) +++ tck/src/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java (working copy) @@ -117,8 +117,7 @@ private static final Date FIRST_OF_JAN_1999; static { // initialize static field FIRST_OF_JAN_1999 - Calendar cal = new GregorianCalendar( - TimeZone.getTimeZone("America/New_York")); + Calendar cal = new GregorianCalendar(); cal.set(1999, GregorianCalendar.JANUARY, 1, 0, 0, 0); cal.set(GregorianCalendar.MILLISECOND, 0); FIRST_OF_JAN_1999 = cal.getTime(); Index: tck/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java =================================================================== --- tck/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java (revision 1484152) +++ tck/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java (working copy) @@ -111,8 +111,7 @@ "this.weeklyhours> (SELECT AVG(e.weeklyhours) FROM " + Employee.class.getName() + " e)"; - Calendar cal = Calendar.getInstance( - TimeZone.getTimeZone("America/New_York"), Locale.US); + Calendar cal = Calendar.getInstance(Locale.US); cal.set(2002, Calendar.SEPTEMBER, 1, 0, 0, 0); Date hired = cal.getTime(); Index: tck/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java =================================================================== --- tck/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java (revision 1484152) +++ tck/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java (working copy) @@ -117,8 +117,7 @@ "(SELECT AVG(e.weeklyhours) FROM " + Employee.class.getName() + " e WHERE e.manager == this.manager)"; - Calendar cal = Calendar.getInstance( - TimeZone.getTimeZone("America/New_York"), Locale.US); + Calendar cal = Calendar.getInstance(Locale.US); cal.set(2002, Calendar.SEPTEMBER, 1, 0, 0, 0); Date hired = cal.getTime(); Index: tck/src/java/org/apache/jdo/tck/query/result/ProjectedSCODoesNotTrackChanges.java =================================================================== --- tck/src/java/org/apache/jdo/tck/query/result/ProjectedSCODoesNotTrackChanges.java (revision 1484152) +++ tck/src/java/org/apache/jdo/tck/query/result/ProjectedSCODoesNotTrackChanges.java (working copy) @@ -18,6 +18,7 @@ package org.apache.jdo.tck.query.result; +import java.util.Calendar; import java.util.Date; import javax.jdo.JDOHelper; @@ -49,8 +50,15 @@ private static final String ASSERTION_FAILED = "Assertion A14.6.9-3 (ProjectedSCODoesNotTrackChanges) failed: "; - private static final Date expectedDate = new Date(2007908); // pm - + private static final Date expectedDate; + + static { + Calendar cal = Calendar.getInstance(); + cal.set(1970, 0, 1, 0, 0, 0); + cal.set(Calendar.MILLISECOND, 0); + expectedDate = cal.getTime(); + } + /** * The main is called when the class * is directly executed from the command line. @@ -135,6 +143,7 @@ query.setUnique(true); Date retrievedDate = (Date) query.execute(); retrievedDate.setTime(123789L); + if (JDOHelper.isDirty((Object)comp)) { appendMessage("Expected Company instance not to be dirty; " + "actual state is " + getStateOfInstance((Object)comp)); @@ -144,6 +153,7 @@ // Check value of date pm.currentTransaction().begin(); Date actualDate = (Date) query.execute(); + logger.info("expectedDate " + expectedDate.getTime() + " actualDate " + actualDate.getTime()); if (!actualDate.equals(expectedDate)) { appendMessage("Expected projected field value is " + expectedDate + "; actual value is " + actualDate Index: tck/src/java/org/apache/jdo/tck/util/ConversionHelper.java =================================================================== --- tck/src/java/org/apache/jdo/tck/util/ConversionHelper.java (revision 1484152) +++ tck/src/java/org/apache/jdo/tck/util/ConversionHelper.java (working copy) @@ -56,6 +56,15 @@ } } + public static Date toUtilDate(String pattern, Locale locale, String value) { + SimpleDateFormat formatter = new SimpleDateFormat(pattern, locale); + try { + return formatter.parse(value); + } catch (ParseException e) { + throw new JDOFatalException("", e); + } + } + /** * Converts the given array into a {@link Map}. * The first dimension represents the map entries,