Hi Craig,
resend.
My original mail was rejected by jdo-dev, because the patch file was too
big. I stripped off the removal notice for file jdo-2_0-signatures.txt.
----------------------------------------------------
attached you find a patch fixing the signature test issue.
I found some differences between classes JDOHelper and Constants between
api2 and api2-legacy. I assume the version in api2 is the current one,
so I changed the api2-legacy version accordingly, because the diffs have
nothing to do with JDK 1.5 support.
Here are the changes:
- JDOHelper, JDOHelperConfigTest and Constants in api2-legacy:
Renamed PROPERTY_SERVER_TIMEZONE_ID to PROPERTY_SERVER_TIME_ZONE_ID
- JDOHelper in api2-legacy:
Changed modifier of method getPersistenceUnit from public to private
- jdo-2_0-signatures.txt, project.properties
Renamed jdo-2_0-signatures.txt to jdo-2_1-signatures.txt
Regards Michael
Hi Michael,
On Jul 31, 2007, at 6:01 AM, Michael Bouschen wrote:
Hi Craig,
I see the same results when running runtck.jdori in tck2:
Total tests run: 1393. Failures: 6, Errors: 2.
6 of 79 configurations failed.
I get one more failure in tck2-legacy:
Total tests run: 1377. Failures: 7, Errors: 2.
7 of 63 configurations failed.
The signature test fails because of changes in JDOHelper,
JDOHelperImpl and PersistenceManagerFactory. I think the
configuration file jdo-2_0-signatures.txt needs to be updated. Maybe
we should rename it to jdo-2_1-signatures.txt (in both projects tck2
and tck2-legacy). We can use issue JDO-341 for this work.
Good idea to rename the file to reflect that it's now 2.1.
Craig
Regards Michael
[...]
--
[EMAIL PROTECTED] Engineering GmbH Tel.: +49/(0)30/235 520-33
Buelowstr. 66 Fax.: +49/(0)30/217 520-12
10783 Berlin mailto:[EMAIL PROTECTED]
Geschaeftsfuehrung: Dr. Gerhard Mueller-Proefrock
Anna-Kristin Proefrock
Sitz Berlin, Amtsgericht Charlottenburg, HRB 564 52
Index: api2/src/java/javax/jdo/Constants.java
===================================================================
--- api2/src/java/javax/jdo/Constants.java (Revision 562255)
+++ api2/src/java/javax/jdo/Constants.java (Arbeitskopie)
@@ -703,7 +703,7 @@
*
* @since 2.1
*/
- static String PROPERTY_SERVER_TIME_ZONE_ID
+ static String PROPERTY_SERVER_TIME_ZONE_ID
= "javax.jdo.option.ServerTimeZoneID";
/**
Index: api2-legacy/test/java/javax/jdo/JDOHelperConfigTest.java
===================================================================
--- api2-legacy/test/java/javax/jdo/JDOHelperConfigTest.java (Revision
562255)
+++ api2-legacy/test/java/javax/jdo/JDOHelperConfigTest.java (Arbeitskopie)
@@ -216,7 +216,7 @@
PROPERTY_DETACH_ALL_ON_COMMIT,
PMF_ATTRIBUTE_DETACH_ALL_ON_COMMIT + "." + testVariant);
expected.put(
- PROPERTY_SERVER_TIMEZONE_ID,
+ PROPERTY_SERVER_TIME_ZONE_ID,
PMF_ATTRIBUTE_SERVER_TIME_ZONE_ID + "." + testVariant);
// listeners
Index: api2-legacy/src/java/javax/jdo/JDOHelper.java
===================================================================
--- api2-legacy/src/java/javax/jdo/JDOHelper.java (Revision 562255)
+++ api2-legacy/src/java/javax/jdo/JDOHelper.java (Arbeitskopie)
@@ -155,8 +155,8 @@
PMF_ATTRIBUTE_DETACH_ALL_ON_COMMIT,
PROPERTY_DETACH_ALL_ON_COMMIT);
xref.put(
- PMF_ATTRIBUTE_SERVER_TIME_ZONE_ID,
- PROPERTY_SERVER_TIMEZONE_ID);
+ PMF_ATTRIBUTE_SERVER_TIME_ZONE_ID,
+ PROPERTY_SERVER_TIME_ZONE_ID);
return Collections.unmodifiableMap(xref);
}
@@ -932,11 +932,10 @@
* with the given name, or any other is encountered.
* @since 2.1
*/
- public static PersistenceManagerFactory getPersistenceUnit(
+ private static PersistenceManagerFactory getPersistenceUnit(
String name,
ClassLoader resourceLoader,
- ClassLoader pmfLoader
- ) {
+ ClassLoader pmfLoader) {
Map properties = getPersistenceUnitProperties(
name, resourceLoader, JDOCONFIG_RESOURCE_NAME);
Index: api2-legacy/src/java/javax/jdo/Constants.java
===================================================================
--- api2-legacy/src/java/javax/jdo/Constants.java (Revision 562255)
+++ api2-legacy/src/java/javax/jdo/Constants.java (Arbeitskopie)
@@ -703,7 +703,7 @@
*
* @since 2.1
*/
- static String PROPERTY_SERVER_TIMEZONE_ID
+ static String PROPERTY_SERVER_TIME_ZONE_ID
= "javax.jdo.option.ServerTimeZoneID";
/**
Index: tck2/project.properties
===================================================================
--- tck2/project.properties (Revision 562255)
+++ tck2/project.properties (Arbeitskopie)
@@ -50,7 +50,7 @@
jdo.tck.log.directory = ${maven.build.dir}/logs
jdo.tck.log.directory.database = ${jdo.tck.log.directory}/database
jdo.tck.log.directory.enhancer = ${jdo.tck.log.directory}/enhancer
-jdo.tck.signaturefile = ${basedir}/src/conf/jdo-2_0-signatures.txt
+jdo.tck.signaturefile = ${basedir}/src/conf/jdo-2_1-signatures.txt
jdori.pmf.properties = jdori-pmf.properties
jdori.runtck.sysproperties = -Xmx512m
Index: tck2-legacy/project.properties
===================================================================
--- tck2-legacy/project.properties (Revision 562255)
+++ tck2-legacy/project.properties (Arbeitskopie)
@@ -47,7 +47,7 @@
jdo.tck.log.directory = ${maven.build.dir}/logs
jdo.tck.log.directory.database = ${jdo.tck.log.directory}/database
jdo.tck.log.directory.enhancer = ${jdo.tck.log.directory}/enhancer
-jdo.tck.signaturefile = ${basedir}/src/conf/jdo-2_0-signatures.txt
+jdo.tck.signaturefile = ${basedir}/src/conf/jdo-2_1-signatures.txt
jdori.pmf.properties = jdori-pmf.properties
jdori.runtck.sysproperties = -Xmx512m
Index: tck2-legacy/src/conf/jdo-2_1-signatures.txt
===================================================================
--- tck2-legacy/src/conf/jdo-2_1-signatures.txt (Revision 562255)
+++ tck2-legacy/src/conf/jdo-2_1-signatures.txt (Arbeitskopie)
@@ -1,3 +1,195 @@
+public interface javax.jdo.Constants {
+ static String SERVICE_LOOKUP_PMF_RESOURCE_NAME
+ = "META-INF/services/javax.jdo.PersistenceManagerFactory";
+ static String JDOCONFIG_RESOURCE_NAME
+ = "META-INF/jdoconfig.xml";
+ static String JDOCONFIG_XSD_NS
+ = "http://java.sun.com/xml/ns/jdo/jdoconfig";;
+ static String JDO_XSD_NS
+ = "http://java.sun.com/xml/ns/jdo/jdo";;
+ static String ORM_XSD_NS
+ = "http://java.sun.com/xml/ns/jdo/orm";;
+ static String JDOQUERY_XSD_NS
+ = "http://java.sun.com/xml/ns/jdo/jdoquery";;
+ static String ELEMENT_PERSISTENCE_MANAGER_FACTORY
+ = "persistence-manager-factory";
+ static String PMF_ATTRIBUTE_CLASS
+ = "class";
+ static String PMF_ATTRIBUTE_PERSISTENCE_UNIT_NAME
+ = "persistence-unit-name";
+ static String PMF_ATTRIBUTE_OPTIMISTIC
+ = "optimistic";
+ static String PMF_ATTRIBUTE_RETAIN_VALUES
+ = "retain-values";
+ static String PMF_ATTRIBUTE_RESTORE_VALUES
+ = "restore-values";
+ static String PMF_ATTRIBUTE_IGNORE_CACHE
+ = "ignore-cache";
+ static String PMF_ATTRIBUTE_NONTRANSACTIONAL_READ
+ = "nontransactional-read";
+ static String PMF_ATTRIBUTE_NONTRANSACTIONAL_WRITE
+ = "nontransactional-write";
+ static String PMF_ATTRIBUTE_MULTITHREADED
+ = "multithreaded";
+ static String PMF_ATTRIBUTE_CONNECTION_DRIVER_NAME
+ = "connection-driver-name";
+ static String PMF_ATTRIBUTE_CONNECTION_USER_NAME
+ = "connection-user-name";
+ static String PMF_ATTRIBUTE_CONNECTION_PASSWORD
+ = "connection-password";
+ static String PMF_ATTRIBUTE_CONNECTION_URL
+ = "connection-url";
+ static String PMF_ATTRIBUTE_CONNECTION_FACTORY_NAME
+ = "connection-factory-name";
+ static String PMF_ATTRIBUTE_CONNECTION_FACTORY2_NAME
+ = "connection-factory2-name";
+ static String PMF_ATTRIBUTE_DETACH_ALL_ON_COMMIT
+ = "detach-all-on-commit";
+ static String PMF_ATTRIBUTE_MAPPING
+ = "mapping";
+ static String PMF_ATTRIBUTE_SERVER_TIME_ZONE_ID
+ = "server-time-zone-id";
+ static String ELEMENT_PROPERTY
+ = "property";
+ static String PROPERTY_ATTRIBUTE_NAME
+ = "name";
+ static String PROPERTY_ATTRIBUTE_VALUE
+ = "value";
+ static String ELEMENT_INSTANCE_LIFECYCLE_LISTENER
+ = "instance-lifecycle-listener";
+ static String INSTANCE_LIFECYCLE_LISTENER_ATTRIBUTE_LISTENER
+ = "listener";
+ static String INSTANCE_LIFECYCLE_LISTENER_ATTRIBUTE_CLASSES
+ = "classes";
+ static String OPTION_TRANSACTIONAL_TRANSIENT
+ = "javax.jdo.option.TransientTransactional";
+ static String OPTION_NONTRANSACTIONAL_READ
+ = "javax.jdo.option.NontransactionalRead";
+ static String OPTION_NONTRANSACTIONAL_WRITE
+ = "javax.jdo.option.NontransactionalWrite";
+ static String OPTION_RETAIN_VALUES
+ = "javax.jdo.option.RetainValues";
+ static String OPTION_OPTIMISTIC
+ = "javax.jdo.option.Optimistic";
+ static String OPTION_APPLICATION_IDENTITY
+ = "javax.jdo.option.ApplicationIdentity";
+ static String OPTION_DATASTORE_IDENTITY
+ = "javax.jdo.option.DatastoreIdentity";
+ static String OPTION_NONDURABLE_IDENTITY
+ = "javax.jdo.option.NonDurableIdentity";
+ static String OPTION_ARRAYLIST
+ = "javax.jdo.option.ArrayList";
+ static String OPTION_LINKEDLIST
+ = "javax.jdo.option.LinkedList";
+ static String OPTION_TREEMAP
+ = "javax.jdo.option.TreeMap";
+ static String OPTION_TREESET
+ = "javax.jdo.option.TreeSet";
+ static String OPTION_VECTOR
+ = "javax.jdo.option.Vector";
+ static String OPTION_ARRAY
+ = "javax.jdo.option.Array";
+ static String OPTION_NULL_COLLECTION
+ = "javax.jdo.option.NullCollection";
+ static String OPTION_CHANGE_APPLICATION_IDENTITY
+ = "javax.jdo.option.ChangeApplicationIdentity";
+ static String OPTION_BINARY_COMPATIBILITY
+ = "javax.jdo.option.BinaryCompatibility";
+ static String OPTION_GET_DATASTORE_CONNECTION
+ = "javax.jdo.option.GetDataStoreConnection";
+ static String OPTION_GET_JDBC_CONNECTION
+ = "javax.jdo.option.GetJDBCConnection";
+ static String OPTION_QUERY_SQL
+ = "javax.jdo.query.SQL";
+ static String OPTION_UNCONSTRAINED_QUERY_VARIABLES
+ = "javax.jdo.option.UnconstrainedQueryVariables";
+ static String OPTION_VERSION_DATETIME
+ = "javax.jdo.option.version.DateTime";
+ static String OPTION_VERSION_STATE_IMAGE
+ = "javax.jdo.option.version.StateImage";
+ static String OPTION_PREDIRTY_EVENT
+ = "javax.jdo.option.PreDirtyEvent";
+ static String OPTION_MAPPING_HETEROGENEOUS_OBJECT_TYPE
+ = "javax.jdo.option.mapping.HeterogeneousObjectType";
+ static String OPTION_MAPPING_HETEROGENEOUS_INTERFACE_TYPE
+ = "javax.jdo.option.mapping.HeterogeneousInterfaceType";
+ static String OPTION_MAPPING_JOINED_TABLE_PER_CLASS
+ = "javax.jdo.option.mapping.JoinedTablePerClass";
+ static String OPTION_MAPPING_JOINED_TABLE_PER_CONCRETE_CLASS
+ = "javax.jdo.option.mapping.JoinedTablePerConcreteClass";
+ static String OPTION_MAPPING_NON_JOINED_TABLE_PER_CONCRETE_CLASS
+ = "javax.jdo.option.mapping.NonJoinedTablePerConcreteClass";
+ static String OPTION_MAPPING_RELATION_SUBCLASS_TABLE
+ = "javax.jdo.option.mapping.RelationSubclassTable";
+ static String PROPERTY_PERSISTENCE_MANAGER_FACTORY_CLASS
+ = "javax.jdo.PersistenceManagerFactoryClass";
+ static String PROPERTY_OPTIMISTIC
+ = "javax.jdo.option.Optimistic";
+ static String PROPERTY_RETAIN_VALUES
+ = "javax.jdo.option.RetainValues";
+ static String PROPERTY_RESTORE_VALUES
+ = "javax.jdo.option.RestoreValues";
+ static String PROPERTY_IGNORE_CACHE
+ = "javax.jdo.option.IgnoreCache";
+ static String PROPERTY_NONTRANSACTIONAL_READ
+ = "javax.jdo.option.NontransactionalRead";
+ static String PROPERTY_NONTRANSACTIONAL_WRITE
+ = "javax.jdo.option.NontransactionalWrite";
+ static String PROPERTY_MULTITHREADED
+ = "javax.jdo.option.Multithreaded";
+ static String PROPERTY_DETACH_ALL_ON_COMMIT
+ = "javax.jdo.option.DetachAllOnCommit";
+ static String PROPERTY_CONNECTION_DRIVER_NAME
+ = "javax.jdo.option.ConnectionDriverName";
+ static String PROPERTY_CONNECTION_USER_NAME
+ = "javax.jdo.option.ConnectionUserName";
+ static String PROPERTY_CONNECTION_PASSWORD
+ = "javax.jdo.option.ConnectionPassword";
+ static String PROPERTY_CONNECTION_URL
+ = "javax.jdo.option.ConnectionURL";
+ static String PROPERTY_CONNECTION_FACTORY_NAME
+ = "javax.jdo.option.ConnectionFactoryName";
+ static String PROPERTY_CONNECTION_FACTORY2_NAME
+ = "javax.jdo.option.ConnectionFactory2Name";
+ static String PROPERTY_MAPPING
+ = "javax.jdo.option.Mapping";
+ static String PROPERTY_PERSISTENCE_UNIT_NAME
+ = "javax.jdo.option.PersistenceUnitName";
+ static String PROPERTY_INSTANCE_LIFECYCLE_LISTENER
+ = "javax.jdo.option.InstanceLifecycleListener";
+ static String PROPERTY_PREFIX_INSTANCE_LIFECYCLE_LISTENER
+ = "javax.jdo.option.InstanceLifecycleListener.";
+ static String PROPERTY_MAPPING_CATALOG
+ = "javax.jdo.mapping.Catalog";
+ static String PROPERTY_MAPPING_SCHEMA
+ = "javax.jdo.mapping.Schema";
+ static String PROPERTY_SERVER_TIME_ZONE_ID
+ = "javax.jdo.option.ServerTimeZoneID";
+ static String NONCONFIGURABLE_PROPERTY_VENDOR_NAME
+ = "VendorName";
+ static String NONCONFIGURABLE_PROPERTY_VERSION_NUMBER
+ = "VersionNumber";
+ static String JTA
+ = "JTA";
+ static String RESOURCE_LOCAL
+ = "RESOURCE_LOCAL";
+ static String JDOCONFIG_DTD_RESOURCE
+ = "javax/jdo/jdoconfig_2_1.dtd";
+ static String JDOCONFIG_XSD_RESOURCE
+ = "javax/jdo/jdoconfig_2_1.xsd";
+ static String JDO_DTD_RESOURCE
+ = "javax/jdo/jdo_2_0.dtd";
+ static String JDO_XSD_RESOURCE
+ = "javax/jdo/jdo_2_1.xsd";
+ static String ORM_DTD_RESOURCE
+ = "javax/jdo/orm_2_0.dtd";
+ static String ORM_XSD_RESOURCE
+ = "javax/jdo/orm_2_1.xsd";
+ static String JDOQUERY_DTD_RESOURCE
+ = "javax/jdo/jdoquery_2_0.dtd";
+ static String JDOQUERY_XSD_RESOURCE
+ = "javax/jdo/jdoquery_2_1.xsd";
+}
public interface javax.jdo.datastore.DataStoreCache {
public void evict(Object oid);
@@ -239,7 +431,7 @@
public JDOFatalUserException(String msg, Throwable nested, Object failed);
}
-public class javax.jdo.JDOHelper {
+public class javax.jdo.JDOHelper implements javax.jdo.Constants {
public JDOHelper();
public static javax.jdo.JDOHelper getInstance();
public static javax.jdo.PersistenceManager getPersistenceManager(Object
pc);
@@ -255,11 +447,14 @@
public static boolean isNew(Object pc);
public static boolean isDeleted(Object pc);
public static boolean isDetached(Object pc);
+ public static javax.jdo.PersistenceManagerFactory
getPersistenceManagerFactory();
public static javax.jdo.PersistenceManagerFactory
getPersistenceManagerFactory(java.util.Map props);
public static javax.jdo.PersistenceManagerFactory
getPersistenceManagerFactory(java.util.Map props, ClassLoader cl);
public static javax.jdo.PersistenceManagerFactory
getPersistenceManagerFactory(String propsResource);
public static javax.jdo.PersistenceManagerFactory
getPersistenceManagerFactory(String propsResource, ClassLoader loader);
public static javax.jdo.PersistenceManagerFactory
getPersistenceManagerFactory(String propsResource, ClassLoader propsLoader,
ClassLoader pmfLoader);
+ public static javax.jdo.PersistenceManagerFactory
getPersistenceManagerFactory(ClassLoader pmfLoader);
+ public static javax.jdo.PersistenceManagerFactory
getPersistenceManagerFactory(ClassLoader propsLoader, ClassLoader pmfLoader);
public static javax.jdo.PersistenceManagerFactory
getPersistenceManagerFactory(java.io.File propsFile);
public static javax.jdo.PersistenceManagerFactory
getPersistenceManagerFactory(java.io.File propsFile, ClassLoader loader);
public static javax.jdo.PersistenceManagerFactory
getPersistenceManagerFactory(String jndiLocation, javax.naming.Context context);
@@ -487,8 +682,6 @@
}
public interface javax.jdo.PersistenceManagerFactory extends
java.io.Serializable {
- public static final java.lang.String JTA;
- public static final java.lang.String RESOURCE_LOCAL;
public void close();
public boolean isClosed();
public javax.jdo.PersistenceManager getPersistenceManager();
@@ -609,6 +802,10 @@
public Object registerStringConstructor(Class cls,
javax.jdo.spi.JDOImplHelper$StringConstructor sc);
public static Object construct(String className, String keyString);
public synchronized void registerDateFormat(java.text.DateFormat df);
+ public synchronized void registerErrorHandler(org.xml.sax.ErrorHandler);
+ public static org.xml.sax.ErrorHandler getRegisteredErrorHandler();
+ public synchronized void
registerDocumentBuilderFactory(javax.xml.parsers.DocumentBuilderFactory);
+ public static javax.xml.parsers.DocumentBuilderFactory
getRegisteredDocumentBuilderFactory();
public synchronized void
addStateInterrogation(javax.jdo.spi.StateInterrogation si);
public synchronized void
removeStateInterrogation(javax.jdo.spi.StateInterrogation si);
public void nonBinaryCompatibleMakeDirty(Object pc, String fieldName);
