Hi Michael,
I'm having trouble with the patches. When I (1) check out a clean JDO
installation from svn, then (2) apply the patch, I get two copies of the
new java code in each .java file. This of course gives compile errors
when the compiler encounters the second set of package and import
statements. I tried Assertions-A7.patch, Assertions-A7.patch2, and
PCClasses-for-assertions-A7.patch. All had the same problem.
Also, I noticed that the new abstract classes for A7 were missing the
copyright header.
-- Michelle
Michael Watzek wrote:
Hi Michelle,
the next 5 mails you'll receive in the next minutes will contain one
patch file each. These patch files contains changes for assertions A7,
A8. The changes to the last patches of these assertions are:
- Bug fix concerning the class hierarchy of pc classes in package
"...pc.singlefieldidentity": Persistent fields with accessors/mutators
in the abstract super class have been moved to concrete subclasses.
- Additional check in all tests of package "...api.persistencecapable":
isBinaryCompatible && !instanceof PersistenceCapable
- Test cases
NewObjectIdInstance.testSingleFieldIdentityNotInitializedXXX catch
JDONullIdentityException instead of JDOFatalInternalException
- Dependency to JNDI implementation in project.xml of TCK20 has been
removed. Instead, files "fscontext.jar" and "providerutil.jar" must be
present in TCK20 directory. The initial naming factory is specified in
"...conf/jndi.properties".
Please note, that you need to checkin all patches or none. These are the
file names of all patch files:
- Assertions-A7.patch2
- Assertions-A8.patch2
- Environment.patch2
- PCClasses-for-assertions-A7.patch2
- Schema.patch2
You find the list of changes in my TCK20 workspace below.
Regards,
Michael
M test/sql/derby/applicationidentity/schema.sql
A test/java/org/apache/jdo/tck/pc/singlefieldidentity
A
test/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldCharacter.java
A
test/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivebyte.java
A
test/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldInteger.java
A
test/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldLong.java
A
test/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldShort.java
A
test/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldByte.java
A
test/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitiveint.java
A
test/java/org/apache/jdo/tck/pc/singlefieldidentity/AbstractPCPointSingleField.java
A
test/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivechar.java
A
test/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldString.java
A
test/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivelong.java
A
test/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitiveshort.java
A
test/java/org/apache/jdo/tck/api/persistencemanagerfactory/AbstractGetPMF.java
A
test/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByJNDILocation.java
A
test/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByJNDILocationAndClassLoader.java
A
test/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByFile.java
A
test/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByFileAndClassLoader.java
A
test/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByResourceAndClassLoader.java
A
test/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByResource.java
A
test/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByStream.java
A
test/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByStreamAndClassLoader.java
A test/java/org/apache/jdo/tck/api/persistencecapable
A
test/java/org/apache/jdo/tck/api/persistencecapable/AbstractPersistenceCapableTest.java
A
test/java/org/apache/jdo/tck/api/persistencecapable/CopyKeyFieldsFromObjectId.java
A
test/java/org/apache/jdo/tck/api/persistencecapable/NewObjectIdInstance.java
M test/java/org/apache/jdo/tck/util/BatchResultPrinter.java
M test/conf/alltests.conf
A test/conf/jndi.properties
A
test/jdo/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity
A
test/jdo/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package.jdo
A
test/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity
A
test/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package-derby.orm
M project.properties
M maven.xml
Hi Michael,
Are there any patches from last week that still need to be checked
in? If so, please let me know which ones and I will take care of it.
-- Michelle
