You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by to...@apache.org on 2022/08/23 19:41:14 UTC
[db-jdo] branch gjf-reformat created (now 6788ca24)
This is an automated email from the ASF dual-hosted git repository.
tobous pushed a change to branch gjf-reformat
in repository https://gitbox.apache.org/repos/asf/db-jdo.git
at 6788ca24 Optimize imports to follow GJF
This branch includes the following new commits:
new e9936cd9 Format all Java files using GJF
new 6788ca24 Optimize imports to follow GJF
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[db-jdo] 02/02: Optimize imports to follow GJF
Posted by to...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tobous pushed a commit to branch gjf-reformat
in repository https://gitbox.apache.org/repos/asf/db-jdo.git
commit 6788ca24db659d6065b601ad5d332c25b0820922
Author: Tobias Bouschen <to...@googlemail.com>
AuthorDate: Tue Aug 23 21:37:34 2022 +0200
Optimize imports to follow GJF
---
api/src/main/java/javax/jdo/Enhancer.java | 16 +++++-------
api/src/main/java/javax/jdo/Extent.java | 1 -
api/src/main/java/javax/jdo/JDOEnhancer.java | 1 -
api/src/main/java/javax/jdo/JDOHelper.java | 2 --
api/src/main/java/javax/jdo/JDOQLTypedQuery.java | 1 -
.../main/java/javax/jdo/JDOQLTypedSubquery.java | 1 -
api/src/main/java/javax/jdo/LegacyJava.java | 7 +++--
.../main/java/javax/jdo/PersistenceManager.java | 2 --
.../java/javax/jdo/PersistenceManagerFactory.java | 10 ++++----
.../main/java/javax/jdo/annotations/Convert.java | 1 -
.../main/java/javax/jdo/annotations/Element.java | 1 -
api/src/main/java/javax/jdo/annotations/Key.java | 1 -
.../java/javax/jdo/annotations/Persistent.java | 1 -
api/src/main/java/javax/jdo/annotations/Value.java | 1 -
.../main/java/javax/jdo/identity/CharIdentity.java | 1 -
.../java/javax/jdo/identity/ObjectIdentity.java | 7 ++---
.../javax/jdo/identity/SingleFieldIdentity.java | 2 --
.../main/java/javax/jdo/metadata/TypeMetadata.java | 1 -
.../java/javax/jdo/query/LocalDateExpression.java | 3 ---
.../javax/jdo/query/LocalDateTimeExpression.java | 3 ---
.../java/javax/jdo/query/LocalTimeExpression.java | 3 ---
api/src/main/java/javax/jdo/spi/I18NHelper.java | 9 ++++---
api/src/main/java/javax/jdo/spi/JDOImplHelper.java | 18 ++++++-------
.../test/java/javax/jdo/AbstractJDOConfigTest.java | 1 -
api/src/test/java/javax/jdo/EnhancerTest.java | 1 -
.../test/java/javax/jdo/JDOHelperConfigTest.java | 2 --
api/src/test/java/javax/jdo/JDOHelperTest.java | 3 ---
api/src/test/java/javax/jdo/MockEnhancer.java | 7 +++--
api/src/test/java/javax/jdo/ObjectStateTest.java | 2 --
api/src/test/java/javax/jdo/PMFMapMapTest.java | 4 +--
.../java/javax/jdo/identity/ByteIdentityTest.java | 1 -
.../java/javax/jdo/identity/CharIdentityTest.java | 1 -
.../java/javax/jdo/identity/IntIdentityTest.java | 1 -
.../java/javax/jdo/identity/LongIdentityTest.java | 1 -
.../javax/jdo/identity/ObjectIdentityTest.java | 18 ++++---------
.../java/javax/jdo/identity/ShortIdentityTest.java | 1 -
.../jdo/identity/SingleFieldIdentityTest.java | 1 -
.../javax/jdo/identity/StringIdentityTest.java | 1 -
api/src/test/java/javax/jdo/pc/PCPoint.java | 4 +--
api/src/test/java/javax/jdo/schema/XMLTest.java | 1 -
.../test/java/javax/jdo/spi/JDOImplHelperTest.java | 1 -
.../java/javax/jdo/spi/StateInterrogationTest.java | 2 --
api/src/test/java/javax/jdo/stub/StubPMF.java | 1 -
api/src/test/java/javax/jdo/util/AbstractTest.java | 2 --
.../java/javax/jdo/util/BatchResultPrinter.java | 1 -
.../test/java/javax/jdo/util/BatchTestRunner.java | 3 +--
api/src/test/java/javax/jdo/util/XMLTestUtil.java | 15 +++++------
.../org/apache/jdo/exectck/AbstractTCKMojo.java | 1 -
.../main/java/org/apache/jdo/exectck/Enhance.java | 19 +++++++-------
.../java/org/apache/jdo/exectck/InstallSchema.java | 9 +++----
.../main/java/org/apache/jdo/exectck/RunTCK.java | 5 +++-
.../org/apache/jdo/tck/AbstractReaderTest.java | 6 ++---
tck/src/main/java/org/apache/jdo/tck/JDO_Test.java | 19 +++++++++-----
.../java/org/apache/jdo/tck/api/SignatureTest.java | 13 ++++------
.../api/converter/IntAttributeConverterTest.java | 11 ++++----
.../api/converter/PointAttributeConverterTest.java | 11 ++++----
.../tck/api/exceptions/ExceptionConstructor.java | 1 -
.../jdo/tck/api/fetchgroup/FetchGroupTest.java | 4 ---
.../AbstractInstanceLifecycleListener.java | 10 +-------
.../AccessOtherInstancesInPrestore.java | 3 ---
.../AccessingFieldsInPredelete.java | 3 ---
.../api/instancecallbacks/CallingJdoPostload.java | 1 -
.../api/instancecallbacks/CallingJdoPreclear.java | 3 ---
.../api/instancecallbacks/CallingJdoPredelete.java | 1 -
.../api/instancecallbacks/CallingJdoPrestore.java | 1 -
.../InstanceLifecycleListenerAttach.java | 11 --------
.../InstanceLifecycleListenerClear.java | 11 --------
.../InstanceLifecycleListenerCreate.java | 14 ----------
.../InstanceLifecycleListenerDelete.java | 10 --------
.../InstanceLifecycleListenerDetach.java | 9 -------
.../InstanceLifecycleListenerDirty.java | 10 --------
.../InstanceLifecycleListenerLoad.java | 11 +-------
.../InstanceLifecycleListenerStore.java | 11 +-------
...ationOfNontransactionalNonpersistentFields.java | 2 --
.../NoAccessToFieldsAfterPredelete.java | 2 --
.../jdo/tck/api/instancecallbacks/TestParts.java | 1 -
.../apache/jdo/tck/api/jdohelper/GetObjectId.java | 1 -
.../jdo/tck/api/jdohelper/GetObjectIdForNull.java | 1 -
.../tck/api/jdohelper/GetObjectIdForTransient.java | 1 -
.../GetObjectIdNotPersistenceCapable.java | 1 -
.../apache/jdo/tck/api/jdohelper/GetObjectIds.java | 6 +----
.../tck/api/jdohelper/GetPersistenceManager.java | 1 -
.../jdohelper/GetPersistenceManagerForNull.java | 1 -
.../GetPersistenceManagerForTransient.java | 1 -
...GetPersistenceManagerNotPersistenceCapable.java | 1 -
.../api/jdohelper/GetTransactionalObjectId.java | 1 -
.../jdohelper/GetTransactionalObjectIdForNull.java | 1 -
.../GetTransactionalObjectIdForTransient.java | 1 -
...TransactionalObjectIdNotPersistenceCapable.java | 1 -
.../apache/jdo/tck/api/jdohelper/IsDeleted.java | 1 -
.../jdo/tck/api/jdohelper/IsDeletedFalse.java | 1 -
.../jdo/tck/api/jdohelper/IsDeletedForNull.java | 1 -
.../tck/api/jdohelper/IsDeletedForTransient.java | 1 -
.../jdohelper/IsDeletedNotPersistenceCapable.java | 1 -
.../apache/jdo/tck/api/jdohelper/IsDetached.java | 5 ++--
.../org/apache/jdo/tck/api/jdohelper/IsDirty.java | 1 -
.../apache/jdo/tck/api/jdohelper/IsDirtyFalse.java | 1 -
.../jdo/tck/api/jdohelper/IsDirtyForNull.java | 1 -
.../jdo/tck/api/jdohelper/IsDirtyForTransient.java | 1 -
.../jdohelper/IsDirtyNotPersistenceCapable.java | 1 -
.../org/apache/jdo/tck/api/jdohelper/IsNew.java | 1 -
.../apache/jdo/tck/api/jdohelper/IsNewFalse.java | 1 -
.../apache/jdo/tck/api/jdohelper/IsNewForNull.java | 1 -
.../jdo/tck/api/jdohelper/IsNewForTransient.java | 1 -
.../api/jdohelper/IsNewNotPersistenceCapable.java | 1 -
.../apache/jdo/tck/api/jdohelper/IsPersistent.java | 1 -
.../jdo/tck/api/jdohelper/IsPersistentFalse.java | 1 -
.../jdo/tck/api/jdohelper/IsPersistentForNull.java | 1 -
.../api/jdohelper/IsPersistentForTransient.java | 1 -
.../IsPersistentNotPersistenceCapable.java | 1 -
.../jdo/tck/api/jdohelper/IsTransactional.java | 1 -
.../tck/api/jdohelper/IsTransactionalFalse.java | 1 -
.../tck/api/jdohelper/IsTransactionalForNull.java | 1 -
.../api/jdohelper/IsTransactionalForTransient.java | 1 -
.../IsTransactionalNotPersistenceCapable.java | 1 -
.../apache/jdo/tck/api/jdohelper/MakeDirty.java | 1 -
.../jdo/tck/api/jdohelper/MakeDirtyForNull.java | 1 -
.../tck/api/jdohelper/MakeDirtyForTransient.java | 1 -
.../jdohelper/MakeDirtyNotPersistenceCapable.java | 1 -
.../AbstractPersistenceCapableTest.java | 1 -
.../CopyKeyFieldsFromObjectId.java | 1 -
.../persistencecapable/NewObjectIdInstance.java | 1 -
.../ConcurrentPersistenceManagers.java | 2 --
.../ConcurrentPersistenceManagersSameClasses.java | 2 --
.../api/persistencemanager/CurrentTransaction.java | 1 -
.../api/persistencemanager/DataStoreCacheTest.java | 3 ---
.../persistencemanager/DataStoreConnection.java | 4 ---
.../DataStoreConnectionThrows.java | 7 -----
.../api/persistencemanager/DatastoreTimeout.java | 7 ++---
.../api/persistencemanager/DeletePersistent.java | 2 --
.../DeletePersistentAllFails.java | 2 --
...DeletePersistentFailsIfInstanceIsTransient.java | 2 --
...InstanceManagedByAnotherPersistenceManager.java | 2 --
...etePersistentHasNoEffectOnDeletedInstances.java | 2 --
.../GetPersistenceManagerFactory.java | 1 -
.../tck/api/persistencemanager/GetProperties.java | 5 +---
.../persistencemanager/GetPutRemoveUserObject.java | 1 -
.../api/persistencemanager/GetSetUserObject.java | 1 -
...nsactionalObjectIdWhenObjectIdBeingChanged.java | 1 -
.../GetTransactionalObjectIdWithNoTransaction.java | 1 -
.../tck/api/persistencemanager/NewInstance.java | 6 ++---
.../ObjectIdUniqueAmongInstances.java | 2 --
.../OneInstanceOfObjectPerPersistenceManager.java | 2 --
.../api/persistencemanager/OptimisticFailure.java | 2 --
.../persistencemanager/PersistenceManagerTest.java | 1 -
...ionInstanceForAllCallsToCurrentTransaction.java | 1 -
.../jdo/tck/api/persistencemanager/ThreadSafe.java | 5 +---
...TransactionalInstanceRetainsValuesAtCommit.java | 2 --
...llingEvictAllWithCollectionContainingNulls.java | 2 --
...ingRefreshAllWithCollectionContainingNulls.java | 2 --
.../cache/EvictAllWithNoParameters.java | 1 -
.../EvictingCollectionOfInstancesSideEffects.java | 3 ---
.../cache/EvictingWithRestoreValuesFalse.java | 4 +--
.../cache/EvictingWithRetainValuesFalse.java | 4 +--
.../PassingNullToEvictAllThrowsException.java | 2 --
.../cache/PassingNullToEvictHasNoEffect.java | 1 -
.../PassingNullToRefreshAllThrowsException.java | 2 --
.../cache/PassingNullToRefreshHasNoEffect.java | 1 -
.../cache/RefreshAllNoParameterSideEffects.java | 1 -
.../cache/RefreshAllSideEffects.java | 4 +--
.../cache/RefreshAllWithNoParameters.java | 1 -
.../cache/RefreshSideEffects.java | 2 --
.../tck/api/persistencemanager/cache/Retrieve.java | 3 ---
.../close/AfterCloseAllMethodsThrowException.java | 1 -
.../persistencemanager/close/AutoCloseable.java | 1 -
.../close/CloseWithActiveTxRollsBack.java | 2 --
.../close/IsClosedIsFalseUponConstruction.java | 2 +-
.../IsClosedIsFalseUponRetrievalFromPool.java | 2 +-
.../close/IsClosedIsTrueAfterClose.java | 3 +--
.../detach/CopyOnAttachFalse.java | 1 -
.../detach/DetachAccessUnloadedField.java | 1 -
.../detach/DetachAllOnCommit.java | 13 ----------
.../persistencemanager/detach/DetachAttach.java | 12 ---------
.../detach/DetachAttachDirty.java | 12 ---------
.../api/persistencemanager/detach/DetachCopy.java | 10 --------
.../persistencemanager/detach/DetachSerialize.java | 5 ----
.../api/persistencemanager/detach/DetachTest.java | 6 +----
.../detach/DetachUndetachable.java | 1 -
.../detach/SetDetachAllOnCommit.java | 2 --
...WithInstancesMadePersistentViaReachability.java | 8 ++----
.../extent/GetExtentWithNoSubclasses.java | 4 +--
.../extent/GetExtentWithSubclasses.java | 3 ---
.../fetchplan/AbstractFetchPlanTest.java | 2 --
.../fetchplan/FetchPlanInterface.java | 4 ---
.../fetchplan/FetchPlanIsCopy.java | 5 ----
.../fetchplan/FetchPlanMakeTransient.java | 4 ---
.../fetchplan/FetchPlanQuery.java | 5 ----
.../fetchplan/FetchPlanRefresh.java | 3 ---
.../fetchplan/FetchPlanRetrieve.java | 3 ---
.../persistencemanager/flags/GetIgnoreCache.java | 3 +--
.../flags/SetIgnoreCacheToFalse.java | 3 +--
.../flags/SetIgnoreCacheToTrue.java | 3 +--
.../flags/SetMultithreadedFalse.java | 3 +--
.../flags/SetMultithreadedTrue.java | 3 +--
.../flags/SettingFlagsWithTransactionInstance.java | 3 +--
.../getobject/GetObjectById.java | 3 +--
.../getobject/GetObjectByIdExactClass.java | 11 +++-----
.../GetObjectByIdNoValidationInstanceInCache.java | 3 +--
...IdNoValidationInstanceInCacheNoStateChange.java | 3 +--
...etObjectByIdNoValidationInstanceNotInCache.java | 3 +--
...jectByIdNoValidationInstanceNotInCacheNoTx.java | 3 +--
...jectByIdNoValidationInstanceNotInDatastore.java | 3 +--
.../getobject/GetObjectByIdNotResolved.java | 3 +--
...GetObjectByIdWithValidationInstanceInCache.java | 3 +--
...ithValidationInstanceInCacheNotInDatastore.java | 3 +--
...ValidationInstanceNotInCacheNotInDatastore.java | 3 +--
.../persistencemanager/getobject/GetObjectId.java | 3 +--
.../getobject/GetObjectIdClass.java | 3 +--
...assForAbstractOrNonPersistenceCapableClass.java | 3 +--
.../GetObjectIdForNullOrNotPersistent.java | 3 +--
.../GetObjectIdForPersistentInterface.java | 6 -----
...etObjectIdWithApplicationModifyingIdentity.java | 3 +--
.../getobject/GetObjectsById.java | 3 ---
.../lifecycle/MakeNontransactionalAllFails.java | 4 +--
.../MakeNontransactionalDirtyInstance.java | 4 +--
.../lifecycle/MakeNontransactionalIsImmediate.java | 4 +--
...akeNontransactionalPersistentCleanInstance.java | 4 +--
...MakeNontransactionalTransientCleanInstance.java | 4 +--
.../lifecycle/MakePersistent.java | 4 +--
.../lifecycle/MakePersistentAllFails.java | 4 +--
.../MakePersistentAndInstancesNotReachable.java | 4 +--
.../lifecycle/MakePersistentAssignsObjectId.java | 6 ++---
...InstanceManagedByAnotherPersistenceManager.java | 4 +--
...PersistentHasNoEffectOnPersistentInstances.java | 4 +--
.../lifecycle/MakeTransactional.java | 4 +--
...ctionalANontransactionalPersistentInstance.java | 4 +--
.../lifecycle/MakeTransactionalAllFails.java | 4 +--
.../lifecycle/MakeTransactionalIsImmediate.java | 4 +--
...eTransactionalPriorToTransactionRolledback.java | 4 +--
...keTransactionalWithinTransactionRolledback.java | 4 +--
.../lifecycle/MakeTransient.java | 4 +--
.../lifecycle/MakeTransientAllFails.java | 4 +--
.../MakeTransientCausesLossOfIdentity.java | 4 +--
.../MakeTransientFailsWithDirtyInstance.java | 4 +--
.../MakeTransientFieldsPreservedUnchanged.java | 4 +--
...keTransientHasNoEffectOnTransientInstances.java | 4 +--
.../MakeTransientNotSubjectToRollback.java | 4 +--
.../nullargs/DeletePersistentNullArgs.java | 5 ----
.../nullargs/DetachCopyNullArgs.java | 5 ----
.../persistencemanager/nullargs/EvictNullArgs.java | 5 ----
.../nullargs/MakeNontransactionalNullArgs.java | 5 ----
.../nullargs/MakePersistentNullArgs.java | 5 ----
.../nullargs/MakeTransactionalNullArgs.java | 5 ----
.../nullargs/MakeTransientNullArgs.java | 5 ----
.../nullargs/PersistenceManagerNullsTest.java | 4 ---
.../nullargs/RefreshNullArgs.java | 5 ----
.../nullargs/RetrieveNullArgs.java | 5 ----
.../nullargs/RetrieveWithFetchPlanNullArgs.java | 5 ----
.../persistencemanagerfactory/AbstractGetPMF.java | 5 +---
.../AfterCloseGetPMThrowsException.java | 1 -
.../AfterCloseSetMethodsThrowException.java | 2 --
...erGetPersistenceManagerNoSetMethodsSucceed.java | 2 --
.../tck/api/persistencemanagerfactory/Close.java | 6 ++---
.../CloseFailsIfTransactionActive.java | 1 -
...seWithoutPermissionThrowsSecurityException.java | 2 --
.../FlushThrowsIfReadOnly.java | 2 --
.../GetManagedClasses.java | 2 --
.../persistencemanagerfactory/GetPMFByFile.java | 2 --
.../GetPMFByFileAndClassLoader.java | 2 --
.../GetPMFByJNDILocation.java | 2 --
.../GetPMFByJNDILocationAndClassLoader.java | 2 --
.../GetPMFByResource.java | 1 -
.../GetPMFByResourceAndClassLoader.java | 1 -
.../persistencemanagerfactory/GetPMFByStream.java | 2 --
.../GetPMFByStreamAndClassLoader.java | 2 --
.../GetPersistenceManager.java | 1 -
...sistenceManagerFactoryByPropertiesInstance.java | 2 --
.../GetPersistenceManagerForUser.java | 2 --
.../persistencemanagerfactory/GetProperties.java | 2 --
.../SetConnectionURL.java | 1 -
.../SetConnectionUserName.java | 1 -
.../persistencemanagerfactory/SetIgnoreCache.java | 2 --
.../SetMultithreaded.java | 5 ----
.../SetNonTransactionalRead.java | 2 --
.../SetNonTransactionalWrite.java | 2 --
.../api/persistencemanagerfactory/SetReadOnly.java | 2 --
.../persistencemanagerfactory/SetRetainValues.java | 2 --
.../SupportedOptions.java | 2 --
.../config/ThrowOnUnknownStandardProperties.java | 2 --
.../metadata/GetMetadataTest.java | 1 -
.../apache/jdo/tck/enhancement/EnhancerTest.java | 1 -
.../org/apache/jdo/tck/extents/AutoCloseable.java | 5 +---
.../java/org/apache/jdo/tck/extents/CloseAll.java | 2 --
.../CloseOfExtentIteratorIsIteratorSpecific.java | 2 --
.../org/apache/jdo/tck/extents/ExtentTest.java | 2 --
.../apache/jdo/tck/extents/GetCandidateClass.java | 1 -
.../jdo/tck/extents/GetPersistenceManager.java | 1 -
.../apache/jdo/tck/extents/HasSubclassesFalse.java | 1 -
.../apache/jdo/tck/extents/HasSubclassesTrue.java | 1 -
...nstancesDeletedPriorToIterationNotReturned.java | 2 --
...InstancesPersistedPriorToIterationReturned.java | 2 --
.../IteratorHasNextFalseAfterExtentClose.java | 2 --
.../jdo/tck/extents/IteratorMutatingMethods.java | 2 --
.../tck/extents/IteratorNextAfterExtentClose.java | 2 --
.../extents/IteratorNextAfterExtentCloseAll.java | 2 --
.../java/org/apache/jdo/tck/extents/Iterators.java | 2 --
...ltiplePMsReturnInstancesRepresentingSamePC.java | 2 --
.../NontransactionalWriteDatastoreCommit.java | 7 -----
...ntransactionalWriteDatastoreCommitConflict.java | 7 -----
.../NontransactionalWriteDatastoreRollback.java | 7 -----
.../NontransactionalWriteOptimisticCommit.java | 7 -----
...transactionalWriteOptimisticCommitConflict.java | 7 -----
.../NontransactionalWriteOptimisticRollback.java | 7 -----
.../tck/lifecycle/NontransactionalWriteTest.java | 3 ---
.../tck/lifecycle/NontransactionalWriteThrows.java | 6 -----
...tIdNotModifiedWhenObjectIdInstanceModified.java | 4 ---
.../PMReturnsIdenticalInstancesForEqualObjIds.java | 2 --
.../PMsCanSharePCClassesButNotPCInstances.java | 7 ++---
.../apache/jdo/tck/lifecycle/StateTransitions.java | 2 --
.../lifecycle/StateTransitionsReturnedObjects.java | 2 --
.../TransientTransactionalStateRollback.java | 1 -
.../jdo/tck/mapping/AbstractRelationshipTest.java | 1 -
.../apache/jdo/tck/mapping/CompletenessTest.java | 1 -
.../jdo/tck/mapping/CompletenessTestJPA.java | 1 -
.../jdo/tck/mapping/CompletenessTestList.java | 1 -
.../jdo/tck/mapping/CompletenessTestMap.java | 1 -
.../jdo/tck/mapping/CompletenessTestOrder.java | 1 -
.../Relationship1ToManyAllRelationships.java | 5 ----
.../tck/models/embedded/EmbeddedInheritance.java | 3 ---
.../SecondClassObjectsTrackTheirChanges.java | 1 -
.../models/fieldtypes/TestArrayCollections.java | 5 ----
.../fieldtypes/TestArrayListCollections.java | 4 +--
.../fieldtypes/TestCollectionCollections.java | 2 --
.../models/fieldtypes/TestFieldsOfBigDecimal.java | 2 --
.../models/fieldtypes/TestFieldsOfBigInteger.java | 2 --
.../tck/models/fieldtypes/TestFieldsOfBoolean.java | 1 -
.../tck/models/fieldtypes/TestFieldsOfByte.java | 1 -
.../models/fieldtypes/TestFieldsOfCharacter.java | 1 -
.../tck/models/fieldtypes/TestFieldsOfDate.java | 2 --
.../tck/models/fieldtypes/TestFieldsOfDouble.java | 1 -
.../tck/models/fieldtypes/TestFieldsOfFloat.java | 1 -
.../tck/models/fieldtypes/TestFieldsOfInteger.java | 1 -
.../tck/models/fieldtypes/TestFieldsOfLocale.java | 2 --
.../tck/models/fieldtypes/TestFieldsOfLong.java | 1 -
.../tck/models/fieldtypes/TestFieldsOfObject.java | 1 -
.../fieldtypes/TestFieldsOfPrimitiveboolean.java | 1 -
.../fieldtypes/TestFieldsOfPrimitivebyte.java | 1 -
.../fieldtypes/TestFieldsOfPrimitivechar.java | 1 -
.../fieldtypes/TestFieldsOfPrimitivedouble.java | 1 -
.../fieldtypes/TestFieldsOfPrimitivefloat.java | 1 -
.../fieldtypes/TestFieldsOfPrimitiveint.java | 1 -
.../fieldtypes/TestFieldsOfPrimitivelong.java | 1 -
.../fieldtypes/TestFieldsOfPrimitiveshort.java | 1 -
.../tck/models/fieldtypes/TestFieldsOfShort.java | 1 -
.../models/fieldtypes/TestFieldsOfSimpleClass.java | 1 -
.../models/fieldtypes/TestFieldsOfSimpleEnum.java | 1 -
.../fieldtypes/TestFieldsOfSimpleInterface.java | 1 -
.../tck/models/fieldtypes/TestFieldsOfString.java | 1 -
.../TestHashMapStringKeyCollections.java | 4 ---
.../TestHashMapStringValueCollections.java | 3 ---
.../models/fieldtypes/TestHashSetCollections.java | 3 ---
.../TestHashtableStringKeyCollections.java | 4 ---
.../TestHashtableStringValueCollections.java | 3 ---
.../fieldtypes/TestLinkedListCollections.java | 5 +---
.../tck/models/fieldtypes/TestListCollections.java | 6 +----
.../fieldtypes/TestMapStringKeyCollections.java | 5 +---
.../fieldtypes/TestMapStringValueCollections.java | 3 ---
.../tck/models/fieldtypes/TestSetCollections.java | 3 ---
.../TestTreeMapStringKeyCollections.java | 6 +----
.../TestTreeMapStringValueCollections.java | 5 +---
.../models/fieldtypes/TestTreeSetCollections.java | 4 +--
.../apache/jdo/tck/models/fieldtypes/TestUtil.java | 10 +++++---
.../models/fieldtypes/TestVectorCollections.java | 6 +----
.../inheritance/FieldWithSameNameInSuperclass.java | 17 +++++-------
...rsistentFieldsAreNonPersistentInSubclasses.java | 3 ---
.../inheritance/NonpersistentSuperClass.java | 17 +++++-------
...ceCapableFlexibilityInInheritanceHierarchy.java | 17 +++++-------
.../PersistentFieldsArePersistentInSubClasses.java | 17 +++++-------
...actionalFieldsAreTransactionalInSubclasses.java | 3 ---
.../org/apache/jdo/tck/pc/company/Address.java | 1 -
.../org/apache/jdo/tck/pc/company/Company.java | 14 ++++------
.../apache/jdo/tck/pc/company/CompanyFactory.java | 1 -
.../tck/pc/company/CompanyFactoryAbstractImpl.java | 1 -
.../pc/company/CompanyFactoryConcreteClass.java | 2 --
.../jdo/tck/pc/company/CompanyFactoryRegistry.java | 5 ----
.../jdo/tck/pc/company/CompanyModelReader.java | 1 -
.../apache/jdo/tck/pc/company/DentalInsurance.java | 5 +---
.../org/apache/jdo/tck/pc/company/Department.java | 9 +++----
.../org/apache/jdo/tck/pc/company/Employee.java | 7 ++---
.../jdo/tck/pc/company/FullTimeEmployee.java | 4 +--
.../org/apache/jdo/tck/pc/company/Insurance.java | 5 +---
.../jdo/tck/pc/company/MedicalInsurance.java | 6 +----
.../org/apache/jdo/tck/pc/company/MeetingRoom.java | 4 +--
.../jdo/tck/pc/company/PartTimeEmployee.java | 2 --
.../java/org/apache/jdo/tck/pc/company/Person.java | 6 +----
.../org/apache/jdo/tck/pc/company/Project.java | 13 ++++------
.../CompanyFactoryAnnotatedFCAppConcrete.java | 11 +++++++-
.../CompanyFactoryAnnotatedFCAppPM.java | 11 +++++++-
.../CompanyFactoryAnnotatedFCDSConcrete.java | 11 +++++++-
.../CompanyFactoryAnnotatedFCDSPM.java | 11 +++++++-
.../CompanyFactoryAnnotatedPMFieldClass.java | 10 +++++++-
...toreIdDiscriminatorClassNameInheritanceNew.java | 4 +--
...iscriminatorClassNameInheritanceSuperclass.java | 4 +--
.../tck/pc/companyAnnotatedFC/FCAppAddress.java | 4 +--
.../tck/pc/companyAnnotatedFC/FCAppCompany.java | 24 ++++++++++-------
.../companyAnnotatedFC/FCAppDentalInsurance.java | 6 ++---
.../tck/pc/companyAnnotatedFC/FCAppDepartment.java | 17 ++++++------
.../tck/pc/companyAnnotatedFC/FCAppEmployee.java | 13 +++++-----
.../companyAnnotatedFC/FCAppFullTimeEmployee.java | 8 +++---
.../tck/pc/companyAnnotatedFC/FCAppInsurance.java | 13 +++++++---
.../companyAnnotatedFC/FCAppMedicalInsurance.java | 5 ++--
.../pc/companyAnnotatedFC/FCAppMeetingRoom.java | 11 +++++---
.../companyAnnotatedFC/FCAppPartTimeEmployee.java | 9 ++++---
.../jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java | 18 ++++++++-----
.../tck/pc/companyAnnotatedFC/FCAppProject.java | 23 +++++++++++------
.../jdo/tck/pc/companyAnnotatedFC/FCDSAddress.java | 4 +--
.../jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java | 19 +++++++-------
.../pc/companyAnnotatedFC/FCDSDentalInsurance.java | 6 +++--
.../tck/pc/companyAnnotatedFC/FCDSDepartment.java | 12 ++++-----
.../tck/pc/companyAnnotatedFC/FCDSEmployee.java | 9 ++++---
.../companyAnnotatedFC/FCDSFullTimeEmployee.java | 4 +--
.../tck/pc/companyAnnotatedFC/FCDSInsurance.java | 7 +++--
.../companyAnnotatedFC/FCDSMedicalInsurance.java | 5 +++-
.../tck/pc/companyAnnotatedFC/FCDSMeetingRoom.java | 5 ++--
.../companyAnnotatedFC/FCDSPartTimeEmployee.java | 4 +--
.../jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java | 13 ++++++----
.../jdo/tck/pc/companyAnnotatedFC/FCDSProject.java | 17 ++++++------
.../CompanyFactoryAnnotatedJPAAppConcrete.java | 11 +++++++-
.../CompanyFactoryAnnotatedJPAAppPM.java | 12 ++++++++-
.../CompanyFactoryAnnotatedPMFieldClassJPA.java | 10 +++++++-
.../tck/pc/companyAnnotatedJPA/JPAAppAddress.java | 4 +--
.../tck/pc/companyAnnotatedJPA/JPAAppCompany.java | 28 +++++++++++++-------
.../companyAnnotatedJPA/JPAAppDentalInsurance.java | 5 ++--
.../pc/companyAnnotatedJPA/JPAAppDepartment.java | 17 +++++++-----
.../tck/pc/companyAnnotatedJPA/JPAAppEmployee.java | 14 ++++++----
.../JPAAppFullTimeEmployee.java | 5 ++--
.../pc/companyAnnotatedJPA/JPAAppInsurance.java | 12 ++++++---
.../JPAAppMedicalInsurance.java | 4 +--
.../JPAAppPartTimeEmployee.java | 6 ++---
.../tck/pc/companyAnnotatedJPA/JPAAppPerson.java | 25 +++++++++++++-----
.../pc/companyAnnotatedJPA/JPAAppPhoneNumber.java | 10 ++++++--
.../tck/pc/companyAnnotatedJPA/JPAAppProject.java | 23 +++++++++++------
.../CompanyFactoryAnnotatedPCAppConcrete.java | 11 +++++++-
.../CompanyFactoryAnnotatedPCAppPM.java | 11 +++++++-
.../CompanyFactoryAnnotatedPCDSConcrete.java | 11 +++++++-
.../CompanyFactoryAnnotatedPCDSPM.java | 11 +++++++-
.../tck/pc/companyAnnotatedPC/PCAppAddress.java | 4 +--
.../tck/pc/companyAnnotatedPC/PCAppCompany.java | 26 +++++++++++--------
.../companyAnnotatedPC/PCAppDentalInsurance.java | 7 ++---
.../tck/pc/companyAnnotatedPC/PCAppDepartment.java | 20 ++++++++++-----
.../tck/pc/companyAnnotatedPC/PCAppEmployee.java | 15 ++++++-----
.../companyAnnotatedPC/PCAppFullTimeEmployee.java | 9 ++++---
.../tck/pc/companyAnnotatedPC/PCAppInsurance.java | 15 ++++++++---
.../companyAnnotatedPC/PCAppMedicalInsurance.java | 6 +++--
.../companyAnnotatedPC/PCAppPartTimeEmployee.java | 10 +++++---
.../jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java | 21 ++++++++++-----
.../tck/pc/companyAnnotatedPC/PCAppProject.java | 25 +++++++++++-------
.../jdo/tck/pc/companyAnnotatedPC/PCDSAddress.java | 4 +--
.../jdo/tck/pc/companyAnnotatedPC/PCDSCompany.java | 27 +++++++++++--------
.../pc/companyAnnotatedPC/PCDSDentalInsurance.java | 7 +++--
.../tck/pc/companyAnnotatedPC/PCDSDepartment.java | 20 ++++++++++-----
.../tck/pc/companyAnnotatedPC/PCDSEmployee.java | 15 +++++++----
.../companyAnnotatedPC/PCDSFullTimeEmployee.java | 9 +++++--
.../tck/pc/companyAnnotatedPC/PCDSInsurance.java | 15 ++++++++---
.../companyAnnotatedPC/PCDSMedicalInsurance.java | 6 ++++-
.../companyAnnotatedPC/PCDSPartTimeEmployee.java | 9 +++++--
.../jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java | 21 ++++++++++-----
.../jdo/tck/pc/companyAnnotatedPC/PCDSProject.java | 25 +++++++++++-------
.../CompanyFactoryAnnotatedPIAppPM.java | 11 +++++++-
.../CompanyFactoryAnnotatedPIDSPM.java | 11 +++++++-
.../CompanyFactoryAnnotatedPMInterface.java | 11 +++++++-
.../tck/pc/companyAnnotatedPI/PIAppAddress.java | 4 +--
.../tck/pc/companyAnnotatedPI/PIAppCompany.java | 15 ++++++++---
.../companyAnnotatedPI/PIAppDentalInsurance.java | 6 ++---
.../tck/pc/companyAnnotatedPI/PIAppDepartment.java | 13 +++++++---
.../tck/pc/companyAnnotatedPI/PIAppEmployee.java | 12 ++++++---
.../companyAnnotatedPI/PIAppFullTimeEmployee.java | 6 ++++-
.../tck/pc/companyAnnotatedPI/PIAppInsurance.java | 11 ++++++--
.../companyAnnotatedPI/PIAppMedicalInsurance.java | 5 ++--
.../companyAnnotatedPI/PIAppPartTimeEmployee.java | 6 ++++-
.../jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java | 16 +++++++++---
.../tck/pc/companyAnnotatedPI/PIAppProject.java | 14 +++++++---
.../jdo/tck/pc/companyAnnotatedPI/PIDSAddress.java | 2 +-
.../jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java | 14 +++++++---
.../pc/companyAnnotatedPI/PIDSDentalInsurance.java | 5 ++--
.../tck/pc/companyAnnotatedPI/PIDSDepartment.java | 13 +++++++---
.../tck/pc/companyAnnotatedPI/PIDSEmployee.java | 8 ++++--
.../companyAnnotatedPI/PIDSFullTimeEmployee.java | 6 +++--
.../tck/pc/companyAnnotatedPI/PIDSInsurance.java | 12 +++++++--
.../companyAnnotatedPI/PIDSMedicalInsurance.java | 4 +--
.../companyAnnotatedPI/PIDSPartTimeEmployee.java | 6 +++--
.../jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java | 16 +++++++++---
.../jdo/tck/pc/companyAnnotatedPI/PIDSProject.java | 14 +++++++---
.../jdo/tck/pc/companyListWithoutJoin/Company.java | 11 +++-----
.../pc/companyListWithoutJoin/CompanyFactory.java | 2 --
.../CompanyFactoryAbstractImpl.java | 1 -
.../CompanyFactoryConcreteClass.java | 3 ---
.../CompanyFactoryRegistry.java | 5 ----
.../companyListWithoutJoin/CompanyModelReader.java | 1 -
.../tck/pc/companyListWithoutJoin/Department.java | 5 ----
.../tck/pc/companyListWithoutJoin/Employee.java | 5 +---
.../companyListWithoutJoin/FullTimeEmployee.java | 2 --
.../companyListWithoutJoin/PartTimeEmployee.java | 2 --
.../jdo/tck/pc/companyListWithoutJoin/Person.java | 4 ---
.../jdo/tck/pc/companyMapWithoutJoin/Company.java | 11 +++-----
.../pc/companyMapWithoutJoin/CompanyFactory.java | 2 --
.../CompanyFactoryAbstractImpl.java | 1 -
.../CompanyFactoryConcreteClass.java | 3 ---
.../CompanyFactoryRegistry.java | 5 ----
.../companyMapWithoutJoin/CompanyModelReader.java | 1 -
.../tck/pc/companyMapWithoutJoin/Department.java | 5 ----
.../jdo/tck/pc/companyMapWithoutJoin/Employee.java | 6 +----
.../pc/companyMapWithoutJoin/FullTimeEmployee.java | 2 --
.../jdo/tck/pc/companyMapWithoutJoin/IPerson.java | 1 -
.../pc/companyMapWithoutJoin/PartTimeEmployee.java | 2 --
.../jdo/tck/pc/companyMapWithoutJoin/Person.java | 6 -----
.../ApplicationIdDiscriminatorClassName.java | 2 +-
.../jdo/tck/pc/converter/PCPointAnnotated.java | 5 ++--
.../jdo/tck/pc/converter/PCPointPropAnnotated.java | 5 ++--
.../org/apache/jdo/tck/pc/converter/PCRect.java | 3 +--
.../jdo/tck/pc/converter/PCRectAnnotated.java | 7 +++--
.../org/apache/jdo/tck/pc/fieldtypes/AllTypes.java | 12 ++++-----
.../jdo/tck/pc/fieldtypes/ArrayCollections.java | 6 +++--
.../jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.java | 3 +--
.../jdo/tck/pc/fieldtypes/FieldsOfBigInteger.java | 3 +--
.../apache/jdo/tck/pc/fieldtypes/FieldsOfDate.java | 3 +--
.../jdo/tck/pc/fieldtypes/FieldsOfLocale.java | 3 +--
.../apache/jdo/tck/pc/fieldtypes/SimpleClass.java | 2 +-
.../apache/jdo/tck/pc/fieldtypes/SimpleEnum.java | 1 -
.../instancecallbacks/InstanceCallbackClass.java | 2 --
.../InstanceCallbackNonPersistFdsClass.java | 11 +++++---
.../org/apache/jdo/tck/pc/mylib/MylibReader.java | 1 -
.../java/org/apache/jdo/tck/pc/mylib/PCClass.java | 1 -
.../java/org/apache/jdo/tck/pc/mylib/PCPoint2.java | 1 -
.../apache/jdo/tck/pc/mylib/PrimitiveTypes.java | 2 +-
.../apache/jdo/tck/pc/mylib/VersionedPCPoint.java | 2 +-
.../java/org/apache/jdo/tck/pc/order/Order.java | 1 -
.../org/apache/jdo/tck/pc/order/OrderFactory.java | 3 ---
.../jdo/tck/pc/order/OrderFactoryAbstractImpl.java | 4 +--
.../tck/pc/order/OrderFactoryConcreteClass.java | 1 -
.../jdo/tck/pc/order/OrderFactoryRegistry.java | 1 -
.../org/apache/jdo/tck/pc/order/OrderItem.java | 1 -
.../apache/jdo/tck/pc/order/OrderModelReader.java | 1 -
.../jdo/tck/pc/query/NamedQueriesSample.java | 5 ++--
.../org/apache/jdo/tck/pc/shoppingcart/Cart.java | 4 ++-
.../AbstractPCPointSingleField.java | 1 -
.../PCPointSingleFieldDate.java | 1 -
.../jdo/tck/pc/singlefieldidentity/Person.java | 2 --
.../apache/jdo/tck/query/QueryElementHolder.java | 2 +-
.../java/org/apache/jdo/tck/query/QueryTest.java | 2 --
.../apache/jdo/tck/query/api/AutoCloseable.java | 6 ++---
.../org/apache/jdo/tck/query/api/ChangeQuery.java | 3 ---
.../java/org/apache/jdo/tck/query/api/Close.java | 3 ---
.../org/apache/jdo/tck/query/api/CloseAll.java | 3 ---
.../org/apache/jdo/tck/query/api/CompileQuery.java | 3 ---
.../apache/jdo/tck/query/api/DeclareImports.java | 8 ++----
.../jdo/tck/query/api/DeclareParameters.java | 3 ---
.../apache/jdo/tck/query/api/DeclareVariables.java | 4 ---
.../org/apache/jdo/tck/query/api/ExecuteQuery.java | 3 ---
.../jdo/tck/query/api/ExecuteQueryWithArray.java | 3 ---
.../jdo/tck/query/api/ExecuteQueryWithMap.java | 3 ---
.../org/apache/jdo/tck/query/api/GetFetchPlan.java | 2 --
.../apache/jdo/tck/query/api/GetIgnoreCache.java | 1 -
.../jdo/tck/query/api/GetPersistenceManager.java | 1 -
...sistenceManagerFromRestoredSerializedQuery.java | 2 --
.../jdo/tck/query/api/InvalidNamedQuery.java | 1 -
.../jdo/tck/query/api/MetadataSearchOrder.java | 2 --
.../jdo/tck/query/api/NamedQueryNotFound.java | 1 -
.../query/api/NamedQueryRepeatableAnnotations.java | 4 +--
.../apache/jdo/tck/query/api/NewNamedQuery.java | 3 ---
...ryFromExistingQueryBoundToPMFromSameVendor.java | 3 ---
.../api/NewQueryFromRestoredSerializedQuery.java | 3 ---
.../jdo/tck/query/api/NewQuerySingleString.java | 1 -
.../tck/query/api/NewQueryWithCandidateClass.java | 2 --
.../NewQueryWithCandidateClassAndCollection.java | 2 --
.../api/NewQueryWithCandidateClassAndExtent.java | 2 --
.../api/NewQueryWithCandidateClassAndFilter.java | 3 ---
...NewQueryWithCandidateClassCollectionFilter.java | 3 ---
.../jdo/tck/query/api/NewQueryWithExtent.java | 2 --
.../tck/query/api/NewQueryWithExtentAndFilter.java | 3 ---
.../api/NewQueryWithSpecifiedLanguageAndQuery.java | 3 ---
.../org/apache/jdo/tck/query/api/QueryCancel.java | 6 +----
.../apache/jdo/tck/query/api/QueryExtentions.java | 3 ---
.../apache/jdo/tck/query/api/SampleQueries.java | 26 +++++++++----------
.../apache/jdo/tck/query/api/SaveAsNamedQuery.java | 3 ---
.../jdo/tck/query/api/SetCandidateCollection.java | 3 ---
.../jdo/tck/query/api/SetCandidateExtent.java | 3 ---
.../org/apache/jdo/tck/query/api/SetFilter.java | 3 ---
.../org/apache/jdo/tck/query/api/SetGrouping.java | 3 ---
.../apache/jdo/tck/query/api/SetIgnoreCache.java | 1 -
.../org/apache/jdo/tck/query/api/SetOrdering.java | 3 ---
.../org/apache/jdo/tck/query/api/SetRange.java | 2 --
.../org/apache/jdo/tck/query/api/SetResult.java | 3 ---
.../apache/jdo/tck/query/api/SetResultClass.java | 3 ---
.../org/apache/jdo/tck/query/api/SetUnique.java | 2 --
.../tck/query/api/SetterReplacePreviousValues.java | 2 --
.../jdo/tck/query/api/SingleStringQuery.java | 3 ---
.../jdo/tck/query/api/UnmodifiableQuery.java | 3 ---
.../jdo/tck/query/delete/DeleteCallback.java | 3 ---
.../jdo/tck/query/delete/DeletePersistentAll.java | 7 ++---
.../jdo/tck/query/delete/DeleteQueryElements.java | 2 --
...nmentPrePostIncrementDecrementNotSupported.java | 1 -
.../java/org/apache/jdo/tck/query/jdoql/Cast.java | 5 +---
.../query/jdoql/CharacterAndStringLiterals.java | 4 +--
.../jdoql/ComparingCollectionFieldToNull.java | 7 ++---
...omparingPersistentAndNonPersistentInstance.java | 10 +++-----
.../tck/query/jdoql/DenoteUniquenessInFilter.java | 4 +--
...ExecuteQueryWhenPersistenceManagerIsClosed.java | 1 -
...gMultipleQueriesSimultaneouslyIsThreadSafe.java | 3 ---
...eryWhenNoTransactionNoNontransactionalRead.java | 1 -
.../org/apache/jdo/tck/query/jdoql/Having.java | 5 +---
.../query/jdoql/IdentifiersEqualFieldNames.java | 9 +++----
.../apache/jdo/tck/query/jdoql/IfElseInFilter.java | 9 +++----
.../jdo/tck/query/jdoql/IgnoreCacheFalse.java | 3 ---
...ctiveQueryInstanceInSamePersistenceManager.java | 3 ---
.../tck/query/jdoql/MultipleIdenticalImports.java | 3 ---
.../tck/query/jdoql/NamespaceOfIdentifiers.java | 3 ---
.../query/jdoql/NavigationComparisonWithNull.java | 12 +--------
.../jdoql/NavigationThroughACollectionField.java | 4 +--
.../jdoql/NavigationThroughANullValuedField.java | 4 +--
...NavigationThroughReferencesUsesDotOperator.java | 4 +--
.../apache/jdo/tck/query/jdoql/NegativeRange.java | 5 +---
.../jdoql/NullCollectionsAndContainsMethod.java | 10 +++-----
.../tck/query/jdoql/NullCollectionsAndIsEmpty.java | 4 +--
.../jdo/tck/query/jdoql/OrderingSpecification.java | 3 ---
.../jdoql/ParenthesesMarkOperatorPrecedence.java | 3 ---
.../apache/jdo/tck/query/jdoql/PositiveRange.java | 4 +--
.../jdo/tck/query/jdoql/QueryIsSerializable.java | 3 ---
.../jdoql/QueryResultPassedToAnotherQuery.java | 3 ---
.../jdo/tck/query/jdoql/QueryWithNoFilter.java | 3 ---
.../apache/jdo/tck/query/jdoql/RangeAsString.java | 7 +----
...ializedQueryInstanceLosesAssociationWithPM.java | 2 --
.../query/jdoql/SeparateNamespaceForTypeNames.java | 12 +++------
.../jdoql/WhiteSpaceIsACharacterAndIgnored.java | 3 ---
.../jdo/tck/query/jdoql/keywords/SingleString.java | 2 --
.../ThisIsReservedWordForElementOfCollection.java | 3 ---
.../keywords/UseOfThisToAcessHiddenField.java | 3 ---
.../tck/query/jdoql/methods/EnumMethodOrdinal.java | 3 ---
.../query/jdoql/methods/EnumMethodToString.java | 3 ---
.../MethodsAndObjectConstructionNotSupported.java | 1 -
.../query/jdoql/methods/StartsWithAndEndsWith.java | 4 +--
.../jdoql/methods/SupportedCollectionMethods.java | 10 +++-----
.../query/jdoql/methods/SupportedDateMethods.java | 4 +--
.../jdoql/methods/SupportedJDOHelperMethods.java | 3 ---
.../query/jdoql/methods/SupportedListMethods.java | 7 ++---
.../jdoql/methods/SupportedLocalDateMethods.java | 14 +++++-----
.../methods/SupportedLocalDateTimeMethods.java | 14 +++++-----
.../jdoql/methods/SupportedLocalTimeMethods.java | 14 +++++-----
.../query/jdoql/methods/SupportedMapMethods.java | 5 +---
.../query/jdoql/methods/SupportedMathMethods.java | 3 ---
.../jdoql/methods/SupportedOptionalMethods.java | 3 ---
.../jdoql/methods/SupportedStringMethods.java | 4 +--
.../query/jdoql/methods/SupportedTimeMethods.java | 3 ---
.../tck/query/jdoql/operators/BinaryAddition.java | 3 ---
.../query/jdoql/operators/BinarySubtraction.java | 3 ---
.../jdoql/operators/BitwiseBinaryOperators.java | 10 +++-----
.../query/jdoql/operators/BitwiseComplement.java | 3 ---
.../query/jdoql/operators/BooleanLogicalAND.java | 5 ----
.../query/jdoql/operators/BooleanLogicalOR.java | 3 ---
.../tck/query/jdoql/operators/ComparisonTests.java | 3 ---
.../tck/query/jdoql/operators/ConditionalAND.java | 3 ---
.../tck/query/jdoql/operators/ConditionalOR.java | 3 ---
.../jdo/tck/query/jdoql/operators/Division.java | 3 ---
.../jdo/tck/query/jdoql/operators/Equality.java | 1 -
...dComparisonsBetweenDateFieldsAndParameters.java | 7 ++---
...risonsBetweenPrimitivesAndWrapperInstances.java | 3 ---
...omparisonsBetweenStringFieldsAndParameters.java | 10 +++-----
.../jdo/tck/query/jdoql/operators/GreaterThan.java | 1 -
.../query/jdoql/operators/GreaterThanOrEqual.java | 1 -
.../jdo/tck/query/jdoql/operators/Instanceof.java | 4 +--
.../jdo/tck/query/jdoql/operators/LessThan.java | 1 -
.../tck/query/jdoql/operators/LessThanOrEqual.java | 1 -
.../query/jdoql/operators/LogicalComplement.java | 27 +++++++++++++++----
.../jdo/tck/query/jdoql/operators/Modulo.java | 3 ---
.../tck/query/jdoql/operators/Multiplication.java | 3 ---
.../jdo/tck/query/jdoql/operators/NotEquals.java | 1 -
.../operators/PromotionOfNumericOperands.java | 3 ---
.../tck/query/jdoql/operators/SignInversion.java | 3 ---
.../query/jdoql/operators/StringConcatenation.java | 10 +++-----
.../jdo/tck/query/jdoql/operators/UnaryPlus.java | 3 ---
.../jdoql/parameters/BoundParameterCheck.java | 1 -
.../parameters/DomainObjectsAsParameters.java | 3 ---
.../query/jdoql/parameters/ImplicitParameters.java | 2 --
.../query/jdoql/parameters/OrderOfParameters.java | 9 +++----
.../parameters/ParameterBoundToDifferentPM.java | 2 --
...eclaredWithSameNameAsFieldOfCandidateClass.java | 3 ---
.../parameters/PrimitiveParameterPassedAsNull.java | 2 --
.../query/jdoql/subqueries/AggregateOnSize.java | 2 --
.../jdoql/subqueries/CorrelatedSubqueries.java | 3 ---
.../CorrelatedSubqueriesWithParameters.java | 2 --
.../subqueries/MultipleCallsReplaceSubquery.java | 2 --
.../jdoql/subqueries/NonCorrelatedSubqueries.java | 6 -----
.../NullCandidateCollectionExpression.java | 5 ----
.../jdoql/subqueries/NullSubqueryParameter.java | 5 ----
.../jdoql/subqueries/NullVariableDeclaration.java | 7 -----
.../tck/query/jdoql/subqueries/SubqueriesTest.java | 4 +--
.../subqueries/UnmodifiedSubqueryInstance.java | 5 ----
.../tck/query/jdoql/variables/MixedVariables.java | 1 -
.../jdoql/variables/UnconstrainedVariable.java | 10 +++-----
...eclaredWithSameNameAsFieldOfCandidateClass.java | 1 -
.../query/jdoql/variables/VariablesAndFields.java | 5 +---
.../jdoql/variables/VariablesWithoutExtent.java | 3 ---
.../jdo/tck/query/result/AggregateResult.java | 5 +---
.../apache/jdo/tck/query/result/DefaultResult.java | 5 +---
.../apache/jdo/tck/query/result/DefaultUnique.java | 5 +---
.../query/result/DistinctCandidateInstances.java | 5 ----
.../apache/jdo/tck/query/result/DistinctQuery.java | 6 +----
.../org/apache/jdo/tck/query/result/Grouping.java | 5 +---
.../apache/jdo/tck/query/result/IfElseResult.java | 9 +++----
.../jdo/tck/query/result/ImmutableQueryResult.java | 3 ---
.../jdo/tck/query/result/MethodsInResult.java | 3 ---
.../jdo/tck/query/result/NPEInResultExpr.java | 5 +---
.../apache/jdo/tck/query/result/NullResults.java | 5 +---
.../result/ProjectedSCODoesNotTrackChanges.java | 2 --
.../tck/query/result/ResultClassRequirements.java | 5 +---
.../jdo/tck/query/result/ResultExpressions.java | 7 ++---
.../apache/jdo/tck/query/result/ShapeOfResult.java | 5 +---
.../org/apache/jdo/tck/query/result/Unique.java | 2 --
.../jdo/tck/query/result/VariableInResult.java | 5 +---
.../result/VariableInResultMultipleNavigation.java | 7 ++---
.../query/result/VariableInResultNavigation.java | 5 +---
.../jdo/tck/query/sql/AllowedAPIMethods.java | 3 ---
.../apache/jdo/tck/query/sql/ExecuteWithMap.java | 1 -
.../org/apache/jdo/tck/query/sql/NewQuery.java | 2 --
.../apache/jdo/tck/query/sql/NoCandidateClass.java | 3 ---
.../apache/jdo/tck/query/sql/ShapeOfResult.java | 3 ---
.../AfterCompletionMethodCalledWhenCommitted.java | 1 -
.../AfterCompletionMethodCalledWhenRolledback.java | 2 --
.../AfterSetRollbackOnlyCommitFails.java | 2 --
.../transactions/BeforeCompletionMethodCalled.java | 2 --
...oreCompletionMethodNotCalledBeforeRollback.java | 1 -
.../org/apache/jdo/tck/transactions/Commit.java | 1 -
.../tck/transactions/GetPersistenceManager.java | 1 -
.../jdo/tck/transactions/GetRetainValues.java | 1 -
.../GetRollbackOnlyReturnsFalseUntilSet.java | 2 --
.../jdo/tck/transactions/GetSynchronization.java | 1 -
.../org/apache/jdo/tck/transactions/IsActive.java | 1 -
.../IsActiveUntilAfterCompletionMethodCalled.java | 1 -
.../org/apache/jdo/tck/transactions/Rollback.java | 2 --
.../tck/transactions/SetNontransactionalRead.java | 2 --
...ntransactionalReadCalledDuringTxCompletion.java | 1 -
...etNontransactionalReadTrueWhenNotSupported.java | 1 -
...transactionalWriteCalledDuringTxCompletion.java | 1 -
.../apache/jdo/tck/transactions/SetOptimistic.java | 1 -
.../SetOptimisticCalledDuringTxCompletion.java | 1 -
.../SetOptimisticDuringTransaction.java | 1 -
.../SetOptimisticTrueWhenNotSupported.java | 1 -
.../jdo/tck/transactions/SetRetainValues.java | 1 -
.../SetRetainValuesCalledDuringTxCompletion.java | 1 -
.../SetRetainValuesTrueWhenNotSupported.java | 1 -
.../jdo/tck/transactions/SetSynchronization.java | 1 -
.../tck/transactions/SetSynchronizationToNull.java | 1 -
.../WhenNontransactionalReadIsFalse.java | 4 +--
.../apache/jdo/tck/util/BatchResultPrinter.java | 1 -
.../org/apache/jdo/tck/util/BatchTestRunner.java | 7 +----
.../org/apache/jdo/tck/util/ClassGenerator.java | 3 ++-
.../org/apache/jdo/tck/util/ConversionHelper.java | 1 -
.../java/org/apache/jdo/tck/util/DeepEquality.java | 2 --
.../org/apache/jdo/tck/util/EqualityHelper.java | 4 +--
.../jdo/tck/util/IntegerToStringConverter.java | 3 +--
.../apache/jdo/tck/util/JDOCustomDateEditor.java | 3 +--
.../org/apache/jdo/tck/util/JDOJdk14Logger.java | 10 +++-----
.../jdo/tck/util/PointToStringConverter.java | 3 +--
.../org/apache/jdo/tck/util/ResultSummary.java | 2 --
.../org/apache/jdo/tck/util/SystemCfgSummary.java | 2 --
.../apache/jdo/tck/util/signature/Formatter.java | 6 ++---
.../jdo/tck/util/signature/SignatureVerifier.java | 30 ++++++++++------------
.../apache/jdo/tck/util/signature/TypeHelper.java | 14 +++-------
758 files changed, 1221 insertions(+), 2279 deletions(-)
diff --git a/api/src/main/java/javax/jdo/Enhancer.java b/api/src/main/java/javax/jdo/Enhancer.java
index be8104cc..3634e03a 100644
--- a/api/src/main/java/javax/jdo/Enhancer.java
+++ b/api/src/main/java/javax/jdo/Enhancer.java
@@ -16,25 +16,23 @@
*/
package javax.jdo;
+import static javax.jdo.Constants.ENHANCER_EXCEPTION;
+import static javax.jdo.Constants.ENHANCER_NO_JDO_ENHANCER_FOUND;
+import static javax.jdo.Constants.ENHANCER_USAGE_ERROR;
+import static javax.jdo.Constants.PROPERTY_ENHANCER_VENDOR_NAME;
+import static javax.jdo.Constants.PROPERTY_ENHANCER_VERSION_NUMBER;
+
import java.io.File;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.net.URLClassLoader;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
-import java.util.Map.Entry;
-
-import static javax.jdo.Constants.ENHANCER_EXCEPTION;
-import static javax.jdo.Constants.ENHANCER_NO_JDO_ENHANCER_FOUND;
-import static javax.jdo.Constants.ENHANCER_USAGE_ERROR;
-import static javax.jdo.Constants.PROPERTY_ENHANCER_VENDOR_NAME;
-import static javax.jdo.Constants.PROPERTY_ENHANCER_VERSION_NUMBER;
-
import javax.jdo.spi.I18NHelper;
/**
diff --git a/api/src/main/java/javax/jdo/Extent.java b/api/src/main/java/javax/jdo/Extent.java
index 573cdcf7..264e07ab 100644
--- a/api/src/main/java/javax/jdo/Extent.java
+++ b/api/src/main/java/javax/jdo/Extent.java
@@ -22,7 +22,6 @@
package javax.jdo;
-import java.lang.Iterable;
import java.util.Iterator;
/**
diff --git a/api/src/main/java/javax/jdo/JDOEnhancer.java b/api/src/main/java/javax/jdo/JDOEnhancer.java
index ac53c995..1c6306f1 100644
--- a/api/src/main/java/javax/jdo/JDOEnhancer.java
+++ b/api/src/main/java/javax/jdo/JDOEnhancer.java
@@ -18,7 +18,6 @@ package javax.jdo;
import java.lang.instrument.ClassFileTransformer;
import java.util.Properties;
-
import javax.jdo.metadata.JDOMetadata;
/**
diff --git a/api/src/main/java/javax/jdo/JDOHelper.java b/api/src/main/java/javax/jdo/JDOHelper.java
index d43e298b..0b68680b 100644
--- a/api/src/main/java/javax/jdo/JDOHelper.java
+++ b/api/src/main/java/javax/jdo/JDOHelper.java
@@ -44,7 +44,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-
import javax.jdo.spi.I18NHelper;
import javax.jdo.spi.JDOImplHelper;
import javax.jdo.spi.JDOImplHelper.StateInterrogationBooleanReturn;
@@ -59,7 +58,6 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.FactoryConfigurationError;
import javax.xml.parsers.ParserConfigurationException;
-
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
diff --git a/api/src/main/java/javax/jdo/JDOQLTypedQuery.java b/api/src/main/java/javax/jdo/JDOQLTypedQuery.java
index 9ea45666..edf9ae3a 100644
--- a/api/src/main/java/javax/jdo/JDOQLTypedQuery.java
+++ b/api/src/main/java/javax/jdo/JDOQLTypedQuery.java
@@ -21,7 +21,6 @@ import java.io.Serializable;
import java.util.Collection;
import java.util.List;
import java.util.Map;
-
import javax.jdo.query.BooleanExpression;
import javax.jdo.query.CharacterExpression;
import javax.jdo.query.CollectionExpression;
diff --git a/api/src/main/java/javax/jdo/JDOQLTypedSubquery.java b/api/src/main/java/javax/jdo/JDOQLTypedSubquery.java
index 384537f8..dff6381a 100644
--- a/api/src/main/java/javax/jdo/JDOQLTypedSubquery.java
+++ b/api/src/main/java/javax/jdo/JDOQLTypedSubquery.java
@@ -17,7 +17,6 @@
package javax.jdo;
import java.io.Serializable;
-
import javax.jdo.query.BooleanExpression;
import javax.jdo.query.CharacterExpression;
import javax.jdo.query.CollectionExpression;
diff --git a/api/src/main/java/javax/jdo/LegacyJava.java b/api/src/main/java/javax/jdo/LegacyJava.java
index f511c92b..d8206c65 100644
--- a/api/src/main/java/javax/jdo/LegacyJava.java
+++ b/api/src/main/java/javax/jdo/LegacyJava.java
@@ -16,10 +16,13 @@
*/
package javax.jdo;
-import javax.jdo.spi.JDOPermission;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.security.*;
+import java.security.Permission;
+import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import javax.jdo.spi.JDOPermission;
/**
* This class provides wrapper implementations for the Java SecurityManager and AccessController
diff --git a/api/src/main/java/javax/jdo/PersistenceManager.java b/api/src/main/java/javax/jdo/PersistenceManager.java
index d47cde36..9a7f8606 100644
--- a/api/src/main/java/javax/jdo/PersistenceManager.java
+++ b/api/src/main/java/javax/jdo/PersistenceManager.java
@@ -26,10 +26,8 @@ import java.util.Date;
import java.util.EnumSet;
import java.util.Map;
import java.util.Set;
-
import javax.jdo.datastore.JDOConnection;
import javax.jdo.datastore.Sequence;
-
import javax.jdo.listener.InstanceLifecycleListener;
/**
diff --git a/api/src/main/java/javax/jdo/PersistenceManagerFactory.java b/api/src/main/java/javax/jdo/PersistenceManagerFactory.java
index a46ff89e..5886ed99 100644
--- a/api/src/main/java/javax/jdo/PersistenceManagerFactory.java
+++ b/api/src/main/java/javax/jdo/PersistenceManagerFactory.java
@@ -22,15 +22,15 @@
package javax.jdo;
-import javax.jdo.datastore.DataStoreCache;
-import javax.jdo.listener.InstanceLifecycleListener;
-import javax.jdo.metadata.TypeMetadata;
-import javax.jdo.metadata.JDOMetadata;
-import javax.jdo.spi.JDOPermission; // for getFetchGroups javadoc
import java.io.Serializable;
import java.util.Collection;
import java.util.Properties;
import java.util.Set;
+import javax.jdo.datastore.DataStoreCache;
+import javax.jdo.listener.InstanceLifecycleListener;
+import javax.jdo.metadata.JDOMetadata;
+import javax.jdo.metadata.TypeMetadata;
+import javax.jdo.spi.JDOPermission;
/**
* The <code>PersistenceManagerFactory</code> is the interface to use to obtain <code>
diff --git a/api/src/main/java/javax/jdo/annotations/Convert.java b/api/src/main/java/javax/jdo/annotations/Convert.java
index a035c0d0..72ae3f98 100644
--- a/api/src/main/java/javax/jdo/annotations/Convert.java
+++ b/api/src/main/java/javax/jdo/annotations/Convert.java
@@ -20,7 +20,6 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-
import javax.jdo.AttributeConverter;
/**
diff --git a/api/src/main/java/javax/jdo/annotations/Element.java b/api/src/main/java/javax/jdo/annotations/Element.java
index 45013424..9fe0348d 100644
--- a/api/src/main/java/javax/jdo/annotations/Element.java
+++ b/api/src/main/java/javax/jdo/annotations/Element.java
@@ -20,7 +20,6 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-
import javax.jdo.AttributeConverter;
import javax.jdo.AttributeConverter.UseDefault;
diff --git a/api/src/main/java/javax/jdo/annotations/Key.java b/api/src/main/java/javax/jdo/annotations/Key.java
index fc988823..e6702d6e 100644
--- a/api/src/main/java/javax/jdo/annotations/Key.java
+++ b/api/src/main/java/javax/jdo/annotations/Key.java
@@ -20,7 +20,6 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-
import javax.jdo.AttributeConverter;
import javax.jdo.AttributeConverter.UseDefault;
diff --git a/api/src/main/java/javax/jdo/annotations/Persistent.java b/api/src/main/java/javax/jdo/annotations/Persistent.java
index 8691d932..7b2cca44 100644
--- a/api/src/main/java/javax/jdo/annotations/Persistent.java
+++ b/api/src/main/java/javax/jdo/annotations/Persistent.java
@@ -20,7 +20,6 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-
import javax.jdo.AttributeConverter;
import javax.jdo.AttributeConverter.UseDefault;
diff --git a/api/src/main/java/javax/jdo/annotations/Value.java b/api/src/main/java/javax/jdo/annotations/Value.java
index 800843c6..912c8d9b 100644
--- a/api/src/main/java/javax/jdo/annotations/Value.java
+++ b/api/src/main/java/javax/jdo/annotations/Value.java
@@ -20,7 +20,6 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-
import javax.jdo.AttributeConverter;
import javax.jdo.AttributeConverter.UseDefault;
diff --git a/api/src/main/java/javax/jdo/identity/CharIdentity.java b/api/src/main/java/javax/jdo/identity/CharIdentity.java
index 6e34a4c4..0a82e46e 100644
--- a/api/src/main/java/javax/jdo/identity/CharIdentity.java
+++ b/api/src/main/java/javax/jdo/identity/CharIdentity.java
@@ -25,7 +25,6 @@ package javax.jdo.identity;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-
import javax.jdo.spi.I18NHelper;
/**
diff --git a/api/src/main/java/javax/jdo/identity/ObjectIdentity.java b/api/src/main/java/javax/jdo/identity/ObjectIdentity.java
index 69b97996..2b73efae 100644
--- a/api/src/main/java/javax/jdo/identity/ObjectIdentity.java
+++ b/api/src/main/java/javax/jdo/identity/ObjectIdentity.java
@@ -25,14 +25,11 @@ package javax.jdo.identity;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-
-import javax.jdo.JDOFatalInternalException;
-import javax.jdo.LegacyJava;
import java.lang.reflect.InvocationTargetException;
import java.security.PrivilegedAction;
-
+import javax.jdo.JDOFatalInternalException;
import javax.jdo.JDOUserException;
-
+import javax.jdo.LegacyJava;
import javax.jdo.spi.JDOImplHelper;
/**
diff --git a/api/src/main/java/javax/jdo/identity/SingleFieldIdentity.java b/api/src/main/java/javax/jdo/identity/SingleFieldIdentity.java
index 095c36cb..4d53b7ab 100644
--- a/api/src/main/java/javax/jdo/identity/SingleFieldIdentity.java
+++ b/api/src/main/java/javax/jdo/identity/SingleFieldIdentity.java
@@ -26,10 +26,8 @@ import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-
import javax.jdo.JDOFatalInternalException;
import javax.jdo.JDONullIdentityException;
-
import javax.jdo.spi.I18NHelper;
/**
diff --git a/api/src/main/java/javax/jdo/metadata/TypeMetadata.java b/api/src/main/java/javax/jdo/metadata/TypeMetadata.java
index 952e79cf..1cf45674 100644
--- a/api/src/main/java/javax/jdo/metadata/TypeMetadata.java
+++ b/api/src/main/java/javax/jdo/metadata/TypeMetadata.java
@@ -17,7 +17,6 @@
package javax.jdo.metadata;
import java.lang.reflect.Method;
-
import javax.jdo.annotations.IdentityType;
/**
diff --git a/api/src/main/java/javax/jdo/query/LocalDateExpression.java b/api/src/main/java/javax/jdo/query/LocalDateExpression.java
index be08a203..7be4b83e 100644
--- a/api/src/main/java/javax/jdo/query/LocalDateExpression.java
+++ b/api/src/main/java/javax/jdo/query/LocalDateExpression.java
@@ -16,9 +16,6 @@
*/
package javax.jdo.query;
-import javax.jdo.query.ComparableExpression;
-import javax.jdo.query.NumericExpression;
-
/** Representation of a java.time.LocalDate in a query. */
public interface LocalDateExpression extends ComparableExpression<java.time.LocalDate> {
/**
diff --git a/api/src/main/java/javax/jdo/query/LocalDateTimeExpression.java b/api/src/main/java/javax/jdo/query/LocalDateTimeExpression.java
index a9cac3b5..2c40184f 100644
--- a/api/src/main/java/javax/jdo/query/LocalDateTimeExpression.java
+++ b/api/src/main/java/javax/jdo/query/LocalDateTimeExpression.java
@@ -16,9 +16,6 @@
*/
package javax.jdo.query;
-import javax.jdo.query.ComparableExpression;
-import javax.jdo.query.NumericExpression;
-
/** Representation of a java.time.LocalDateTime type in a query. */
public interface LocalDateTimeExpression extends ComparableExpression<java.time.LocalDateTime> {
/**
diff --git a/api/src/main/java/javax/jdo/query/LocalTimeExpression.java b/api/src/main/java/javax/jdo/query/LocalTimeExpression.java
index e0dd7f07..994fd9ed 100644
--- a/api/src/main/java/javax/jdo/query/LocalTimeExpression.java
+++ b/api/src/main/java/javax/jdo/query/LocalTimeExpression.java
@@ -16,9 +16,6 @@
*/
package javax.jdo.query;
-import javax.jdo.query.ComparableExpression;
-import javax.jdo.query.NumericExpression;
-
/** Representation of a java.time.LocalTime in a query. */
public interface LocalTimeExpression extends ComparableExpression<java.time.LocalTime> {
/**
diff --git a/api/src/main/java/javax/jdo/spi/I18NHelper.java b/api/src/main/java/javax/jdo/spi/I18NHelper.java
index 45c4d3a9..26d29534 100644
--- a/api/src/main/java/javax/jdo/spi/I18NHelper.java
+++ b/api/src/main/java/javax/jdo/spi/I18NHelper.java
@@ -18,12 +18,13 @@
package javax.jdo.spi;
import java.lang.reflect.InvocationTargetException;
-import java.util.*;
-import java.text.MessageFormat;
-import javax.jdo.LegacyJava;
import java.security.PrivilegedAction;
-
+import java.text.MessageFormat;
+import java.util.Hashtable;
+import java.util.Locale;
+import java.util.ResourceBundle;
import javax.jdo.JDOFatalInternalException;
+import javax.jdo.LegacyJava;
/**
* Helper class for constructing messages from bundles. The intended usage of this class is to
diff --git a/api/src/main/java/javax/jdo/spi/JDOImplHelper.java b/api/src/main/java/javax/jdo/spi/JDOImplHelper.java
index d77e4cdd..e2cf5bde 100644
--- a/api/src/main/java/javax/jdo/spi/JDOImplHelper.java
+++ b/api/src/main/java/javax/jdo/spi/JDOImplHelper.java
@@ -22,20 +22,12 @@
package javax.jdo.spi;
-import org.xml.sax.ErrorHandler;
-
-import javax.jdo.LegacyJava;
-import javax.jdo.LegacyJava.SecurityManager;
-
import java.lang.reflect.Constructor;
-
import java.lang.reflect.InvocationTargetException;
import java.security.PrivilegedAction;
-
import java.text.DateFormat;
import java.text.ParsePosition;
import java.text.SimpleDateFormat;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -49,9 +41,15 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
-
-import javax.jdo.*;
+import javax.jdo.Constants;
+import javax.jdo.JDOException;
+import javax.jdo.JDOFatalInternalException;
+import javax.jdo.JDOFatalUserException;
+import javax.jdo.JDOUserException;
+import javax.jdo.LegacyJava;
+import javax.jdo.LegacyJava.SecurityManager;
import javax.xml.parsers.DocumentBuilderFactory;
+import org.xml.sax.ErrorHandler;
/**
* This class is a helper class for JDO implementations. It contains methods to register metadata
diff --git a/api/src/test/java/javax/jdo/AbstractJDOConfigTest.java b/api/src/test/java/javax/jdo/AbstractJDOConfigTest.java
index d7e8b05d..94745b18 100644
--- a/api/src/test/java/javax/jdo/AbstractJDOConfigTest.java
+++ b/api/src/test/java/javax/jdo/AbstractJDOConfigTest.java
@@ -22,7 +22,6 @@ import java.util.Enumeration;
import java.util.Iterator;
import java.util.Map;
import java.util.Random;
-
import javax.jdo.util.AbstractTest;
public abstract class AbstractJDOConfigTest extends AbstractTest {
diff --git a/api/src/test/java/javax/jdo/EnhancerTest.java b/api/src/test/java/javax/jdo/EnhancerTest.java
index 414008c0..7a9b4ecb 100644
--- a/api/src/test/java/javax/jdo/EnhancerTest.java
+++ b/api/src/test/java/javax/jdo/EnhancerTest.java
@@ -26,7 +26,6 @@ import java.nio.CharBuffer;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
-
import javax.jdo.util.AbstractTest;
import javax.jdo.util.BatchTestRunner;
diff --git a/api/src/test/java/javax/jdo/JDOHelperConfigTest.java b/api/src/test/java/javax/jdo/JDOHelperConfigTest.java
index 77ffc81e..fd74a15e 100644
--- a/api/src/test/java/javax/jdo/JDOHelperConfigTest.java
+++ b/api/src/test/java/javax/jdo/JDOHelperConfigTest.java
@@ -21,9 +21,7 @@ import java.io.InputStream;
import java.net.URLClassLoader;
import java.util.HashMap;
import java.util.Map;
-
import javax.jdo.util.BatchTestRunner;
-
import junit.framework.TestSuite;
/** Tests class javax.jdo.JDOHelper for META-INF/jdoconfig.xml compliance. */
diff --git a/api/src/test/java/javax/jdo/JDOHelperTest.java b/api/src/test/java/javax/jdo/JDOHelperTest.java
index c95c34cb..8181a394 100644
--- a/api/src/test/java/javax/jdo/JDOHelperTest.java
+++ b/api/src/test/java/javax/jdo/JDOHelperTest.java
@@ -19,15 +19,12 @@ package javax.jdo;
import java.io.File;
import java.io.InputStream;
-
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-
import javax.jdo.pc.PCPoint;
import javax.jdo.util.AbstractTest;
import javax.jdo.util.BatchTestRunner;
-
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
diff --git a/api/src/test/java/javax/jdo/MockEnhancer.java b/api/src/test/java/javax/jdo/MockEnhancer.java
index 1e989ea2..2877de86 100644
--- a/api/src/test/java/javax/jdo/MockEnhancer.java
+++ b/api/src/test/java/javax/jdo/MockEnhancer.java
@@ -17,16 +17,15 @@
package javax.jdo;
+import static javax.jdo.Constants.PROPERTY_ENHANCER_VENDOR_NAME;
+import static javax.jdo.Constants.PROPERTY_ENHANCER_VERSION_NUMBER;
+
import java.lang.instrument.IllegalClassFormatException;
import java.security.ProtectionDomain;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Properties;
-
-import static javax.jdo.Constants.PROPERTY_ENHANCER_VENDOR_NAME;
-import static javax.jdo.Constants.PROPERTY_ENHANCER_VERSION_NUMBER;
-
import javax.jdo.metadata.JDOMetadata;
/**
diff --git a/api/src/test/java/javax/jdo/ObjectStateTest.java b/api/src/test/java/javax/jdo/ObjectStateTest.java
index 55b0b18d..8e9b306a 100644
--- a/api/src/test/java/javax/jdo/ObjectStateTest.java
+++ b/api/src/test/java/javax/jdo/ObjectStateTest.java
@@ -20,9 +20,7 @@ package javax.jdo;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-
import javax.jdo.spi.PersistenceCapable;
-
import javax.jdo.util.AbstractTest;
import javax.jdo.util.BatchTestRunner;
diff --git a/api/src/test/java/javax/jdo/PMFMapMapTest.java b/api/src/test/java/javax/jdo/PMFMapMapTest.java
index 565d15f4..e6fd9674 100644
--- a/api/src/test/java/javax/jdo/PMFMapMapTest.java
+++ b/api/src/test/java/javax/jdo/PMFMapMapTest.java
@@ -19,13 +19,11 @@ package javax.jdo;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
-
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
-import junit.framework.TestSuite;
-
import javax.jdo.util.BatchTestRunner;
+import junit.framework.TestSuite;
/**
* Tests class javax.jdo.JDOHelper for calls to the impl's static method
diff --git a/api/src/test/java/javax/jdo/identity/ByteIdentityTest.java b/api/src/test/java/javax/jdo/identity/ByteIdentityTest.java
index 7407e095..a4cbd777 100644
--- a/api/src/test/java/javax/jdo/identity/ByteIdentityTest.java
+++ b/api/src/test/java/javax/jdo/identity/ByteIdentityTest.java
@@ -23,7 +23,6 @@
package javax.jdo.identity;
import javax.jdo.JDONullIdentityException;
-
import javax.jdo.util.BatchTestRunner;
/** */
diff --git a/api/src/test/java/javax/jdo/identity/CharIdentityTest.java b/api/src/test/java/javax/jdo/identity/CharIdentityTest.java
index 8d595013..f4b543cd 100644
--- a/api/src/test/java/javax/jdo/identity/CharIdentityTest.java
+++ b/api/src/test/java/javax/jdo/identity/CharIdentityTest.java
@@ -23,7 +23,6 @@
package javax.jdo.identity;
import javax.jdo.JDONullIdentityException;
-
import javax.jdo.util.BatchTestRunner;
/**
diff --git a/api/src/test/java/javax/jdo/identity/IntIdentityTest.java b/api/src/test/java/javax/jdo/identity/IntIdentityTest.java
index 1a474d48..5d9d6a1d 100644
--- a/api/src/test/java/javax/jdo/identity/IntIdentityTest.java
+++ b/api/src/test/java/javax/jdo/identity/IntIdentityTest.java
@@ -23,7 +23,6 @@
package javax.jdo.identity;
import javax.jdo.JDONullIdentityException;
-
import javax.jdo.util.BatchTestRunner;
/** */
diff --git a/api/src/test/java/javax/jdo/identity/LongIdentityTest.java b/api/src/test/java/javax/jdo/identity/LongIdentityTest.java
index e8a21842..53f54f0e 100644
--- a/api/src/test/java/javax/jdo/identity/LongIdentityTest.java
+++ b/api/src/test/java/javax/jdo/identity/LongIdentityTest.java
@@ -23,7 +23,6 @@
package javax.jdo.identity;
import javax.jdo.JDONullIdentityException;
-
import javax.jdo.util.BatchTestRunner;
/** */
diff --git a/api/src/test/java/javax/jdo/identity/ObjectIdentityTest.java b/api/src/test/java/javax/jdo/identity/ObjectIdentityTest.java
index 18970e3b..bafa5800 100644
--- a/api/src/test/java/javax/jdo/identity/ObjectIdentityTest.java
+++ b/api/src/test/java/javax/jdo/identity/ObjectIdentityTest.java
@@ -21,28 +21,20 @@
*/
package javax.jdo.identity;
-import java.lang.reflect.InvocationTargetException;
-
import java.io.Serializable;
-
+import java.lang.reflect.InvocationTargetException;
import java.math.BigDecimal;
-
-import javax.jdo.JDOFatalInternalException;
-import javax.jdo.LegacyJava;
import java.security.PrivilegedAction;
-
-import java.text.SimpleDateFormat;
import java.text.DateFormat;
-
+import java.text.SimpleDateFormat;
import java.util.Currency;
import java.util.Date;
import java.util.Locale;
-
-import javax.jdo.JDOUserException;
+import javax.jdo.JDOFatalInternalException;
import javax.jdo.JDONullIdentityException;
-
+import javax.jdo.JDOUserException;
+import javax.jdo.LegacyJava;
import javax.jdo.spi.JDOImplHelper;
-
import javax.jdo.util.BatchTestRunner;
/** */
diff --git a/api/src/test/java/javax/jdo/identity/ShortIdentityTest.java b/api/src/test/java/javax/jdo/identity/ShortIdentityTest.java
index 5d35bf09..2fac39e2 100644
--- a/api/src/test/java/javax/jdo/identity/ShortIdentityTest.java
+++ b/api/src/test/java/javax/jdo/identity/ShortIdentityTest.java
@@ -23,7 +23,6 @@
package javax.jdo.identity;
import javax.jdo.JDONullIdentityException;
-
import javax.jdo.util.BatchTestRunner;
/** */
diff --git a/api/src/test/java/javax/jdo/identity/SingleFieldIdentityTest.java b/api/src/test/java/javax/jdo/identity/SingleFieldIdentityTest.java
index 10157185..cc2f6e85 100644
--- a/api/src/test/java/javax/jdo/identity/SingleFieldIdentityTest.java
+++ b/api/src/test/java/javax/jdo/identity/SingleFieldIdentityTest.java
@@ -26,7 +26,6 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-
import javax.jdo.util.AbstractTest;
import javax.jdo.util.BatchTestRunner;
diff --git a/api/src/test/java/javax/jdo/identity/StringIdentityTest.java b/api/src/test/java/javax/jdo/identity/StringIdentityTest.java
index 56ef6b79..cac6051b 100644
--- a/api/src/test/java/javax/jdo/identity/StringIdentityTest.java
+++ b/api/src/test/java/javax/jdo/identity/StringIdentityTest.java
@@ -23,7 +23,6 @@
package javax.jdo.identity;
import javax.jdo.JDONullIdentityException;
-
import javax.jdo.util.BatchTestRunner;
/** */
diff --git a/api/src/test/java/javax/jdo/pc/PCPoint.java b/api/src/test/java/javax/jdo/pc/PCPoint.java
index 1a27a3d1..7ab7df1f 100644
--- a/api/src/test/java/javax/jdo/pc/PCPoint.java
+++ b/api/src/test/java/javax/jdo/pc/PCPoint.java
@@ -18,9 +18,9 @@
package javax.jdo.pc;
import javax.jdo.PersistenceManager;
-import javax.jdo.spi.*;
-
+import javax.jdo.spi.JDOImplHelper;
import javax.jdo.spi.PersistenceCapable;
+import javax.jdo.spi.StateManager;
/**
* This is a hand-enhanced version of a simple class with two fields. The enhanced code assumes
diff --git a/api/src/test/java/javax/jdo/schema/XMLTest.java b/api/src/test/java/javax/jdo/schema/XMLTest.java
index 49a51416..0c153443 100644
--- a/api/src/test/java/javax/jdo/schema/XMLTest.java
+++ b/api/src/test/java/javax/jdo/schema/XMLTest.java
@@ -19,7 +19,6 @@ package javax.jdo.schema;
import java.io.File;
import java.io.FilenameFilter;
-
import javax.jdo.util.AbstractTest;
import javax.jdo.util.BatchTestRunner;
import javax.jdo.util.XMLTestUtil;
diff --git a/api/src/test/java/javax/jdo/spi/JDOImplHelperTest.java b/api/src/test/java/javax/jdo/spi/JDOImplHelperTest.java
index ccacd55a..54726245 100644
--- a/api/src/test/java/javax/jdo/spi/JDOImplHelperTest.java
+++ b/api/src/test/java/javax/jdo/spi/JDOImplHelperTest.java
@@ -19,7 +19,6 @@ package javax.jdo.spi;
import java.util.Collection;
import java.util.Properties;
-
import javax.jdo.Constants;
import javax.jdo.JDOUserException;
import javax.jdo.pc.PCPoint;
diff --git a/api/src/test/java/javax/jdo/spi/StateInterrogationTest.java b/api/src/test/java/javax/jdo/spi/StateInterrogationTest.java
index 8d4ffbab..b0641493 100644
--- a/api/src/test/java/javax/jdo/spi/StateInterrogationTest.java
+++ b/api/src/test/java/javax/jdo/spi/StateInterrogationTest.java
@@ -19,10 +19,8 @@ package javax.jdo.spi;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
-
import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManager;
-
import javax.jdo.util.AbstractTest;
import javax.jdo.util.BatchTestRunner;
diff --git a/api/src/test/java/javax/jdo/stub/StubPMF.java b/api/src/test/java/javax/jdo/stub/StubPMF.java
index 811f701b..bba259f8 100644
--- a/api/src/test/java/javax/jdo/stub/StubPMF.java
+++ b/api/src/test/java/javax/jdo/stub/StubPMF.java
@@ -21,7 +21,6 @@ import java.util.Collection;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-
import javax.jdo.Constants;
import javax.jdo.FetchGroup;
import javax.jdo.PersistenceManager;
diff --git a/api/src/test/java/javax/jdo/util/AbstractTest.java b/api/src/test/java/javax/jdo/util/AbstractTest.java
index d55e09a4..c7d6bbb2 100644
--- a/api/src/test/java/javax/jdo/util/AbstractTest.java
+++ b/api/src/test/java/javax/jdo/util/AbstractTest.java
@@ -18,9 +18,7 @@
package javax.jdo.util;
import java.io.PrintStream;
-
import javax.jdo.Constants;
-
import junit.framework.TestCase;
/** */
diff --git a/api/src/test/java/javax/jdo/util/BatchResultPrinter.java b/api/src/test/java/javax/jdo/util/BatchResultPrinter.java
index 2ca7e81d..6cd0bf41 100644
--- a/api/src/test/java/javax/jdo/util/BatchResultPrinter.java
+++ b/api/src/test/java/javax/jdo/util/BatchResultPrinter.java
@@ -18,7 +18,6 @@
package javax.jdo.util;
import java.io.PrintStream;
-
import junit.framework.AssertionFailedError;
import junit.framework.Test;
import junit.framework.TestCase;
diff --git a/api/src/test/java/javax/jdo/util/BatchTestRunner.java b/api/src/test/java/javax/jdo/util/BatchTestRunner.java
index dfd9150e..0d0cbb2c 100644
--- a/api/src/test/java/javax/jdo/util/BatchTestRunner.java
+++ b/api/src/test/java/javax/jdo/util/BatchTestRunner.java
@@ -17,10 +17,9 @@
package javax.jdo.util;
+import java.io.PrintStream;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import java.io.PrintStream;
-
import junit.framework.Test;
import junit.framework.TestResult;
import junit.framework.TestSuite;
diff --git a/api/src/test/java/javax/jdo/util/XMLTestUtil.java b/api/src/test/java/javax/jdo/util/XMLTestUtil.java
index f037a24b..88a89729 100644
--- a/api/src/test/java/javax/jdo/util/XMLTestUtil.java
+++ b/api/src/test/java/javax/jdo/util/XMLTestUtil.java
@@ -19,29 +19,26 @@ package javax.jdo.util;
import java.io.BufferedReader;
import java.io.File;
+import java.io.FileFilter;
import java.io.FileReader;
+import java.io.FilenameFilter;
+import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.IOException;
-import java.io.FileFilter;
-import java.io.FilenameFilter;
-
-import javax.jdo.JDOFatalInternalException;
-import javax.jdo.LegacyJava;
import java.lang.reflect.InvocationTargetException;
import java.security.PrivilegedAction;
-import java.util.Arrays;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
-
import javax.jdo.JDOFatalException;
+import javax.jdo.JDOFatalInternalException;
+import javax.jdo.LegacyJava;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-
import org.w3c.dom.Document;
import org.xml.sax.EntityResolver;
import org.xml.sax.ErrorHandler;
diff --git a/exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java b/exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java
index e4840765..39db770c 100644
--- a/exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java
+++ b/exectck/src/main/java/org/apache/jdo/exectck/AbstractTCKMojo.java
@@ -22,7 +22,6 @@ import java.nio.charset.Charset;
import java.util.Collection;
import java.util.HashSet;
import java.util.Properties;
-
import org.apache.commons.io.FileUtils;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
diff --git a/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java b/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java
index ecf7e16f..11ee87c9 100644
--- a/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java
+++ b/exectck/src/main/java/org/apache/jdo/exectck/Enhance.java
@@ -17,26 +17,25 @@
package org.apache.jdo.exectck;
-import java.net.MalformedURLException;
-import java.nio.charset.Charset;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.apache.commons.io.FileUtils;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-
import java.io.File;
import java.io.IOException;
+import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
+import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.jdo.JDOEnhancer;
import javax.jdo.JDOHelper;
+import org.apache.commons.io.FileUtils;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
/** Goal that enhances test classes for testing a JDO implementation. */
@Mojo(name = "enhance")
diff --git a/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java b/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java
index 5460f096..3fa9ab5b 100644
--- a/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java
+++ b/exectck/src/main/java/org/apache/jdo/exectck/InstallSchema.java
@@ -15,11 +15,6 @@
*/
package org.apache.jdo.exectck;
-import org.apache.commons.io.FileUtils;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Mojo;
-import org.apache.maven.plugins.annotations.Parameter;
-
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
@@ -30,6 +25,10 @@ import java.sql.Statement;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
+import org.apache.commons.io.FileUtils;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
/** Goal that installs a database schema for testing a JDO implementation. */
@Mojo(name = "installSchema")
diff --git a/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java b/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java
index 79cf42bb..cfda5f7f 100644
--- a/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java
+++ b/exectck/src/main/java/org/apache/jdo/exectck/RunTCK.java
@@ -15,7 +15,10 @@
*/
package org.apache.jdo.exectck;
-import java.io.*;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
diff --git a/tck/src/main/java/org/apache/jdo/tck/AbstractReaderTest.java b/tck/src/main/java/org/apache/jdo/tck/AbstractReaderTest.java
index 841f582b..c8ccbe54 100644
--- a/tck/src/main/java/org/apache/jdo/tck/AbstractReaderTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/AbstractReaderTest.java
@@ -17,15 +17,13 @@
package org.apache.jdo.tck;
-import javax.jdo.JDOFatalInternalException;
-import javax.jdo.LegacyJava;
import java.lang.reflect.InvocationTargetException;
import java.security.PrivilegedAction;
-
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
+import javax.jdo.JDOFatalInternalException;
+import javax.jdo.LegacyJava;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
/*
diff --git a/tck/src/main/java/org/apache/jdo/tck/JDO_Test.java b/tck/src/main/java/org/apache/jdo/tck/JDO_Test.java
index 3ddf5a9e..da445126 100644
--- a/tck/src/main/java/org/apache/jdo/tck/JDO_Test.java
+++ b/tck/src/main/java/org/apache/jdo/tck/JDO_Test.java
@@ -18,20 +18,16 @@
package org.apache.jdo.tck;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
-
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Modifier;
-
-import javax.jdo.*;
import java.security.PrivilegedAction;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -42,10 +38,19 @@ import java.util.Map;
import java.util.Properties;
import java.util.StringTokenizer;
import java.util.Vector;
-
+import javax.jdo.Constants;
+import javax.jdo.Extent;
+import javax.jdo.JDOException;
+import javax.jdo.JDOFatalException;
+import javax.jdo.JDOFatalInternalException;
+import javax.jdo.JDOHelper;
+import javax.jdo.JDOObjectNotFoundException;
+import javax.jdo.LegacyJava;
+import javax.jdo.PersistenceManager;
+import javax.jdo.PersistenceManagerFactory;
+import javax.jdo.Query;
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/SignatureTest.java b/tck/src/main/java/org/apache/jdo/tck/api/SignatureTest.java
index 71c4da9c..0b366318 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/SignatureTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/SignatureTest.java
@@ -17,18 +17,15 @@
package org.apache.jdo.tck.api;
-import org.apache.jdo.tck.JDO_Test;
-import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.util.signature.SignatureVerifier;
-
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
-
-import java.util.List;
-import java.util.ArrayList;
-
import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.jdo.tck.JDO_Test;
+import org.apache.jdo.tck.util.BatchTestRunner;
+import org.apache.jdo.tck.util.signature.SignatureVerifier;
/**
* <B>Title:</B> SignatureTest <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/converter/IntAttributeConverterTest.java b/tck/src/main/java/org/apache/jdo/tck/api/converter/IntAttributeConverterTest.java
index a0d4f5ba..fa600828 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/converter/IntAttributeConverterTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/converter/IntAttributeConverterTest.java
@@ -16,6 +16,11 @@
*/
package org.apache.jdo.tck.api.converter;
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+import javax.jdo.JDOHelper;
+import javax.jdo.Query;
+import javax.jdo.Transaction;
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.converter.IPCPoint;
import org.apache.jdo.tck.pc.converter.PCPoint;
@@ -25,12 +30,6 @@ import org.apache.jdo.tck.pc.converter.PCPointPropAnnotated;
import org.apache.jdo.tck.util.BatchTestRunner;
import org.apache.jdo.tck.util.IntegerToStringConverter;
-import javax.jdo.JDOHelper;
-import javax.jdo.Query;
-import javax.jdo.Transaction;
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
/**
* <B>Title:</B>IntAttributeConverterTest <br>
* <B>Keywords:</B> mapping <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/converter/PointAttributeConverterTest.java b/tck/src/main/java/org/apache/jdo/tck/api/converter/PointAttributeConverterTest.java
index b63da91b..a52bde06 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/converter/PointAttributeConverterTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/converter/PointAttributeConverterTest.java
@@ -16,6 +16,11 @@
*/
package org.apache.jdo.tck.api.converter;
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+import javax.jdo.JDOHelper;
+import javax.jdo.Query;
+import javax.jdo.Transaction;
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.converter.IPCRect;
import org.apache.jdo.tck.pc.converter.PCRect;
@@ -24,12 +29,6 @@ import org.apache.jdo.tck.pc.mylib.Point;
import org.apache.jdo.tck.util.BatchTestRunner;
import org.apache.jdo.tck.util.PointToStringConverter;
-import javax.jdo.JDOHelper;
-import javax.jdo.Query;
-import javax.jdo.Transaction;
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
/**
* <B>Title:</B>PointAttributeConverterTest <br>
* <B>Keywords:</B> mapping <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/exceptions/ExceptionConstructor.java b/tck/src/main/java/org/apache/jdo/tck/api/exceptions/ExceptionConstructor.java
index c69f408b..6b934654 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/exceptions/ExceptionConstructor.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/exceptions/ExceptionConstructor.java
@@ -17,7 +17,6 @@
package org.apache.jdo.tck.api.exceptions;
import java.lang.reflect.Constructor;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/fetchgroup/FetchGroupTest.java b/tck/src/main/java/org/apache/jdo/tck/api/fetchgroup/FetchGroupTest.java
index 143f7cb1..da91a456 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/fetchgroup/FetchGroupTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/fetchgroup/FetchGroupTest.java
@@ -20,15 +20,12 @@ package org.apache.jdo.tck.api.fetchgroup;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
-
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import javax.jdo.FetchGroup;
-
import javax.jdo.JDOException;
import org.apache.jdo.tck.JDO_Test;
-
import org.apache.jdo.tck.pc.company.Address;
import org.apache.jdo.tck.pc.company.Company;
import org.apache.jdo.tck.pc.company.DentalInsurance;
@@ -42,7 +39,6 @@ import org.apache.jdo.tck.pc.company.PIEmployee;
import org.apache.jdo.tck.pc.company.PartTimeEmployee;
import org.apache.jdo.tck.pc.company.Person;
import org.apache.jdo.tck.pc.company.Project;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AbstractInstanceLifecycleListener.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AbstractInstanceLifecycleListener.java
index 475e898e..d13dae2d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AbstractInstanceLifecycleListener.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AbstractInstanceLifecycleListener.java
@@ -19,26 +19,18 @@ package org.apache.jdo.tck.api.instancecallbacks;
import java.util.ArrayList;
import java.util.List;
-
import javax.jdo.JDOHelper;
-
-import javax.jdo.listener.InstanceLifecycleEvent;
-import javax.jdo.listener.InstanceLifecycleListener;
import javax.jdo.listener.AttachLifecycleListener;
import javax.jdo.listener.ClearLifecycleListener;
import javax.jdo.listener.CreateLifecycleListener;
import javax.jdo.listener.DeleteLifecycleListener;
import javax.jdo.listener.DetachLifecycleListener;
import javax.jdo.listener.DirtyLifecycleListener;
+import javax.jdo.listener.InstanceLifecycleEvent;
import javax.jdo.listener.LoadLifecycleListener;
import javax.jdo.listener.StoreLifecycleListener;
-
import org.apache.jdo.tck.JDO_Test;
-import org.apache.jdo.tck.pc.mylib.PCPoint;
-
-import org.apache.jdo.tck.util.BatchTestRunner;
-
/**
* <B>Title:</B> Abstract test AbstractInstanceLifecycleListener <br>
* <B>Keywords:</B> LifeCycleListener lifecycle listener callback <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AccessOtherInstancesInPrestore.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AccessOtherInstancesInPrestore.java
index 9a2165e5..fcd22e7a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AccessOtherInstancesInPrestore.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AccessOtherInstancesInPrestore.java
@@ -18,10 +18,7 @@
package org.apache.jdo.tck.api.instancecallbacks;
import java.util.Date;
-
import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.instancecallbacks.InstanceCallbackClass;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AccessingFieldsInPredelete.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AccessingFieldsInPredelete.java
index 5e632d7f..62b27e87 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AccessingFieldsInPredelete.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AccessingFieldsInPredelete.java
@@ -18,12 +18,9 @@
package org.apache.jdo.tck.api.instancecallbacks;
import java.util.Date;
-
import javax.jdo.JDODataStoreException;
import javax.jdo.JDOUserException;
import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.instancecallbacks.InstanceCallbackClass;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPostload.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPostload.java
index a54cacc3..611dd8e5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPostload.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPostload.java
@@ -20,7 +20,6 @@ package org.apache.jdo.tck.api.instancecallbacks;
import javax.jdo.JDODataStoreException;
import javax.jdo.JDOUserException;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.instancecallbacks.InstanceCallbackNonPersistFdsClass;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java
index ab11209a..8bea35ca 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPreclear.java
@@ -19,12 +19,9 @@ package org.apache.jdo.tck.api.instancecallbacks;
import java.util.Calendar;
import java.util.Date;
-
import javax.jdo.JDODataStoreException;
import javax.jdo.JDOUserException;
import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.instancecallbacks.InstanceCallbackClass;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPredelete.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPredelete.java
index 96f3c1a3..20556b74 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPredelete.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPredelete.java
@@ -20,7 +20,6 @@ package org.apache.jdo.tck.api.instancecallbacks;
import javax.jdo.JDOException;
import javax.jdo.JDOUserException;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.instancecallbacks.InstanceCallbackClass;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPrestore.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPrestore.java
index 3d3940fc..e1002101 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPrestore.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPrestore.java
@@ -20,7 +20,6 @@ package org.apache.jdo.tck.api.instancecallbacks;
import javax.jdo.JDODataStoreException;
import javax.jdo.JDOUserException;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.instancecallbacks.InstanceCallbackClass;
import org.apache.jdo.tck.pc.instancecallbacks.InstanceCallbackNonPersistFdsClass;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerAttach.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerAttach.java
index 14dac259..552462a3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerAttach.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerAttach.java
@@ -18,19 +18,8 @@
package org.apache.jdo.tck.api.instancecallbacks;
import java.util.Date;
-
import javax.jdo.listener.AttachCallback;
-
-import javax.jdo.JDOHelper;
-
import javax.jdo.listener.InstanceLifecycleEvent;
-import javax.jdo.listener.InstanceLifecycleListener;
-import javax.jdo.listener.ClearLifecycleListener;
-
-import org.apache.jdo.tck.JDO_Test;
-
-import org.apache.jdo.tck.pc.mylib.PCPoint;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerClear.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerClear.java
index 0752c9de..760eaf67 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerClear.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerClear.java
@@ -18,19 +18,8 @@
package org.apache.jdo.tck.api.instancecallbacks;
import java.util.Date;
-
import javax.jdo.listener.ClearCallback;
-
-import javax.jdo.JDOHelper;
-
import javax.jdo.listener.InstanceLifecycleEvent;
-import javax.jdo.listener.InstanceLifecycleListener;
-import javax.jdo.listener.ClearLifecycleListener;
-
-import org.apache.jdo.tck.JDO_Test;
-
-import org.apache.jdo.tck.pc.mylib.PCPoint;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerCreate.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerCreate.java
index b73b4a39..24225b31 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerCreate.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerCreate.java
@@ -17,22 +17,8 @@
package org.apache.jdo.tck.api.instancecallbacks;
-import javax.jdo.JDOHelper;
-
import javax.jdo.listener.InstanceLifecycleEvent;
-import javax.jdo.listener.InstanceLifecycleListener;
-import javax.jdo.listener.AttachLifecycleListener;
-import javax.jdo.listener.ClearLifecycleListener;
-import javax.jdo.listener.CreateLifecycleListener;
-import javax.jdo.listener.DeleteLifecycleListener;
-import javax.jdo.listener.DetachLifecycleListener;
-import javax.jdo.listener.LoadLifecycleListener;
-import javax.jdo.listener.StoreLifecycleListener;
-
-import org.apache.jdo.tck.JDO_Test;
-
import org.apache.jdo.tck.pc.mylib.PCPoint;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDelete.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDelete.java
index 3994210f..908fdb64 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDelete.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDelete.java
@@ -18,18 +18,8 @@
package org.apache.jdo.tck.api.instancecallbacks;
import java.util.Date;
-
import javax.jdo.listener.DeleteCallback;
-import javax.jdo.JDOHelper;
-
import javax.jdo.listener.InstanceLifecycleEvent;
-import javax.jdo.listener.InstanceLifecycleListener;
-import javax.jdo.listener.DeleteLifecycleListener;
-
-import org.apache.jdo.tck.JDO_Test;
-
-import org.apache.jdo.tck.pc.mylib.PCPoint;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDetach.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDetach.java
index b9a2e827..badc5f33 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDetach.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDetach.java
@@ -18,17 +18,8 @@
package org.apache.jdo.tck.api.instancecallbacks;
import java.util.Date;
-
import javax.jdo.listener.DetachCallback;
-
-import javax.jdo.JDOHelper;
-
import javax.jdo.listener.InstanceLifecycleEvent;
-import javax.jdo.listener.InstanceLifecycleListener;
-import javax.jdo.listener.ClearLifecycleListener;
-
-import org.apache.jdo.tck.JDO_Test;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDirty.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDirty.java
index b6594b02..97e55c6b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDirty.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerDirty.java
@@ -17,18 +17,8 @@
package org.apache.jdo.tck.api.instancecallbacks;
-import java.util.Date;
-
-import javax.jdo.JDOHelper;
-
import javax.jdo.listener.InstanceLifecycleEvent;
-import javax.jdo.listener.InstanceLifecycleListener;
-import javax.jdo.listener.ClearLifecycleListener;
-
-import org.apache.jdo.tck.JDO_Test;
-
import org.apache.jdo.tck.pc.mylib.PCPoint;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerLoad.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerLoad.java
index 1f8712c0..48a7ad57 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerLoad.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerLoad.java
@@ -18,17 +18,8 @@
package org.apache.jdo.tck.api.instancecallbacks;
import java.util.Date;
-
-import javax.jdo.listener.LoadCallback;
-
-import javax.jdo.JDOHelper;
-
import javax.jdo.listener.InstanceLifecycleEvent;
-import javax.jdo.listener.InstanceLifecycleListener;
-import javax.jdo.listener.ClearLifecycleListener;
-
-import org.apache.jdo.tck.JDO_Test;
-
+import javax.jdo.listener.LoadCallback;
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerStore.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerStore.java
index 2e367615..fb9e1564 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerStore.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/InstanceLifecycleListenerStore.java
@@ -18,17 +18,8 @@
package org.apache.jdo.tck.api.instancecallbacks;
import java.util.Date;
-
-import javax.jdo.listener.StoreCallback;
-
-import javax.jdo.JDOHelper;
-
import javax.jdo.listener.InstanceLifecycleEvent;
-import javax.jdo.listener.InstanceLifecycleListener;
-import javax.jdo.listener.ClearLifecycleListener;
-
-import org.apache.jdo.tck.JDO_Test;
-
+import javax.jdo.listener.StoreCallback;
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/ModificationOfNontransactionalNonpersistentFields.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/ModificationOfNontransactionalNonpersistentFields.java
index 8d84bc67..84f04cf6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/ModificationOfNontransactionalNonpersistentFields.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/ModificationOfNontransactionalNonpersistentFields.java
@@ -18,11 +18,9 @@
package org.apache.jdo.tck.api.instancecallbacks;
import java.util.Iterator;
-
import javax.jdo.JDODataStoreException;
import javax.jdo.JDOUserException;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.instancecallbacks.InstanceCallbackNonPersistFdsClass;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/NoAccessToFieldsAfterPredelete.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/NoAccessToFieldsAfterPredelete.java
index 173eceab..933d642a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/NoAccessToFieldsAfterPredelete.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/NoAccessToFieldsAfterPredelete.java
@@ -19,11 +19,9 @@ package org.apache.jdo.tck.api.instancecallbacks;
import java.util.Date;
import java.util.HashSet;
-
import javax.jdo.JDODataStoreException;
import javax.jdo.JDOUserException;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.instancecallbacks.InstanceCallbackClass;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/TestParts.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/TestParts.java
index b6258553..275a7b30 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/TestParts.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/TestParts.java
@@ -18,7 +18,6 @@
package org.apache.jdo.tck.api.instancecallbacks;
import java.util.Date;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.instancecallbacks.InstanceCallbackClass;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectId.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectId.java
index 77086fcc..672969b6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectId.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectId.java
@@ -18,7 +18,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForNull.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForNull.java
index 165affd5..d1e04b5a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForNull.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForNull.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForTransient.java
index 81760ef7..bd6116b9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdForTransient.java
@@ -18,7 +18,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdNotPersistenceCapable.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdNotPersistenceCapable.java
index faa6721b..44d6dac6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdNotPersistenceCapable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIdNotPersistenceCapable.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.Point;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIds.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIds.java
index 8dc8a24d..5984642b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIds.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIds.java
@@ -17,21 +17,17 @@
package org.apache.jdo.tck.api.jdohelper;
-import java.util.List;
import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.Iterator;
-
+import java.util.List;
import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManager;
import javax.jdo.identity.SingleFieldIdentity;
-
import org.apache.jdo.tck.JDO_Test;
-
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.pc.singlefieldidentity.PCPointSingleFieldInteger;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManager.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManager.java
index 7b7ee004..762e2674 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManager.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManager.java
@@ -20,7 +20,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerForNull.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerForNull.java
index 60a255c7..eb382be8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerForNull.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerForNull.java
@@ -20,7 +20,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerForTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerForTransient.java
index 18a69977..8ead928f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerForTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerForTransient.java
@@ -20,7 +20,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerNotPersistenceCapable.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerNotPersistenceCapable.java
index a043857b..3d5f2ca0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerNotPersistenceCapable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetPersistenceManagerNotPersistenceCapable.java
@@ -20,7 +20,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.Point;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectId.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectId.java
index 1133dfe0..0a50f9c4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectId.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectId.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdForNull.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdForNull.java
index f40875d6..7c785cf6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdForNull.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdForNull.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdForTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdForTransient.java
index bf482343..caf1c258 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdForTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdForTransient.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdNotPersistenceCapable.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdNotPersistenceCapable.java
index d42f09f4..3e0d4e10 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdNotPersistenceCapable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetTransactionalObjectIdNotPersistenceCapable.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.Point;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeleted.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeleted.java
index ddc74c02..0e21277a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeleted.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeleted.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedFalse.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedFalse.java
index 4f83bdd1..bb366fb0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedFalse.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedFalse.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedForNull.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedForNull.java
index 345ed1bb..90593c94 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedForNull.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedForNull.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedForTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedForTransient.java
index 27a1ae02..dadad8c3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedForTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedForTransient.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedNotPersistenceCapable.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedNotPersistenceCapable.java
index b3afbc69..4723778e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedNotPersistenceCapable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDeletedNotPersistenceCapable.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.Point;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDetached.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDetached.java
index f5ed9cd3..5fc386db 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDetached.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDetached.java
@@ -16,14 +16,13 @@
*/
package org.apache.jdo.tck.api.jdohelper;
+import javax.jdo.JDOHelper;
+import javax.jdo.Transaction;
import org.apache.jdo.tck.api.persistencemanager.detach.DetachTest;
import org.apache.jdo.tck.pc.shoppingcart.Cart;
import org.apache.jdo.tck.pc.shoppingcart.Undetachable;
import org.apache.jdo.tck.util.BatchTestRunner;
-import javax.jdo.JDOHelper;
-import javax.jdo.Transaction;
-
/**
* <B>Title:</B> Test IsDetached <br>
* <B>Keywords:</B> <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirty.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirty.java
index 248f7c6d..e5a8286a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirty.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirty.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyFalse.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyFalse.java
index 167fdbf5..8556213b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyFalse.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyFalse.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyForNull.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyForNull.java
index 3781b570..c3e8e549 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyForNull.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyForNull.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyForTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyForTransient.java
index 73d951df..9aeaf2af 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyForTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyForTransient.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyNotPersistenceCapable.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyNotPersistenceCapable.java
index da16c935..bb765b68 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyNotPersistenceCapable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsDirtyNotPersistenceCapable.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.Point;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNew.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNew.java
index 0e279fac..275e58d8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNew.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNew.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewFalse.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewFalse.java
index 87d512d7..15157312 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewFalse.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewFalse.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewForNull.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewForNull.java
index c4e991ed..1f442991 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewForNull.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewForNull.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewForTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewForTransient.java
index 7572e448..32c2b005 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewForTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewForTransient.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewNotPersistenceCapable.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewNotPersistenceCapable.java
index cb143c48..ce370e5e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewNotPersistenceCapable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsNewNotPersistenceCapable.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.Point;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistent.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistent.java
index 189adf37..f00a06c0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistent.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistent.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentFalse.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentFalse.java
index 48add49b..d18419b7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentFalse.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentFalse.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentForNull.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentForNull.java
index 50a2ca34..7cd0ded6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentForNull.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentForNull.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentForTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentForTransient.java
index 27cabfc3..4d578157 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentForTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentForTransient.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentNotPersistenceCapable.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentNotPersistenceCapable.java
index 22b674fb..1599f8c5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentNotPersistenceCapable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsPersistentNotPersistenceCapable.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.Point;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactional.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactional.java
index 1827d8fd..534c22f6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactional.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactional.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalFalse.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalFalse.java
index 948175aa..046ecf5b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalFalse.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalFalse.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalForNull.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalForNull.java
index ba320047..b982e34e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalForNull.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalForNull.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalForTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalForTransient.java
index 0b4e4657..4ec57e96 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalForTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalForTransient.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalNotPersistenceCapable.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalNotPersistenceCapable.java
index e60a43e0..5cd7e743 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalNotPersistenceCapable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/IsTransactionalNotPersistenceCapable.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.Point;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirty.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirty.java
index e368b549..8f537c1a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirty.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirty.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyForNull.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyForNull.java
index d620227e..26a988d2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyForNull.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyForNull.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyForTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyForTransient.java
index d508e7d1..d564a194 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyForTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyForTransient.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyNotPersistenceCapable.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyNotPersistenceCapable.java
index 1f54edb8..025e5fdb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyNotPersistenceCapable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/MakeDirtyNotPersistenceCapable.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.jdohelper;
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.Point;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/AbstractPersistenceCapableTest.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/AbstractPersistenceCapableTest.java
index 9d9990aa..c0e03c3f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/AbstractPersistenceCapableTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/AbstractPersistenceCapableTest.java
@@ -20,7 +20,6 @@ package org.apache.jdo.tck.api.persistencecapable;
import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManager;
import javax.jdo.spi.PersistenceCapable;
-
import org.apache.jdo.tck.JDO_Test;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/CopyKeyFieldsFromObjectId.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/CopyKeyFieldsFromObjectId.java
index 787b7fcb..d42ca851 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/CopyKeyFieldsFromObjectId.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/CopyKeyFieldsFromObjectId.java
@@ -26,7 +26,6 @@ import javax.jdo.identity.ShortIdentity;
import javax.jdo.identity.SingleFieldIdentity;
import javax.jdo.identity.StringIdentity;
import javax.jdo.spi.PersistenceCapable;
-
import org.apache.jdo.tck.pc.singlefieldidentity.AbstractPCPointSingleField;
import org.apache.jdo.tck.pc.singlefieldidentity.PCPointSingleFieldByte;
import org.apache.jdo.tck.pc.singlefieldidentity.PCPointSingleFieldCharacter;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/NewObjectIdInstance.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/NewObjectIdInstance.java
index 115fa72d..452337dd 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/NewObjectIdInstance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/NewObjectIdInstance.java
@@ -20,7 +20,6 @@ package org.apache.jdo.tck.api.persistencecapable;
import javax.jdo.JDONullIdentityException;
import javax.jdo.identity.SingleFieldIdentity;
import javax.jdo.spi.PersistenceCapable;
-
import org.apache.jdo.tck.pc.singlefieldidentity.AbstractPCPointSingleField;
import org.apache.jdo.tck.pc.singlefieldidentity.PCPointSingleFieldByte;
import org.apache.jdo.tck.pc.singlefieldidentity.PCPointSingleFieldCharacter;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ConcurrentPersistenceManagers.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ConcurrentPersistenceManagers.java
index bbc626a0..4301356e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ConcurrentPersistenceManagers.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ConcurrentPersistenceManagers.java
@@ -18,12 +18,10 @@
package org.apache.jdo.tck.api.persistencemanager;
import java.util.Properties;
-
import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManager;
import javax.jdo.PersistenceManagerFactory;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ConcurrentPersistenceManagersSameClasses.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ConcurrentPersistenceManagersSameClasses.java
index 9f4d1da6..677331f5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ConcurrentPersistenceManagersSameClasses.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ConcurrentPersistenceManagersSameClasses.java
@@ -20,13 +20,11 @@ package org.apache.jdo.tck.api.persistencemanager;
import java.util.Collection;
import java.util.Iterator;
import java.util.Properties;
-
import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManager;
import javax.jdo.PersistenceManagerFactory;
import javax.jdo.Query;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.pc.mylib.PCRect;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/CurrentTransaction.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/CurrentTransaction.java
index 45c2f68b..141ecb4b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/CurrentTransaction.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/CurrentTransaction.java
@@ -18,7 +18,6 @@
package org.apache.jdo.tck.api.persistencemanager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreCacheTest.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreCacheTest.java
index 244b447e..48e40868 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreCacheTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreCacheTest.java
@@ -19,11 +19,8 @@ package org.apache.jdo.tck.api.persistencemanager;
import java.util.Collection;
import java.util.HashSet;
-
import javax.jdo.datastore.DataStoreCache;
-
import org.apache.jdo.tck.pc.mylib.PCPoint;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnection.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnection.java
index 6c746969..270d0779 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnection.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnection.java
@@ -20,14 +20,10 @@ package org.apache.jdo.tck.api.persistencemanager;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-
import java.util.Collection;
import java.util.HashSet;
-
import javax.jdo.datastore.JDOConnection;
-
import org.apache.jdo.tck.pc.mylib.PCPoint;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnectionThrows.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnectionThrows.java
index eede2d37..8cb5cab8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnectionThrows.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DataStoreConnectionThrows.java
@@ -18,18 +18,11 @@
package org.apache.jdo.tck.api.persistencemanager;
import java.sql.Connection;
-import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-
-import java.util.Collection;
import java.util.HashMap;
-import java.util.HashSet;
-
import javax.jdo.datastore.JDOConnection;
-
import org.apache.jdo.tck.pc.mylib.PCPoint;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DatastoreTimeout.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DatastoreTimeout.java
index 399bba12..5e847cd8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DatastoreTimeout.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DatastoreTimeout.java
@@ -18,16 +18,13 @@
package org.apache.jdo.tck.api.persistencemanager;
import java.util.List;
-
-import junit.framework.AssertionFailedError;
-
-import javax.jdo.JDOFatalException;
import javax.jdo.JDODataStoreException;
+import javax.jdo.JDOFatalException;
import javax.jdo.JDOUnsupportedOptionException;
import javax.jdo.PersistenceManager;
import javax.jdo.Query;
import javax.jdo.Transaction;
-
+import junit.framework.AssertionFailedError;
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.pc.mylib.PCRect;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistent.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistent.java
index 339431b1..e396d1f0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistent.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistent.java
@@ -19,11 +19,9 @@ package org.apache.jdo.tck.api.persistencemanager;
import java.util.Collection;
import java.util.HashSet;
-
import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentAllFails.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentAllFails.java
index 4b1f56b3..77a971be 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentAllFails.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentAllFails.java
@@ -18,11 +18,9 @@
package org.apache.jdo.tck.api.persistencemanager;
import java.util.Collection;
-
import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.pc.mylib.Point;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentFailsIfInstanceIsTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentFailsIfInstanceIsTransient.java
index 8ba1317d..1242c8fb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentFailsIfInstanceIsTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentFailsIfInstanceIsTransient.java
@@ -18,10 +18,8 @@
package org.apache.jdo.tck.api.persistencemanager;
import java.util.Collection;
-
import javax.jdo.JDOUserException;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentFailsIfInstanceManagedByAnotherPersistenceManager.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentFailsIfInstanceManagedByAnotherPersistenceManager.java
index 3f79707c..c5a9ab25 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentFailsIfInstanceManagedByAnotherPersistenceManager.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentFailsIfInstanceManagedByAnotherPersistenceManager.java
@@ -19,11 +19,9 @@ package org.apache.jdo.tck.api.persistencemanager;
import java.util.Collection;
import java.util.HashSet;
-
import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentHasNoEffectOnDeletedInstances.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentHasNoEffectOnDeletedInstances.java
index e772c683..00746c7a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentHasNoEffectOnDeletedInstances.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/DeletePersistentHasNoEffectOnDeletedInstances.java
@@ -18,10 +18,8 @@
package org.apache.jdo.tck.api.persistencemanager;
import java.util.Collection;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetPersistenceManagerFactory.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetPersistenceManagerFactory.java
index 2355f0c2..f4b6b4b0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetPersistenceManagerFactory.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetPersistenceManagerFactory.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.persistencemanager;
import javax.jdo.PersistenceManager;
import javax.jdo.PersistenceManagerFactory;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetProperties.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetProperties.java
index 366811fd..c8a74ae6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetProperties.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetProperties.java
@@ -22,12 +22,9 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-
-import javax.jdo.PersistenceManager;
import javax.jdo.Constants;
-
+import javax.jdo.PersistenceManager;
import org.apache.jdo.tck.JDO_Test;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetPutRemoveUserObject.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetPutRemoveUserObject.java
index 233ad22f..6f3c6152 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetPutRemoveUserObject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetPutRemoveUserObject.java
@@ -18,7 +18,6 @@
package org.apache.jdo.tck.api.persistencemanager;
import org.apache.jdo.tck.JDO_Test;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetSetUserObject.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetSetUserObject.java
index 57ce619e..3e6aca8c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetSetUserObject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetSetUserObject.java
@@ -18,7 +18,6 @@
package org.apache.jdo.tck.api.persistencemanager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.pc.mylib.Point;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetTransactionalObjectIdWhenObjectIdBeingChanged.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetTransactionalObjectIdWhenObjectIdBeingChanged.java
index 33b8d29e..706ee38e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetTransactionalObjectIdWhenObjectIdBeingChanged.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetTransactionalObjectIdWhenObjectIdBeingChanged.java
@@ -18,7 +18,6 @@
package org.apache.jdo.tck.api.persistencemanager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetTransactionalObjectIdWithNoTransaction.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetTransactionalObjectIdWithNoTransaction.java
index 0ab1d3f2..3f668be0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetTransactionalObjectIdWithNoTransaction.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetTransactionalObjectIdWithNoTransaction.java
@@ -18,7 +18,6 @@
package org.apache.jdo.tck.api.persistencemanager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/NewInstance.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/NewInstance.java
index 3bc7ce44..9c7d6450 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/NewInstance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/NewInstance.java
@@ -17,13 +17,11 @@
package org.apache.jdo.tck.api.persistencemanager;
-import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
import org.apache.jdo.tck.pc.newInstance.AAddress;
-import org.apache.jdo.tck.pc.newInstance.Address;
-import org.apache.jdo.tck.pc.newInstance.IAddress;
import org.apache.jdo.tck.pc.newInstance.AAddress_bad;
+import org.apache.jdo.tck.pc.newInstance.Address;
import org.apache.jdo.tck.pc.newInstance.Address_bad;
+import org.apache.jdo.tck.pc.newInstance.IAddress;
import org.apache.jdo.tck.pc.newInstance.IAddress_bad;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ObjectIdUniqueAmongInstances.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ObjectIdUniqueAmongInstances.java
index 2a739c5a..113470b6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ObjectIdUniqueAmongInstances.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ObjectIdUniqueAmongInstances.java
@@ -19,9 +19,7 @@ package org.apache.jdo.tck.api.persistencemanager;
import java.util.HashSet;
import java.util.Iterator;
-
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OneInstanceOfObjectPerPersistenceManager.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OneInstanceOfObjectPerPersistenceManager.java
index 6068059d..81674bc5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OneInstanceOfObjectPerPersistenceManager.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OneInstanceOfObjectPerPersistenceManager.java
@@ -19,10 +19,8 @@ package org.apache.jdo.tck.api.persistencemanager;
import java.util.Collection;
import java.util.Iterator;
-
import javax.jdo.Query;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.pc.mylib.PCRect;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OptimisticFailure.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OptimisticFailure.java
index 83c63bf7..0313f8d9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OptimisticFailure.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OptimisticFailure.java
@@ -19,13 +19,11 @@ package org.apache.jdo.tck.api.persistencemanager;
import java.util.HashSet;
import java.util.Set;
-
import javax.jdo.JDOException;
import javax.jdo.JDOHelper;
import javax.jdo.JDOOptimisticVerificationException;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.pc.mylib.VersionedPCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java
index 2dab5e6d..45734475 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/PersistenceManagerTest.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.persistencemanager;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.company.Company;
import org.apache.jdo.tck.pc.company.Department;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/SameTransactionInstanceForAllCallsToCurrentTransaction.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/SameTransactionInstanceForAllCallsToCurrentTransaction.java
index 75a6a620..0124e39f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/SameTransactionInstanceForAllCallsToCurrentTransaction.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/SameTransactionInstanceForAllCallsToCurrentTransaction.java
@@ -18,7 +18,6 @@
package org.apache.jdo.tck.api.persistencemanager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ThreadSafe.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ThreadSafe.java
index 39e004f9..bdfa947d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ThreadSafe.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ThreadSafe.java
@@ -20,16 +20,13 @@ package org.apache.jdo.tck.api.persistencemanager;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-
import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
-import javax.jdo.PersistenceManagerFactory;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.util.ThreadExceptionHandler;
import org.apache.jdo.tck.util.RogueBarrier;
+import org.apache.jdo.tck.util.ThreadExceptionHandler;
/**
* <B>Title:</B> Thread Safe <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/TransientTransactionalInstanceRetainsValuesAtCommit.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/TransientTransactionalInstanceRetainsValuesAtCommit.java
index 069160d2..fad7bada 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/TransientTransactionalInstanceRetainsValuesAtCommit.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/TransientTransactionalInstanceRetainsValuesAtCommit.java
@@ -19,10 +19,8 @@ package org.apache.jdo.tck.api.persistencemanager;
import java.util.Collection;
import java.util.HashSet;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/CallingEvictAllWithCollectionContainingNulls.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/CallingEvictAllWithCollectionContainingNulls.java
index 54bf470a..652d5e32 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/CallingEvictAllWithCollectionContainingNulls.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/CallingEvictAllWithCollectionContainingNulls.java
@@ -18,10 +18,8 @@
package org.apache.jdo.tck.api.persistencemanager.cache;
import java.util.Collection;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/CallingRefreshAllWithCollectionContainingNulls.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/CallingRefreshAllWithCollectionContainingNulls.java
index 4835aa7b..6e35cde6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/CallingRefreshAllWithCollectionContainingNulls.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/CallingRefreshAllWithCollectionContainingNulls.java
@@ -18,10 +18,8 @@
package org.apache.jdo.tck.api.persistencemanager.cache;
import java.util.Collection;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictAllWithNoParameters.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictAllWithNoParameters.java
index 75db8629..f2623dff 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictAllWithNoParameters.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictAllWithNoParameters.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.persistencemanager.cache;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint2;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java
index e35d588e..d27f5783 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingCollectionOfInstancesSideEffects.java
@@ -18,11 +18,8 @@
package org.apache.jdo.tck.api.persistencemanager.cache;
import java.util.Collection;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint2;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java
index a4dbdec4..393641bf 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRestoreValuesFalse.java
@@ -18,8 +18,6 @@
package org.apache.jdo.tck.api.persistencemanager.cache;
import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint2;
import org.apache.jdo.tck.util.BatchTestRunner;
@@ -73,7 +71,7 @@ public class EvictingWithRestoreValuesFalse extends PersistenceManagerTest {
Transaction tx = pm.currentTransaction();
tx.setRestoreValues(
false); // This should cause eviction of transactional instances when transaction is later
- // rolled back.
+ // rolled back.
// Test
tx.begin();
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java
index b90304ae..9387f3c0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/EvictingWithRetainValuesFalse.java
@@ -18,8 +18,6 @@
package org.apache.jdo.tck.api.persistencemanager.cache;
import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint2;
import org.apache.jdo.tck.util.BatchTestRunner;
@@ -78,7 +76,7 @@ public class EvictingWithRetainValuesFalse extends PersistenceManagerTest {
Transaction tx = pm.currentTransaction();
tx.setRetainValues(
false); // This should cause eviction of transactional instances when transaction is later
- // commited.
+ // commited.
// Test
tx.begin();
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToEvictAllThrowsException.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToEvictAllThrowsException.java
index 6ac266f4..7fa8882e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToEvictAllThrowsException.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToEvictAllThrowsException.java
@@ -18,10 +18,8 @@
package org.apache.jdo.tck.api.persistencemanager.cache;
import java.util.Collection;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToEvictHasNoEffect.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToEvictHasNoEffect.java
index 3da46754..b0ace288 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToEvictHasNoEffect.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToEvictHasNoEffect.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.persistencemanager.cache;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToRefreshAllThrowsException.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToRefreshAllThrowsException.java
index 6aac16e1..2fa1279d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToRefreshAllThrowsException.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToRefreshAllThrowsException.java
@@ -18,10 +18,8 @@
package org.apache.jdo.tck.api.persistencemanager.cache;
import java.util.Collection;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToRefreshHasNoEffect.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToRefreshHasNoEffect.java
index a12fa5ca..2f8db077 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToRefreshHasNoEffect.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/PassingNullToRefreshHasNoEffect.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.persistencemanager.cache;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllNoParameterSideEffects.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllNoParameterSideEffects.java
index 25b44383..970b8e49 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllNoParameterSideEffects.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllNoParameterSideEffects.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.persistencemanager.cache;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.VersionedPCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllSideEffects.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllSideEffects.java
index 110562bc..9dc60393 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllSideEffects.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllSideEffects.java
@@ -17,12 +17,10 @@
package org.apache.jdo.tck.api.persistencemanager.cache;
-import java.util.Collection;
import java.util.ArrayList;
-
+import java.util.Collection;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.VersionedPCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllWithNoParameters.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllWithNoParameters.java
index f400acdb..364d3784 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllWithNoParameters.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllWithNoParameters.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.persistencemanager.cache;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshSideEffects.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshSideEffects.java
index 6b0035f3..1db01d44 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshSideEffects.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshSideEffects.java
@@ -21,9 +21,7 @@ import javax.jdo.JDOFatalException;
import javax.jdo.PersistenceManager;
import javax.jdo.PersistenceManagerFactory;
import javax.jdo.Transaction;
-
import junit.framework.AssertionFailedError;
-
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/Retrieve.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/Retrieve.java
index 91b5ad14..398c21ed 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/Retrieve.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/Retrieve.java
@@ -19,12 +19,9 @@ package org.apache.jdo.tck.api.persistencemanager.cache;
import java.util.ArrayList;
import java.util.Collection;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
-
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.pc.mylib.PCPoint2;
import org.apache.jdo.tck.pc.mylib.PCRect;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/AfterCloseAllMethodsThrowException.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/AfterCloseAllMethodsThrowException.java
index d3f68ee1..19444198 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/AfterCloseAllMethodsThrowException.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/AfterCloseAllMethodsThrowException.java
@@ -21,7 +21,6 @@ import javax.jdo.JDOFatalUserException;
import javax.jdo.PersistenceManager;
import javax.jdo.PersistenceManagerFactory;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/AutoCloseable.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/AutoCloseable.java
index af9aa1f3..b1fe45d3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/AutoCloseable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/AutoCloseable.java
@@ -18,7 +18,6 @@
package org.apache.jdo.tck.api.persistencemanager.close;
import javax.jdo.PersistenceManager;
-
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/CloseWithActiveTxRollsBack.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/CloseWithActiveTxRollsBack.java
index 6e3aec1a..2b3ae18b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/CloseWithActiveTxRollsBack.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/CloseWithActiveTxRollsBack.java
@@ -18,10 +18,8 @@
package org.apache.jdo.tck.api.persistencemanager.close;
import javax.jdo.JDOObjectNotFoundException;
-import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsFalseUponConstruction.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsFalseUponConstruction.java
index 49feafb9..42d89f15 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsFalseUponConstruction.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsFalseUponConstruction.java
@@ -17,8 +17,8 @@
package org.apache.jdo.tck.api.persistencemanager.close;
-import org.apache.jdo.tck.util.BatchTestRunner;
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
+import org.apache.jdo.tck.util.BatchTestRunner;
/**
* <B>Title:</B> Is Closed returns false Upon Construction <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsFalseUponRetrievalFromPool.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsFalseUponRetrievalFromPool.java
index 6503105f..9d1f6192 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsFalseUponRetrievalFromPool.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsFalseUponRetrievalFromPool.java
@@ -17,8 +17,8 @@
package org.apache.jdo.tck.api.persistencemanager.close;
-import org.apache.jdo.tck.util.BatchTestRunner;
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
+import org.apache.jdo.tck.util.BatchTestRunner;
/**
* <B>Title:</B> Is Closed Is False Upon Retrieval From a Pool <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsTrueAfterClose.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsTrueAfterClose.java
index 6d91acbc..f3d4fee7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsTrueAfterClose.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/close/IsClosedIsTrueAfterClose.java
@@ -18,9 +18,8 @@
package org.apache.jdo.tck.api.persistencemanager.close;
import javax.jdo.PersistenceManagerFactory;
-
-import org.apache.jdo.tck.util.BatchTestRunner;
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
+import org.apache.jdo.tck.util.BatchTestRunner;
/**
* <B>Title:</B> Is Closed Is True After Close <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/CopyOnAttachFalse.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/CopyOnAttachFalse.java
index 3dc50051..0f6c933a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/CopyOnAttachFalse.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/CopyOnAttachFalse.java
@@ -18,7 +18,6 @@ package org.apache.jdo.tck.api.persistencemanager.detach;
import javax.jdo.JDOUserException;
import org.apache.jdo.tck.pc.shoppingcart.Cart;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAccessUnloadedField.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAccessUnloadedField.java
index 322abdf1..9720ef70 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAccessUnloadedField.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAccessUnloadedField.java
@@ -20,7 +20,6 @@ import javax.jdo.FetchPlan;
import javax.jdo.JDODetachedFieldAccessException;
import org.apache.jdo.tck.pc.shoppingcart.CartEntry;
import org.apache.jdo.tck.pc.shoppingcart.Product;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAllOnCommit.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAllOnCommit.java
index 39a4d666..a74354b6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAllOnCommit.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAllOnCommit.java
@@ -16,19 +16,6 @@
*/
package org.apache.jdo.tck.api.persistencemanager.detach;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import java.util.Collection;
-import java.util.HashSet;
-
-import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.pc.shoppingcart.Cart;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttach.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttach.java
index 56ba35f4..0e0a692c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttach.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttach.java
@@ -16,19 +16,7 @@
*/
package org.apache.jdo.tck.api.persistencemanager.detach;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import java.util.Collection;
-import java.util.HashSet;
-
-import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
import org.apache.jdo.tck.pc.shoppingcart.Cart;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttachDirty.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttachDirty.java
index 6837f864..86f865d4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttachDirty.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachAttachDirty.java
@@ -16,19 +16,7 @@
*/
package org.apache.jdo.tck.api.persistencemanager.detach;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import java.util.Collection;
-import java.util.HashSet;
-
-import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
import org.apache.jdo.tck.pc.shoppingcart.Cart;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachCopy.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachCopy.java
index 96b7b13e..97254aff 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachCopy.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachCopy.java
@@ -16,19 +16,9 @@
*/
package org.apache.jdo.tck.api.persistencemanager.detach;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
import java.util.Collection;
import java.util.HashSet;
-
-import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
import org.apache.jdo.tck.pc.shoppingcart.Cart;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachSerialize.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachSerialize.java
index 27152548..a457ff0c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachSerialize.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachSerialize.java
@@ -20,12 +20,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-
-import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
import org.apache.jdo.tck.pc.shoppingcart.Cart;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachTest.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachTest.java
index 7ae06c82..22ea3a2c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachTest.java
@@ -18,18 +18,14 @@
package org.apache.jdo.tck.api.persistencemanager.detach;
import java.util.Iterator;
-
import javax.jdo.FetchPlan;
import javax.jdo.JDOHelper;
-
import org.apache.jdo.tck.JDO_Test;
-import org.apache.jdo.tck.pc.shoppingcart.CartEntry;
import org.apache.jdo.tck.pc.shoppingcart.Cart;
+import org.apache.jdo.tck.pc.shoppingcart.CartEntry;
import org.apache.jdo.tck.pc.shoppingcart.Product;
import org.apache.jdo.tck.pc.shoppingcart.Undetachable;
-import javax.jdo.PersistenceManager;
-
/** */
public abstract class DetachTest extends JDO_Test {
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachUndetachable.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachUndetachable.java
index de5c102b..7122b66c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachUndetachable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachUndetachable.java
@@ -17,7 +17,6 @@
package org.apache.jdo.tck.api.persistencemanager.detach;
import javax.jdo.JDOHelper;
-
import org.apache.jdo.tck.pc.shoppingcart.Undetachable;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/SetDetachAllOnCommit.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/SetDetachAllOnCommit.java
index 6385b171..f805c547 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/SetDetachAllOnCommit.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/SetDetachAllOnCommit.java
@@ -17,8 +17,6 @@
package org.apache.jdo.tck.api.persistencemanager.detach;
import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithInstancesMadePersistentViaReachability.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithInstancesMadePersistentViaReachability.java
index 9a02edfe..b0c2bf7d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithInstancesMadePersistentViaReachability.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithInstancesMadePersistentViaReachability.java
@@ -17,19 +17,15 @@
package org.apache.jdo.tck.api.persistencemanager.extent;
-import java.util.Iterator;
import java.util.Date;
-
+import java.util.Iterator;
import javax.jdo.Extent;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
-
+import org.apache.jdo.tck.pc.company.Address;
import org.apache.jdo.tck.pc.company.Company;
import org.apache.jdo.tck.pc.company.Department;
-import org.apache.jdo.tck.pc.company.Address;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithNoSubclasses.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithNoSubclasses.java
index 2be22698..ca46c142 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithNoSubclasses.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithNoSubclasses.java
@@ -18,14 +18,12 @@
package org.apache.jdo.tck.api.persistencemanager.extent;
import java.util.Iterator;
-
import javax.jdo.Extent;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> GetExtentWithNoSubclasses <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithSubclasses.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithSubclasses.java
index e5034845..2673b9fb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithSubclasses.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/extent/GetExtentWithSubclasses.java
@@ -19,12 +19,9 @@ package org.apache.jdo.tck.api.persistencemanager.extent;
import java.util.Date;
import java.util.Iterator;
-
import javax.jdo.Extent;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.company.Employee;
import org.apache.jdo.tck.pc.company.FullTimeEmployee;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/AbstractFetchPlanTest.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/AbstractFetchPlanTest.java
index 009d8df5..346f1321 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/AbstractFetchPlanTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/AbstractFetchPlanTest.java
@@ -19,9 +19,7 @@ package org.apache.jdo.tck.api.persistencemanager.fetchplan;
import java.util.Collection;
import java.util.HashSet;
-
import javax.jdo.FetchPlan;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.pc.mylib.PCRect;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanInterface.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanInterface.java
index be823265..694bb2f3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanInterface.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanInterface.java
@@ -21,14 +21,10 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-
import javax.jdo.FetchPlan;
-
import org.apache.jdo.tck.JDO_Test;
-
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.pc.mylib.PCRect;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanIsCopy.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanIsCopy.java
index 9664db59..dc952aae 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanIsCopy.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanIsCopy.java
@@ -18,14 +18,9 @@
package org.apache.jdo.tck.api.persistencemanager.fetchplan;
import java.util.Arrays;
-
import javax.jdo.Extent;
-import javax.jdo.FetchPlan;
import javax.jdo.Query;
-
-import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.pc.mylib.PCRect;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanMakeTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanMakeTransient.java
index a0c4551e..e89988f4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanMakeTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanMakeTransient.java
@@ -19,11 +19,7 @@ package org.apache.jdo.tck.api.persistencemanager.fetchplan;
import java.util.Collection;
import java.util.HashSet;
-
-import org.apache.jdo.tck.api.persistencemanager.fetchplan.AbstractFetchPlanTest;
-
import org.apache.jdo.tck.pc.mylib.PCRect;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanQuery.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanQuery.java
index 97142709..256ef5e8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanQuery.java
@@ -17,13 +17,8 @@
package org.apache.jdo.tck.api.persistencemanager.fetchplan;
-import javax.jdo.FetchPlan;
import javax.jdo.Query;
-
-import org.apache.jdo.tck.api.persistencemanager.fetchplan.AbstractFetchPlanTest;
-
import org.apache.jdo.tck.pc.mylib.PCRect;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanRefresh.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanRefresh.java
index 88fb0218..02df883f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanRefresh.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanRefresh.java
@@ -19,10 +19,7 @@ package org.apache.jdo.tck.api.persistencemanager.fetchplan;
import java.util.Collection;
import java.util.HashSet;
-import org.apache.jdo.tck.api.persistencemanager.fetchplan.AbstractFetchPlanTest;
-
import org.apache.jdo.tck.pc.mylib.PCRect;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanRetrieve.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanRetrieve.java
index 75f9c2d9..e03a754d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanRetrieve.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/fetchplan/FetchPlanRetrieve.java
@@ -19,10 +19,7 @@ package org.apache.jdo.tck.api.persistencemanager.fetchplan;
import java.util.Collection;
import java.util.HashSet;
-import org.apache.jdo.tck.api.persistencemanager.fetchplan.AbstractFetchPlanTest;
-
import org.apache.jdo.tck.pc.mylib.PCRect;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/GetIgnoreCache.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/GetIgnoreCache.java
index aed65758..ff877850 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/GetIgnoreCache.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/GetIgnoreCache.java
@@ -18,10 +18,9 @@
package org.apache.jdo.tck.api.persistencemanager.flags;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> Get IgnoreCache Value from PersistenceManager <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetIgnoreCacheToFalse.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetIgnoreCacheToFalse.java
index 95c1059a..408f0a01 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetIgnoreCacheToFalse.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetIgnoreCacheToFalse.java
@@ -19,10 +19,9 @@ package org.apache.jdo.tck.api.persistencemanager.flags;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> Set IgnoreCache To False <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetIgnoreCacheToTrue.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetIgnoreCacheToTrue.java
index 17f6085c..2098b8c7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetIgnoreCacheToTrue.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetIgnoreCacheToTrue.java
@@ -19,10 +19,9 @@ package org.apache.jdo.tck.api.persistencemanager.flags;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> Set IgnoreCache To True <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetMultithreadedFalse.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetMultithreadedFalse.java
index f5052cf4..4a9fa1fa 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetMultithreadedFalse.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetMultithreadedFalse.java
@@ -19,10 +19,9 @@ package org.apache.jdo.tck.api.persistencemanager.flags;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> Set Multithreaded False <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetMultithreadedTrue.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetMultithreadedTrue.java
index 9596b627..043e8592 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetMultithreadedTrue.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SetMultithreadedTrue.java
@@ -19,9 +19,8 @@ package org.apache.jdo.tck.api.persistencemanager.flags;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.util.BatchTestRunner;
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
+import org.apache.jdo.tck.util.BatchTestRunner;
/**
* <B>Title:</B> Set Multithreaded True <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SettingFlagsWithTransactionInstance.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SettingFlagsWithTransactionInstance.java
index c732c7f1..f1780644 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SettingFlagsWithTransactionInstance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/flags/SettingFlagsWithTransactionInstance.java
@@ -19,9 +19,8 @@ package org.apache.jdo.tck.api.persistencemanager.flags;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.util.BatchTestRunner;
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
+import org.apache.jdo.tck.util.BatchTestRunner;
/**
* <B>Title:</B> Setting Flags With Transaction instance <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectById.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectById.java
index 0f4bd425..f3b107a7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectById.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectById.java
@@ -18,9 +18,8 @@
package org.apache.jdo.tck.api.persistencemanager.getobject;
import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.util.BatchTestRunner;
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
+import org.apache.jdo.tck.util.BatchTestRunner;
/**
* <B>Title:</B> Get Object By Id <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdExactClass.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdExactClass.java
index 8761265d..fb49135d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdExactClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdExactClass.java
@@ -18,18 +18,15 @@
package org.apache.jdo.tck.api.persistencemanager.getobject;
import java.util.Date;
-import javax.jdo.Transaction;
import javax.jdo.JDOException;
-
+import javax.jdo.Transaction;
import javax.jdo.identity.LongIdentity;
-
-import org.apache.jdo.tck.util.BatchTestRunner;
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
-
-import org.apache.jdo.tck.pc.singlefieldidentity.Person;
import org.apache.jdo.tck.pc.singlefieldidentity.Employee;
-import org.apache.jdo.tck.pc.singlefieldidentity.PartTimeEmployee;
import org.apache.jdo.tck.pc.singlefieldidentity.FullTimeEmployee;
+import org.apache.jdo.tck.pc.singlefieldidentity.PartTimeEmployee;
+import org.apache.jdo.tck.pc.singlefieldidentity.Person;
+import org.apache.jdo.tck.util.BatchTestRunner;
/**
* <B>Title:</B> Get Object By Id <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceInCache.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceInCache.java
index 92bb0342..9d8f65b8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceInCache.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceInCache.java
@@ -18,10 +18,9 @@
package org.apache.jdo.tck.api.persistencemanager.getobject;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> Get Object By Id No Validation, Instance In Cache <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceInCacheNoStateChange.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceInCacheNoStateChange.java
index ec1dc063..4ce3d93d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceInCacheNoStateChange.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceInCacheNoStateChange.java
@@ -18,10 +18,9 @@
package org.apache.jdo.tck.api.persistencemanager.getobject;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> Get Object By Id No Validation, Instance In Cache, No State Change <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceNotInCache.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceNotInCache.java
index de3b3722..5fb8b675 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceNotInCache.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceNotInCache.java
@@ -18,10 +18,9 @@
package org.apache.jdo.tck.api.persistencemanager.getobject;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> Get Object By Id No Validation Instance Not In Cache <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceNotInCacheNoTx.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceNotInCacheNoTx.java
index f672c580..9fa69e90 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceNotInCacheNoTx.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceNotInCacheNoTx.java
@@ -18,10 +18,9 @@
package org.apache.jdo.tck.api.persistencemanager.getobject;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> Get Object By Id No Validation Instance Not In Cache, No Tx <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceNotInDatastore.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceNotInDatastore.java
index acf5f0f7..a837c676 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceNotInDatastore.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNoValidationInstanceNotInDatastore.java
@@ -18,10 +18,9 @@
package org.apache.jdo.tck.api.persistencemanager.getobject;
import javax.jdo.JDOObjectNotFoundException;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> Get Object By Id No Validation Instance Not In Datastore <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNotResolved.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNotResolved.java
index 16a600af..c6bed500 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNotResolved.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdNotResolved.java
@@ -19,10 +19,9 @@ package org.apache.jdo.tck.api.persistencemanager.getobject;
import javax.jdo.JDOObjectNotFoundException;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> Get ObjectId For Null Or Not Persistent <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdWithValidationInstanceInCache.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdWithValidationInstanceInCache.java
index a4480745..3c3ad404 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdWithValidationInstanceInCache.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdWithValidationInstanceInCache.java
@@ -18,10 +18,9 @@
package org.apache.jdo.tck.api.persistencemanager.getobject;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> Get Object By Id With Validation Instance in Cache <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdWithValidationInstanceInCacheNotInDatastore.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdWithValidationInstanceInCacheNotInDatastore.java
index cd73c28d..b3f3c24d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdWithValidationInstanceInCacheNotInDatastore.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdWithValidationInstanceInCacheNotInDatastore.java
@@ -19,10 +19,9 @@ package org.apache.jdo.tck.api.persistencemanager.getobject;
import javax.jdo.JDOObjectNotFoundException;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> Get Object By Id With Validation, Instance in Cache, Not in Datastore <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdWithValidationInstanceNotInCacheNotInDatastore.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdWithValidationInstanceNotInCacheNotInDatastore.java
index 06902609..769fd9af 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdWithValidationInstanceNotInCacheNotInDatastore.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectByIdWithValidationInstanceNotInCacheNotInDatastore.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.persistencemanager.getobject;
import javax.jdo.JDOObjectNotFoundException;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
@@ -54,7 +53,7 @@ public class GetObjectByIdWithValidationInstanceNotInCacheNotInDatastore
Transaction tx = pm.currentTransaction();
tx.setRestoreValues(
false); // This should cause eviction of transactional instances when transaction is later
- // rolled back.
+ // rolled back.
tx.begin();
PCPoint p1 = new PCPoint(1, 3);
pm.makePersistent(p1);
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectId.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectId.java
index e9746f22..51da0908 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectId.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectId.java
@@ -18,10 +18,9 @@
package org.apache.jdo.tck.api.persistencemanager.getobject;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> Get Objectid <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectIdClass.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectIdClass.java
index d2f5544f..34864ffa 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectIdClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectIdClass.java
@@ -18,10 +18,9 @@
package org.apache.jdo.tck.api.persistencemanager.getobject;
import javax.jdo.PersistenceManager;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> Get ObjectId Class <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectIdClassForAbstractOrNonPersistenceCapableClass.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectIdClassForAbstractOrNonPersistenceCapableClass.java
index 25646fda..a1b50d89 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectIdClassForAbstractOrNonPersistenceCapableClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectIdClassForAbstractOrNonPersistenceCapableClass.java
@@ -18,10 +18,9 @@
package org.apache.jdo.tck.api.persistencemanager.getobject;
import javax.jdo.PersistenceManager;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.Point;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> Get ObjectId Class For Abstract or Non-PersistenceCapable Class <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectIdForNullOrNotPersistent.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectIdForNullOrNotPersistent.java
index 47c5bbfa..2122b8a2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectIdForNullOrNotPersistent.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectIdForNullOrNotPersistent.java
@@ -18,10 +18,9 @@
package org.apache.jdo.tck.api.persistencemanager.getobject;
import javax.jdo.PersistenceManager;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.Point;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> GetObjectIdForNullOrNotPersistent <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectIdForPersistentInterface.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectIdForPersistentInterface.java
index 3d9bb2fe..a70bd399 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectIdForPersistentInterface.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectIdForPersistentInterface.java
@@ -18,17 +18,11 @@
package org.apache.jdo.tck.api.persistencemanager.getobject;
import java.util.Date;
-
import javax.jdo.Transaction;
-
import javax.jdo.identity.LongIdentity;
-
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
-
-import org.apache.jdo.tck.pc.company.Company;
import org.apache.jdo.tck.pc.company.ICompany;
import org.apache.jdo.tck.pc.company.PICompany;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectIdWithApplicationModifyingIdentity.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectIdWithApplicationModifyingIdentity.java
index 35226ae4..b87f3e53 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectIdWithApplicationModifyingIdentity.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectIdWithApplicationModifyingIdentity.java
@@ -18,10 +18,9 @@
package org.apache.jdo.tck.api.persistencemanager.getobject;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> Get ObjectId With Application Modifying Identity <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectsById.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectsById.java
index 0cb0306e..566d571d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectsById.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/getobject/GetObjectsById.java
@@ -20,11 +20,8 @@ package org.apache.jdo.tck.api.persistencemanager.getobject;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-
import org.apache.jdo.tck.JDO_Test;
-
import org.apache.jdo.tck.pc.mylib.PCPoint;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalAllFails.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalAllFails.java
index cfdb07a5..3bacb688 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalAllFails.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalAllFails.java
@@ -18,15 +18,13 @@
package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Collection;
-
import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.pc.mylib.Point;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> MakeNontransactionalAllFails <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalDirtyInstance.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalDirtyInstance.java
index 77797df5..c2e556e8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalDirtyInstance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalDirtyInstance.java
@@ -20,14 +20,12 @@ package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
-
import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> Make Nontransactional a Dirty Instance <br>
* <B>Keywords:</B> exception <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalIsImmediate.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalIsImmediate.java
index 6b60e6e6..8a84cce0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalIsImmediate.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalIsImmediate.java
@@ -20,13 +20,11 @@ package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> Make Nontransactional is immediate <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalPersistentCleanInstance.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalPersistentCleanInstance.java
index 0f8f4596..ddf3ad06 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalPersistentCleanInstance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalPersistentCleanInstance.java
@@ -19,13 +19,11 @@ package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Collection;
import java.util.Iterator;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> Make Nontransactional a Persistent-Clean Instance <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalTransientCleanInstance.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalTransientCleanInstance.java
index 6ac03a5f..84003881 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalTransientCleanInstance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeNontransactionalTransientCleanInstance.java
@@ -19,13 +19,11 @@ package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Collection;
import java.util.Iterator;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> MakeNontransactionalTransientCleanInstance <br>
* <B>Keywords:</B> lifecycle <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistent.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistent.java
index 172cf620..c03e2ff1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistent.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistent.java
@@ -19,14 +19,12 @@ package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Collection;
import java.util.HashSet;
-
import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> make instance persistent <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentAllFails.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentAllFails.java
index 703ee0e5..54c15c00 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentAllFails.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentAllFails.java
@@ -18,15 +18,13 @@
package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Collection;
-
import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.pc.mylib.Point;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> MakePersistentAll Fails <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentAndInstancesNotReachable.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentAndInstancesNotReachable.java
index 1782560c..6c22b1c8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentAndInstancesNotReachable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentAndInstancesNotReachable.java
@@ -18,10 +18,8 @@
package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Date;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.company.Address;
import org.apache.jdo.tck.pc.company.Company;
@@ -80,7 +78,7 @@ public class MakePersistentAndInstancesNotReachable extends PersistenceManagerTe
comp.addDepartment(dep3);
pm.makePersistent(
comp); // Now the transient departments should be made provisionally persistent via
- // reachability
+ // reachability
int curr = currentState(dep1);
if (curr != PERSISTENT_NEW) {
fail(ASSERTION_FAILED, "dep1 should be persistent-new, state is " + states[curr]);
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentAssignsObjectId.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentAssignsObjectId.java
index 8ff2bc55..d420fba4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentAssignsObjectId.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentAssignsObjectId.java
@@ -20,13 +20,11 @@ package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
-
-import javax.jdo.Transaction;
import javax.jdo.PersistenceManager;
-
+import javax.jdo.Transaction;
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> make instance persistent <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentFailsIfInstanceManagedByAnotherPersistenceManager.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentFailsIfInstanceManagedByAnotherPersistenceManager.java
index 85aad0ee..a0dbe4b5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentFailsIfInstanceManagedByAnotherPersistenceManager.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentFailsIfInstanceManagedByAnotherPersistenceManager.java
@@ -18,14 +18,12 @@
package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Collection;
-
import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> MakePersistent Fails If Instance Managed By Another PersistenceManager <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentHasNoEffectOnPersistentInstances.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentHasNoEffectOnPersistentInstances.java
index c42e1947..7cb2075b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentHasNoEffectOnPersistentInstances.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakePersistentHasNoEffectOnPersistentInstances.java
@@ -18,13 +18,11 @@
package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Collection;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> MakePersistent Has No Effect On Persistent Instances <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactional.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactional.java
index 49c7b952..f2f12343 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactional.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactional.java
@@ -19,13 +19,11 @@ package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Collection;
import java.util.Iterator;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> MakeTransactional <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalANontransactionalPersistentInstance.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalANontransactionalPersistentInstance.java
index 235afb66..81f03318 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalANontransactionalPersistentInstance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalANontransactionalPersistentInstance.java
@@ -18,13 +18,11 @@
package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Collection;
-
import javax.jdo.JDOUserException;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> Make Transactional A Persistent Nontransactional Instance <br>
* <B>Keywords:</B> persistentnontransactional <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalAllFails.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalAllFails.java
index 620acdec..be5f53ae 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalAllFails.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalAllFails.java
@@ -18,15 +18,13 @@
package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Collection;
-
import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.pc.mylib.Point;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> MakeTransactionalAllFails <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalIsImmediate.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalIsImmediate.java
index e6fb44b0..4dbda95f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalIsImmediate.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalIsImmediate.java
@@ -20,13 +20,11 @@ package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> Make Nontransactional is immediate <br>
* <B>Keywords:</B> <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalPriorToTransactionRolledback.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalPriorToTransactionRolledback.java
index f94d4cfc..1bc8267a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalPriorToTransactionRolledback.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalPriorToTransactionRolledback.java
@@ -19,13 +19,11 @@ package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Collection;
import java.util.HashSet;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> MakeTransactional Prior To a Transaction Rolledback <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalWithinTransactionRolledback.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalWithinTransactionRolledback.java
index b2b694c9..cbca9a71 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalWithinTransactionRolledback.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransactionalWithinTransactionRolledback.java
@@ -18,13 +18,11 @@
package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Collection;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> MakeTransactionalWithinTransactionRolledback <br>
* <B>Keywords:</B> transienttransactional <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransient.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransient.java
index 35d0535f..e38aff1a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransient.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransient.java
@@ -19,13 +19,11 @@ package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Collection;
import java.util.Iterator;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> MakeTransient <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientAllFails.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientAllFails.java
index 217293a1..fb7135da 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientAllFails.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientAllFails.java
@@ -19,15 +19,13 @@ package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Collection;
import java.util.HashSet;
-
import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.pc.mylib.Point;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B>MakeTransientAll Fail <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientCausesLossOfIdentity.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientCausesLossOfIdentity.java
index a00b3480..ccb07420 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientCausesLossOfIdentity.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientCausesLossOfIdentity.java
@@ -18,13 +18,11 @@
package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Collection;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> MakeTransientCausesLossOfIdentity <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientFailsWithDirtyInstance.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientFailsWithDirtyInstance.java
index c52c4a16..03cae391 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientFailsWithDirtyInstance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientFailsWithDirtyInstance.java
@@ -19,14 +19,12 @@ package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Collection;
import java.util.HashSet;
-
import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B>MakeTransientFailsWithDirtyInstance <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientFieldsPreservedUnchanged.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientFieldsPreservedUnchanged.java
index 3bff1b22..b258518e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientFieldsPreservedUnchanged.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientFieldsPreservedUnchanged.java
@@ -20,13 +20,11 @@ package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> MakeTransient Fields Preserved Unchanged <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientHasNoEffectOnTransientInstances.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientHasNoEffectOnTransientInstances.java
index 3394d196..82d89855 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientHasNoEffectOnTransientInstances.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientHasNoEffectOnTransientInstances.java
@@ -19,13 +19,11 @@ package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Collection;
import java.util.HashSet;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> MakeTransientHasNoEffectOnTransientInstances <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientNotSubjectToRollback.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientNotSubjectToRollback.java
index 2e08fd22..2f9752c7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientNotSubjectToRollback.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/lifecycle/MakeTransientNotSubjectToRollback.java
@@ -18,13 +18,11 @@
package org.apache.jdo.tck.api.persistencemanager.lifecycle;
import java.util.Collection;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
+import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
-import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
/**
* <B>Title:</B> MakeTransientNotSubjectToRollback <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DeletePersistentNullArgs.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DeletePersistentNullArgs.java
index bdaa010e..27d0e4f8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DeletePersistentNullArgs.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DeletePersistentNullArgs.java
@@ -18,12 +18,7 @@
package org.apache.jdo.tck.api.persistencemanager.nullargs;
import java.util.Collection;
-
-import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DetachCopyNullArgs.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DetachCopyNullArgs.java
index b7422edd..93d3dc9d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DetachCopyNullArgs.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/DetachCopyNullArgs.java
@@ -18,12 +18,7 @@
package org.apache.jdo.tck.api.persistencemanager.nullargs;
import java.util.Collection;
-
-import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/EvictNullArgs.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/EvictNullArgs.java
index b798ff2a..a125b974 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/EvictNullArgs.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/EvictNullArgs.java
@@ -18,12 +18,7 @@
package org.apache.jdo.tck.api.persistencemanager.nullargs;
import java.util.Collection;
-
-import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeNontransactionalNullArgs.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeNontransactionalNullArgs.java
index 1ebe90cf..870fd993 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeNontransactionalNullArgs.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeNontransactionalNullArgs.java
@@ -18,12 +18,7 @@
package org.apache.jdo.tck.api.persistencemanager.nullargs;
import java.util.Collection;
-
-import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakePersistentNullArgs.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakePersistentNullArgs.java
index 5ff36b4d..efa657a4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakePersistentNullArgs.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakePersistentNullArgs.java
@@ -18,12 +18,7 @@
package org.apache.jdo.tck.api.persistencemanager.nullargs;
import java.util.Collection;
-
-import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransactionalNullArgs.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransactionalNullArgs.java
index be1e96be..6485c657 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransactionalNullArgs.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransactionalNullArgs.java
@@ -18,12 +18,7 @@
package org.apache.jdo.tck.api.persistencemanager.nullargs;
import java.util.Collection;
-
-import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransientNullArgs.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransientNullArgs.java
index e2f817be..5b193f78 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransientNullArgs.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/MakeTransientNullArgs.java
@@ -18,12 +18,7 @@
package org.apache.jdo.tck.api.persistencemanager.nullargs;
import java.util.Collection;
-
-import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/PersistenceManagerNullsTest.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/PersistenceManagerNullsTest.java
index ff83030b..69f48a62 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/PersistenceManagerNullsTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/PersistenceManagerNullsTest.java
@@ -18,14 +18,10 @@
package org.apache.jdo.tck.api.persistencemanager.nullargs;
import java.util.Arrays;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-
-import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RefreshNullArgs.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RefreshNullArgs.java
index 73e0e395..6b26fbb0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RefreshNullArgs.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RefreshNullArgs.java
@@ -18,12 +18,7 @@
package org.apache.jdo.tck.api.persistencemanager.nullargs;
import java.util.Collection;
-
-import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RetrieveNullArgs.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RetrieveNullArgs.java
index acd6657e..b6e248b3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RetrieveNullArgs.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RetrieveNullArgs.java
@@ -18,12 +18,7 @@
package org.apache.jdo.tck.api.persistencemanager.nullargs;
import java.util.Collection;
-
-import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RetrieveWithFetchPlanNullArgs.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RetrieveWithFetchPlanNullArgs.java
index c517af17..b5322846 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RetrieveWithFetchPlanNullArgs.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/RetrieveWithFetchPlanNullArgs.java
@@ -18,12 +18,7 @@
package org.apache.jdo.tck.api.persistencemanager.nullargs;
import java.util.Collection;
-
-import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
-import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AbstractGetPMF.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AbstractGetPMF.java
index e82167fb..83528e41 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AbstractGetPMF.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AbstractGetPMF.java
@@ -17,18 +17,15 @@
package org.apache.jdo.tck.api.persistencemanagerfactory;
-import java.lang.reflect.Method;
-
import java.io.File;
+import java.lang.reflect.Method;
import java.util.Iterator;
import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
-
import javax.jdo.JDOFatalUserException;
import javax.jdo.PersistenceManagerFactory;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseGetPMThrowsException.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseGetPMThrowsException.java
index f4272226..106ad1d3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseGetPMThrowsException.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseGetPMThrowsException.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.persistencemanagerfactory;
import javax.jdo.JDOFatalUserException;
import javax.jdo.JDOUserException;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseSetMethodsThrowException.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseSetMethodsThrowException.java
index 356c18f4..ef966e4d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseSetMethodsThrowException.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseSetMethodsThrowException.java
@@ -20,11 +20,9 @@ package org.apache.jdo.tck.api.persistencemanagerfactory;
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
-
import javax.jdo.JDOFatalInternalException;
import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManagerFactory;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java
index 32294f88..bb6bc98c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java
@@ -21,12 +21,10 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
import java.util.Properties;
-
import javax.jdo.JDOException;
import javax.jdo.JDOFatalInternalException;
import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManagerFactory;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/Close.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/Close.java
index 4b253cff..f6a7cd06 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/Close.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/Close.java
@@ -17,14 +17,12 @@
package org.apache.jdo.tck.api.persistencemanagerfactory;
-import javax.jdo.JDOFatalInternalException;
-import javax.jdo.LegacyJava;
import java.lang.reflect.InvocationTargetException;
import java.security.PrivilegedAction;
-
+import javax.jdo.JDOFatalInternalException;
import javax.jdo.JDOFatalUserException;
import javax.jdo.JDOUserException;
-
+import javax.jdo.LegacyJava;
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/CloseFailsIfTransactionActive.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/CloseFailsIfTransactionActive.java
index 6c3bb87e..13c4635a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/CloseFailsIfTransactionActive.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/CloseFailsIfTransactionActive.java
@@ -22,7 +22,6 @@ import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
import javax.jdo.PersistenceManagerFactory;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/CloseWithoutPermissionThrowsSecurityException.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/CloseWithoutPermissionThrowsSecurityException.java
index a3abb4d1..1384c8c7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/CloseWithoutPermissionThrowsSecurityException.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/CloseWithoutPermissionThrowsSecurityException.java
@@ -18,12 +18,10 @@
package org.apache.jdo.tck.api.persistencemanagerfactory;
import java.security.Permission;
-
import javax.jdo.JDOException;
import javax.jdo.LegacyJava;
import javax.jdo.PersistenceManagerFactory;
import javax.jdo.spi.JDOPermission;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/FlushThrowsIfReadOnly.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/FlushThrowsIfReadOnly.java
index 029ff29f..9709e300 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/FlushThrowsIfReadOnly.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/FlushThrowsIfReadOnly.java
@@ -18,14 +18,12 @@
package org.apache.jdo.tck.api.persistencemanagerfactory;
import java.util.Date;
-
import java.util.Properties;
import javax.jdo.Constants;
import javax.jdo.JDOHelper;
import javax.jdo.JDOReadOnlyException;
import javax.jdo.PersistenceManagerFactory;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.company.Address;
import org.apache.jdo.tck.pc.company.Company;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetManagedClasses.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetManagedClasses.java
index 9268139c..2a3ccafc 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetManagedClasses.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetManagedClasses.java
@@ -18,9 +18,7 @@
package org.apache.jdo.tck.api.persistencemanagerfactory;
import java.util.Collection;
-
import javax.jdo.Query;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.mylib.PCPoint;
import org.apache.jdo.tck.pc.mylib.PCRect;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByFile.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByFile.java
index 53064147..45c83da3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByFile.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByFile.java
@@ -18,10 +18,8 @@
package org.apache.jdo.tck.api.persistencemanagerfactory;
import java.io.File;
-
import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManagerFactory;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByFileAndClassLoader.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByFileAndClassLoader.java
index d632ec61..64503be5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByFileAndClassLoader.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByFileAndClassLoader.java
@@ -18,10 +18,8 @@
package org.apache.jdo.tck.api.persistencemanagerfactory;
import java.io.File;
-
import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManagerFactory;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByJNDILocation.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByJNDILocation.java
index 36790a29..d68b547d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByJNDILocation.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByJNDILocation.java
@@ -18,14 +18,12 @@
package org.apache.jdo.tck.api.persistencemanagerfactory;
import java.io.File;
-
import javax.jdo.JDOFatalException;
import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManagerFactory;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByJNDILocationAndClassLoader.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByJNDILocationAndClassLoader.java
index 45a82d6d..5c4bb396 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByJNDILocationAndClassLoader.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByJNDILocationAndClassLoader.java
@@ -18,14 +18,12 @@
package org.apache.jdo.tck.api.persistencemanagerfactory;
import java.io.File;
-
import javax.jdo.JDOFatalException;
import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManagerFactory;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByResource.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByResource.java
index 55e392c6..5205a674 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByResource.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByResource.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.persistencemanagerfactory;
import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManagerFactory;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByResourceAndClassLoader.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByResourceAndClassLoader.java
index 82c42060..501f1598 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByResourceAndClassLoader.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByResourceAndClassLoader.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.api.persistencemanagerfactory;
import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManagerFactory;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByStream.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByStream.java
index 74cdb720..b79331e2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByStream.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByStream.java
@@ -20,10 +20,8 @@ package org.apache.jdo.tck.api.persistencemanagerfactory;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-
import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManagerFactory;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByStreamAndClassLoader.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByStreamAndClassLoader.java
index 7540a03f..a2ef87c7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByStreamAndClassLoader.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPMFByStreamAndClassLoader.java
@@ -20,10 +20,8 @@ package org.apache.jdo.tck.api.persistencemanagerfactory;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-
import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManagerFactory;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManager.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManager.java
index 5aab89a7..afe87694 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManager.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManager.java
@@ -18,7 +18,6 @@
package org.apache.jdo.tck.api.persistencemanagerfactory;
import javax.jdo.PersistenceManager;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManagerFactoryByPropertiesInstance.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManagerFactoryByPropertiesInstance.java
index f9105f06..763c6639 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManagerFactoryByPropertiesInstance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManagerFactoryByPropertiesInstance.java
@@ -18,10 +18,8 @@
package org.apache.jdo.tck.api.persistencemanagerfactory;
import java.util.Date;
-
import javax.jdo.JDOHelper;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.company.Address;
import org.apache.jdo.tck.pc.company.Company;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManagerForUser.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManagerForUser.java
index b7fe1e1d..56bc2ce7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManagerForUser.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetPersistenceManagerForUser.java
@@ -18,10 +18,8 @@
package org.apache.jdo.tck.api.persistencemanagerfactory;
import java.util.Properties;
-
import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManager;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetProperties.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetProperties.java
index bb456649..e2bb6e44 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetProperties.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/GetProperties.java
@@ -19,9 +19,7 @@ package org.apache.jdo.tck.api.persistencemanagerfactory;
import java.util.Enumeration;
import java.util.Properties;
-
import javax.jdo.PersistenceManagerFactory;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetConnectionURL.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetConnectionURL.java
index 452c7cec..678e267f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetConnectionURL.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetConnectionURL.java
@@ -18,7 +18,6 @@
package org.apache.jdo.tck.api.persistencemanagerfactory;
import javax.jdo.JDOException;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetConnectionUserName.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetConnectionUserName.java
index 349fc19f..6dfcac6b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetConnectionUserName.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetConnectionUserName.java
@@ -18,7 +18,6 @@
package org.apache.jdo.tck.api.persistencemanagerfactory;
import javax.jdo.JDOException;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetIgnoreCache.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetIgnoreCache.java
index b8820732..fb17e7c4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetIgnoreCache.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetIgnoreCache.java
@@ -17,8 +17,6 @@
package org.apache.jdo.tck.api.persistencemanagerfactory;
-import javax.jdo.PersistenceManagerFactory;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetMultithreaded.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetMultithreaded.java
index f7d7362d..9af3964f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetMultithreaded.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetMultithreaded.java
@@ -17,11 +17,6 @@
package org.apache.jdo.tck.api.persistencemanagerfactory;
-import java.util.Properties;
-
-import javax.jdo.PersistenceManager;
-import javax.jdo.PersistenceManagerFactory;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetNonTransactionalRead.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetNonTransactionalRead.java
index 118039db..458d3f8e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetNonTransactionalRead.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetNonTransactionalRead.java
@@ -17,8 +17,6 @@
package org.apache.jdo.tck.api.persistencemanagerfactory;
-import javax.jdo.PersistenceManagerFactory;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetNonTransactionalWrite.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetNonTransactionalWrite.java
index b05d2836..aad5b5fd 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetNonTransactionalWrite.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetNonTransactionalWrite.java
@@ -17,8 +17,6 @@
package org.apache.jdo.tck.api.persistencemanagerfactory;
-import javax.jdo.PersistenceManagerFactory;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetReadOnly.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetReadOnly.java
index 41396f9c..4252ab17 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetReadOnly.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetReadOnly.java
@@ -17,8 +17,6 @@
package org.apache.jdo.tck.api.persistencemanagerfactory;
-import javax.jdo.PersistenceManagerFactory;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetRetainValues.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetRetainValues.java
index 4960b5e0..27a964f7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetRetainValues.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetRetainValues.java
@@ -17,8 +17,6 @@
package org.apache.jdo.tck.api.persistencemanagerfactory;
-import javax.jdo.PersistenceManagerFactory;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SupportedOptions.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SupportedOptions.java
index 107f69e1..83fcfa0d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SupportedOptions.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SupportedOptions.java
@@ -19,9 +19,7 @@ package org.apache.jdo.tck.api.persistencemanagerfactory;
import java.util.Collection;
import java.util.Iterator;
-
import javax.jdo.PersistenceManagerFactory;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/config/ThrowOnUnknownStandardProperties.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/config/ThrowOnUnknownStandardProperties.java
index e3c6e744..0bb0c2ee 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/config/ThrowOnUnknownStandardProperties.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/config/ThrowOnUnknownStandardProperties.java
@@ -21,10 +21,8 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Map;
import java.util.Properties;
-
import javax.jdo.JDOException;
import javax.jdo.JDOUserException;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/metadata/GetMetadataTest.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/metadata/GetMetadataTest.java
index 3bd98867..53ebdd9e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/metadata/GetMetadataTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/metadata/GetMetadataTest.java
@@ -22,7 +22,6 @@ import javax.jdo.metadata.MemberMetadata;
import javax.jdo.metadata.Metadata;
import javax.jdo.metadata.PackageMetadata;
import javax.jdo.metadata.TypeMetadata;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/enhancement/EnhancerTest.java b/tck/src/main/java/org/apache/jdo/tck/enhancement/EnhancerTest.java
index 3cd296f9..22290204 100644
--- a/tck/src/main/java/org/apache/jdo/tck/enhancement/EnhancerTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/enhancement/EnhancerTest.java
@@ -29,7 +29,6 @@ import java.util.Enumeration;
import java.util.List;
import java.util.Properties;
import java.util.StringTokenizer;
-
import org.apache.jdo.tck.JDO_Test;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/extents/AutoCloseable.java b/tck/src/main/java/org/apache/jdo/tck/extents/AutoCloseable.java
index c563abcb..0a3ba137 100644
--- a/tck/src/main/java/org/apache/jdo/tck/extents/AutoCloseable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/extents/AutoCloseable.java
@@ -19,14 +19,11 @@ package org.apache.jdo.tck.extents;
import java.util.Iterator;
import java.util.NoSuchElementException;
-
import javax.jdo.Extent;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.pc.mylib.PCPoint;
-import org.apache.jdo.tck.util.BatchTestRunner;
import org.apache.jdo.tck.pc.company.Department;
+import org.apache.jdo.tck.util.BatchTestRunner;
/**
* <B>Title:</B> AutoCloseable <br>
diff --git a/tck/src/main/java/org/apache/jdo/tck/extents/CloseAll.java b/tck/src/main/java/org/apache/jdo/tck/extents/CloseAll.java
index 3e1a12ee..3d158461 100644
--- a/tck/src/main/java/org/apache/jdo/tck/extents/CloseAll.java
+++ b/tck/src/main/java/org/apache/jdo/tck/extents/CloseAll.java
@@ -18,9 +18,7 @@
package org.apache.jdo.tck.extents;
import java.util.Iterator;
-
import javax.jdo.Extent;
-
import org.apache.jdo.tck.pc.company.Employee;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/extents/CloseOfExtentIteratorIsIteratorSpecific.java b/tck/src/main/java/org/apache/jdo/tck/extents/CloseOfExtentIteratorIsIteratorSpecific.java
index c1bef984..695e3aea 100644
--- a/tck/src/main/java/org/apache/jdo/tck/extents/CloseOfExtentIteratorIsIteratorSpecific.java
+++ b/tck/src/main/java/org/apache/jdo/tck/extents/CloseOfExtentIteratorIsIteratorSpecific.java
@@ -19,10 +19,8 @@ package org.apache.jdo.tck.extents;
import java.util.Collection;
import java.util.Iterator;
-
import javax.jdo.Extent;
import javax.jdo.Query;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/extents/ExtentTest.java b/tck/src/main/java/org/apache/jdo/tck/extents/ExtentTest.java
index ca93b281..ab8494a0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/extents/ExtentTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/extents/ExtentTest.java
@@ -24,12 +24,10 @@ import java.util.GregorianCalendar;
import java.util.HashSet;
import java.util.Iterator;
import java.util.TimeZone;
-
import javax.jdo.Extent;
import javax.jdo.JDOFatalInternalException;
import javax.jdo.PersistenceManager;
import javax.jdo.PersistenceManagerFactory;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.company.Address;
import org.apache.jdo.tck.pc.company.Company;
diff --git a/tck/src/main/java/org/apache/jdo/tck/extents/GetCandidateClass.java b/tck/src/main/java/org/apache/jdo/tck/extents/GetCandidateClass.java
index d8a5cc83..dd2c890d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/extents/GetCandidateClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/extents/GetCandidateClass.java
@@ -18,7 +18,6 @@
package org.apache.jdo.tck.extents;
import javax.jdo.Extent;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/extents/GetPersistenceManager.java b/tck/src/main/java/org/apache/jdo/tck/extents/GetPersistenceManager.java
index 81cf2d19..0bd6c47f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/extents/GetPersistenceManager.java
+++ b/tck/src/main/java/org/apache/jdo/tck/extents/GetPersistenceManager.java
@@ -18,7 +18,6 @@
package org.apache.jdo.tck.extents;
import javax.jdo.Extent;
-
import org.apache.jdo.tck.pc.company.Employee;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/extents/HasSubclassesFalse.java b/tck/src/main/java/org/apache/jdo/tck/extents/HasSubclassesFalse.java
index c7cc612a..17a1cd64 100644
--- a/tck/src/main/java/org/apache/jdo/tck/extents/HasSubclassesFalse.java
+++ b/tck/src/main/java/org/apache/jdo/tck/extents/HasSubclassesFalse.java
@@ -18,7 +18,6 @@
package org.apache.jdo.tck.extents;
import javax.jdo.Extent;
-
import org.apache.jdo.tck.pc.company.Employee;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/extents/HasSubclassesTrue.java b/tck/src/main/java/org/apache/jdo/tck/extents/HasSubclassesTrue.java
index f835a60b..eeadfd37 100644
--- a/tck/src/main/java/org/apache/jdo/tck/extents/HasSubclassesTrue.java
+++ b/tck/src/main/java/org/apache/jdo/tck/extents/HasSubclassesTrue.java
@@ -18,7 +18,6 @@
package org.apache.jdo.tck.extents;
import javax.jdo.Extent;
-
import org.apache.jdo.tck.pc.company.Employee;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/extents/InstancesDeletedPriorToIterationNotReturned.java b/tck/src/main/java/org/apache/jdo/tck/extents/InstancesDeletedPriorToIterationNotReturned.java
index 7a945845..f0958d4a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/extents/InstancesDeletedPriorToIterationNotReturned.java
+++ b/tck/src/main/java/org/apache/jdo/tck/extents/InstancesDeletedPriorToIterationNotReturned.java
@@ -18,9 +18,7 @@
package org.apache.jdo.tck.extents;
import java.util.Iterator;
-
import javax.jdo.Extent;
-
import org.apache.jdo.tck.pc.company.Employee;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/extents/InstancesPersistedPriorToIterationReturned.java b/tck/src/main/java/org/apache/jdo/tck/extents/InstancesPersistedPriorToIterationReturned.java
index b4be1f1d..a7d59fcf 100644
--- a/tck/src/main/java/org/apache/jdo/tck/extents/InstancesPersistedPriorToIterationReturned.java
+++ b/tck/src/main/java/org/apache/jdo/tck/extents/InstancesPersistedPriorToIterationReturned.java
@@ -18,9 +18,7 @@
package org.apache.jdo.tck.extents;
import java.util.Iterator;
-
import javax.jdo.Extent;
-
import org.apache.jdo.tck.pc.company.Employee;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/extents/IteratorHasNextFalseAfterExtentClose.java b/tck/src/main/java/org/apache/jdo/tck/extents/IteratorHasNextFalseAfterExtentClose.java
index 2cd5fba5..312dd4e9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/extents/IteratorHasNextFalseAfterExtentClose.java
+++ b/tck/src/main/java/org/apache/jdo/tck/extents/IteratorHasNextFalseAfterExtentClose.java
@@ -18,9 +18,7 @@
package org.apache.jdo.tck.extents;
import java.util.Iterator;
-
import javax.jdo.Extent;
-
import org.apache.jdo.tck.pc.company.Employee;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/extents/IteratorMutatingMethods.java b/tck/src/main/java/org/apache/jdo/tck/extents/IteratorMutatingMethods.java
index fdc7a855..0410798e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/extents/IteratorMutatingMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/extents/IteratorMutatingMethods.java
@@ -18,9 +18,7 @@
package org.apache.jdo.tck.extents;
import java.util.Iterator;
-
import javax.jdo.Extent;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/extents/IteratorNextAfterExtentClose.java b/tck/src/main/java/org/apache/jdo/tck/extents/IteratorNextAfterExtentClose.java
index 309db1b5..1c71c3df 100644
--- a/tck/src/main/java/org/apache/jdo/tck/extents/IteratorNextAfterExtentClose.java
+++ b/tck/src/main/java/org/apache/jdo/tck/extents/IteratorNextAfterExtentClose.java
@@ -19,9 +19,7 @@ package org.apache.jdo.tck.extents;
import java.util.Iterator;
import java.util.NoSuchElementException;
-
import javax.jdo.Extent;
-
import org.apache.jdo.tck.pc.company.Employee;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/extents/IteratorNextAfterExtentCloseAll.java b/tck/src/main/java/org/apache/jdo/tck/extents/IteratorNextAfterExtentCloseAll.java
index 351e55f9..3acbed44 100644
--- a/tck/src/main/java/org/apache/jdo/tck/extents/IteratorNextAfterExtentCloseAll.java
+++ b/tck/src/main/java/org/apache/jdo/tck/extents/IteratorNextAfterExtentCloseAll.java
@@ -19,9 +19,7 @@ package org.apache.jdo.tck.extents;
import java.util.Iterator;
import java.util.NoSuchElementException;
-
import javax.jdo.Extent;
-
import org.apache.jdo.tck.pc.company.Employee;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/extents/Iterators.java b/tck/src/main/java/org/apache/jdo/tck/extents/Iterators.java
index fb7f124d..c63f0e3a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/extents/Iterators.java
+++ b/tck/src/main/java/org/apache/jdo/tck/extents/Iterators.java
@@ -18,9 +18,7 @@
package org.apache.jdo.tck.extents;
import java.util.Iterator;
-
import javax.jdo.Extent;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/MultiplePMsReturnInstancesRepresentingSamePC.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/MultiplePMsReturnInstancesRepresentingSamePC.java
index 2084d0f1..a0d95bfb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/MultiplePMsReturnInstancesRepresentingSamePC.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/MultiplePMsReturnInstancesRepresentingSamePC.java
@@ -18,11 +18,9 @@
package org.apache.jdo.tck.lifecycle;
import java.util.Iterator;
-
import javax.jdo.Extent;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.lifecycle.StateTransitionObj;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteDatastoreCommit.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteDatastoreCommit.java
index cb1ba2b9..4956b2c3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteDatastoreCommit.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteDatastoreCommit.java
@@ -17,13 +17,6 @@
package org.apache.jdo.tck.lifecycle;
-import javax.jdo.JDOUnsupportedOptionException;
-import javax.jdo.PersistenceManager;
-
-import org.apache.jdo.tck.JDO_Test;
-
-import org.apache.jdo.tck.pc.mylib.VersionedPCPoint;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteDatastoreCommitConflict.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteDatastoreCommitConflict.java
index 57358f12..be12f77f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteDatastoreCommitConflict.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteDatastoreCommitConflict.java
@@ -17,13 +17,6 @@
package org.apache.jdo.tck.lifecycle;
-import javax.jdo.JDOUnsupportedOptionException;
-import javax.jdo.PersistenceManager;
-
-import org.apache.jdo.tck.JDO_Test;
-
-import org.apache.jdo.tck.pc.mylib.VersionedPCPoint;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteDatastoreRollback.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteDatastoreRollback.java
index d4dbda20..583b1339 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteDatastoreRollback.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteDatastoreRollback.java
@@ -17,13 +17,6 @@
package org.apache.jdo.tck.lifecycle;
-import javax.jdo.JDOUnsupportedOptionException;
-import javax.jdo.PersistenceManager;
-
-import org.apache.jdo.tck.JDO_Test;
-
-import org.apache.jdo.tck.pc.mylib.VersionedPCPoint;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteOptimisticCommit.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteOptimisticCommit.java
index 9b6bc734..2f42ec5c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteOptimisticCommit.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteOptimisticCommit.java
@@ -17,13 +17,6 @@
package org.apache.jdo.tck.lifecycle;
-import javax.jdo.JDOUnsupportedOptionException;
-import javax.jdo.PersistenceManager;
-
-import org.apache.jdo.tck.JDO_Test;
-
-import org.apache.jdo.tck.pc.mylib.VersionedPCPoint;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteOptimisticCommitConflict.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteOptimisticCommitConflict.java
index 6925a46b..9c353376 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteOptimisticCommitConflict.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteOptimisticCommitConflict.java
@@ -17,13 +17,6 @@
package org.apache.jdo.tck.lifecycle;
-import javax.jdo.JDOUnsupportedOptionException;
-import javax.jdo.PersistenceManager;
-
-import org.apache.jdo.tck.JDO_Test;
-
-import org.apache.jdo.tck.pc.mylib.VersionedPCPoint;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteOptimisticRollback.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteOptimisticRollback.java
index 21cde8c5..19ea682c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteOptimisticRollback.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteOptimisticRollback.java
@@ -17,13 +17,6 @@
package org.apache.jdo.tck.lifecycle;
-import javax.jdo.JDOUnsupportedOptionException;
-import javax.jdo.PersistenceManager;
-
-import org.apache.jdo.tck.JDO_Test;
-
-import org.apache.jdo.tck.pc.mylib.VersionedPCPoint;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteTest.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteTest.java
index 894269ba..0acb2602 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteTest.java
@@ -18,11 +18,8 @@
package org.apache.jdo.tck.lifecycle;
import javax.jdo.JDOOptimisticVerificationException;
-
import javax.jdo.PersistenceManager;
-
import org.apache.jdo.tck.JDO_Test;
-
import org.apache.jdo.tck.pc.mylib.VersionedPCPoint;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteThrows.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteThrows.java
index bb139dc9..f4ac4b5c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteThrows.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/NontransactionalWriteThrows.java
@@ -18,12 +18,6 @@
package org.apache.jdo.tck.lifecycle;
import javax.jdo.JDOUnsupportedOptionException;
-import javax.jdo.PersistenceManager;
-
-import org.apache.jdo.tck.JDO_Test;
-
-import org.apache.jdo.tck.pc.mylib.VersionedPCPoint;
-
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/ObjectIdNotModifiedWhenObjectIdInstanceModified.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/ObjectIdNotModifiedWhenObjectIdInstanceModified.java
index 1305776c..b19e6470 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/ObjectIdNotModifiedWhenObjectIdInstanceModified.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/ObjectIdNotModifiedWhenObjectIdInstanceModified.java
@@ -17,13 +17,9 @@
package org.apache.jdo.tck.lifecycle;
-import java.util.ArrayList;
import java.util.Iterator;
-import java.util.List;
-
import javax.jdo.Extent;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.lifecycle.StateTransitionObj;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/PMReturnsIdenticalInstancesForEqualObjIds.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/PMReturnsIdenticalInstancesForEqualObjIds.java
index a814a1a9..4a238cfc 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/PMReturnsIdenticalInstancesForEqualObjIds.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/PMReturnsIdenticalInstancesForEqualObjIds.java
@@ -18,10 +18,8 @@
package org.apache.jdo.tck.lifecycle;
import java.util.Iterator;
-
import javax.jdo.Extent;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.lifecycle.StateTransitionObj;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/PMsCanSharePCClassesButNotPCInstances.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/PMsCanSharePCClassesButNotPCInstances.java
index a98eaff1..466da4e3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/PMsCanSharePCClassesButNotPCInstances.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/PMsCanSharePCClassesButNotPCInstances.java
@@ -20,7 +20,6 @@ package org.apache.jdo.tck.lifecycle;
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
-
import javax.jdo.Extent;
import javax.jdo.JDOException;
import javax.jdo.JDOFatalException;
@@ -28,9 +27,7 @@ import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManager;
import javax.jdo.PersistenceManagerFactory;
import javax.jdo.Transaction;
-
import junit.framework.AssertionFailedError;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.lifecycle.StateTransitionObj;
import org.apache.jdo.tck.util.BatchTestRunner;
@@ -189,8 +186,8 @@ public class PMsCanSharePCClassesButNotPCInstances extends JDO_Test {
tx.commit();
} catch (JDOException ex) {
if (!sharedPC) // we expect an exception for all but one of the inserters in the case of a
- // shared PC
- throw ex;
+ // shared PC
+ throw ex;
} finally {
incrAttempts();
if (tx != null && tx.isActive()) tx.rollback();
diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitions.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitions.java
index 6df92de6..5cfc7b72 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitions.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitions.java
@@ -21,11 +21,9 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.util.Iterator;
-
import javax.jdo.Extent;
import javax.jdo.JDOFatalException;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.lifecycle.StateTransitionObj;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitionsReturnedObjects.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitionsReturnedObjects.java
index 0d1a12e7..6d5c2829 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitionsReturnedObjects.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitionsReturnedObjects.java
@@ -23,11 +23,9 @@ import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.Iterator;
-
import javax.jdo.Extent;
import javax.jdo.JDOFatalException;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.lifecycle.StateTransitionObj;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/TransientTransactionalStateRollback.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/TransientTransactionalStateRollback.java
index edb83c56..c3026943 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/TransientTransactionalStateRollback.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/TransientTransactionalStateRollback.java
@@ -18,7 +18,6 @@
package org.apache.jdo.tck.lifecycle;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.lifecycle.StateTransitionObj;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/mapping/AbstractRelationshipTest.java b/tck/src/main/java/org/apache/jdo/tck/mapping/AbstractRelationshipTest.java
index b75d7237..05d392ba 100644
--- a/tck/src/main/java/org/apache/jdo/tck/mapping/AbstractRelationshipTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/mapping/AbstractRelationshipTest.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-
import org.apache.jdo.tck.AbstractReaderTest;
import org.apache.jdo.tck.pc.company.CompanyFactoryRegistry;
import org.apache.jdo.tck.pc.company.CompanyModelReader;
diff --git a/tck/src/main/java/org/apache/jdo/tck/mapping/CompletenessTest.java b/tck/src/main/java/org/apache/jdo/tck/mapping/CompletenessTest.java
index e7a76356..a3cd12e1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/mapping/CompletenessTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/mapping/CompletenessTest.java
@@ -20,7 +20,6 @@ package org.apache.jdo.tck.mapping;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-
import org.apache.jdo.tck.AbstractReaderTest;
import org.apache.jdo.tck.pc.company.CompanyFactoryRegistry;
import org.apache.jdo.tck.pc.company.CompanyModelReader;
diff --git a/tck/src/main/java/org/apache/jdo/tck/mapping/CompletenessTestJPA.java b/tck/src/main/java/org/apache/jdo/tck/mapping/CompletenessTestJPA.java
index 61a85bfe..e42e5fa0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/mapping/CompletenessTestJPA.java
+++ b/tck/src/main/java/org/apache/jdo/tck/mapping/CompletenessTestJPA.java
@@ -20,7 +20,6 @@ package org.apache.jdo.tck.mapping;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-
import org.apache.jdo.tck.AbstractReaderTest;
import org.apache.jdo.tck.pc.company.CompanyFactoryRegistry;
import org.apache.jdo.tck.pc.company.CompanyModelReader;
diff --git a/tck/src/main/java/org/apache/jdo/tck/mapping/CompletenessTestList.java b/tck/src/main/java/org/apache/jdo/tck/mapping/CompletenessTestList.java
index 9ca0b865..1ee5bcf8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/mapping/CompletenessTestList.java
+++ b/tck/src/main/java/org/apache/jdo/tck/mapping/CompletenessTestList.java
@@ -20,7 +20,6 @@ package org.apache.jdo.tck.mapping;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-
import org.apache.jdo.tck.AbstractReaderTest;
import org.apache.jdo.tck.pc.companyListWithoutJoin.CompanyFactoryRegistry;
import org.apache.jdo.tck.pc.companyListWithoutJoin.CompanyModelReader;
diff --git a/tck/src/main/java/org/apache/jdo/tck/mapping/CompletenessTestMap.java b/tck/src/main/java/org/apache/jdo/tck/mapping/CompletenessTestMap.java
index 280b2cc8..df0a4e8e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/mapping/CompletenessTestMap.java
+++ b/tck/src/main/java/org/apache/jdo/tck/mapping/CompletenessTestMap.java
@@ -20,7 +20,6 @@ package org.apache.jdo.tck.mapping;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-
import org.apache.jdo.tck.AbstractReaderTest;
import org.apache.jdo.tck.pc.companyMapWithoutJoin.CompanyFactoryRegistry;
import org.apache.jdo.tck.pc.companyMapWithoutJoin.CompanyModelReader;
diff --git a/tck/src/main/java/org/apache/jdo/tck/mapping/CompletenessTestOrder.java b/tck/src/main/java/org/apache/jdo/tck/mapping/CompletenessTestOrder.java
index dda18a86..a5da74e9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/mapping/CompletenessTestOrder.java
+++ b/tck/src/main/java/org/apache/jdo/tck/mapping/CompletenessTestOrder.java
@@ -20,7 +20,6 @@ package org.apache.jdo.tck.mapping;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-
import org.apache.jdo.tck.AbstractReaderTest;
import org.apache.jdo.tck.pc.order.OrderFactoryRegistry;
import org.apache.jdo.tck.pc.order.OrderModelReader;
diff --git a/tck/src/main/java/org/apache/jdo/tck/mapping/Relationship1ToManyAllRelationships.java b/tck/src/main/java/org/apache/jdo/tck/mapping/Relationship1ToManyAllRelationships.java
index a363cb1c..153a9e60 100644
--- a/tck/src/main/java/org/apache/jdo/tck/mapping/Relationship1ToManyAllRelationships.java
+++ b/tck/src/main/java/org/apache/jdo/tck/mapping/Relationship1ToManyAllRelationships.java
@@ -19,16 +19,11 @@ package org.apache.jdo.tck.mapping;
import java.util.Date;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
-
-import javax.jdo.JDOHelper;
-
import org.apache.jdo.tck.pc.company.Department;
import org.apache.jdo.tck.pc.company.Employee;
import org.apache.jdo.tck.pc.company.FullTimeEmployee;
import org.apache.jdo.tck.pc.company.IDepartment;
-import org.apache.jdo.tck.pc.company.IEmployee;
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/embedded/EmbeddedInheritance.java b/tck/src/main/java/org/apache/jdo/tck/models/embedded/EmbeddedInheritance.java
index 4db20252..8ba41e99 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/embedded/EmbeddedInheritance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/embedded/EmbeddedInheritance.java
@@ -17,11 +17,8 @@
package org.apache.jdo.tck.models.embedded;
import java.util.List;
-
import javax.jdo.Query;
-
import org.apache.jdo.tck.JDO_Test;
-
import org.apache.jdo.tck.pc.building.Kitchen;
import org.apache.jdo.tck.pc.building.MultifunctionOven;
import org.apache.jdo.tck.pc.building.Oven;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/embedded/SecondClassObjectsTrackTheirChanges.java b/tck/src/main/java/org/apache/jdo/tck/models/embedded/SecondClassObjectsTrackTheirChanges.java
index c9e1c24d..46ac4463 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/embedded/SecondClassObjectsTrackTheirChanges.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/embedded/SecondClassObjectsTrackTheirChanges.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.models.embedded;
import java.util.Date;
import java.util.Set;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.company.Address;
import org.apache.jdo.tck.pc.company.Company;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java
index fe72d0dc..4db40ddc 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java
@@ -18,16 +18,11 @@
package org.apache.jdo.tck.models.fieldtypes;
import java.lang.reflect.Array;
-
import java.math.BigDecimal;
-
import java.util.Arrays;
-import java.util.Collection;
import java.util.Vector;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.ArrayCollections;
import org.apache.jdo.tck.pc.fieldtypes.SimpleClass;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java
index 3fe49ff4..de635fc5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java
@@ -19,13 +19,11 @@ package org.apache.jdo.tck.models.fieldtypes;
import java.math.BigDecimal;
import java.util.ArrayList;
-import java.util.List;
import java.util.Collection;
+import java.util.List;
import java.util.Vector;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.ArrayListCollections;
import org.apache.jdo.tck.pc.fieldtypes.SimpleClass;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java
index a7f9d068..86819985 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java
@@ -21,10 +21,8 @@ import java.math.BigDecimal;
import java.util.Collection;
import java.util.List;
import java.util.Vector;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.CollectionCollections;
import org.apache.jdo.tck.pc.fieldtypes.SimpleClass;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java
index dd1c7bf0..2ea6ea78 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java
@@ -18,10 +18,8 @@
package org.apache.jdo.tck.models.fieldtypes;
import java.math.BigDecimal;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfBigDecimal;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigInteger.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigInteger.java
index b38d2116..58f98ffa 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigInteger.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigInteger.java
@@ -18,10 +18,8 @@
package org.apache.jdo.tck.models.fieldtypes;
import java.math.BigInteger;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfBigInteger;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBoolean.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBoolean.java
index 5944083c..f7b7b526 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBoolean.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBoolean.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.models.fieldtypes;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfBoolean;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfByte.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfByte.java
index 060f54a3..59ac3f94 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfByte.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfByte.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.models.fieldtypes;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfByte;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfCharacter.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfCharacter.java
index 4d1cc9ad..e9ff1c8d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfCharacter.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfCharacter.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.models.fieldtypes;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfCharacter;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDate.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDate.java
index 9dddf172..002afc48 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDate.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDate.java
@@ -18,10 +18,8 @@
package org.apache.jdo.tck.models.fieldtypes;
import java.util.Date;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfDate;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDouble.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDouble.java
index 7fb6521b..4d78b83a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDouble.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDouble.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.models.fieldtypes;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.AllTypes;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfDouble;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfFloat.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfFloat.java
index 103ad879..a7200fb3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfFloat.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfFloat.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.models.fieldtypes;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.AllTypes;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfFloat;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfInteger.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfInteger.java
index ba2fef44..bc280708 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfInteger.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfInteger.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.models.fieldtypes;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfInteger;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLocale.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLocale.java
index c9ec8568..1e385dc5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLocale.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLocale.java
@@ -18,10 +18,8 @@
package org.apache.jdo.tck.models.fieldtypes;
import java.util.Locale;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfLocale;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLong.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLong.java
index b465cf23..6fe1e6b0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLong.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLong.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.models.fieldtypes;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfLong;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfObject.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfObject.java
index cb7a97e5..5ee4ab3b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfObject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfObject.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.models.fieldtypes;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfObject;
import org.apache.jdo.tck.pc.fieldtypes.SimpleClass;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveboolean.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveboolean.java
index 7e73bc16..5f295c88 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveboolean.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveboolean.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.models.fieldtypes;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitiveboolean;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivebyte.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivebyte.java
index 9c1efc36..3cd86f41 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivebyte.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivebyte.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.models.fieldtypes;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitivebyte;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivechar.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivechar.java
index 1c196540..9086c813 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivechar.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivechar.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.models.fieldtypes;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitivechar;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivedouble.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivedouble.java
index ada01075..873d7896 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivedouble.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivedouble.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.models.fieldtypes;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitivedouble;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivefloat.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivefloat.java
index 8194aeff..f1dc27eb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivefloat.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivefloat.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.models.fieldtypes;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitivefloat;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveint.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveint.java
index 4230433d..38d31009 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveint.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveint.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.models.fieldtypes;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitiveint;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivelong.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivelong.java
index 513922bf..fac4a790 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivelong.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitivelong.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.models.fieldtypes;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitivelong;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveshort.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveshort.java
index 7760b5ac..d575f277 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveshort.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfPrimitiveshort.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.models.fieldtypes;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfPrimitiveshort;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfShort.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfShort.java
index e0c2a19e..ec32f82d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfShort.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfShort.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.models.fieldtypes;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfShort;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleClass.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleClass.java
index 81fb083f..e036e737 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleClass.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.models.fieldtypes;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfSimpleClass;
import org.apache.jdo.tck.pc.fieldtypes.SimpleClass;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleEnum.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleEnum.java
index 47a8397e..ccf03705 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleEnum.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleEnum.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.models.fieldtypes;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfSimpleEnum;
import org.apache.jdo.tck.pc.fieldtypes.SimpleEnum;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleInterface.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleInterface.java
index af5fd4d0..4225a00c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleInterface.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleInterface.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.models.fieldtypes;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfSimpleInterface;
import org.apache.jdo.tck.pc.fieldtypes.SimpleClass;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfString.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfString.java
index dfe935f3..454d0c64 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfString.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfString.java
@@ -19,7 +19,6 @@ package org.apache.jdo.tck.models.fieldtypes;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.FieldsOfString;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java
index 5f8c928c..d859cfb9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java
@@ -18,16 +18,12 @@
package org.apache.jdo.tck.models.fieldtypes;
import java.math.BigDecimal;
-
import java.util.HashMap;
-import java.util.Hashtable;
import java.util.Iterator;
import java.util.Set;
import java.util.Vector;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.HashMapStringKeyCollections;
import org.apache.jdo.tck.pc.fieldtypes.SimpleClass;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringValueCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringValueCollections.java
index 1e5e2b48..7303bfd5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringValueCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringValueCollections.java
@@ -18,15 +18,12 @@
package org.apache.jdo.tck.models.fieldtypes;
import java.math.BigDecimal;
-
import java.util.HashMap;
import java.util.Iterator;
import java.util.Set;
import java.util.Vector;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.HashMapStringValueCollections;
import org.apache.jdo.tck.pc.fieldtypes.SimpleClass;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashSetCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashSetCollections.java
index 6a1c4884..fb394230 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashSetCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashSetCollections.java
@@ -18,15 +18,12 @@
package org.apache.jdo.tck.models.fieldtypes;
import java.math.BigDecimal;
-
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.TreeSet;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.HashSetCollections;
import org.apache.jdo.tck.pc.fieldtypes.SimpleClass;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java
index babbaa3c..fbdf9d5d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java
@@ -18,16 +18,12 @@
package org.apache.jdo.tck.models.fieldtypes;
import java.math.BigDecimal;
-
import java.util.Hashtable;
import java.util.Iterator;
-import java.util.List;
import java.util.Set;
import java.util.Vector;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.HashtableStringKeyCollections;
import org.apache.jdo.tck.pc.fieldtypes.SimpleClass;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringValueCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringValueCollections.java
index 9468ef7d..e66d4646 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringValueCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringValueCollections.java
@@ -18,15 +18,12 @@
package org.apache.jdo.tck.models.fieldtypes;
import java.math.BigDecimal;
-
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Set;
import java.util.Vector;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.HashtableStringValueCollections;
import org.apache.jdo.tck.pc.fieldtypes.SimpleClass;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestLinkedListCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestLinkedListCollections.java
index 383703b7..5de616c0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestLinkedListCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestLinkedListCollections.java
@@ -18,14 +18,11 @@
package org.apache.jdo.tck.models.fieldtypes;
import java.math.BigDecimal;
-
import java.util.Collection;
-import java.util.ListIterator;
import java.util.LinkedList;
-
+import java.util.ListIterator;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.LinkedListCollections;
import org.apache.jdo.tck.pc.fieldtypes.SimpleClass;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java
index 1aafffbe..be3247a1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java
@@ -18,15 +18,11 @@
package org.apache.jdo.tck.models.fieldtypes;
import java.math.BigDecimal;
-
-import java.util.Collection;
-import java.util.Vector;
import java.util.List;
import java.util.ListIterator;
-
+import java.util.Vector;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.ListCollections;
import org.apache.jdo.tck.pc.fieldtypes.SimpleClass;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java
index f5f15883..481a4d24 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java
@@ -18,16 +18,13 @@
package org.apache.jdo.tck.models.fieldtypes;
import java.math.BigDecimal;
-
import java.util.HashMap;
import java.util.Iterator;
-import java.util.Set;
import java.util.Map;
+import java.util.Set;
import java.util.Vector;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.MapStringKeyCollections;
import org.apache.jdo.tck.pc.fieldtypes.SimpleClass;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringValueCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringValueCollections.java
index a641e271..d5b5a9b9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringValueCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringValueCollections.java
@@ -18,16 +18,13 @@
package org.apache.jdo.tck.models.fieldtypes;
import java.math.BigDecimal;
-
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import java.util.Vector;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.MapStringValueCollections;
import org.apache.jdo.tck.pc.fieldtypes.SimpleClass;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestSetCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestSetCollections.java
index 7325ecbc..8ce019c1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestSetCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestSetCollections.java
@@ -18,16 +18,13 @@
package org.apache.jdo.tck.models.fieldtypes;
import java.math.BigDecimal;
-
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import java.util.TreeSet;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.fieldtypes.SetCollections;
import org.apache.jdo.tck.pc.fieldtypes.SimpleClass;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java
index 31ebef84..caf60c42 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java
@@ -18,19 +18,15 @@
package org.apache.jdo.tck.models.fieldtypes;
import java.math.BigDecimal;
-
import java.util.Iterator;
-import java.util.List;
import java.util.Set;
import java.util.TreeMap;
import java.util.Vector;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
-import org.apache.jdo.tck.pc.fieldtypes.TreeMapStringKeyCollections;
import org.apache.jdo.tck.pc.fieldtypes.SimpleClass;
+import org.apache.jdo.tck.pc.fieldtypes.TreeMapStringKeyCollections;
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringValueCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringValueCollections.java
index 9d6dacba..e1186b03 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringValueCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringValueCollections.java
@@ -18,18 +18,15 @@
package org.apache.jdo.tck.models.fieldtypes;
import java.math.BigDecimal;
-
import java.util.Iterator;
import java.util.Set;
import java.util.TreeMap;
import java.util.Vector;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
-import org.apache.jdo.tck.pc.fieldtypes.TreeMapStringValueCollections;
import org.apache.jdo.tck.pc.fieldtypes.SimpleClass;
+import org.apache.jdo.tck.pc.fieldtypes.TreeMapStringValueCollections;
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeSetCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeSetCollections.java
index 60b25fbf..580c15c6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeSetCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeSetCollections.java
@@ -20,13 +20,11 @@ package org.apache.jdo.tck.models.fieldtypes;
import java.util.Collection;
import java.util.TreeSet;
import java.util.Vector;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
-import org.apache.jdo.tck.pc.fieldtypes.TreeSetCollections;
import org.apache.jdo.tck.pc.fieldtypes.SimpleClass;
+import org.apache.jdo.tck.pc.fieldtypes.TreeSetCollections;
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java
index ee3803b4..103b3f8f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java
@@ -17,9 +17,13 @@
package org.apache.jdo.tck.models.fieldtypes;
-import java.util.*;
-import java.math.*;
-
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Set;
+import java.util.Vector;
import org.apache.jdo.tck.pc.fieldtypes.AllTypes;
import org.apache.jdo.tck.pc.fieldtypes.SimpleClass;
import org.apache.jdo.tck.pc.fieldtypes.SimpleEnum;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestVectorCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestVectorCollections.java
index 5291de20..6409caf2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestVectorCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestVectorCollections.java
@@ -18,16 +18,12 @@
package org.apache.jdo.tck.models.fieldtypes;
import java.math.BigDecimal;
-
-import java.util.Collection;
import java.util.Vector;
-
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
import org.apache.jdo.tck.JDO_Test;
-import org.apache.jdo.tck.pc.fieldtypes.VectorCollections;
import org.apache.jdo.tck.pc.fieldtypes.SimpleClass;
+import org.apache.jdo.tck.pc.fieldtypes.VectorCollections;
import org.apache.jdo.tck.util.BatchTestRunner;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/inheritance/FieldWithSameNameInSuperclass.java b/tck/src/main/java/org/apache/jdo/tck/models/inheritance/FieldWithSameNameInSuperclass.java
index b024f40e..1f8f7891 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/inheritance/FieldWithSameNameInSuperclass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/inheritance/FieldWithSameNameInSuperclass.java
@@ -18,14 +18,11 @@
package org.apache.jdo.tck.models.inheritance;
import java.util.Iterator;
-
import javax.jdo.Extent;
import javax.jdo.JDOException;
import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.inheritance.Constants;
import org.apache.jdo.tck.pc.inheritance.FieldSameName4;
import org.apache.jdo.tck.util.BatchTestRunner;
@@ -146,7 +143,7 @@ public class FieldWithSameNameInSuperclass extends TestParts {
FieldSameName4 b = null;
try { // retrieve object created in previous transaction & store in value array for later
- // comparison
+ // comparison
TestParts.thirdObj_V[1] = (FieldSameName4) pm.getObjectById(objPtrB, true);
} catch (JDOUserException e) {
// could not locate persistent object created in previous
@@ -168,9 +165,8 @@ public class FieldWithSameNameInSuperclass extends TestParts {
// verify referenced persistent object contains correct values
b = a.getThirdObj();
- if (b
- != null) { // if previous error caused b to be null, then these tests cannot be
- // performed.
+ if (b != null) { // if previous error caused b to be null, then these tests cannot be
+ // performed.
checkPersistentAreCorrect(
ASSERTION_FAILED,
persistentAfterCommit,
@@ -297,7 +293,7 @@ public class FieldWithSameNameInSuperclass extends TestParts {
// verify rollback lost all persistent changes.
try { // retrieve object created in previous transaction & store in value array for later
- // comparison
+ // comparison
TestParts.thirdObj_V[1] = (FieldSameName4) pm.getObjectById(objPtrB, true);
} catch (JDOUserException e) {
// could not locate persistent object created in previous transaction
@@ -316,9 +312,8 @@ public class FieldWithSameNameInSuperclass extends TestParts {
a.getThirdObj(),
a.getIntH());
b = a.getThirdObj();
- if (b
- != null) { // if previous error caused b to be null, then these tests cannot be
- // performed.
+ if (b != null) { // if previous error caused b to be null, then these tests cannot be
+ // performed.
checkPersistentAreCorrect(
ASSERTION_FAILED,
persistentAfterRollback,
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/inheritance/NonPersistentFieldsAreNonPersistentInSubclasses.java b/tck/src/main/java/org/apache/jdo/tck/models/inheritance/NonPersistentFieldsAreNonPersistentInSubclasses.java
index 29e3e563..b73885b5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/inheritance/NonPersistentFieldsAreNonPersistentInSubclasses.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/inheritance/NonPersistentFieldsAreNonPersistentInSubclasses.java
@@ -18,12 +18,9 @@
package org.apache.jdo.tck.models.inheritance;
import java.util.Iterator;
-
import javax.jdo.Extent;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.inheritance.AllPersist4;
import org.apache.jdo.tck.pc.inheritance.Constants;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/inheritance/NonpersistentSuperClass.java b/tck/src/main/java/org/apache/jdo/tck/models/inheritance/NonpersistentSuperClass.java
index d9fe73ac..0b7a14d1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/inheritance/NonpersistentSuperClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/inheritance/NonpersistentSuperClass.java
@@ -18,13 +18,10 @@
package org.apache.jdo.tck.models.inheritance;
import java.util.Iterator;
-
import javax.jdo.Extent;
import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.inheritance.Constants;
import org.apache.jdo.tck.pc.inheritance.TopNonPersistH;
import org.apache.jdo.tck.util.BatchTestRunner;
@@ -135,7 +132,7 @@ public class NonpersistentSuperClass extends TestParts {
TopNonPersistH b = null;
try { // retrieve object created in previous transaction & store in value array for later
- // comparison
+ // comparison
TestParts.thirdObj_V[1] = (TopNonPersistH) pm.getObjectById(objPtrB, true);
} catch (JDOUserException e) {
// could not locate persistent object created in previous transaction
@@ -156,9 +153,8 @@ public class NonpersistentSuperClass extends TestParts {
// verify referenced persistent object contains correct values
b = a.thirdObj;
- if (b
- != null) { // if previous error caused b to be null, then these tests cannot be
- // performed.
+ if (b != null) { // if previous error caused b to be null, then these tests cannot be
+ // performed.
checkPersistentAreCorrect(
ASSERTION_FAILED,
persistentAfterCommit,
@@ -285,7 +281,7 @@ public class NonpersistentSuperClass extends TestParts {
// verify rollback lost all persistent changes.
try { // retrieve object created in previous transaction & store in value array for later
- // comparison
+ // comparison
TestParts.thirdObj_V[1] = (TopNonPersistH) pm.getObjectById(objPtrB, true);
} catch (JDOUserException e) {
// could not locate persistent object created in previous transaction
@@ -304,9 +300,8 @@ public class NonpersistentSuperClass extends TestParts {
a.thirdObj,
a.intH);
b = a.thirdObj;
- if (b
- != null) { // if previous error caused b to be null, then these tests cannot be
- // performed.
+ if (b != null) { // if previous error caused b to be null, then these tests cannot be
+ // performed.
checkPersistentAreCorrect(
ASSERTION_FAILED,
persistentAfterRollback,
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/inheritance/PersistenceCapableFlexibilityInInheritanceHierarchy.java b/tck/src/main/java/org/apache/jdo/tck/models/inheritance/PersistenceCapableFlexibilityInInheritanceHierarchy.java
index 8673369d..1a305fba 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/inheritance/PersistenceCapableFlexibilityInInheritanceHierarchy.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/inheritance/PersistenceCapableFlexibilityInInheritanceHierarchy.java
@@ -18,13 +18,10 @@
package org.apache.jdo.tck.models.inheritance;
import java.util.Iterator;
-
import javax.jdo.Extent;
import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.inheritance.Constants;
import org.apache.jdo.tck.pc.inheritance.TopPersistH;
import org.apache.jdo.tck.util.BatchTestRunner;
@@ -137,7 +134,7 @@ public class PersistenceCapableFlexibilityInInheritanceHierarchy extends TestPar
TopPersistH b = null;
try { // retrieve object created in previous transaction & store in value array for later
- // comparison
+ // comparison
TestParts.thirdObj_V[1] = (TopPersistH) pm.getObjectById(objPtrB, true);
} catch (JDOUserException e) {
// could not locate persistent object created in previous transaction
@@ -158,9 +155,8 @@ public class PersistenceCapableFlexibilityInInheritanceHierarchy extends TestPar
// verify referenced persistent object contains correct values
b = a.thirdObj;
- if (b
- != null) { // if previous error caused b to be null, then these tests cannot be
- // performed.
+ if (b != null) { // if previous error caused b to be null, then these tests cannot be
+ // performed.
checkPersistentAreCorrect(
ASSERTION_FAILED,
persistentAfterCommit,
@@ -287,7 +283,7 @@ public class PersistenceCapableFlexibilityInInheritanceHierarchy extends TestPar
// verify rollback lost all persistent changes.
try { // retrieve object created in previous transaction & store in value array for later
- // comparison
+ // comparison
TestParts.thirdObj_V[1] = (TopPersistH) pm.getObjectById(objPtrB, true);
} catch (JDOUserException e) {
// could not locate persistent object created in previous transaction
@@ -306,9 +302,8 @@ public class PersistenceCapableFlexibilityInInheritanceHierarchy extends TestPar
a.thirdObj,
a.intH);
b = a.thirdObj;
- if (b
- != null) { // if previous error caused b to be null, then these tests cannot be
- // performed.
+ if (b != null) { // if previous error caused b to be null, then these tests cannot be
+ // performed.
checkPersistentAreCorrect(
ASSERTION_FAILED,
persistentAfterRollback,
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/inheritance/PersistentFieldsArePersistentInSubClasses.java b/tck/src/main/java/org/apache/jdo/tck/models/inheritance/PersistentFieldsArePersistentInSubClasses.java
index 968ea511..97f313f0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/inheritance/PersistentFieldsArePersistentInSubClasses.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/inheritance/PersistentFieldsArePersistentInSubClasses.java
@@ -18,13 +18,10 @@
package org.apache.jdo.tck.models.inheritance;
import java.util.Iterator;
-
import javax.jdo.Extent;
import javax.jdo.JDOUserException;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.inheritance.AllPersist4;
import org.apache.jdo.tck.pc.inheritance.Constants;
import org.apache.jdo.tck.util.BatchTestRunner;
@@ -135,7 +132,7 @@ public class PersistentFieldsArePersistentInSubClasses extends TestParts {
AllPersist4 b = null;
try { // retrieve object created in previous transaction & store in value array for later
- // comparison
+ // comparison
TestParts.thirdObj_V[1] = (AllPersist4) pm.getObjectById(objPtrB, true);
} catch (JDOUserException e) {
// could not locate persistent object created in previous transaction
@@ -156,9 +153,8 @@ public class PersistentFieldsArePersistentInSubClasses extends TestParts {
// verify referenced persistent object contains correct values
b = a.thirdObj;
- if (b
- != null) { // if previous error caused b to be null, then these tests cannot be
- // performed.
+ if (b != null) { // if previous error caused b to be null, then these tests cannot be
+ // performed.
checkPersistentAreCorrect(
ASSERTION_FAILED,
persistentAfterCommit,
@@ -274,7 +270,7 @@ public class PersistentFieldsArePersistentInSubClasses extends TestParts {
// verify rollback lost all persistent changes.
try { // retrieve object created in previous transaction & store in value array for later
- // comparison
+ // comparison
TestParts.thirdObj_V[1] = (AllPersist4) pm.getObjectById(objPtrB, true);
} catch (JDOUserException e) {
// could not locate persistent object created in previous transaction
@@ -293,9 +289,8 @@ public class PersistentFieldsArePersistentInSubClasses extends TestParts {
a.thirdObj,
a.intH);
b = a.thirdObj;
- if (b
- != null) { // if previous error caused b to be null, then these tests cannot be
- // performed.
+ if (b != null) { // if previous error caused b to be null, then these tests cannot be
+ // performed.
checkPersistentAreCorrect(
ASSERTION_FAILED,
persistentAfterRollback,
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/inheritance/TransactionalFieldsAreTransactionalInSubclasses.java b/tck/src/main/java/org/apache/jdo/tck/models/inheritance/TransactionalFieldsAreTransactionalInSubclasses.java
index 6f5d64c5..199157e2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/inheritance/TransactionalFieldsAreTransactionalInSubclasses.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/inheritance/TransactionalFieldsAreTransactionalInSubclasses.java
@@ -18,12 +18,9 @@
package org.apache.jdo.tck.models.inheritance;
import java.util.Iterator;
-
import javax.jdo.Extent;
import javax.jdo.PersistenceManager;
import javax.jdo.Transaction;
-
-import org.apache.jdo.tck.JDO_Test;
import org.apache.jdo.tck.pc.inheritance.AllPersist4;
import org.apache.jdo.tck.pc.inheritance.Constants;
import org.apache.jdo.tck.util.BatchTestRunner;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/Address.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/Address.java
index badc5b99..8daf6043 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/Address.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/Address.java
@@ -19,7 +19,6 @@ 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;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/Company.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/Company.java
index f370d06e..3f8e4aaa 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/Company.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/Company.java
@@ -17,23 +17,19 @@
package org.apache.jdo.tck.pc.company;
-import java.io.Serializable;
-import java.io.ObjectInputStream;
import java.io.IOException;
-
+import java.io.ObjectInputStream;
+import java.io.Serializable;
import java.text.SimpleDateFormat;
-
import java.util.Collections;
import java.util.Comparator;
-import java.util.Set;
-import java.util.HashSet;
import java.util.Date;
-
+import java.util.HashSet;
+import java.util.Set;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
-import javax.jdo.annotations.PersistenceCapable;
-
/** This class represents information about a company. */
@PersistenceCapable
public class Company implements ICompany, Serializable, Comparable, Comparator, DeepEquality {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactory.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactory.java
index c04fcb18..f00c204c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactory.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactory.java
@@ -23,7 +23,6 @@
package org.apache.jdo.tck.pc.company;
import java.math.BigDecimal;
-
import java.util.Date;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryAbstractImpl.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryAbstractImpl.java
index 213bee60..b201c089 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryAbstractImpl.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryAbstractImpl.java
@@ -18,7 +18,6 @@
package org.apache.jdo.tck.pc.company;
import javax.jdo.PersistenceManager;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryConcreteClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryConcreteClass.java
index 02e42fa3..7345d30d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryConcreteClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryConcreteClass.java
@@ -18,9 +18,7 @@
package org.apache.jdo.tck.pc.company;
import java.math.BigDecimal;
-
import java.util.Date;
-
import javax.jdo.PersistenceManager;
/*
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryRegistry.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryRegistry.java
index 88bccc2f..ead5dcd1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryRegistry.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryRegistry.java
@@ -18,11 +18,6 @@
package org.apache.jdo.tck.pc.company;
import java.lang.reflect.Constructor;
-
-import java.math.BigDecimal;
-
-import java.util.Date;
-
import javax.jdo.PersistenceManager;
/*
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java
index 9cf588ae..f113ffb5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java
@@ -20,7 +20,6 @@ package org.apache.jdo.tck.pc.company;
import java.util.Date;
import java.util.List;
import java.util.Locale;
-
import org.apache.jdo.tck.util.ConversionHelper;
import org.apache.jdo.tck.util.JDOCustomDateEditor;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/DentalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/DentalInsurance.java
index 7fc80c75..3f4691ea 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/DentalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/DentalInsurance.java
@@ -18,11 +18,8 @@
package org.apache.jdo.tck.pc.company;
import java.math.BigDecimal;
-
-import org.apache.jdo.tck.util.DeepEquality;
-import org.apache.jdo.tck.util.EqualityHelper;
-
import javax.jdo.annotations.PersistenceCapable;
+import org.apache.jdo.tck.util.EqualityHelper;
/**
* This class represents a dental insurance carrier selection for a particular <code>Employee</code>
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/Department.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/Department.java
index 2e515fbe..7b757650 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/Department.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/Department.java
@@ -17,22 +17,19 @@
package org.apache.jdo.tck.pc.company;
-import java.io.Serializable;
-import java.io.ObjectInputStream;
import java.io.IOException;
-
+import java.io.ObjectInputStream;
+import java.io.Serializable;
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 javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
-import javax.jdo.annotations.PersistenceCapable;
-
/** This class represents a department within a company. */
@PersistenceCapable
public class Department implements IDepartment, Serializable, Comparable, Comparator, DeepEquality {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/Employee.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/Employee.java
index 4de9a64c..e6ab0b0b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/Employee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/Employee.java
@@ -17,17 +17,14 @@
package org.apache.jdo.tck.pc.company;
-import java.io.ObjectInputStream;
import java.io.IOException;
-
+import java.io.ObjectInputStream;
import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
-
-import org.apache.jdo.tck.util.EqualityHelper;
-
import javax.jdo.annotations.PersistenceCapable;
+import org.apache.jdo.tck.util.EqualityHelper;
/** This class represents an employee. */
@PersistenceCapable
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/FullTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/FullTimeEmployee.java
index aa4926bb..2f560c31 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/FullTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/FullTimeEmployee.java
@@ -18,10 +18,8 @@
package org.apache.jdo.tck.pc.company;
import java.util.Date;
-
-import org.apache.jdo.tck.util.EqualityHelper;
-
import javax.jdo.annotations.PersistenceCapable;
+import org.apache.jdo.tck.util.EqualityHelper;
/** This class represents a full-time employee. */
@PersistenceCapable
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/Insurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/Insurance.java
index 9570e2de..17f1eb0b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/Insurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/Insurance.java
@@ -18,14 +18,11 @@
package org.apache.jdo.tck.pc.company;
import java.io.Serializable;
-
import java.util.Comparator;
-
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
-import javax.jdo.annotations.PersistenceCapable;
-
/** This class represents an insurance carrier selection for a particular <code>Employee</code>. */
@PersistenceCapable
public abstract class Insurance
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/MedicalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/MedicalInsurance.java
index 02c86751..f472e23a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/MedicalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/MedicalInsurance.java
@@ -17,12 +17,8 @@
package org.apache.jdo.tck.pc.company;
-import java.io.Serializable;
-
-import org.apache.jdo.tck.util.DeepEquality;
-import org.apache.jdo.tck.util.EqualityHelper;
-
import javax.jdo.annotations.PersistenceCapable;
+import org.apache.jdo.tck.util.EqualityHelper;
/**
* This class represents a dental insurance carrier selection for a particular <code>Employee</code>
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/MeetingRoom.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/MeetingRoom.java
index 4931af17..560f003f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/MeetingRoom.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/MeetingRoom.java
@@ -19,12 +19,10 @@ package org.apache.jdo.tck.pc.company;
import java.io.Serializable;
import java.util.Comparator;
-
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
-import javax.jdo.annotations.PersistenceCapable;
-
/** This class represents a meeting room. */
@PersistenceCapable
public class MeetingRoom
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/PartTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/PartTimeEmployee.java
index 04df9e79..69f23096 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/PartTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/PartTimeEmployee.java
@@ -18,8 +18,6 @@
package org.apache.jdo.tck.pc.company;
import java.util.Date;
-
-import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
/** This class represents a part-time employee. */
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/Person.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/Person.java
index 7fd744cc..c1b2f389 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/Person.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/Person.java
@@ -18,20 +18,16 @@
package org.apache.jdo.tck.pc.company;
import java.io.Serializable;
-
import java.text.SimpleDateFormat;
-
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
-
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
-import javax.jdo.annotations.PersistenceCapable;
-
/** This class represents a person. */
@PersistenceCapable
public class Person implements IPerson, Serializable, Comparable, Comparator, DeepEquality {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/Project.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/Project.java
index 824e5289..e362423f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/Project.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/Project.java
@@ -17,21 +17,18 @@
package org.apache.jdo.tck.pc.company;
-import java.io.Serializable;
-import java.io.ObjectInputStream;
import java.io.IOException;
-
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Set;
import java.util.HashSet;
-import java.math.BigDecimal;
-
+import java.util.Set;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
-import javax.jdo.annotations.PersistenceCapable;
-
/** This class represents a project, a budgeted task with one or more employees working on it. */
@PersistenceCapable
public class Project implements IProject, Serializable, Comparable, Comparator, DeepEquality {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppConcrete.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppConcrete.java
index 1ec0b9eb..60ca407a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppConcrete.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppConcrete.java
@@ -18,7 +18,16 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
import javax.jdo.PersistenceManager;
-import org.apache.jdo.tck.pc.company.*;
+import org.apache.jdo.tck.pc.company.CompanyFactoryNewInstance;
+import org.apache.jdo.tck.pc.company.IAddress;
+import org.apache.jdo.tck.pc.company.ICompany;
+import org.apache.jdo.tck.pc.company.IDentalInsurance;
+import org.apache.jdo.tck.pc.company.IDepartment;
+import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
+import org.apache.jdo.tck.pc.company.IMedicalInsurance;
+import org.apache.jdo.tck.pc.company.IMeetingRoom;
+import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
+import org.apache.jdo.tck.pc.company.IProject;
/*
* CompanyFactoryAnnotatedPMFieldClass.java
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppPM.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppPM.java
index b0c72e3b..e4cbc39e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppPM.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCAppPM.java
@@ -18,7 +18,16 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
import javax.jdo.PersistenceManager;
-import org.apache.jdo.tck.pc.company.*;
+import org.apache.jdo.tck.pc.company.CompanyFactoryNewInstance;
+import org.apache.jdo.tck.pc.company.IAddress;
+import org.apache.jdo.tck.pc.company.ICompany;
+import org.apache.jdo.tck.pc.company.IDentalInsurance;
+import org.apache.jdo.tck.pc.company.IDepartment;
+import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
+import org.apache.jdo.tck.pc.company.IMedicalInsurance;
+import org.apache.jdo.tck.pc.company.IMeetingRoom;
+import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
+import org.apache.jdo.tck.pc.company.IProject;
/*
* CompanyFactoryAnnotatedPMFieldClass.java
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSConcrete.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSConcrete.java
index 05823401..deb009b0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSConcrete.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSConcrete.java
@@ -18,7 +18,16 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
import javax.jdo.PersistenceManager;
-import org.apache.jdo.tck.pc.company.*;
+import org.apache.jdo.tck.pc.company.CompanyFactoryNewInstance;
+import org.apache.jdo.tck.pc.company.IAddress;
+import org.apache.jdo.tck.pc.company.ICompany;
+import org.apache.jdo.tck.pc.company.IDentalInsurance;
+import org.apache.jdo.tck.pc.company.IDepartment;
+import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
+import org.apache.jdo.tck.pc.company.IMedicalInsurance;
+import org.apache.jdo.tck.pc.company.IMeetingRoom;
+import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
+import org.apache.jdo.tck.pc.company.IProject;
/*
* CompanyFactoryAnnotatedFCDSPM.java
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSPM.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSPM.java
index 0783c41d..020a3b4f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSPM.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCDSPM.java
@@ -18,7 +18,16 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
import javax.jdo.PersistenceManager;
-import org.apache.jdo.tck.pc.company.*;
+import org.apache.jdo.tck.pc.company.CompanyFactoryNewInstance;
+import org.apache.jdo.tck.pc.company.IAddress;
+import org.apache.jdo.tck.pc.company.ICompany;
+import org.apache.jdo.tck.pc.company.IDentalInsurance;
+import org.apache.jdo.tck.pc.company.IDepartment;
+import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
+import org.apache.jdo.tck.pc.company.IMedicalInsurance;
+import org.apache.jdo.tck.pc.company.IMeetingRoom;
+import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
+import org.apache.jdo.tck.pc.company.IProject;
/*
* CompanyFactoryAnnotatedFCDSPM.java
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedPMFieldClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedPMFieldClass.java
index 200a714e..3d8abfcd 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedPMFieldClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedPMFieldClass.java
@@ -18,7 +18,15 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
import javax.jdo.PersistenceManager;
-import org.apache.jdo.tck.pc.company.*;
+import org.apache.jdo.tck.pc.company.IAddress;
+import org.apache.jdo.tck.pc.company.ICompany;
+import org.apache.jdo.tck.pc.company.IDentalInsurance;
+import org.apache.jdo.tck.pc.company.IDepartment;
+import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
+import org.apache.jdo.tck.pc.company.IMedicalInsurance;
+import org.apache.jdo.tck.pc.company.IMeetingRoom;
+import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
+import org.apache.jdo.tck.pc.company.IProject;
/*
* CompanyFactoryAnnotatedPMFieldClass.java
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceNew.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceNew.java
index 6b3530d7..721be202 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceNew.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceNew.java
@@ -21,10 +21,10 @@ 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;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.InheritanceStrategy;
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceSuperclass.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceSuperclass.java
index 4e909892..144e5b28 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceSuperclass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/DatastoreIdDiscriminatorClassNameInheritanceSuperclass.java
@@ -21,10 +21,10 @@ 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;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.InheritanceStrategy;
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppAddress.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppAddress.java
index a563977b..a5b92c7a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppAddress.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppAddress.java
@@ -19,9 +19,7 @@ package org.apache.jdo.tck.pc.companyAnnotatedFC;
import java.io.Serializable;
import java.util.Comparator;
-
-import javax.jdo.annotations.*;
-
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IAddress;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppCompany.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppCompany.java
index f8e2c7f1..a467ebe2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppCompany.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppCompany.java
@@ -17,21 +17,27 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
-import javax.jdo.annotations.*;
-
-import java.io.Serializable;
-import java.io.ObjectInputStream;
import java.io.IOException;
-
+import java.io.ObjectInputStream;
+import java.io.Serializable;
import java.text.SimpleDateFormat;
-
import java.util.Collections;
import java.util.Comparator;
-import java.util.Set;
-import java.util.HashSet;
import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.Embedded;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.PersistenceModifier;
+import javax.jdo.annotations.Persistent;
import org.apache.jdo.tck.pc.company.IAddress;
-
import org.apache.jdo.tck.pc.company.ICompany;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDentalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDentalInsurance.java
index 1b889368..78f76cde 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDentalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDentalInsurance.java
@@ -17,10 +17,10 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
-import javax.jdo.annotations.*;
-
import java.math.BigDecimal;
-
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IDentalInsurance;
import org.apache.jdo.tck.pc.company.IEmployee;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDepartment.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDepartment.java
index b95946e9..1b26b832 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDepartment.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppDepartment.java
@@ -17,24 +17,25 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
-import javax.jdo.annotations.*;
-
-import java.io.Serializable;
-import java.io.ObjectInputStream;
import java.io.IOException;
-
+import java.io.ObjectInputStream;
+import java.io.Serializable;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
+import javax.jdo.annotations.PrimaryKey;
import org.apache.jdo.tck.pc.company.ICompany;
-
import org.apache.jdo.tck.pc.company.IDepartment;
import org.apache.jdo.tck.pc.company.IEmployee;
-
import org.apache.jdo.tck.pc.compositeAnnotation.ApplicationIdDiscriminatorClassName;
-
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppEmployee.java
index 3c9333b0..677b07e6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppEmployee.java
@@ -17,24 +17,23 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
-import javax.jdo.annotations.*;
-
-import java.io.ObjectInputStream;
import java.io.IOException;
-
+import java.io.ObjectInputStream;
import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.Persistent;
import org.apache.jdo.tck.pc.company.IAddress;
import org.apache.jdo.tck.pc.company.IDentalInsurance;
import org.apache.jdo.tck.pc.company.IDepartment;
-
import org.apache.jdo.tck.pc.company.IEmployee;
import org.apache.jdo.tck.pc.company.IMedicalInsurance;
-
import org.apache.jdo.tck.pc.compositeAnnotation.ApplicationIdDiscriminatorClassName;
-
import org.apache.jdo.tck.util.EqualityHelper;
/** This class represents an employee. */
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppFullTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppFullTimeEmployee.java
index be6f441d..a77d7cf3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppFullTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppFullTimeEmployee.java
@@ -17,11 +17,13 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
-import javax.jdo.annotations.*;
-
import java.util.Date;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IAddress;
-
import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppInsurance.java
index 748b9caf..97aae419 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppInsurance.java
@@ -17,13 +17,18 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
-import javax.jdo.annotations.*;
-
import java.io.Serializable;
-
import java.util.Comparator;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Index;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.PrimaryKey;
import org.apache.jdo.tck.pc.company.IEmployee;
-
import org.apache.jdo.tck.pc.company.IInsurance;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppMedicalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppMedicalInsurance.java
index fe18440d..fe8004ec 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppMedicalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppMedicalInsurance.java
@@ -17,9 +17,10 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
-import javax.jdo.annotations.*;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IEmployee;
-
import org.apache.jdo.tck.pc.company.IMedicalInsurance;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppMeetingRoom.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppMeetingRoom.java
index 7ba6d304..d9e0bda7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppMeetingRoom.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppMeetingRoom.java
@@ -17,11 +17,16 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
-import javax.jdo.annotations.*;
-
import java.io.Serializable;
import java.util.Comparator;
-
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
import org.apache.jdo.tck.pc.company.IMeetingRoom;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPartTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPartTimeEmployee.java
index 441644ce..f6196ebe 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPartTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPartTimeEmployee.java
@@ -17,12 +17,13 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
-import javax.jdo.annotations.*;
-
import java.util.Date;
-
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
-import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
/** This class represents a part-time employee. */
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java
index 885baacc..1e064042 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java
@@ -17,24 +17,28 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
-import javax.jdo.annotations.*;
-
import java.io.Serializable;
-
import java.text.SimpleDateFormat;
-
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Embedded;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.Join;
+import javax.jdo.annotations.Key;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
+import javax.jdo.annotations.PrimaryKey;
+import javax.jdo.annotations.Value;
import org.apache.jdo.tck.pc.company.IAddress;
-
import org.apache.jdo.tck.pc.company.IPerson;
+import org.apache.jdo.tck.pc.compositeAnnotation.ApplicationIdDiscriminatorClassName;
import org.apache.jdo.tck.util.DeepEquality;
-
import org.apache.jdo.tck.util.EqualityHelper;
-import org.apache.jdo.tck.pc.compositeAnnotation.ApplicationIdDiscriminatorClassName;
/** This class represents a person. */
@PersistenceCapable(table = "persons")
@Inheritance(strategy = InheritanceStrategy.NEW_TABLE)
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppProject.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppProject.java
index db1f6745..326e528a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppProject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppProject.java
@@ -17,18 +17,25 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
-import javax.jdo.annotations.*;
-
-import java.io.Serializable;
-import java.io.ObjectInputStream;
import java.io.IOException;
-
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Set;
import java.util.HashSet;
-import java.math.BigDecimal;
-
+import java.util.Set;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.Join;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
+import javax.jdo.annotations.PrimaryKey;
import org.apache.jdo.tck.pc.company.IProject;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSAddress.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSAddress.java
index 3bd177ec..960783c1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSAddress.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSAddress.java
@@ -19,10 +19,8 @@ package org.apache.jdo.tck.pc.companyAnnotatedFC;
import java.io.Serializable;
import java.util.Comparator;
-
-import javax.jdo.annotations.*;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IAddress;
-
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java
index c2c16584..c2a7b7d9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java
@@ -17,22 +17,23 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
-import javax.jdo.annotations.*;
-
-import java.io.Serializable;
-import java.io.ObjectInputStream;
import java.io.IOException;
-
+import java.io.ObjectInputStream;
+import java.io.Serializable;
import java.text.SimpleDateFormat;
-
import java.util.Collections;
import java.util.Comparator;
-import java.util.Set;
-import java.util.HashSet;
import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.Embedded;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.PersistenceModifier;
+import javax.jdo.annotations.Persistent;
import org.apache.jdo.tck.pc.company.IAddress;
import org.apache.jdo.tck.pc.company.ICompany;
-
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDentalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDentalInsurance.java
index 38738867..dd075373 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDentalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDentalInsurance.java
@@ -17,9 +17,11 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
-import javax.jdo.annotations.*;
-
import java.math.BigDecimal;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.DatastoreIdentity;
+import javax.jdo.annotations.IdGeneratorStrategy;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IDentalInsurance;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDepartment.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDepartment.java
index 7cad8380..1490572c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDepartment.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSDepartment.java
@@ -17,21 +17,21 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
-import javax.jdo.annotations.*;
-
-import java.io.Serializable;
-import java.io.ObjectInputStream;
import java.io.IOException;
-
+import java.io.ObjectInputStream;
+import java.io.Serializable;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
import org.apache.jdo.tck.pc.company.ICompany;
import org.apache.jdo.tck.pc.company.IDepartment;
import org.apache.jdo.tck.pc.company.IEmployee;
-
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java
index f044a0cd..57b9ad56 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSEmployee.java
@@ -17,15 +17,16 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
-import javax.jdo.annotations.*;
-
-import java.io.ObjectInputStream;
import java.io.IOException;
-
+import java.io.ObjectInputStream;
import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
import org.apache.jdo.tck.pc.company.IDentalInsurance;
import org.apache.jdo.tck.pc.company.IDepartment;
import org.apache.jdo.tck.pc.company.IEmployee;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSFullTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSFullTimeEmployee.java
index 1f61a1d1..82b71d14 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSFullTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSFullTimeEmployee.java
@@ -17,9 +17,9 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
-import javax.jdo.annotations.*;
-
import java.util.Date;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IAddress;
import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSInsurance.java
index 104b65f6..8184e9e5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSInsurance.java
@@ -17,14 +17,13 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
-import javax.jdo.annotations.*;
-
import java.io.Serializable;
-
import java.util.Comparator;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Index;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IEmployee;
import org.apache.jdo.tck.pc.company.IInsurance;
-
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMedicalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMedicalInsurance.java
index 7fd40026..82840c8b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMedicalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMedicalInsurance.java
@@ -17,7 +17,10 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
-import javax.jdo.annotations.*;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.DatastoreIdentity;
+import javax.jdo.annotations.IdGeneratorStrategy;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IMedicalInsurance;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMeetingRoom.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMeetingRoom.java
index 9d06bed5..1f0173d4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMeetingRoom.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSMeetingRoom.java
@@ -17,11 +17,10 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
-import javax.jdo.annotations.*;
-
import java.io.Serializable;
import java.util.Comparator;
-
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IMeetingRoom;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPartTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPartTimeEmployee.java
index a482baad..df6363e9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPartTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPartTimeEmployee.java
@@ -17,9 +17,9 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
-import javax.jdo.annotations.*;
-
import java.util.Date;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IAddress;
import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java
index 4b6603a0..19db98f8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java
@@ -17,20 +17,23 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
-import javax.jdo.annotations.*;
-
import java.io.Serializable;
-
import java.text.SimpleDateFormat;
-
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Embedded;
+import javax.jdo.annotations.Join;
+import javax.jdo.annotations.Key;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.PersistenceModifier;
+import javax.jdo.annotations.Persistent;
+import javax.jdo.annotations.Value;
import org.apache.jdo.tck.pc.company.IAddress;
import org.apache.jdo.tck.pc.company.IPerson;
-
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.java
index 131ff442..493e149b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSProject.java
@@ -17,19 +17,20 @@
package org.apache.jdo.tck.pc.companyAnnotatedFC;
-import javax.jdo.annotations.*;
-
-import java.io.Serializable;
-import java.io.ObjectInputStream;
import java.io.IOException;
-
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Set;
import java.util.HashSet;
-import java.math.BigDecimal;
+import java.util.Set;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.Join;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
import org.apache.jdo.tck.pc.company.IProject;
-
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppConcrete.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppConcrete.java
index b7546c67..cbbd8478 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppConcrete.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppConcrete.java
@@ -18,7 +18,16 @@
package org.apache.jdo.tck.pc.companyAnnotatedJPA;
import javax.jdo.PersistenceManager;
-import org.apache.jdo.tck.pc.company.*;
+import org.apache.jdo.tck.pc.company.CompanyFactoryAbstractImpl;
+import org.apache.jdo.tck.pc.company.IAddress;
+import org.apache.jdo.tck.pc.company.ICompany;
+import org.apache.jdo.tck.pc.company.IDentalInsurance;
+import org.apache.jdo.tck.pc.company.IDepartment;
+import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
+import org.apache.jdo.tck.pc.company.IMedicalInsurance;
+import org.apache.jdo.tck.pc.company.IMeetingRoom;
+import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
+import org.apache.jdo.tck.pc.company.IProject;
/*
* CompanyFactoryAnnotatedPMFieldClass.java
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppPM.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppPM.java
index ba20e7af..4690f7d4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppPM.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedJPAAppPM.java
@@ -18,7 +18,17 @@
package org.apache.jdo.tck.pc.companyAnnotatedJPA;
import javax.jdo.PersistenceManager;
-import org.apache.jdo.tck.pc.company.*;
+import org.apache.jdo.tck.pc.company.CompanyFactoryAbstractImpl;
+import org.apache.jdo.tck.pc.company.CompanyFactoryNewInstance;
+import org.apache.jdo.tck.pc.company.IAddress;
+import org.apache.jdo.tck.pc.company.ICompany;
+import org.apache.jdo.tck.pc.company.IDentalInsurance;
+import org.apache.jdo.tck.pc.company.IDepartment;
+import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
+import org.apache.jdo.tck.pc.company.IMedicalInsurance;
+import org.apache.jdo.tck.pc.company.IMeetingRoom;
+import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
+import org.apache.jdo.tck.pc.company.IProject;
/*
* CompanyFactoryAnnotatedPMFieldClass.java
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedPMFieldClassJPA.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedPMFieldClassJPA.java
index e8badefb..a7881c3f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedPMFieldClassJPA.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/CompanyFactoryAnnotatedPMFieldClassJPA.java
@@ -18,7 +18,15 @@
package org.apache.jdo.tck.pc.companyAnnotatedJPA;
import javax.jdo.PersistenceManager;
-import org.apache.jdo.tck.pc.company.*;
+import org.apache.jdo.tck.pc.company.IAddress;
+import org.apache.jdo.tck.pc.company.ICompany;
+import org.apache.jdo.tck.pc.company.IDentalInsurance;
+import org.apache.jdo.tck.pc.company.IDepartment;
+import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
+import org.apache.jdo.tck.pc.company.IMedicalInsurance;
+import org.apache.jdo.tck.pc.company.IMeetingRoom;
+import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
+import org.apache.jdo.tck.pc.company.IProject;
/*
* CompanyFactoryAnnotatedPMFieldClassJPA.java
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppAddress.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppAddress.java
index 1614fa62..73695f94 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppAddress.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppAddress.java
@@ -19,9 +19,7 @@ package org.apache.jdo.tck.pc.companyAnnotatedJPA;
import java.io.Serializable;
import java.util.Comparator;
-
-import javax.persistence.*;
-
+import javax.persistence.Embeddable;
import org.apache.jdo.tck.pc.company.IAddress;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppCompany.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppCompany.java
index 0152b025..454cab8d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppCompany.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppCompany.java
@@ -17,21 +17,31 @@
package org.apache.jdo.tck.pc.companyAnnotatedJPA;
-import javax.persistence.*;
-
-import java.io.Serializable;
-import java.io.ObjectInputStream;
import java.io.IOException;
-
+import java.io.ObjectInputStream;
+import java.io.Serializable;
import java.text.SimpleDateFormat;
-
import java.util.Collections;
import java.util.Comparator;
-import java.util.Set;
-import java.util.HashSet;
import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.DiscriminatorType;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
import org.apache.jdo.tck.pc.company.IAddress;
-
import org.apache.jdo.tck.pc.company.ICompany;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDentalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDentalInsurance.java
index 7c8676b4..21990bd7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDentalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDentalInsurance.java
@@ -17,10 +17,9 @@
package org.apache.jdo.tck.pc.companyAnnotatedJPA;
-import javax.persistence.*;
-
import java.math.BigDecimal;
-
+import javax.persistence.Column;
+import javax.persistence.Entity;
import org.apache.jdo.tck.pc.company.IDentalInsurance;
import org.apache.jdo.tck.pc.company.IEmployee;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDepartment.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDepartment.java
index 6c425798..ce946548 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDepartment.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppDepartment.java
@@ -17,19 +17,24 @@
package org.apache.jdo.tck.pc.companyAnnotatedJPA;
-import javax.persistence.*;
-
-import java.io.Serializable;
-import java.io.ObjectInputStream;
import java.io.IOException;
-
+import java.io.ObjectInputStream;
+import java.io.Serializable;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.DiscriminatorType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
import org.apache.jdo.tck.pc.company.ICompany;
-
import org.apache.jdo.tck.pc.company.IDepartment;
import org.apache.jdo.tck.pc.company.IEmployee;
import org.apache.jdo.tck.util.DeepEquality;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppEmployee.java
index 1ec6d11b..6298ab1c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppEmployee.java
@@ -17,19 +17,23 @@
package org.apache.jdo.tck.pc.companyAnnotatedJPA;
-import javax.persistence.*;
-
-import java.io.ObjectInputStream;
import java.io.IOException;
-
+import java.io.ObjectInputStream;
import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
import org.apache.jdo.tck.pc.company.IAddress;
import org.apache.jdo.tck.pc.company.IDentalInsurance;
import org.apache.jdo.tck.pc.company.IDepartment;
-
import org.apache.jdo.tck.pc.company.IEmployee;
import org.apache.jdo.tck.pc.company.IMedicalInsurance;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppFullTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppFullTimeEmployee.java
index f404d56e..09908402 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppFullTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppFullTimeEmployee.java
@@ -17,11 +17,10 @@
package org.apache.jdo.tck.pc.companyAnnotatedJPA;
-import javax.persistence.*;
-
import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.Entity;
import org.apache.jdo.tck.pc.company.IAddress;
-
import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppInsurance.java
index a7a807e3..0940abae 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppInsurance.java
@@ -17,13 +17,17 @@
package org.apache.jdo.tck.pc.companyAnnotatedJPA;
-import javax.persistence.*;
-
import java.io.Serializable;
-
import java.util.Comparator;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.DiscriminatorType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
import org.apache.jdo.tck.pc.company.IEmployee;
-
import org.apache.jdo.tck.pc.company.IInsurance;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppMedicalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppMedicalInsurance.java
index d3a041aa..a45792d4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppMedicalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppMedicalInsurance.java
@@ -17,8 +17,8 @@
package org.apache.jdo.tck.pc.companyAnnotatedJPA;
-import javax.persistence.*;
-
+import javax.persistence.Column;
+import javax.persistence.Entity;
import org.apache.jdo.tck.pc.company.IEmployee;
import org.apache.jdo.tck.pc.company.IMedicalInsurance;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPartTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPartTimeEmployee.java
index ab4ccacc..b051a0f0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPartTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPartTimeEmployee.java
@@ -17,12 +17,10 @@
package org.apache.jdo.tck.pc.companyAnnotatedJPA;
-import javax.persistence.*;
-
import java.util.Date;
-
+import javax.persistence.Column;
+import javax.persistence.Entity;
import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
-import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
/** This class represents a part-time employee. */
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java
index 483f92fe..3b428a08 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java
@@ -17,19 +17,32 @@
package org.apache.jdo.tck.pc.companyAnnotatedJPA;
-import javax.persistence.*;
-
import java.io.Serializable;
-
import java.text.SimpleDateFormat;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
-import java.util.Set;
+import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.DiscriminatorType;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.MapKey;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
import org.apache.jdo.tck.pc.company.IAddress;
-
import org.apache.jdo.tck.pc.company.IPerson;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPhoneNumber.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPhoneNumber.java
index 43702c59..cad75ef3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPhoneNumber.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPhoneNumber.java
@@ -17,9 +17,15 @@
package org.apache.jdo.tck.pc.companyAnnotatedJPA;
-import javax.persistence.*;
-
import java.io.Serializable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
/** This class represents a person. */
@Entity
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppProject.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppProject.java
index 8642c93d..aad0bef4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppProject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppProject.java
@@ -17,18 +17,25 @@
package org.apache.jdo.tck.pc.companyAnnotatedJPA;
-import javax.persistence.*;
-
-import java.io.Serializable;
-import java.io.ObjectInputStream;
import java.io.IOException;
-
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Set;
import java.util.HashSet;
-import java.math.BigDecimal;
-
+import java.util.Set;
+import javax.persistence.Column;
+import javax.persistence.DiscriminatorColumn;
+import javax.persistence.DiscriminatorType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
import org.apache.jdo.tck.pc.company.IProject;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppConcrete.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppConcrete.java
index da0e3992..ae5ff9df 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppConcrete.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppConcrete.java
@@ -18,7 +18,16 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
import javax.jdo.PersistenceManager;
-import org.apache.jdo.tck.pc.company.*;
+import org.apache.jdo.tck.pc.company.CompanyFactoryNewInstance;
+import org.apache.jdo.tck.pc.company.IAddress;
+import org.apache.jdo.tck.pc.company.ICompany;
+import org.apache.jdo.tck.pc.company.IDentalInsurance;
+import org.apache.jdo.tck.pc.company.IDepartment;
+import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
+import org.apache.jdo.tck.pc.company.IMedicalInsurance;
+import org.apache.jdo.tck.pc.company.IMeetingRoom;
+import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
+import org.apache.jdo.tck.pc.company.IProject;
/*
* CompanyFactoryAnnotatedPMFieldClass.java
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppPM.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppPM.java
index 0c52b301..5657d333 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppPM.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCAppPM.java
@@ -18,7 +18,16 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
import javax.jdo.PersistenceManager;
-import org.apache.jdo.tck.pc.company.*;
+import org.apache.jdo.tck.pc.company.CompanyFactoryNewInstance;
+import org.apache.jdo.tck.pc.company.IAddress;
+import org.apache.jdo.tck.pc.company.ICompany;
+import org.apache.jdo.tck.pc.company.IDentalInsurance;
+import org.apache.jdo.tck.pc.company.IDepartment;
+import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
+import org.apache.jdo.tck.pc.company.IMedicalInsurance;
+import org.apache.jdo.tck.pc.company.IMeetingRoom;
+import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
+import org.apache.jdo.tck.pc.company.IProject;
/*
* CompanyFactoryAnnotatedPMFieldClass.java
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSConcrete.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSConcrete.java
index 9d84a8cc..101d2dcf 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSConcrete.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSConcrete.java
@@ -18,7 +18,16 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
import javax.jdo.PersistenceManager;
-import org.apache.jdo.tck.pc.company.*;
+import org.apache.jdo.tck.pc.company.CompanyFactoryNewInstance;
+import org.apache.jdo.tck.pc.company.IAddress;
+import org.apache.jdo.tck.pc.company.ICompany;
+import org.apache.jdo.tck.pc.company.IDentalInsurance;
+import org.apache.jdo.tck.pc.company.IDepartment;
+import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
+import org.apache.jdo.tck.pc.company.IMedicalInsurance;
+import org.apache.jdo.tck.pc.company.IMeetingRoom;
+import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
+import org.apache.jdo.tck.pc.company.IProject;
/*
* CompanyFactoryAnnotatedFCDSPM.java
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSPM.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSPM.java
index 9a089278..56bb472f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSPM.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCDSPM.java
@@ -18,7 +18,16 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
import javax.jdo.PersistenceManager;
-import org.apache.jdo.tck.pc.company.*;
+import org.apache.jdo.tck.pc.company.CompanyFactoryNewInstance;
+import org.apache.jdo.tck.pc.company.IAddress;
+import org.apache.jdo.tck.pc.company.ICompany;
+import org.apache.jdo.tck.pc.company.IDentalInsurance;
+import org.apache.jdo.tck.pc.company.IDepartment;
+import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
+import org.apache.jdo.tck.pc.company.IMedicalInsurance;
+import org.apache.jdo.tck.pc.company.IMeetingRoom;
+import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
+import org.apache.jdo.tck.pc.company.IProject;
/*
* CompanyFactoryAnnotatedPCDSPM.java
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppAddress.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppAddress.java
index 0ff6a9f1..0ec78029 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppAddress.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppAddress.java
@@ -19,9 +19,7 @@ package org.apache.jdo.tck.pc.companyAnnotatedPC;
import java.io.Serializable;
import java.util.Comparator;
-
-import javax.jdo.annotations.*;
-
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IAddress;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java
index af599da4..14e03da5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppCompany.java
@@ -17,21 +17,27 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
-import javax.jdo.annotations.*;
-
-import java.io.Serializable;
-import java.io.ObjectInputStream;
import java.io.IOException;
-
+import java.io.ObjectInputStream;
+import java.io.Serializable;
import java.text.SimpleDateFormat;
-
-import java.util.Collections;
import java.util.Comparator;
-import java.util.Set;
-import java.util.HashSet;
import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.Embedded;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.NotPersistent;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.PersistenceModifier;
+import javax.jdo.annotations.Persistent;
import org.apache.jdo.tck.pc.company.IAddress;
-
import org.apache.jdo.tck.pc.company.ICompany;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDentalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDentalInsurance.java
index 8511df99..4a22a422 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDentalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDentalInsurance.java
@@ -17,10 +17,11 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
-import javax.jdo.annotations.*;
-
import java.math.BigDecimal;
-
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.NotPersistent;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IDentalInsurance;
import org.apache.jdo.tck.pc.company.IEmployee;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDepartment.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDepartment.java
index fbe0b3aa..fc49947f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDepartment.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppDepartment.java
@@ -17,19 +17,25 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
-import javax.jdo.annotations.*;
-
-import java.io.Serializable;
-import java.io.ObjectInputStream;
import java.io.IOException;
-
-import java.util.Collections;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.NotPersistent;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
+import javax.jdo.annotations.PrimaryKey;
import org.apache.jdo.tck.pc.company.ICompany;
-
import org.apache.jdo.tck.pc.company.IDepartment;
import org.apache.jdo.tck.pc.company.IEmployee;
import org.apache.jdo.tck.util.DeepEquality;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppEmployee.java
index 9d39a2bc..192c5962 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppEmployee.java
@@ -17,19 +17,22 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
-import javax.jdo.annotations.*;
-
-import java.io.ObjectInputStream;
import java.io.IOException;
-
-import java.util.Collections;
+import java.io.ObjectInputStream;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.NotPersistent;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
import org.apache.jdo.tck.pc.company.IAddress;
import org.apache.jdo.tck.pc.company.IDentalInsurance;
import org.apache.jdo.tck.pc.company.IDepartment;
-
import org.apache.jdo.tck.pc.company.IEmployee;
import org.apache.jdo.tck.pc.company.IMedicalInsurance;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppFullTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppFullTimeEmployee.java
index 30d88754..a76a324e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppFullTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppFullTimeEmployee.java
@@ -17,11 +17,14 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
-import javax.jdo.annotations.*;
-
import java.util.Date;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.NotPersistent;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IAddress;
-
import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppInsurance.java
index d0dfe399..8c391a27 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppInsurance.java
@@ -17,13 +17,20 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
-import javax.jdo.annotations.*;
-
import java.io.Serializable;
-
import java.util.Comparator;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Index;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.NotPersistent;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
+import javax.jdo.annotations.PrimaryKey;
import org.apache.jdo.tck.pc.company.IEmployee;
-
import org.apache.jdo.tck.pc.company.IInsurance;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppMedicalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppMedicalInsurance.java
index 4aa26407..6b2a4fc7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppMedicalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppMedicalInsurance.java
@@ -17,9 +17,11 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
-import javax.jdo.annotations.*;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.NotPersistent;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IEmployee;
-
import org.apache.jdo.tck.pc.company.IMedicalInsurance;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPartTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPartTimeEmployee.java
index a2740411..7eec1ee1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPartTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPartTimeEmployee.java
@@ -17,12 +17,14 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
-import javax.jdo.annotations.*;
-
import java.util.Date;
-
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.NotPersistent;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
-import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
/** This class represents a part-time employee. */
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java
index 7aa2b517..9fe2aeb0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java
@@ -17,19 +17,28 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
-import javax.jdo.annotations.*;
-
import java.io.Serializable;
-
import java.text.SimpleDateFormat;
-
-import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.Embedded;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.Join;
+import javax.jdo.annotations.Key;
+import javax.jdo.annotations.NotPersistent;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.PersistenceModifier;
+import javax.jdo.annotations.Persistent;
+import javax.jdo.annotations.PrimaryKey;
+import javax.jdo.annotations.Value;
import org.apache.jdo.tck.pc.company.IAddress;
-
import org.apache.jdo.tck.pc.company.IPerson;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppProject.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppProject.java
index ef45e7f8..76ff7b49 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppProject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppProject.java
@@ -17,18 +17,25 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
-import javax.jdo.annotations.*;
-
-import java.io.Serializable;
-import java.io.ObjectInputStream;
import java.io.IOException;
-
-import java.util.Collections;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Comparator;
-import java.util.Set;
import java.util.HashSet;
-import java.math.BigDecimal;
-
+import java.util.Set;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.Join;
+import javax.jdo.annotations.NotPersistent;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
+import javax.jdo.annotations.PrimaryKey;
import org.apache.jdo.tck.pc.company.IProject;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSAddress.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSAddress.java
index bfb4c10c..4fb4e446 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSAddress.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSAddress.java
@@ -19,10 +19,8 @@ package org.apache.jdo.tck.pc.companyAnnotatedPC;
import java.io.Serializable;
import java.util.Comparator;
-
-import javax.jdo.annotations.*;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IAddress;
-
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSCompany.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSCompany.java
index 4c364275..60c5df9f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSCompany.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSCompany.java
@@ -17,22 +17,29 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
-import javax.jdo.annotations.*;
-
-import java.io.Serializable;
-import java.io.ObjectInputStream;
import java.io.IOException;
-
+import java.io.ObjectInputStream;
+import java.io.Serializable;
import java.text.SimpleDateFormat;
-
-import java.util.Collections;
import java.util.Comparator;
-import java.util.Set;
-import java.util.HashSet;
import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.DatastoreIdentity;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.Embedded;
+import javax.jdo.annotations.IdGeneratorStrategy;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.NotPersistent;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.PersistenceModifier;
+import javax.jdo.annotations.Persistent;
import org.apache.jdo.tck.pc.company.IAddress;
import org.apache.jdo.tck.pc.company.ICompany;
-
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDentalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDentalInsurance.java
index a1aedf75..967b076b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDentalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDentalInsurance.java
@@ -17,9 +17,12 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
-import javax.jdo.annotations.*;
-
import java.math.BigDecimal;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.DatastoreIdentity;
+import javax.jdo.annotations.IdGeneratorStrategy;
+import javax.jdo.annotations.NotPersistent;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IDentalInsurance;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDepartment.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDepartment.java
index a42392ed..6e59c968 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDepartment.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSDepartment.java
@@ -17,21 +17,27 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
-import javax.jdo.annotations.*;
-
-import java.io.Serializable;
-import java.io.ObjectInputStream;
import java.io.IOException;
-
-import java.util.Collections;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.DatastoreIdentity;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.IdGeneratorStrategy;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.NotPersistent;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
import org.apache.jdo.tck.pc.company.ICompany;
import org.apache.jdo.tck.pc.company.IDepartment;
import org.apache.jdo.tck.pc.company.IEmployee;
-
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSEmployee.java
index 290275d2..5d861e62 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSEmployee.java
@@ -17,15 +17,20 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
-import javax.jdo.annotations.*;
-
-import java.io.ObjectInputStream;
import java.io.IOException;
-
-import java.util.Collections;
+import java.io.ObjectInputStream;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.DatastoreIdentity;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.IdGeneratorStrategy;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.NotPersistent;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
import org.apache.jdo.tck.pc.company.IDentalInsurance;
import org.apache.jdo.tck.pc.company.IDepartment;
import org.apache.jdo.tck.pc.company.IEmployee;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSFullTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSFullTimeEmployee.java
index 5f28793b..54d5dd0c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSFullTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSFullTimeEmployee.java
@@ -17,9 +17,14 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
-import javax.jdo.annotations.*;
-
import java.util.Date;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.DatastoreIdentity;
+import javax.jdo.annotations.IdGeneratorStrategy;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.NotPersistent;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IAddress;
import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSInsurance.java
index e2491b78..7922eeff 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSInsurance.java
@@ -17,14 +17,21 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
-import javax.jdo.annotations.*;
-
import java.io.Serializable;
-
import java.util.Comparator;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.DatastoreIdentity;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.IdGeneratorStrategy;
+import javax.jdo.annotations.Index;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.NotPersistent;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
import org.apache.jdo.tck.pc.company.IEmployee;
import org.apache.jdo.tck.pc.company.IInsurance;
-
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSMedicalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSMedicalInsurance.java
index 45a9d346..8ff577ba 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSMedicalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSMedicalInsurance.java
@@ -17,7 +17,11 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
-import javax.jdo.annotations.*;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.DatastoreIdentity;
+import javax.jdo.annotations.IdGeneratorStrategy;
+import javax.jdo.annotations.NotPersistent;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IMedicalInsurance;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPartTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPartTimeEmployee.java
index d364d30e..74a0ebbd 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPartTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPartTimeEmployee.java
@@ -17,9 +17,14 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
-import javax.jdo.annotations.*;
-
import java.util.Date;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.DatastoreIdentity;
+import javax.jdo.annotations.IdGeneratorStrategy;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.NotPersistent;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IAddress;
import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java
index 14b95492..a1dd3027 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java
@@ -17,20 +17,29 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
-import javax.jdo.annotations.*;
-
import java.io.Serializable;
-
import java.text.SimpleDateFormat;
-
-import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.DatastoreIdentity;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.Embedded;
+import javax.jdo.annotations.IdGeneratorStrategy;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.Join;
+import javax.jdo.annotations.Key;
+import javax.jdo.annotations.NotPersistent;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.PersistenceModifier;
+import javax.jdo.annotations.Persistent;
+import javax.jdo.annotations.Value;
import org.apache.jdo.tck.pc.company.IAddress;
import org.apache.jdo.tck.pc.company.IPerson;
-
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSProject.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSProject.java
index b518792e..b3cd11e1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSProject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSProject.java
@@ -17,19 +17,26 @@
package org.apache.jdo.tck.pc.companyAnnotatedPC;
-import javax.jdo.annotations.*;
-
-import java.io.Serializable;
-import java.io.ObjectInputStream;
import java.io.IOException;
-
-import java.util.Collections;
+import java.io.ObjectInputStream;
+import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Comparator;
-import java.util.Set;
import java.util.HashSet;
-import java.math.BigDecimal;
+import java.util.Set;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.DatastoreIdentity;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.IdGeneratorStrategy;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.Join;
+import javax.jdo.annotations.NotPersistent;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
import org.apache.jdo.tck.pc.company.IProject;
-
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIAppPM.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIAppPM.java
index 998926c2..7c432c74 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIAppPM.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIAppPM.java
@@ -18,7 +18,16 @@
package org.apache.jdo.tck.pc.companyAnnotatedPI;
import javax.jdo.PersistenceManager;
-import org.apache.jdo.tck.pc.company.*;
+import org.apache.jdo.tck.pc.company.CompanyFactoryNewInstance;
+import org.apache.jdo.tck.pc.company.IAddress;
+import org.apache.jdo.tck.pc.company.ICompany;
+import org.apache.jdo.tck.pc.company.IDentalInsurance;
+import org.apache.jdo.tck.pc.company.IDepartment;
+import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
+import org.apache.jdo.tck.pc.company.IMedicalInsurance;
+import org.apache.jdo.tck.pc.company.IMeetingRoom;
+import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
+import org.apache.jdo.tck.pc.company.IProject;
/*
* CompanyFactoryAnnotatedPMFieldClass.java
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIDSPM.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIDSPM.java
index 2f1c3ff8..0919edf5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIDSPM.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIDSPM.java
@@ -18,7 +18,16 @@
package org.apache.jdo.tck.pc.companyAnnotatedPI;
import javax.jdo.PersistenceManager;
-import org.apache.jdo.tck.pc.company.*;
+import org.apache.jdo.tck.pc.company.CompanyFactoryNewInstance;
+import org.apache.jdo.tck.pc.company.IAddress;
+import org.apache.jdo.tck.pc.company.ICompany;
+import org.apache.jdo.tck.pc.company.IDentalInsurance;
+import org.apache.jdo.tck.pc.company.IDepartment;
+import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
+import org.apache.jdo.tck.pc.company.IMedicalInsurance;
+import org.apache.jdo.tck.pc.company.IMeetingRoom;
+import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
+import org.apache.jdo.tck.pc.company.IProject;
/*
* CompanyFactoryAnnotatedPIDSPM.java
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPMInterface.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPMInterface.java
index b4ba720f..37cf45c4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPMInterface.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPMInterface.java
@@ -18,7 +18,16 @@
package org.apache.jdo.tck.pc.companyAnnotatedPI;
import javax.jdo.PersistenceManager;
-import org.apache.jdo.tck.pc.company.*;
+import org.apache.jdo.tck.pc.company.CompanyFactoryAbstractImpl;
+import org.apache.jdo.tck.pc.company.IAddress;
+import org.apache.jdo.tck.pc.company.ICompany;
+import org.apache.jdo.tck.pc.company.IDentalInsurance;
+import org.apache.jdo.tck.pc.company.IDepartment;
+import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
+import org.apache.jdo.tck.pc.company.IMedicalInsurance;
+import org.apache.jdo.tck.pc.company.IMeetingRoom;
+import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
+import org.apache.jdo.tck.pc.company.IProject;
/*
* CompanyFactoryAnnotatedPMInterface.java
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppAddress.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppAddress.java
index 178b96f2..8886cbf2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppAddress.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppAddress.java
@@ -17,8 +17,8 @@
package org.apache.jdo.tck.pc.companyAnnotatedPI;
-import javax.jdo.annotations.*;
-
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
import org.apache.jdo.tck.pc.company.IAddress;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java
index 8b215c42..91fb9514 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppCompany.java
@@ -17,12 +17,21 @@
package org.apache.jdo.tck.pc.companyAnnotatedPI;
-import javax.jdo.annotations.*;
-
-import org.apache.jdo.tck.pc.company.ICompany;
import java.util.Date;
import java.util.Set;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.Embedded;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
+import javax.jdo.annotations.PrimaryKey;
import org.apache.jdo.tck.pc.company.IAddress;
+import org.apache.jdo.tck.pc.company.ICompany;
/**
* This interface represents the persistent state of Company. Javadoc was deliberately omitted
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDentalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDentalInsurance.java
index b8245479..d36fc017 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDentalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDentalInsurance.java
@@ -17,10 +17,10 @@
package org.apache.jdo.tck.pc.companyAnnotatedPI;
-import javax.jdo.annotations.*;
-
import java.math.BigDecimal;
-
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IDentalInsurance;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDepartment.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDepartment.java
index 127daae6..a58675cb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDepartment.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppDepartment.java
@@ -17,11 +17,18 @@
package org.apache.jdo.tck.pc.companyAnnotatedPI;
-import javax.jdo.annotations.*;
-
import java.util.Set;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.PersistenceModifier;
+import javax.jdo.annotations.Persistent;
import org.apache.jdo.tck.pc.company.ICompany;
-
import org.apache.jdo.tck.pc.company.IDepartment;
import org.apache.jdo.tck.pc.company.IEmployee;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppEmployee.java
index c6eea4fb..1416ecc7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppEmployee.java
@@ -17,15 +17,21 @@
package org.apache.jdo.tck.pc.companyAnnotatedPI;
-import javax.jdo.annotations.*;
-
-import org.apache.jdo.tck.pc.company.IPerson;
import java.util.Date;
import java.util.Set;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.PersistenceModifier;
+import javax.jdo.annotations.Persistent;
import org.apache.jdo.tck.pc.company.IDentalInsurance;
import org.apache.jdo.tck.pc.company.IDepartment;
import org.apache.jdo.tck.pc.company.IEmployee;
import org.apache.jdo.tck.pc.company.IMedicalInsurance;
+import org.apache.jdo.tck.pc.company.IPerson;
/**
* This interface represents the persistent state of Employee. Javadoc was deliberately omitted
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppFullTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppFullTimeEmployee.java
index 44ce60ee..bee6f23a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppFullTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppFullTimeEmployee.java
@@ -17,8 +17,12 @@
package org.apache.jdo.tck.pc.companyAnnotatedPI;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
-import javax.jdo.annotations.*;
/**
* This interface represents the persistent state of FullTimeEmployee. Javadoc was deliberately
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppInsurance.java
index a2e4b545..4d7dc450 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppInsurance.java
@@ -17,9 +17,16 @@
package org.apache.jdo.tck.pc.companyAnnotatedPI;
-import javax.jdo.annotations.*;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Index;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
import org.apache.jdo.tck.pc.company.IEmployee;
-
import org.apache.jdo.tck.pc.company.IInsurance;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppMedicalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppMedicalInsurance.java
index 7a433705..a6d684b4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppMedicalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppMedicalInsurance.java
@@ -17,8 +17,9 @@
package org.apache.jdo.tck.pc.companyAnnotatedPI;
-import javax.jdo.annotations.*;
-
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IMedicalInsurance;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPartTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPartTimeEmployee.java
index 69b14de7..ce6e2949 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPartTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPartTimeEmployee.java
@@ -17,8 +17,12 @@
package org.apache.jdo.tck.pc.companyAnnotatedPI;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
-import javax.jdo.annotations.*;
/**
* This interface represents the persistent state of PartTimeEmployee. Javadoc was deliberately
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java
index 67c902c0..9fb01ab4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java
@@ -17,12 +17,22 @@
package org.apache.jdo.tck.pc.companyAnnotatedPI;
-import javax.jdo.annotations.*;
-
import java.util.Date;
import java.util.Map;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.Embedded;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.Join;
+import javax.jdo.annotations.Key;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.PersistenceModifier;
+import javax.jdo.annotations.Persistent;
+import javax.jdo.annotations.Value;
import org.apache.jdo.tck.pc.company.IAddress;
-
import org.apache.jdo.tck.pc.company.IPerson;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppProject.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppProject.java
index e1193282..56f2e1cd 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppProject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppProject.java
@@ -16,11 +16,19 @@
*/
package org.apache.jdo.tck.pc.companyAnnotatedPI;
-import javax.jdo.annotations.*;
-
import java.math.BigDecimal;
import java.util.Set;
-
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.Join;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
+import javax.jdo.annotations.PrimaryKey;
import org.apache.jdo.tck.pc.company.IProject;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSAddress.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSAddress.java
index 0158a99e..e4039fa8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSAddress.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSAddress.java
@@ -17,7 +17,7 @@
package org.apache.jdo.tck.pc.companyAnnotatedPI;
-import javax.jdo.annotations.*;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IAddress;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java
index 4c0b5c3c..f33b5f43 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java
@@ -17,12 +17,20 @@
package org.apache.jdo.tck.pc.companyAnnotatedPI;
-import javax.jdo.annotations.*;
-
import java.util.Date;
import java.util.Set;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.DatastoreIdentity;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.Embedded;
+import javax.jdo.annotations.IdGeneratorStrategy;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
import org.apache.jdo.tck.pc.company.IAddress;
-
import org.apache.jdo.tck.pc.company.ICompany;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDentalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDentalInsurance.java
index ef0d3332..772f6974 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDentalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDentalInsurance.java
@@ -17,10 +17,9 @@
package org.apache.jdo.tck.pc.companyAnnotatedPI;
-import javax.jdo.annotations.*;
-
import java.math.BigDecimal;
-
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IDentalInsurance;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDepartment.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDepartment.java
index 3f649560..a608280b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDepartment.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSDepartment.java
@@ -17,11 +17,18 @@
package org.apache.jdo.tck.pc.companyAnnotatedPI;
-import javax.jdo.annotations.*;
-
import java.util.Set;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.DatastoreIdentity;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.IdGeneratorStrategy;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
import org.apache.jdo.tck.pc.company.ICompany;
-
import org.apache.jdo.tck.pc.company.IDepartment;
import org.apache.jdo.tck.pc.company.IEmployee;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSEmployee.java
index c1ad1919..2a91bf4c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSEmployee.java
@@ -17,10 +17,14 @@
package org.apache.jdo.tck.pc.companyAnnotatedPI;
-import javax.jdo.annotations.*;
-
import java.util.Date;
import java.util.Set;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
import org.apache.jdo.tck.pc.company.IDentalInsurance;
import org.apache.jdo.tck.pc.company.IDepartment;
import org.apache.jdo.tck.pc.company.IEmployee;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSFullTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSFullTimeEmployee.java
index b847a600..ac9620a0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSFullTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSFullTimeEmployee.java
@@ -17,8 +17,10 @@
package org.apache.jdo.tck.pc.companyAnnotatedPI;
-import javax.jdo.annotations.*;
-
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IFullTimeEmployee;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSInsurance.java
index 3a81753c..348468dd 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSInsurance.java
@@ -17,9 +17,17 @@
package org.apache.jdo.tck.pc.companyAnnotatedPI;
-import javax.jdo.annotations.*;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.DatastoreIdentity;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.IdGeneratorStrategy;
+import javax.jdo.annotations.Index;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
import org.apache.jdo.tck.pc.company.IEmployee;
-
import org.apache.jdo.tck.pc.company.IInsurance;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSMedicalInsurance.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSMedicalInsurance.java
index 6975b77e..e3bb4635 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSMedicalInsurance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSMedicalInsurance.java
@@ -17,8 +17,8 @@
package org.apache.jdo.tck.pc.companyAnnotatedPI;
-import javax.jdo.annotations.*;
-
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IMedicalInsurance;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPartTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPartTimeEmployee.java
index 768fb841..2ab7553c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPartTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPartTimeEmployee.java
@@ -17,8 +17,10 @@
package org.apache.jdo.tck.pc.companyAnnotatedPI;
-import javax.jdo.annotations.*;
-
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.PersistenceCapable;
import org.apache.jdo.tck.pc.company.IPartTimeEmployee;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java
index 69a69850..c8915d8e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java
@@ -17,12 +17,22 @@
package org.apache.jdo.tck.pc.companyAnnotatedPI;
-import javax.jdo.annotations.*;
-
import java.util.Date;
import java.util.Map;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.DatastoreIdentity;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.Embedded;
+import javax.jdo.annotations.IdGeneratorStrategy;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.Join;
+import javax.jdo.annotations.Key;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
+import javax.jdo.annotations.Value;
import org.apache.jdo.tck.pc.company.IAddress;
-
import org.apache.jdo.tck.pc.company.IPerson;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSProject.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSProject.java
index 6ae90b7c..6dfbe22a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSProject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSProject.java
@@ -16,11 +16,19 @@
*/
package org.apache.jdo.tck.pc.companyAnnotatedPI;
-import javax.jdo.annotations.*;
-
import java.math.BigDecimal;
import java.util.Set;
-
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.DatastoreIdentity;
+import javax.jdo.annotations.Discriminator;
+import javax.jdo.annotations.DiscriminatorStrategy;
+import javax.jdo.annotations.Element;
+import javax.jdo.annotations.IdGeneratorStrategy;
+import javax.jdo.annotations.Inheritance;
+import javax.jdo.annotations.InheritanceStrategy;
+import javax.jdo.annotations.Join;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
import org.apache.jdo.tck.pc.company.IProject;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Company.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Company.java
index 462a1e50..ae03a256 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Company.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Company.java
@@ -17,18 +17,15 @@
package org.apache.jdo.tck.pc.companyListWithoutJoin;
-import java.io.Serializable;
-import java.io.ObjectInputStream;
import java.io.IOException;
-
+import java.io.ObjectInputStream;
+import java.io.Serializable;
import java.text.SimpleDateFormat;
-
import java.util.Collections;
import java.util.Comparator;
-import java.util.Set;
-import java.util.HashSet;
import java.util.Date;
-
+import java.util.HashSet;
+import java.util.Set;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactory.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactory.java
index 39b0220b..f6026125 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactory.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactory.java
@@ -22,8 +22,6 @@
package org.apache.jdo.tck.pc.companyListWithoutJoin;
-import java.math.BigDecimal;
-
import java.util.Date;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryAbstractImpl.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryAbstractImpl.java
index 1ec72630..5ca32625 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryAbstractImpl.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryAbstractImpl.java
@@ -18,7 +18,6 @@
package org.apache.jdo.tck.pc.companyListWithoutJoin;
import javax.jdo.PersistenceManager;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryConcreteClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryConcreteClass.java
index c0cfcc2e..d648f3ba 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryConcreteClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryConcreteClass.java
@@ -17,10 +17,7 @@
package org.apache.jdo.tck.pc.companyListWithoutJoin;
-import java.math.BigDecimal;
-
import java.util.Date;
-
import javax.jdo.PersistenceManager;
/*
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryRegistry.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryRegistry.java
index f6fc3e74..2e63e977 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryRegistry.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryRegistry.java
@@ -18,11 +18,6 @@
package org.apache.jdo.tck.pc.companyListWithoutJoin;
import java.lang.reflect.Constructor;
-
-import java.math.BigDecimal;
-
-import java.util.Date;
-
import javax.jdo.PersistenceManager;
/*
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyModelReader.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyModelReader.java
index 0ec6b3ea..68236c89 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyModelReader.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyModelReader.java
@@ -20,7 +20,6 @@ package org.apache.jdo.tck.pc.companyListWithoutJoin;
import java.util.Date;
import java.util.List;
import java.util.Locale;
-
import org.apache.jdo.tck.util.ConversionHelper;
import org.apache.jdo.tck.util.JDOCustomDateEditor;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Department.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Department.java
index 9a83ecaf..73d24d3b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Department.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Department.java
@@ -18,13 +18,8 @@
package org.apache.jdo.tck.pc.companyListWithoutJoin;
import java.io.Serializable;
-import java.io.ObjectInputStream;
-import java.io.IOException;
-
-import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Employee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Employee.java
index 27b3caf0..0762db83 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Employee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Employee.java
@@ -17,15 +17,12 @@
package org.apache.jdo.tck.pc.companyListWithoutJoin;
-import java.io.ObjectInputStream;
import java.io.IOException;
-
+import java.io.ObjectInputStream;
import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.Set;
-
-import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
/** This class represents an employee. */
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/FullTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/FullTimeEmployee.java
index d5ce271f..e3bc69b4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/FullTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/FullTimeEmployee.java
@@ -18,8 +18,6 @@
package org.apache.jdo.tck.pc.companyListWithoutJoin;
import java.util.Date;
-
-import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
/** This class represents a full-time employee. */
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/PartTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/PartTimeEmployee.java
index cfaf0623..9ed027cf 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/PartTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/PartTimeEmployee.java
@@ -18,8 +18,6 @@
package org.apache.jdo.tck.pc.companyListWithoutJoin;
import java.util.Date;
-
-import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
/** This class represents a part-time employee. */
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Person.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Person.java
index b6a6cc38..6a83cb67 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Person.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/Person.java
@@ -18,13 +18,9 @@
package org.apache.jdo.tck.pc.companyListWithoutJoin;
import java.io.Serializable;
-
import java.text.SimpleDateFormat;
-
-import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
-
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Company.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Company.java
index 0eca1bed..ceaec012 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Company.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Company.java
@@ -17,18 +17,15 @@
package org.apache.jdo.tck.pc.companyMapWithoutJoin;
-import java.io.Serializable;
-import java.io.ObjectInputStream;
import java.io.IOException;
-
+import java.io.ObjectInputStream;
+import java.io.Serializable;
import java.text.SimpleDateFormat;
-
import java.util.Collections;
import java.util.Comparator;
-import java.util.Set;
-import java.util.HashSet;
import java.util.Date;
-
+import java.util.HashSet;
+import java.util.Set;
import org.apache.jdo.tck.util.DeepEquality;
import org.apache.jdo.tck.util.EqualityHelper;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactory.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactory.java
index 2041295a..b9af9675 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactory.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactory.java
@@ -22,8 +22,6 @@
package org.apache.jdo.tck.pc.companyMapWithoutJoin;
-import java.math.BigDecimal;
-
import java.util.Date;
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryAbstractImpl.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryAbstractImpl.java
index 6d7c2029..1bffa28b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryAbstractImpl.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryAbstractImpl.java
@@ -18,7 +18,6 @@
package org.apache.jdo.tck.pc.companyMapWithoutJoin;
import javax.jdo.PersistenceManager;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryConcreteClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryConcreteClass.java
index 6295af0e..1fb264f6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryConcreteClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryConcreteClass.java
@@ -17,10 +17,7 @@
package org.apache.jdo.tck.pc.companyMapWithoutJoin;
-import java.math.BigDecimal;
-
import java.util.Date;
-
import javax.jdo.PersistenceManager;
/*
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryRegistry.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryRegistry.java
index 7f51361b..64d736b2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryRegistry.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryRegistry.java
@@ -18,11 +18,6 @@
package org.apache.jdo.tck.pc.companyMapWithoutJoin;
import java.lang.reflect.Constructor;
-
-import java.math.BigDecimal;
-
-import java.util.Date;
-
import javax.jdo.PersistenceManager;
/*
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyModelReader.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyModelReader.java
index 51e96f6e..b4b1ea76 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyModelReader.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyModelReader.java
@@ -20,7 +20,6 @@ package org.apache.jdo.tck.pc.companyMapWithoutJoin;
import java.util.Date;
import java.util.List;
import java.util.Locale;
-
import org.apache.jdo.tck.util.ConversionHelper;
import org.apache.jdo.tck.util.JDOCustomDateEditor;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Department.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Department.java
index ab3aaca7..1308eead 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Department.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Department.java
@@ -18,13 +18,8 @@
package org.apache.jdo.tck.pc.companyMapWithoutJoin;
import java.io.Serializable;
-import java.io.ObjectInputStream;
-import java.io.IOException;
-
-import java.util.Collections;
import java.util.Comparator;
import java.util.Map;
-
import org.apache.jdo.tck.util.DeepEquality;
... 4548 lines suppressed ...
[db-jdo] 01/02: Format all Java files using GJF
Posted by to...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tobous pushed a commit to branch gjf-reformat
in repository https://gitbox.apache.org/repos/asf/db-jdo.git
commit e9936cd9565cb1a79b00617f378b125598b8920b
Author: Tobias Bouschen <to...@googlemail.com>
AuthorDate: Tue Aug 23 21:34:10 2022 +0200
Format all Java files using GJF
---
.../main/java/javax/jdo/AttributeConverter.java | 68 +-
api/src/main/java/javax/jdo/Constants.java | 2005 +++----
api/src/main/java/javax/jdo/Enhancer.java | 765 +--
api/src/main/java/javax/jdo/Extent.java | 149 +-
api/src/main/java/javax/jdo/FetchGroup.java | 476 +-
api/src/main/java/javax/jdo/FetchPlan.java | 414 +-
api/src/main/java/javax/jdo/InstanceCallbacks.java | 77 +-
.../main/java/javax/jdo/JDOCanRetryException.java | 141 +-
.../main/java/javax/jdo/JDODataStoreException.java | 141 +-
.../javax/jdo/JDODetachedFieldAccessException.java | 112 +-
.../main/java/javax/jdo/JDOEnhanceException.java | 72 +-
api/src/main/java/javax/jdo/JDOEnhancer.java | 258 +-
api/src/main/java/javax/jdo/JDOException.java | 526 +-
.../java/javax/jdo/JDOFatalDataStoreException.java | 142 +-
api/src/main/java/javax/jdo/JDOFatalException.java | 143 +-
.../java/javax/jdo/JDOFatalInternalException.java | 141 +-
.../main/java/javax/jdo/JDOFatalUserException.java | 144 +-
api/src/main/java/javax/jdo/JDOHelper.java | 3578 ++++++------
.../java/javax/jdo/JDONullIdentityException.java | 101 +-
.../java/javax/jdo/JDOObjectNotFoundException.java | 141 +-
.../jdo/JDOOptimisticVerificationException.java | 128 +-
api/src/main/java/javax/jdo/JDOQLTypedQuery.java | 1191 ++--
.../main/java/javax/jdo/JDOQLTypedSubquery.java | 173 +-
.../javax/jdo/JDOQueryInterruptedException.java | 40 +-
.../main/java/javax/jdo/JDOReadOnlyException.java | 93 +-
.../javax/jdo/JDOUnsupportedOptionException.java | 79 +-
.../java/javax/jdo/JDOUserCallbackException.java | 142 +-
api/src/main/java/javax/jdo/JDOUserException.java | 142 +-
api/src/main/java/javax/jdo/LegacyJava.java | 289 +-
api/src/main/java/javax/jdo/ObjectState.java | 47 +-
.../main/java/javax/jdo/PersistenceManager.java | 2603 ++++-----
.../java/javax/jdo/PersistenceManagerFactory.java | 1526 ++---
api/src/main/java/javax/jdo/Query.java | 2081 +++----
api/src/main/java/javax/jdo/Transaction.java | 477 +-
.../main/java/javax/jdo/annotations/Cacheable.java | 16 +-
.../main/java/javax/jdo/annotations/Column.java | 149 +-
.../main/java/javax/jdo/annotations/Columns.java | 17 +-
.../main/java/javax/jdo/annotations/Convert.java | 42 +-
.../javax/jdo/annotations/DatastoreIdentity.java | 77 +-
.../java/javax/jdo/annotations/Discriminator.java | 84 +-
.../jdo/annotations/DiscriminatorStrategy.java | 13 +-
.../main/java/javax/jdo/annotations/Element.java | 285 +-
.../main/java/javax/jdo/annotations/Embedded.java | 66 +-
.../java/javax/jdo/annotations/EmbeddedOnly.java | 13 +-
.../main/java/javax/jdo/annotations/Extension.java | 40 +-
.../java/javax/jdo/annotations/Extensions.java | 18 +-
.../java/javax/jdo/annotations/FetchGroup.java | 57 +-
.../java/javax/jdo/annotations/FetchGroups.java | 18 +-
.../main/java/javax/jdo/annotations/FetchPlan.java | 55 +-
.../java/javax/jdo/annotations/FetchPlans.java | 18 +-
.../java/javax/jdo/annotations/ForeignKey.java | 101 +-
.../javax/jdo/annotations/ForeignKeyAction.java | 17 +-
.../java/javax/jdo/annotations/ForeignKeys.java | 18 +-
.../javax/jdo/annotations/IdGeneratorStrategy.java | 19 +-
.../java/javax/jdo/annotations/IdentityType.java | 13 +-
api/src/main/java/javax/jdo/annotations/Index.java | 70 +-
.../main/java/javax/jdo/annotations/Indices.java | 18 +-
.../java/javax/jdo/annotations/Inheritance.java | 35 +-
.../javax/jdo/annotations/InheritanceStrategy.java | 15 +-
api/src/main/java/javax/jdo/annotations/Join.java | 156 +-
api/src/main/java/javax/jdo/annotations/Joins.java | 23 +-
api/src/main/java/javax/jdo/annotations/Key.java | 279 +-
.../java/javax/jdo/annotations/NotPersistent.java | 12 +-
.../main/java/javax/jdo/annotations/NullValue.java | 14 +-
api/src/main/java/javax/jdo/annotations/Order.java | 60 +-
.../javax/jdo/annotations/PersistenceAware.java | 12 +-
.../javax/jdo/annotations/PersistenceCapable.java | 146 +-
.../javax/jdo/annotations/PersistenceModifier.java | 18 +-
.../java/javax/jdo/annotations/Persistent.java | 457 +-
.../java/javax/jdo/annotations/PrimaryKey.java | 55 +-
.../main/java/javax/jdo/annotations/Queries.java | 18 +-
api/src/main/java/javax/jdo/annotations/Query.java | 90 +-
.../main/java/javax/jdo/annotations/Sequence.java | 86 +-
.../javax/jdo/annotations/SequenceStrategy.java | 11 +-
.../java/javax/jdo/annotations/Serialized.java | 17 +-
.../java/javax/jdo/annotations/Transactional.java | 14 +-
.../main/java/javax/jdo/annotations/Unique.java | 75 +-
.../main/java/javax/jdo/annotations/Uniques.java | 18 +-
api/src/main/java/javax/jdo/annotations/Value.java | 280 +-
.../main/java/javax/jdo/annotations/Version.java | 79 +-
.../javax/jdo/annotations/VersionStrategy.java | 15 +-
.../java/javax/jdo/datastore/DataStoreCache.java | 295 +-
.../java/javax/jdo/datastore/JDOConnection.java | 62 +-
.../main/java/javax/jdo/datastore/Sequence.java | 114 +-
.../main/java/javax/jdo/identity/ByteIdentity.java | 250 +-
.../main/java/javax/jdo/identity/CharIdentity.java | 274 +-
.../main/java/javax/jdo/identity/IntIdentity.java | 261 +-
.../main/java/javax/jdo/identity/LongIdentity.java | 278 +-
.../java/javax/jdo/identity/ObjectIdentity.java | 349 +-
.../java/javax/jdo/identity/ShortIdentity.java | 242 +-
.../javax/jdo/identity/SingleFieldIdentity.java | 348 +-
.../java/javax/jdo/identity/StringIdentity.java | 179 +-
.../java/javax/jdo/listener/AttachCallback.java | 50 +-
.../jdo/listener/AttachLifecycleListener.java | 66 +-
.../java/javax/jdo/listener/ClearCallback.java | 37 +-
.../javax/jdo/listener/ClearLifecycleListener.java | 69 +-
.../jdo/listener/CreateLifecycleListener.java | 35 +-
.../java/javax/jdo/listener/DeleteCallback.java | 39 +-
.../jdo/listener/DeleteLifecycleListener.java | 60 +-
.../java/javax/jdo/listener/DetachCallback.java | 47 +-
.../jdo/listener/DetachLifecycleListener.java | 63 +-
.../javax/jdo/listener/DirtyLifecycleListener.java | 48 +-
.../javax/jdo/listener/InstanceLifecycleEvent.java | 304 +-
.../jdo/listener/InstanceLifecycleListener.java | 20 +-
.../main/java/javax/jdo/listener/LoadCallback.java | 36 +-
.../javax/jdo/listener/LoadLifecycleListener.java | 35 +-
.../java/javax/jdo/listener/StoreCallback.java | 41 +-
.../javax/jdo/listener/StoreLifecycleListener.java | 57 +-
.../java/javax/jdo/metadata/ArrayMetadata.java | 97 +-
.../java/javax/jdo/metadata/ClassMetadata.java | 51 +-
.../jdo/metadata/ClassPersistenceModifier.java | 10 +-
.../javax/jdo/metadata/CollectionMetadata.java | 97 +-
.../java/javax/jdo/metadata/ColumnMetadata.java | 309 +-
.../jdo/metadata/DatastoreIdentityMetadata.java | 130 +-
.../javax/jdo/metadata/DiscriminatorMetadata.java | 152 +-
.../java/javax/jdo/metadata/ElementMetadata.java | 312 +-
.../java/javax/jdo/metadata/EmbeddedMetadata.java | 143 +-
.../java/javax/jdo/metadata/ExtensionMetadata.java | 33 +-
.../javax/jdo/metadata/FetchGroupMetadata.java | 84 +-
.../java/javax/jdo/metadata/FetchPlanMetadata.java | 95 +-
.../java/javax/jdo/metadata/FieldMetadata.java | 5 +-
.../javax/jdo/metadata/ForeignKeyMetadata.java | 264 +-
.../java/javax/jdo/metadata/IndexMetadata.java | 155 +-
api/src/main/java/javax/jdo/metadata/Indexed.java | 13 +-
.../javax/jdo/metadata/InheritanceMetadata.java | 93 +-
.../java/javax/jdo/metadata/InterfaceMetadata.java | 5 +-
.../main/java/javax/jdo/metadata/JDOMetadata.java | 230 +-
.../main/java/javax/jdo/metadata/JoinMetadata.java | 311 +-
.../main/java/javax/jdo/metadata/KeyMetadata.java | 319 +-
.../main/java/javax/jdo/metadata/MapMetadata.java | 223 +-
.../java/javax/jdo/metadata/MemberMetadata.java | 999 ++--
api/src/main/java/javax/jdo/metadata/Metadata.java | 54 +-
.../java/javax/jdo/metadata/OrderMetadata.java | 104 +-
.../java/javax/jdo/metadata/PackageMetadata.java | 223 +-
.../javax/jdo/metadata/PrimaryKeyMetadata.java | 82 +-
.../java/javax/jdo/metadata/PropertyMetadata.java | 25 +-
.../java/javax/jdo/metadata/QueryMetadata.java | 154 +-
.../java/javax/jdo/metadata/SequenceMetadata.java | 127 +-
.../main/java/javax/jdo/metadata/TypeMetadata.java | 730 +--
.../java/javax/jdo/metadata/UniqueMetadata.java | 156 +-
.../java/javax/jdo/metadata/ValueMetadata.java | 299 +-
.../java/javax/jdo/metadata/VersionMetadata.java | 128 +-
.../java/javax/jdo/query/BooleanExpression.java | 69 +-
.../main/java/javax/jdo/query/ByteExpression.java | 20 +-
.../java/javax/jdo/query/CharacterExpression.java | 65 +-
.../java/javax/jdo/query/CollectionExpression.java | 67 +-
.../java/javax/jdo/query/ComparableExpression.java | 164 +-
.../main/java/javax/jdo/query/DateExpression.java | 54 +-
.../java/javax/jdo/query/DateTimeExpression.java | 87 +-
.../main/java/javax/jdo/query/EnumExpression.java | 28 +-
api/src/main/java/javax/jdo/query/Expression.java | 133 +-
.../java/javax/jdo/query/IfThenElseExpression.java | 65 +-
.../main/java/javax/jdo/query/ListExpression.java | 45 +-
.../java/javax/jdo/query/LocalDateExpression.java | 52 +-
.../javax/jdo/query/LocalDateTimeExpression.java | 85 +-
.../java/javax/jdo/query/LocalTimeExpression.java | 52 +-
.../main/java/javax/jdo/query/MapExpression.java | 145 +-
.../java/javax/jdo/query/NumericExpression.java | 450 +-
.../java/javax/jdo/query/ObjectExpression.java | 23 +-
.../java/javax/jdo/query/OptionalExpression.java | 43 +-
.../main/java/javax/jdo/query/OrderExpression.java | 90 +-
.../javax/jdo/query/PersistableExpression.java | 39 +-
.../java/javax/jdo/query/StringExpression.java | 467 +-
.../java/javax/jdo/query/SubqueryExpression.java | 21 +-
.../main/java/javax/jdo/query/TimeExpression.java | 54 +-
api/src/main/java/javax/jdo/spi/Detachable.java | 58 +-
api/src/main/java/javax/jdo/spi/I18NHelper.java | 731 +--
api/src/main/java/javax/jdo/spi/JDOImplHelper.java | 2118 +++----
api/src/main/java/javax/jdo/spi/JDOPermission.java | 141 +-
.../java/javax/jdo/spi/PersistenceCapable.java | 1143 ++--
.../java/javax/jdo/spi/RegisterClassEvent.java | 172 +-
.../java/javax/jdo/spi/RegisterClassListener.java | 36 +-
.../java/javax/jdo/spi/StateInterrogation.java | 422 +-
api/src/main/java/javax/jdo/spi/StateManager.java | 1070 ++--
.../test/java/javax/jdo/AbstractJDOConfigTest.java | 205 +-
api/src/test/java/javax/jdo/EnhancerTest.java | 844 +--
.../java/javax/jdo/JDOConfigTestClassLoader.java | 65 +-
.../test/java/javax/jdo/JDOHelperConfigTest.java | 825 +--
api/src/test/java/javax/jdo/JDOHelperTest.java | 1125 ++--
api/src/test/java/javax/jdo/MockEnhancer.java | 215 +-
api/src/test/java/javax/jdo/ObjectStateTest.java | 370 +-
api/src/test/java/javax/jdo/PMFMapMapTest.java | 695 +--
api/src/test/java/javax/jdo/PMFProxy.java | 61 +-
api/src/test/java/javax/jdo/PMFService.java | 58 +-
api/src/test/java/javax/jdo/annotations/Line.java | 11 +-
api/src/test/java/javax/jdo/annotations/Point.java | 11 +-
.../javax/jdo/annotations/TestEmbeddedMap.java | 56 +-
.../javax/jdo/annotations/TestEmbeddedSet.java | 54 +-
.../java/javax/jdo/annotations/TestExtensions.java | 47 +-
.../java/javax/jdo/identity/ByteIdentityTest.java | 212 +-
.../java/javax/jdo/identity/CharIdentityTest.java | 230 +-
.../javax/jdo/identity/ConcreteTestIdentity.java | 73 +-
.../java/javax/jdo/identity/IntIdentityTest.java | 208 +-
.../java/javax/jdo/identity/LongIdentityTest.java | 221 +-
.../javax/jdo/identity/ObjectIdentityTest.java | 768 +--
.../java/javax/jdo/identity/ShortIdentityTest.java | 211 +-
.../jdo/identity/SingleFieldIdentityTest.java | 141 +-
.../javax/jdo/identity/StringIdentityTest.java | 144 +-
.../jdo/listener/InstanceLifecycleEventTest.java | 201 +-
api/src/test/java/javax/jdo/pc/PCPoint.java | 775 ++-
api/src/test/java/javax/jdo/schema/XMLTest.java | 184 +-
.../test/java/javax/jdo/spi/JDOImplHelperTest.java | 466 +-
.../java/javax/jdo/spi/StateInterrogationTest.java | 881 ++-
api/src/test/java/javax/jdo/stub/StubPMF.java | 874 ++-
api/src/test/java/javax/jdo/util/AbstractTest.java | 142 +-
.../java/javax/jdo/util/BatchResultPrinter.java | 165 +-
.../test/java/javax/jdo/util/BatchTestRunner.java | 231 +-
api/src/test/java/javax/jdo/util/XMLTestUtil.java | 969 ++--
.../org/apache/jdo/exectck/AbstractTCKMojo.java | 234 +-
.../main/java/org/apache/jdo/exectck/Enhance.java | 441 +-
.../src/main/java/org/apache/jdo/exectck/Help.java | 137 +-
.../java/org/apache/jdo/exectck/InstallSchema.java | 427 +-
.../java/org/apache/jdo/exectck/PropertyUtils.java | 184 +-
.../main/java/org/apache/jdo/exectck/RunTCK.java | 989 ++--
.../java/org/apache/jdo/exectck/SQLFileLoader.java | 582 +-
.../java/org/apache/jdo/exectck/Utilities.java | 303 +-
.../org/apache/jdo/tck/AbstractReaderTest.java | 101 +-
tck/src/main/java/org/apache/jdo/tck/JDO_Test.java | 2630 +++++----
.../java/org/apache/jdo/tck/api/SignatureTest.java | 164 +-
.../api/converter/IntAttributeConverterTest.java | 760 ++-
.../api/converter/PointAttributeConverterTest.java | 663 ++-
.../tck/api/exceptions/ExceptionConstructor.java | 526 +-
.../jdo/tck/api/fetchgroup/FetchGroupTest.java | 1118 ++--
.../AbstractInstanceLifecycleListener.java | 820 ++-
.../AccessOtherInstancesInPrestore.java | 149 +-
.../AccessingFieldsInPredelete.java | 311 +-
.../api/instancecallbacks/CallingJdoPostload.java | 232 +-
.../api/instancecallbacks/CallingJdoPreclear.java | 254 +-
.../api/instancecallbacks/CallingJdoPredelete.java | 211 +-
.../api/instancecallbacks/CallingJdoPrestore.java | 400 +-
.../InstanceLifecycleListenerAttach.java | 253 +-
.../InstanceLifecycleListenerClear.java | 223 +-
.../InstanceLifecycleListenerCreate.java | 158 +-
.../InstanceLifecycleListenerDelete.java | 227 +-
.../InstanceLifecycleListenerDetach.java | 252 +-
.../InstanceLifecycleListenerDirty.java | 199 +-
.../InstanceLifecycleListenerLoad.java | 208 +-
.../InstanceLifecycleListenerStore.java | 220 +-
...ationOfNontransactionalNonpersistentFields.java | 293 +-
.../NoAccessToFieldsAfterPredelete.java | 272 +-
.../jdo/tck/api/instancecallbacks/TestParts.java | 288 +-
.../apache/jdo/tck/api/jdohelper/GetObjectId.java | 115 +-
.../jdo/tck/api/jdohelper/GetObjectIdForNull.java | 93 +-
.../tck/api/jdohelper/GetObjectIdForTransient.java | 89 +-
.../GetObjectIdNotPersistenceCapable.java | 90 +-
.../apache/jdo/tck/api/jdohelper/GetObjectIds.java | 417 +-
.../tck/api/jdohelper/GetPersistenceManager.java | 117 +-
.../jdohelper/GetPersistenceManagerForNull.java | 89 +-
.../GetPersistenceManagerForTransient.java | 86 +-
...GetPersistenceManagerNotPersistenceCapable.java | 92 +-
.../api/jdohelper/GetTransactionalObjectId.java | 107 +-
.../jdohelper/GetTransactionalObjectIdForNull.java | 91 +-
.../GetTransactionalObjectIdForTransient.java | 91 +-
...TransactionalObjectIdNotPersistenceCapable.java | 85 +-
.../apache/jdo/tck/api/jdohelper/IsDeleted.java | 107 +-
.../jdo/tck/api/jdohelper/IsDeletedFalse.java | 109 +-
.../jdo/tck/api/jdohelper/IsDeletedForNull.java | 89 +-
.../tck/api/jdohelper/IsDeletedForTransient.java | 87 +-
.../jdohelper/IsDeletedNotPersistenceCapable.java | 89 +-
.../apache/jdo/tck/api/jdohelper/IsDetached.java | 103 +-
.../org/apache/jdo/tck/api/jdohelper/IsDirty.java | 109 +-
.../apache/jdo/tck/api/jdohelper/IsDirtyFalse.java | 117 +-
.../jdo/tck/api/jdohelper/IsDirtyForNull.java | 85 +-
.../jdo/tck/api/jdohelper/IsDirtyForTransient.java | 88 +-
.../jdohelper/IsDirtyNotPersistenceCapable.java | 89 +-
.../org/apache/jdo/tck/api/jdohelper/IsNew.java | 104 +-
.../apache/jdo/tck/api/jdohelper/IsNewFalse.java | 98 +-
.../apache/jdo/tck/api/jdohelper/IsNewForNull.java | 83 +-
.../jdo/tck/api/jdohelper/IsNewForTransient.java | 87 +-
.../api/jdohelper/IsNewNotPersistenceCapable.java | 90 +-
.../apache/jdo/tck/api/jdohelper/IsPersistent.java | 105 +-
.../jdo/tck/api/jdohelper/IsPersistentFalse.java | 89 +-
.../jdo/tck/api/jdohelper/IsPersistentForNull.java | 85 +-
.../api/jdohelper/IsPersistentForTransient.java | 92 +-
.../IsPersistentNotPersistenceCapable.java | 89 +-
.../jdo/tck/api/jdohelper/IsTransactional.java | 121 +-
.../tck/api/jdohelper/IsTransactionalFalse.java | 134 +-
.../tck/api/jdohelper/IsTransactionalForNull.java | 86 +-
.../api/jdohelper/IsTransactionalForTransient.java | 86 +-
.../IsTransactionalNotPersistenceCapable.java | 88 +-
.../apache/jdo/tck/api/jdohelper/MakeDirty.java | 117 +-
.../jdo/tck/api/jdohelper/MakeDirtyForNull.java | 87 +-
.../tck/api/jdohelper/MakeDirtyForTransient.java | 91 +-
.../jdohelper/MakeDirtyNotPersistenceCapable.java | 88 +-
.../AbstractPersistenceCapableTest.java | 81 +-
.../CopyKeyFieldsFromObjectId.java | 448 +-
.../persistencecapable/NewObjectIdInstance.java | 393 +-
.../ChangingObjectIdHasNoEffectOnInstance.java | 92 +-
.../ConcurrentPersistenceManagers.java | 115 +-
.../ConcurrentPersistenceManagersSameClasses.java | 242 +-
.../api/persistencemanager/CurrentTransaction.java | 76 +-
.../api/persistencemanager/DataStoreCacheTest.java | 141 +-
.../persistencemanager/DataStoreConnection.java | 214 +-
.../DataStoreConnectionThrows.java | 329 +-
.../api/persistencemanager/DatastoreTimeout.java | 965 ++--
.../api/persistencemanager/DeletePersistent.java | 419 +-
.../DeletePersistentAllFails.java | 243 +-
...DeletePersistentFailsIfInstanceIsTransient.java | 222 +-
...InstanceManagedByAnotherPersistenceManager.java | 276 +-
...etePersistentHasNoEffectOnDeletedInstances.java | 251 +-
.../GetPersistenceManagerFactory.java | 79 +-
.../tck/api/persistencemanager/GetProperties.java | 675 ++-
.../persistencemanager/GetPutRemoveUserObject.java | 259 +-
.../api/persistencemanager/GetSetUserObject.java | 100 +-
...nsactionalObjectIdWhenObjectIdBeingChanged.java | 123 +-
.../GetTransactionalObjectIdWithNoTransaction.java | 104 +-
.../tck/api/persistencemanager/NewInstance.java | 170 +-
.../NoPersistenceManagerIfTransient.java | 67 +-
.../ObjectIdUniqueAmongInstances.java | 136 +-
.../OneInstanceOfObjectPerPersistenceManager.java | 214 +-
...sistenceManagerIfPersistentOrTransactional.java | 67 +-
.../api/persistencemanager/OptimisticFailure.java | 391 +-
.../persistencemanager/PersistenceManagerTest.java | 186 +-
...ionInstanceForAllCallsToCurrentTransaction.java | 103 +-
.../jdo/tck/api/persistencemanager/ThreadSafe.java | 326 +-
...TransactionalInstanceRetainsValuesAtCommit.java | 259 +-
...llingEvictAllWithCollectionContainingNulls.java | 207 +-
...ingRefreshAllWithCollectionContainingNulls.java | 214 +-
.../cache/EvictAllWithNoParameters.java | 211 +-
.../EvictingCollectionOfInstancesSideEffects.java | 350 +-
.../cache/EvictingWithRestoreValuesFalse.java | 222 +-
.../cache/EvictingWithRetainValuesFalse.java | 234 +-
.../PassingNullToEvictAllThrowsException.java | 163 +-
.../cache/PassingNullToEvictHasNoEffect.java | 107 +-
.../PassingNullToRefreshAllThrowsException.java | 169 +-
.../cache/PassingNullToRefreshHasNoEffect.java | 106 +-
.../cache/RefreshAllNoParameterSideEffects.java | 272 +-
.../cache/RefreshAllSideEffects.java | 324 +-
.../cache/RefreshAllWithNoParameters.java | 144 +-
.../cache/RefreshSideEffects.java | 375 +-
.../tck/api/persistencemanager/cache/Retrieve.java | 553 +-
.../close/AfterCloseAllMethodsThrowException.java | 130 +-
.../persistencemanager/close/AutoCloseable.java | 126 +-
.../close/CloseWithActiveTxRollsBack.java | 120 +-
.../close/IsClosedIsFalseUponConstruction.java | 71 +-
.../IsClosedIsFalseUponRetrievalFromPool.java | 74 +-
.../close/IsClosedIsTrueAfterClose.java | 75 +-
.../detach/CopyOnAttachFalse.java | 130 +-
.../detach/DetachAccessUnloadedField.java | 205 +-
.../detach/DetachAllOnCommit.java | 83 +-
.../persistencemanager/detach/DetachAttach.java | 69 +-
.../detach/DetachAttachDirty.java | 87 +-
.../api/persistencemanager/detach/DetachCopy.java | 128 +-
.../persistencemanager/detach/DetachSerialize.java | 142 +-
.../api/persistencemanager/detach/DetachTest.java | 341 +-
.../detach/DetachUndetachable.java | 91 +-
.../detach/SetDetachAllOnCommit.java | 102 +-
...WithInstancesMadePersistentViaReachability.java | 159 +-
.../extent/GetExtentWithNoSubclasses.java | 152 +-
.../extent/GetExtentWithSubclasses.java | 211 +-
.../fetchplan/AbstractFetchPlanTest.java | 270 +-
.../fetchplan/FetchPlanInterface.java | 615 +-
.../fetchplan/FetchPlanIsCopy.java | 214 +-
.../fetchplan/FetchPlanMakeTransient.java | 128 +-
.../fetchplan/FetchPlanQuery.java | 81 +-
.../fetchplan/FetchPlanRefresh.java | 127 +-
.../fetchplan/FetchPlanRetrieve.java | 122 +-
.../persistencemanager/flags/GetIgnoreCache.java | 90 +-
.../flags/SetIgnoreCacheToFalse.java | 111 +-
.../flags/SetIgnoreCacheToTrue.java | 113 +-
.../flags/SetMultithreadedFalse.java | 111 +-
.../flags/SetMultithreadedTrue.java | 112 +-
.../flags/SettingFlagsWithTransactionInstance.java | 88 +-
.../getobject/GetObjectById.java | 219 +-
.../getobject/GetObjectByIdExactClass.java | 448 +-
.../GetObjectByIdNoValidationInstanceInCache.java | 104 +-
...IdNoValidationInstanceInCacheNoStateChange.java | 110 +-
...etObjectByIdNoValidationInstanceNotInCache.java | 114 +-
...jectByIdNoValidationInstanceNotInCacheNoTx.java | 113 +-
...jectByIdNoValidationInstanceNotInDatastore.java | 105 +-
.../getobject/GetObjectByIdNotResolved.java | 113 +-
...GetObjectByIdWithValidationInstanceInCache.java | 122 +-
...ithValidationInstanceInCacheNotInDatastore.java | 119 +-
...ValidationInstanceNotInCacheNotInDatastore.java | 96 +-
.../persistencemanager/getobject/GetObjectId.java | 106 +-
.../getobject/GetObjectIdClass.java | 133 +-
...assForAbstractOrNonPersistenceCapableClass.java | 101 +-
.../GetObjectIdForNullOrNotPersistent.java | 101 +-
.../GetObjectIdForPersistentInterface.java | 114 +-
...etObjectIdWithApplicationModifyingIdentity.java | 131 +-
.../getobject/GetObjectsById.java | 343 +-
.../lifecycle/MakeNontransactionalAllFails.java | 279 +-
.../MakeNontransactionalDirtyInstance.java | 486 +-
.../lifecycle/MakeNontransactionalIsImmediate.java | 402 +-
...akeNontransactionalPersistentCleanInstance.java | 387 +-
...MakeNontransactionalTransientCleanInstance.java | 359 +-
.../lifecycle/MakePersistent.java | 363 +-
.../lifecycle/MakePersistentAllFails.java | 198 +-
.../MakePersistentAndInstancesNotReachable.java | 169 +-
.../lifecycle/MakePersistentAssignsObjectId.java | 282 +-
...InstanceManagedByAnotherPersistenceManager.java | 296 +-
...PersistentHasNoEffectOnPersistentInstances.java | 260 +-
.../lifecycle/MakeTransactional.java | 249 +-
...ctionalANontransactionalPersistentInstance.java | 546 +-
.../lifecycle/MakeTransactionalAllFails.java | 187 +-
.../lifecycle/MakeTransactionalIsImmediate.java | 283 +-
...eTransactionalPriorToTransactionRolledback.java | 356 +-
...keTransactionalWithinTransactionRolledback.java | 318 +-
.../lifecycle/MakeTransient.java | 271 +-
.../lifecycle/MakeTransientAllFails.java | 202 +-
.../MakeTransientCausesLossOfIdentity.java | 299 +-
.../MakeTransientFailsWithDirtyInstance.java | 305 +-
.../MakeTransientFieldsPreservedUnchanged.java | 404 +-
...keTransientHasNoEffectOnTransientInstances.java | 229 +-
.../MakeTransientNotSubjectToRollback.java | 296 +-
.../nullargs/DeletePersistentNullArgs.java | 139 +-
.../nullargs/DetachCopyNullArgs.java | 132 +-
.../persistencemanager/nullargs/EvictNullArgs.java | 130 +-
.../nullargs/MakeNontransactionalNullArgs.java | 143 +-
.../nullargs/MakePersistentNullArgs.java | 136 +-
.../nullargs/MakeTransactionalNullArgs.java | 140 +-
.../nullargs/MakeTransientNullArgs.java | 136 +-
.../nullargs/PersistenceManagerNullsTest.java | 999 ++--
.../nullargs/RefreshNullArgs.java | 131 +-
.../nullargs/RetrieveNullArgs.java | 133 +-
.../nullargs/RetrieveWithFetchPlanNullArgs.java | 143 +-
.../persistencemanagerfactory/AbstractGetPMF.java | 329 +-
.../AfterCloseGetPMThrowsException.java | 96 +-
.../AfterCloseSetMethodsThrowException.java | 368 +-
...erGetPersistenceManagerNoSetMethodsSucceed.java | 373 +-
.../tck/api/persistencemanagerfactory/Close.java | 193 +-
.../CloseFailsIfTransactionActive.java | 317 +-
...seWithoutPermissionThrowsSecurityException.java | 134 +-
.../FlushThrowsIfReadOnly.java | 259 +-
.../GetManagedClasses.java | 95 +-
.../persistencemanagerfactory/GetPMFByFile.java | 94 +-
.../GetPMFByFileAndClassLoader.java | 105 +-
.../GetPMFByJNDILocation.java | 154 +-
.../GetPMFByJNDILocationAndClassLoader.java | 150 +-
.../GetPMFByResource.java | 94 +-
.../GetPMFByResourceAndClassLoader.java | 97 +-
.../persistencemanagerfactory/GetPMFByStream.java | 116 +-
.../GetPMFByStreamAndClassLoader.java | 119 +-
.../GetPersistenceManager.java | 88 +-
...sistenceManagerFactoryByPropertiesInstance.java | 101 +-
.../GetPersistenceManagerForUser.java | 114 +-
.../persistencemanagerfactory/GetProperties.java | 95 +-
.../SetConnectionPassword.java | 90 +-
.../SetConnectionURL.java | 114 +-
.../SetConnectionUserName.java | 119 +-
.../persistencemanagerfactory/SetIgnoreCache.java | 101 +-
.../SetMultithreaded.java | 104 +-
.../SetNonTransactionalRead.java | 104 +-
.../SetNonTransactionalWrite.java | 117 +-
.../persistencemanagerfactory/SetOptimistic.java | 114 +-
.../api/persistencemanagerfactory/SetReadOnly.java | 103 +-
.../persistencemanagerfactory/SetRetainValues.java | 106 +-
.../SetTransactionIsolationLevel.java | 307 +-
.../SupportedOptions.java | 81 +-
.../config/JDOConfigListener.java | 230 +-
.../config/Jdoconfig.java | 328 +-
.../config/Persistence.java | 195 +-
.../config/StoreListener.java | 65 +-
.../config/StoreListenerGetInstance.java | 87 +-
.../config/ThrowOnUnknownStandardProperties.java | 205 +-
.../metadata/GetMetadataTest.java | 192 +-
.../apache/jdo/tck/enhancement/EnhancerTest.java | 140 +-
.../org/apache/jdo/tck/extents/AutoCloseable.java | 255 +-
.../java/org/apache/jdo/tck/extents/CloseAll.java | 104 +-
.../CloseOfExtentIteratorIsIteratorSpecific.java | 100 +-
.../org/apache/jdo/tck/extents/ExtentTest.java | 476 +-
.../apache/jdo/tck/extents/GetCandidateClass.java | 69 +-
.../jdo/tck/extents/GetPersistenceManager.java | 71 +-
.../apache/jdo/tck/extents/HasSubclassesFalse.java | 69 +-
.../apache/jdo/tck/extents/HasSubclassesTrue.java | 69 +-
...nstancesDeletedPriorToIterationNotReturned.java | 106 +-
...InstancesPersistedPriorToIterationReturned.java | 104 +-
.../IteratorHasNextFalseAfterExtentClose.java | 129 +-
.../jdo/tck/extents/IteratorMutatingMethods.java | 90 +-
.../tck/extents/IteratorNextAfterExtentClose.java | 142 +-
.../extents/IteratorNextAfterExtentCloseAll.java | 124 +-
.../java/org/apache/jdo/tck/extents/Iterators.java | 83 +-
.../tck/lifecycle/HollowInstanceMaintainsPK.java | 151 +-
...ltiplePMsReturnInstancesRepresentingSamePC.java | 251 +-
.../NontransactionalWriteDatastoreCommit.java | 112 +-
...ntransactionalWriteDatastoreCommitConflict.java | 119 +-
.../NontransactionalWriteDatastoreRollback.java | 114 +-
.../NontransactionalWriteOptimisticCommit.java | 114 +-
...transactionalWriteOptimisticCommitConflict.java | 122 +-
.../NontransactionalWriteOptimisticRollback.java | 114 +-
.../tck/lifecycle/NontransactionalWriteTest.java | 411 +-
.../tck/lifecycle/NontransactionalWriteThrows.java | 93 +-
...tIdNotModifiedWhenObjectIdInstanceModified.java | 232 +-
.../PMReturnsIdenticalInstancesForEqualObjIds.java | 175 +-
.../PMsCanSharePCClassesButNotPCInstances.java | 403 +-
.../apache/jdo/tck/lifecycle/StateTransitions.java | 2072 +++----
.../lifecycle/StateTransitionsReturnedObjects.java | 1470 ++---
.../TransientTransactionalStateCommit.java | 163 +-
.../TransientTransactionalStateRollback.java | 196 +-
.../jdo/tck/mapping/AbstractRelationshipTest.java | 111 +-
.../apache/jdo/tck/mapping/CompletenessTest.java | 168 +-
.../jdo/tck/mapping/CompletenessTestJPA.java | 174 +-
.../jdo/tck/mapping/CompletenessTestList.java | 174 +-
.../jdo/tck/mapping/CompletenessTestMap.java | 174 +-
.../jdo/tck/mapping/CompletenessTestOrder.java | 171 +-
.../mapping/Relationship1To1AllRelationships.java | 768 +--
.../mapping/Relationship1To1NoRelationships.java | 383 +-
.../Relationship1ToManyAllRelationships.java | 844 +--
.../Relationship1ToManyNoRelationships.java | 431 +-
.../RelationshipManyToManyAllRelationships.java | 895 ++-
.../RelationshipManyToManyNoRelationships.java | 409 +-
.../tck/mapping/RelationshipNegative1To1Test.java | 225 +-
.../mapping/RelationshipNegative1ToManyTest.java | 196 +-
.../tck/models/embedded/EmbeddedInheritance.java | 353 +-
.../SecondClassObjectsTrackTheirChanges.java | 229 +-
.../models/fieldtypes/TestArrayCollections.java | 322 +-
.../fieldtypes/TestArrayListCollections.java | 318 +-
.../fieldtypes/TestCollectionCollections.java | 294 +-
.../models/fieldtypes/TestFieldsOfBigDecimal.java | 202 +-
.../models/fieldtypes/TestFieldsOfBigInteger.java | 205 +-
.../tck/models/fieldtypes/TestFieldsOfBoolean.java | 203 +-
.../tck/models/fieldtypes/TestFieldsOfByte.java | 201 +-
.../models/fieldtypes/TestFieldsOfCharacter.java | 198 +-
.../tck/models/fieldtypes/TestFieldsOfDate.java | 197 +-
.../tck/models/fieldtypes/TestFieldsOfDouble.java | 198 +-
.../tck/models/fieldtypes/TestFieldsOfFloat.java | 196 +-
.../tck/models/fieldtypes/TestFieldsOfInteger.java | 198 +-
.../tck/models/fieldtypes/TestFieldsOfLocale.java | 200 +-
.../tck/models/fieldtypes/TestFieldsOfLong.java | 196 +-
.../tck/models/fieldtypes/TestFieldsOfObject.java | 220 +-
.../fieldtypes/TestFieldsOfPrimitiveboolean.java | 195 +-
.../fieldtypes/TestFieldsOfPrimitivebyte.java | 194 +-
.../fieldtypes/TestFieldsOfPrimitivechar.java | 192 +-
.../fieldtypes/TestFieldsOfPrimitivedouble.java | 194 +-
.../fieldtypes/TestFieldsOfPrimitivefloat.java | 194 +-
.../fieldtypes/TestFieldsOfPrimitiveint.java | 190 +-
.../fieldtypes/TestFieldsOfPrimitivelong.java | 196 +-
.../fieldtypes/TestFieldsOfPrimitiveshort.java | 195 +-
.../tck/models/fieldtypes/TestFieldsOfShort.java | 198 +-
.../models/fieldtypes/TestFieldsOfSimpleClass.java | 189 +-
.../models/fieldtypes/TestFieldsOfSimpleEnum.java | 190 +-
.../fieldtypes/TestFieldsOfSimpleInterface.java | 188 +-
.../tck/models/fieldtypes/TestFieldsOfString.java | 199 +-
.../TestHashMapStringKeyCollections.java | 313 +-
.../TestHashMapStringValueCollections.java | 336 +-
.../models/fieldtypes/TestHashSetCollections.java | 299 +-
.../TestHashtableStringKeyCollections.java | 316 +-
.../TestHashtableStringValueCollections.java | 335 +-
.../fieldtypes/TestLinkedListCollections.java | 296 +-
.../tck/models/fieldtypes/TestListCollections.java | 307 +-
.../fieldtypes/TestMapStringKeyCollections.java | 309 +-
.../fieldtypes/TestMapStringValueCollections.java | 337 +-
.../tck/models/fieldtypes/TestSetCollections.java | 287 +-
.../TestTreeMapStringKeyCollections.java | 312 +-
.../TestTreeMapStringValueCollections.java | 331 +-
.../models/fieldtypes/TestTreeSetCollections.java | 266 +-
.../apache/jdo/tck/models/fieldtypes/TestUtil.java | 599 +-
.../models/fieldtypes/TestVectorCollections.java | 296 +-
.../inheritance/FieldWithSameNameInSuperclass.java | 521 +-
...rsistentFieldsAreNonPersistentInSubclasses.java | 213 +-
.../inheritance/NonpersistentSuperClass.java | 500 +-
...ceCapableFlexibilityInInheritanceHierarchy.java | 504 +-
.../PersistentFieldsArePersistentInSubClasses.java | 491 +-
.../jdo/tck/models/inheritance/TestParts.java | 266 +-
...actionalFieldsAreTransactionalInSubclasses.java | 206 +-
.../org/apache/jdo/tck/pc/building/Kitchen.java | 157 +-
.../jdo/tck/pc/building/MultifunctionOven.java | 92 +-
.../java/org/apache/jdo/tck/pc/building/Oven.java | 114 +-
.../org/apache/jdo/tck/pc/company/Address.java | 599 +-
.../org/apache/jdo/tck/pc/company/Company.java | 638 ++-
.../apache/jdo/tck/pc/company/CompanyFactory.java | 108 +-
.../tck/pc/company/CompanyFactoryAbstractImpl.java | 465 +-
.../CompanyFactoryAnnotatedAbstractDelegator.java | 111 +-
.../pc/company/CompanyFactoryConcreteClass.java | 253 +-
.../tck/pc/company/CompanyFactoryNewInstance.java | 45 +-
.../jdo/tck/pc/company/CompanyFactoryPMClass.java | 116 +-
.../tck/pc/company/CompanyFactoryPMInterface.java | 115 +-
.../jdo/tck/pc/company/CompanyFactoryRegistry.java | 192 +-
.../jdo/tck/pc/company/CompanyModelReader.java | 442 +-
.../apache/jdo/tck/pc/company/DentalInsurance.java | 184 +-
.../org/apache/jdo/tck/pc/company/Department.java | 815 +--
.../org/apache/jdo/tck/pc/company/Employee.java | 928 +--
.../jdo/tck/pc/company/FullTimeEmployee.java | 208 +-
.../org/apache/jdo/tck/pc/company/IAddress.java | 53 +-
.../org/apache/jdo/tck/pc/company/ICompany.java | 49 +-
.../jdo/tck/pc/company/IDentalInsurance.java | 22 +-
.../org/apache/jdo/tck/pc/company/IDepartment.java | 61 +-
.../org/apache/jdo/tck/pc/company/IEmployee.java | 104 +-
.../jdo/tck/pc/company/IFullTimeEmployee.java | 24 +-
.../org/apache/jdo/tck/pc/company/IInsurance.java | 35 +-
.../jdo/tck/pc/company/IMedicalInsurance.java | 24 +-
.../apache/jdo/tck/pc/company/IMeetingRoom.java | 29 +-
.../jdo/tck/pc/company/IPartTimeEmployee.java | 22 +-
.../org/apache/jdo/tck/pc/company/IPerson.java | 60 +-
.../org/apache/jdo/tck/pc/company/IProject.java | 48 +-
.../org/apache/jdo/tck/pc/company/Insurance.java | 464 +-
.../jdo/tck/pc/company/MedicalInsurance.java | 180 +-
.../org/apache/jdo/tck/pc/company/MeetingRoom.java | 411 +-
.../org/apache/jdo/tck/pc/company/PIAddress.java | 53 +-
.../org/apache/jdo/tck/pc/company/PICompany.java | 51 +-
.../jdo/tck/pc/company/PIDentalInsurance.java | 22 +-
.../apache/jdo/tck/pc/company/PIDepartment.java | 54 +-
.../org/apache/jdo/tck/pc/company/PIEmployee.java | 104 +-
.../jdo/tck/pc/company/PIFullTimeEmployee.java | 24 +-
.../org/apache/jdo/tck/pc/company/PIInsurance.java | 35 +-
.../jdo/tck/pc/company/PIMedicalInsurance.java | 24 +-
.../apache/jdo/tck/pc/company/PIMeetingRoom.java | 29 +-
.../jdo/tck/pc/company/PIPartTimeEmployee.java | 22 +-
.../org/apache/jdo/tck/pc/company/PIPerson.java | 60 +-
.../org/apache/jdo/tck/pc/company/PIProject.java | 48 +-
.../jdo/tck/pc/company/PartTimeEmployee.java | 203 +-
.../java/org/apache/jdo/tck/pc/company/Person.java | 757 +--
.../org/apache/jdo/tck/pc/company/Project.java | 640 +--
.../CompanyFactoryAnnotatedFCAppConcrete.java | 120 +-
.../CompanyFactoryAnnotatedFCAppPM.java | 120 +-
...CompanyFactoryAnnotatedFCConcreteDelegator.java | 26 +-
.../CompanyFactoryAnnotatedFCDSConcrete.java | 120 +-
.../CompanyFactoryAnnotatedFCDSPM.java | 120 +-
.../CompanyFactoryAnnotatedFCPMDelegator.java | 27 +-
.../CompanyFactoryAnnotatedPMFieldClass.java | 192 +-
...toreIdDiscriminatorClassNameInheritanceNew.java | 32 +-
...iscriminatorClassNameInheritanceSuperclass.java | 34 +-
.../tck/pc/companyAnnotatedFC/FCAppAddress.java | 605 +-
.../tck/pc/companyAnnotatedFC/FCAppCompany.java | 689 ++-
.../companyAnnotatedFC/FCAppDentalInsurance.java | 190 +-
.../tck/pc/companyAnnotatedFC/FCAppDepartment.java | 784 +--
.../tck/pc/companyAnnotatedFC/FCAppEmployee.java | 993 ++--
.../companyAnnotatedFC/FCAppFullTimeEmployee.java | 220 +-
.../tck/pc/companyAnnotatedFC/FCAppInsurance.java | 497 +-
.../companyAnnotatedFC/FCAppMedicalInsurance.java | 187 +-
.../pc/companyAnnotatedFC/FCAppMeetingRoom.java | 427 +-
.../companyAnnotatedFC/FCAppPartTimeEmployee.java | 215 +-
.../jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java | 815 +--
.../tck/pc/companyAnnotatedFC/FCAppProject.java | 682 +--
.../jdo/tck/pc/companyAnnotatedFC/FCDSAddress.java | 603 +-
.../jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java | 682 +--
.../pc/companyAnnotatedFC/FCDSDentalInsurance.java | 193 +-
.../tck/pc/companyAnnotatedFC/FCDSDepartment.java | 780 +--
.../tck/pc/companyAnnotatedFC/FCDSEmployee.java | 993 ++--
.../companyAnnotatedFC/FCDSFullTimeEmployee.java | 218 +-
.../tck/pc/companyAnnotatedFC/FCDSInsurance.java | 487 +-
.../companyAnnotatedFC/FCDSMedicalInsurance.java | 190 +-
.../tck/pc/companyAnnotatedFC/FCDSMeetingRoom.java | 420 +-
.../companyAnnotatedFC/FCDSPartTimeEmployee.java | 210 +-
.../jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java | 812 +--
.../jdo/tck/pc/companyAnnotatedFC/FCDSProject.java | 676 +--
.../CompanyFactoryAnnotatedJPAAppConcrete.java | 120 +-
.../CompanyFactoryAnnotatedJPAAppPM.java | 116 +-
.../CompanyFactoryAnnotatedPMFieldClassJPA.java | 153 +-
.../tck/pc/companyAnnotatedJPA/JPAAppAddress.java | 605 +-
.../tck/pc/companyAnnotatedJPA/JPAAppCompany.java | 697 ++-
.../companyAnnotatedJPA/JPAAppDentalInsurance.java | 193 +-
.../pc/companyAnnotatedJPA/JPAAppDepartment.java | 792 +--
.../tck/pc/companyAnnotatedJPA/JPAAppEmployee.java | 1011 ++--
.../JPAAppFullTimeEmployee.java | 218 +-
.../pc/companyAnnotatedJPA/JPAAppInsurance.java | 492 +-
.../JPAAppMedicalInsurance.java | 188 +-
.../JPAAppPartTimeEmployee.java | 213 +-
.../tck/pc/companyAnnotatedJPA/JPAAppPerson.java | 891 +--
.../pc/companyAnnotatedJPA/JPAAppPhoneNumber.java | 331 +-
.../tck/pc/companyAnnotatedJPA/JPAAppProject.java | 683 +--
.../CompanyFactoryAnnotatedPCAppConcrete.java | 118 +-
.../CompanyFactoryAnnotatedPCAppPM.java | 118 +-
...CompanyFactoryAnnotatedPCConcreteDelegator.java | 26 +-
.../CompanyFactoryAnnotatedPCDSConcrete.java | 118 +-
.../CompanyFactoryAnnotatedPCDSPM.java | 118 +-
.../CompanyFactoryAnnotatedPCPMDelegator.java | 27 +-
.../tck/pc/companyAnnotatedPC/PCAppAddress.java | 604 +-
.../tck/pc/companyAnnotatedPC/PCAppCompany.java | 694 ++-
.../companyAnnotatedPC/PCAppDentalInsurance.java | 193 +-
.../tck/pc/companyAnnotatedPC/PCAppDepartment.java | 792 ++-
.../tck/pc/companyAnnotatedPC/PCAppEmployee.java | 1024 ++--
.../companyAnnotatedPC/PCAppFullTimeEmployee.java | 223 +-
.../tck/pc/companyAnnotatedPC/PCAppInsurance.java | 515 +-
.../companyAnnotatedPC/PCAppMedicalInsurance.java | 192 +-
.../companyAnnotatedPC/PCAppPartTimeEmployee.java | 219 +-
.../jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java | 815 ++-
.../tck/pc/companyAnnotatedPC/PCAppProject.java | 686 ++-
.../jdo/tck/pc/companyAnnotatedPC/PCDSAddress.java | 602 +-
.../jdo/tck/pc/companyAnnotatedPC/PCDSCompany.java | 699 ++-
.../pc/companyAnnotatedPC/PCDSDentalInsurance.java | 197 +-
.../tck/pc/companyAnnotatedPC/PCDSDepartment.java | 794 ++-
.../tck/pc/companyAnnotatedPC/PCDSEmployee.java | 1037 ++--
.../companyAnnotatedPC/PCDSFullTimeEmployee.java | 222 +-
.../tck/pc/companyAnnotatedPC/PCDSInsurance.java | 516 +-
.../companyAnnotatedPC/PCDSMedicalInsurance.java | 195 +-
.../companyAnnotatedPC/PCDSPartTimeEmployee.java | 216 +-
.../jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java | 815 ++-
.../jdo/tck/pc/companyAnnotatedPC/PCDSProject.java | 688 ++-
.../CompanyFactoryAnnotatedPIAppPM.java | 118 +-
.../CompanyFactoryAnnotatedPIDSPM.java | 118 +-
.../CompanyFactoryAnnotatedPIPMDelegator.java | 26 +-
.../CompanyFactoryAnnotatedPMInterface.java | 177 +-
.../tck/pc/companyAnnotatedPI/PIAppAddress.java | 57 +-
.../tck/pc/companyAnnotatedPI/PIAppCompany.java | 89 +-
.../companyAnnotatedPI/PIAppDentalInsurance.java | 29 +-
.../tck/pc/companyAnnotatedPI/PIAppDepartment.java | 85 +-
.../tck/pc/companyAnnotatedPI/PIAppEmployee.java | 163 +-
.../companyAnnotatedPI/PIAppFullTimeEmployee.java | 30 +-
.../tck/pc/companyAnnotatedPI/PIAppInsurance.java | 67 +-
.../companyAnnotatedPI/PIAppMedicalInsurance.java | 31 +-
.../companyAnnotatedPI/PIAppPartTimeEmployee.java | 28 +-
.../jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java | 117 +-
.../tck/pc/companyAnnotatedPI/PIAppProject.java | 82 +-
.../jdo/tck/pc/companyAnnotatedPI/PIDSAddress.java | 55 +-
.../jdo/tck/pc/companyAnnotatedPI/PIDSCompany.java | 90 +-
.../pc/companyAnnotatedPI/PIDSDentalInsurance.java | 24 +-
.../tck/pc/companyAnnotatedPI/PIDSDepartment.java | 84 +-
.../tck/pc/companyAnnotatedPI/PIDSEmployee.java | 158 +-
.../companyAnnotatedPI/PIDSFullTimeEmployee.java | 28 +-
.../tck/pc/companyAnnotatedPI/PIDSInsurance.java | 64 +-
.../companyAnnotatedPI/PIDSMedicalInsurance.java | 26 +-
.../companyAnnotatedPI/PIDSPartTimeEmployee.java | 26 +-
.../jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java | 114 +-
.../jdo/tck/pc/companyAnnotatedPI/PIDSProject.java | 84 +-
.../jdo/tck/pc/companyListWithoutJoin/Company.java | 575 +-
.../pc/companyListWithoutJoin/CompanyFactory.java | 43 +-
.../CompanyFactoryAbstractImpl.java | 170 +-
.../CompanyFactoryConcreteClass.java | 82 +-
.../CompanyFactoryPMClass.java | 71 +-
.../CompanyFactoryPMInterface.java | 69 +-
.../CompanyFactoryRegistry.java | 192 +-
.../companyListWithoutJoin/CompanyModelReader.java | 303 +-
.../tck/pc/companyListWithoutJoin/Department.java | 586 +-
.../tck/pc/companyListWithoutJoin/Employee.java | 651 ++-
.../companyListWithoutJoin/FullTimeEmployee.java | 167 +-
.../tck/pc/companyListWithoutJoin/ICompany.java | 43 +-
.../tck/pc/companyListWithoutJoin/IDepartment.java | 43 +-
.../tck/pc/companyListWithoutJoin/IEmployee.java | 80 +-
.../companyListWithoutJoin/IFullTimeEmployee.java | 24 +-
.../companyListWithoutJoin/IPartTimeEmployee.java | 22 +-
.../jdo/tck/pc/companyListWithoutJoin/IPerson.java | 48 +-
.../companyListWithoutJoin/PartTimeEmployee.java | 162 +-
.../jdo/tck/pc/companyListWithoutJoin/Person.java | 565 +-
.../jdo/tck/pc/companyMapWithoutJoin/Company.java | 575 +-
.../pc/companyMapWithoutJoin/CompanyFactory.java | 57 +-
.../CompanyFactoryAbstractImpl.java | 176 +-
.../CompanyFactoryConcreteClass.java | 96 +-
.../CompanyFactoryPMClass.java | 71 +-
.../CompanyFactoryPMInterface.java | 69 +-
.../CompanyFactoryRegistry.java | 192 +-
.../companyMapWithoutJoin/CompanyModelReader.java | 303 +-
.../tck/pc/companyMapWithoutJoin/Department.java | 588 +-
.../jdo/tck/pc/companyMapWithoutJoin/Employee.java | 696 +--
.../pc/companyMapWithoutJoin/FullTimeEmployee.java | 176 +-
.../jdo/tck/pc/companyMapWithoutJoin/ICompany.java | 43 +-
.../tck/pc/companyMapWithoutJoin/IDepartment.java | 43 +-
.../tck/pc/companyMapWithoutJoin/IEmployee.java | 86 +-
.../companyMapWithoutJoin/IFullTimeEmployee.java | 24 +-
.../companyMapWithoutJoin/IPartTimeEmployee.java | 22 +-
.../jdo/tck/pc/companyMapWithoutJoin/IPerson.java | 48 +-
.../pc/companyMapWithoutJoin/PartTimeEmployee.java | 171 +-
.../jdo/tck/pc/companyMapWithoutJoin/Person.java | 565 +-
.../ApplicationIdDiscriminatorClassName.java | 25 +-
.../org/apache/jdo/tck/pc/converter/IPCPoint.java | 14 +-
.../org/apache/jdo/tck/pc/converter/IPCRect.java | 14 +-
.../org/apache/jdo/tck/pc/converter/PCPoint.java | 80 +-
.../jdo/tck/pc/converter/PCPointAnnotated.java | 77 +-
.../apache/jdo/tck/pc/converter/PCPointProp.java | 80 +-
.../jdo/tck/pc/converter/PCPointPropAnnotated.java | 77 +-
.../org/apache/jdo/tck/pc/converter/PCRect.java | 84 +-
.../jdo/tck/pc/converter/PCRectAnnotated.java | 96 +-
.../org/apache/jdo/tck/pc/fieldtypes/AllTypes.java | 660 ++-
.../jdo/tck/pc/fieldtypes/ArrayCollections.java | 451 +-
.../tck/pc/fieldtypes/ArrayListCollections.java | 551 +-
.../tck/pc/fieldtypes/CollectionCollections.java | 511 +-
.../jdo/tck/pc/fieldtypes/FieldsOfBigDecimal.java | 1544 ++---
.../jdo/tck/pc/fieldtypes/FieldsOfBigInteger.java | 1544 ++---
.../jdo/tck/pc/fieldtypes/FieldsOfBoolean.java | 1543 ++---
.../apache/jdo/tck/pc/fieldtypes/FieldsOfByte.java | 1559 ++---
.../jdo/tck/pc/fieldtypes/FieldsOfCharacter.java | 1543 ++---
.../apache/jdo/tck/pc/fieldtypes/FieldsOfDate.java | 1544 ++---
.../jdo/tck/pc/fieldtypes/FieldsOfDouble.java | 1559 ++---
.../jdo/tck/pc/fieldtypes/FieldsOfFloat.java | 1559 ++---
.../jdo/tck/pc/fieldtypes/FieldsOfInteger.java | 1560 ++---
.../jdo/tck/pc/fieldtypes/FieldsOfLocale.java | 1544 ++---
.../apache/jdo/tck/pc/fieldtypes/FieldsOfLong.java | 1559 ++---
.../jdo/tck/pc/fieldtypes/FieldsOfObject.java | 1543 ++---
.../pc/fieldtypes/FieldsOfPrimitiveboolean.java | 1543 ++---
.../tck/pc/fieldtypes/FieldsOfPrimitivebyte.java | 1542 ++---
.../tck/pc/fieldtypes/FieldsOfPrimitivechar.java | 1543 ++---
.../tck/pc/fieldtypes/FieldsOfPrimitivedouble.java | 1544 ++---
.../tck/pc/fieldtypes/FieldsOfPrimitivefloat.java | 1543 ++---
.../tck/pc/fieldtypes/FieldsOfPrimitiveint.java | 1543 ++---
.../tck/pc/fieldtypes/FieldsOfPrimitivelong.java | 1544 ++---
.../tck/pc/fieldtypes/FieldsOfPrimitiveshort.java | 1543 ++---
.../jdo/tck/pc/fieldtypes/FieldsOfShort.java | 1559 ++---
.../jdo/tck/pc/fieldtypes/FieldsOfSimpleClass.java | 1796 +++---
.../jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.java | 1544 ++---
.../tck/pc/fieldtypes/FieldsOfSimpleInterface.java | 1543 ++---
.../jdo/tck/pc/fieldtypes/FieldsOfString.java | 1543 ++---
.../pc/fieldtypes/HashMapStringKeyCollections.java | 1059 ++--
.../fieldtypes/HashMapStringValueCollections.java | 992 ++--
.../jdo/tck/pc/fieldtypes/HashSetCollections.java | 511 +-
.../fieldtypes/HashtableStringKeyCollections.java | 1061 ++--
.../HashtableStringValueCollections.java | 991 ++--
.../tck/pc/fieldtypes/LinkedListCollections.java | 512 +-
.../jdo/tck/pc/fieldtypes/ListCollections.java | 511 +-
.../tck/pc/fieldtypes/MapStringKeyCollections.java | 1191 ++--
.../pc/fieldtypes/MapStringValueCollections.java | 1121 ++--
.../jdo/tck/pc/fieldtypes/SetCollections.java | 511 +-
.../apache/jdo/tck/pc/fieldtypes/SimpleClass.java | 150 +-
.../apache/jdo/tck/pc/fieldtypes/SimpleEnum.java | 206 +-
.../jdo/tck/pc/fieldtypes/SimpleInterface.java | 18 +-
.../pc/fieldtypes/TreeMapStringKeyCollections.java | 1062 ++--
.../fieldtypes/TreeMapStringValueCollections.java | 991 ++--
.../jdo/tck/pc/fieldtypes/TreeSetCollections.java | 471 +-
.../jdo/tck/pc/fieldtypes/VectorCollections.java | 512 +-
.../apache/jdo/tck/pc/inheritance/AllPersist.java | 122 +-
.../apache/jdo/tck/pc/inheritance/AllPersist2.java | 46 +-
.../apache/jdo/tck/pc/inheritance/AllPersist3.java | 44 +-
.../apache/jdo/tck/pc/inheritance/AllPersist4.java | 52 +-
.../apache/jdo/tck/pc/inheritance/Constants.java | 51 +-
.../jdo/tck/pc/inheritance/FieldSameName.java | 148 +-
.../jdo/tck/pc/inheritance/FieldSameName2.java | 94 +-
.../jdo/tck/pc/inheritance/FieldSameName3.java | 92 +-
.../jdo/tck/pc/inheritance/FieldSameName4.java | 100 +-
.../jdo/tck/pc/inheritance/TopNonPersist.java | 32 +-
.../jdo/tck/pc/inheritance/TopNonPersistB.java | 104 +-
.../jdo/tck/pc/inheritance/TopNonPersistC.java | 35 +-
.../jdo/tck/pc/inheritance/TopNonPersistD.java | 35 +-
.../jdo/tck/pc/inheritance/TopNonPersistE.java | 38 +-
.../jdo/tck/pc/inheritance/TopNonPersistF.java | 46 +-
.../jdo/tck/pc/inheritance/TopNonPersistG.java | 46 +-
.../jdo/tck/pc/inheritance/TopNonPersistH.java | 46 +-
.../apache/jdo/tck/pc/inheritance/TopPersist.java | 106 +-
.../apache/jdo/tck/pc/inheritance/TopPersistC.java | 33 +-
.../apache/jdo/tck/pc/inheritance/TopPersistD.java | 33 +-
.../apache/jdo/tck/pc/inheritance/TopPersistE.java | 36 +-
.../apache/jdo/tck/pc/inheritance/TopPersistF.java | 46 +-
.../apache/jdo/tck/pc/inheritance/TopPersistG.java | 44 +-
.../apache/jdo/tck/pc/inheritance/TopPersistH.java | 43 +-
.../instancecallbacks/InstanceCallbackClass.java | 398 +-
.../InstanceCallbackNonPersistFdsClass.java | 524 +-
.../jdo/tck/pc/lifecycle/StateTransitionObj.java | 200 +-
.../org/apache/jdo/tck/pc/mylib/MylibReader.java | 146 +-
.../java/org/apache/jdo/tck/pc/mylib/PCClass.java | 295 +-
.../java/org/apache/jdo/tck/pc/mylib/PCPoint.java | 158 +-
.../java/org/apache/jdo/tck/pc/mylib/PCPoint2.java | 211 +-
.../java/org/apache/jdo/tck/pc/mylib/PCRect.java | 162 +-
.../java/org/apache/jdo/tck/pc/mylib/Point.java | 83 +-
.../apache/jdo/tck/pc/mylib/PrimitiveTypes.java | 684 +--
.../apache/jdo/tck/pc/mylib/VersionedPCPoint.java | 178 +-
.../apache/jdo/tck/pc/newInstance/AAddress.java | 53 +-
.../jdo/tck/pc/newInstance/AAddress_bad.java | 61 +-
.../org/apache/jdo/tck/pc/newInstance/Address.java | 589 +-
.../apache/jdo/tck/pc/newInstance/Address_bad.java | 591 +-
.../apache/jdo/tck/pc/newInstance/IAddress.java | 53 +-
.../jdo/tck/pc/newInstance/IAddress_bad.java | 61 +-
.../java/org/apache/jdo/tck/pc/order/Order.java | 325 +-
.../org/apache/jdo/tck/pc/order/OrderFactory.java | 30 +-
.../jdo/tck/pc/order/OrderFactoryAbstractImpl.java | 86 +-
.../tck/pc/order/OrderFactoryConcreteClass.java | 62 +-
.../jdo/tck/pc/order/OrderFactoryPMClass.java | 54 +-
.../jdo/tck/pc/order/OrderFactoryPMInterface.java | 52 +-
.../jdo/tck/pc/order/OrderFactoryRegistry.java | 184 +-
.../org/apache/jdo/tck/pc/order/OrderItem.java | 386 +-
.../apache/jdo/tck/pc/order/OrderModelReader.java | 214 +-
.../tck/pc/query/JDOQLKeywordsAsFieldNames.java | 38 +-
.../apache/jdo/tck/pc/query/LocalDateSample.java | 74 +-
.../jdo/tck/pc/query/LocalDateTimeSample.java | 74 +-
.../apache/jdo/tck/pc/query/LocalTimeSample.java | 74 +-
.../org/apache/jdo/tck/pc/query/MathSample.java | 223 +-
.../jdo/tck/pc/query/NamedQueriesSample.java | 53 +-
.../java/org/apache/jdo/tck/pc/query/NoExtent.java | 42 +-
.../apache/jdo/tck/pc/query/OptionalSample.java | 207 +-
.../org/apache/jdo/tck/pc/query/TimeSample.java | 89 +-
.../org/apache/jdo/tck/pc/shoppingcart/Cart.java | 195 +-
.../apache/jdo/tck/pc/shoppingcart/CartEntry.java | 212 +-
.../apache/jdo/tck/pc/shoppingcart/Product.java | 142 +-
.../jdo/tck/pc/shoppingcart/Undetachable.java | 113 +-
.../AbstractPCPointSingleField.java | 58 +-
.../jdo/tck/pc/singlefieldidentity/Employee.java | 167 +-
.../pc/singlefieldidentity/FullTimeEmployee.java | 134 +-
.../PCPointSingleFieldByte.java | 149 +-
.../PCPointSingleFieldCharacter.java | 149 +-
.../PCPointSingleFieldDate.java | 153 +-
.../PCPointSingleFieldInteger.java | 149 +-
.../PCPointSingleFieldLong.java | 149 +-
.../PCPointSingleFieldPrimitivebyte.java | 130 +-
.../PCPointSingleFieldPrimitivechar.java | 130 +-
.../PCPointSingleFieldPrimitiveint.java | 130 +-
.../PCPointSingleFieldPrimitivelong.java | 130 +-
.../PCPointSingleFieldPrimitiveshort.java | 130 +-
.../PCPointSingleFieldShort.java | 149 +-
.../PCPointSingleFieldString.java | 149 +-
.../pc/singlefieldidentity/PartTimeEmployee.java | 132 +-
.../jdo/tck/pc/singlefieldidentity/Person.java | 299 +-
.../apache/jdo/tck/query/QueryElementHolder.java | 792 +--
.../java/org/apache/jdo/tck/query/QueryTest.java | 2897 +++++-----
.../apache/jdo/tck/query/api/AutoCloseable.java | 434 +-
.../org/apache/jdo/tck/query/api/ChangeQuery.java | 141 +-
.../java/org/apache/jdo/tck/query/api/Close.java | 195 +-
.../org/apache/jdo/tck/query/api/CloseAll.java | 136 +-
.../org/apache/jdo/tck/query/api/CompileQuery.java | 129 +-
.../apache/jdo/tck/query/api/DeclareImports.java | 245 +-
.../jdo/tck/query/api/DeclareParameters.java | 257 +-
.../apache/jdo/tck/query/api/DeclareVariables.java | 165 +-
.../org/apache/jdo/tck/query/api/ExecuteQuery.java | 265 +-
.../jdo/tck/query/api/ExecuteQueryWithArray.java | 221 +-
.../jdo/tck/query/api/ExecuteQueryWithMap.java | 225 +-
.../org/apache/jdo/tck/query/api/GetFetchPlan.java | 176 +-
.../apache/jdo/tck/query/api/GetIgnoreCache.java | 200 +-
.../jdo/tck/query/api/GetPersistenceManager.java | 194 +-
...sistenceManagerFromRestoredSerializedQuery.java | 193 +-
.../jdo/tck/query/api/InvalidNamedQuery.java | 67 +-
.../jdo/tck/query/api/MetadataSearchOrder.java | 176 +-
.../jdo/tck/query/api/NamedQueryNotFound.java | 69 +-
.../query/api/NamedQueryRepeatableAnnotations.java | 71 +-
.../apache/jdo/tck/query/api/NewNamedQuery.java | 135 +-
...ryFromExistingQueryBoundToPMFromSameVendor.java | 259 +-
.../api/NewQueryFromRestoredSerializedQuery.java | 195 +-
.../jdo/tck/query/api/NewQuerySingleString.java | 131 +-
.../tck/query/api/NewQueryWithCandidateClass.java | 105 +-
.../NewQueryWithCandidateClassAndCollection.java | 106 +-
.../api/NewQueryWithCandidateClassAndExtent.java | 112 +-
.../api/NewQueryWithCandidateClassAndFilter.java | 116 +-
...NewQueryWithCandidateClassCollectionFilter.java | 115 +-
.../jdo/tck/query/api/NewQueryWithExtent.java | 105 +-
.../tck/query/api/NewQueryWithExtentAndFilter.java | 114 +-
.../api/NewQueryWithSpecifiedLanguageAndQuery.java | 144 +-
.../org/apache/jdo/tck/query/api/QueryCancel.java | 420 +-
.../apache/jdo/tck/query/api/QueryExtentions.java | 105 +-
.../apache/jdo/tck/query/api/SampleQueries.java | 6053 ++++++++++----------
.../apache/jdo/tck/query/api/SaveAsNamedQuery.java | 128 +-
.../jdo/tck/query/api/SetCandidateCollection.java | 139 +-
.../jdo/tck/query/api/SetCandidateExtent.java | 135 +-
.../org/apache/jdo/tck/query/api/SetFilter.java | 122 +-
.../org/apache/jdo/tck/query/api/SetGrouping.java | 100 +-
.../apache/jdo/tck/query/api/SetIgnoreCache.java | 248 +-
.../org/apache/jdo/tck/query/api/SetOrdering.java | 201 +-
.../org/apache/jdo/tck/query/api/SetRange.java | 100 +-
.../org/apache/jdo/tck/query/api/SetResult.java | 122 +-
.../apache/jdo/tck/query/api/SetResultClass.java | 112 +-
.../org/apache/jdo/tck/query/api/SetUnique.java | 115 +-
.../tck/query/api/SetterReplacePreviousValues.java | 302 +-
.../jdo/tck/query/api/SingleStringQuery.java | 181 +-
.../jdo/tck/query/api/UnmodifiableQuery.java | 300 +-
.../jdo/tck/query/delete/DeleteCallback.java | 839 ++-
.../jdo/tck/query/delete/DeletePersistentAll.java | 443 +-
.../jdo/tck/query/delete/DeleteQueryElements.java | 454 +-
...nmentPrePostIncrementDecrementNotSupported.java | 217 +-
.../java/org/apache/jdo/tck/query/jdoql/Cast.java | 189 +-
.../query/jdoql/CharacterAndStringLiterals.java | 278 +-
.../jdoql/ComparingCollectionFieldToNull.java | 154 +-
...omparingPersistentAndNonPersistentInstance.java | 214 +-
.../tck/query/jdoql/DenoteUniquenessInFilter.java | 328 +-
...ExecuteQueryWhenPersistenceManagerIsClosed.java | 124 +-
...gMultipleQueriesSimultaneouslyIsThreadSafe.java | 273 +-
...eryWhenNoTransactionNoNontransactionalRead.java | 102 +-
.../org/apache/jdo/tck/query/jdoql/Having.java | 299 +-
.../query/jdoql/IdentifiersEqualFieldNames.java | 378 +-
.../apache/jdo/tck/query/jdoql/IfElseInFilter.java | 442 +-
.../jdo/tck/query/jdoql/IgnoreCacheFalse.java | 283 +-
...ctiveQueryInstanceInSamePersistenceManager.java | 171 +-
.../tck/query/jdoql/MultipleIdenticalImports.java | 295 +-
.../tck/query/jdoql/NamespaceOfIdentifiers.java | 127 +-
.../query/jdoql/NavigationComparisonWithNull.java | 870 ++-
.../jdoql/NavigationThroughACollectionField.java | 149 +-
.../jdoql/NavigationThroughANullValuedField.java | 356 +-
...NavigationThroughReferencesUsesDotOperator.java | 347 +-
.../apache/jdo/tck/query/jdoql/NegativeRange.java | 292 +-
.../jdoql/NullCollectionsAndContainsMethod.java | 225 +-
.../tck/query/jdoql/NullCollectionsAndIsEmpty.java | 132 +-
.../jdo/tck/query/jdoql/OrderingSpecification.java | 462 +-
.../jdoql/ParenthesesMarkOperatorPrecedence.java | 673 +--
.../apache/jdo/tck/query/jdoql/PositiveRange.java | 310 +-
.../jdo/tck/query/jdoql/QueryIsSerializable.java | 299 +-
.../jdoql/QueryResultPassedToAnotherQuery.java | 324 +-
.../jdo/tck/query/jdoql/QueryWithNoFilter.java | 134 +-
.../apache/jdo/tck/query/jdoql/RangeAsString.java | 315 +-
...ializedQueryInstanceLosesAssociationWithPM.java | 136 +-
.../query/jdoql/SeparateNamespaceForTypeNames.java | 207 +-
.../jdoql/WhiteSpaceIsACharacterAndIgnored.java | 220 +-
.../query/jdoql/keywords/InvalidUseOfKeywords.java | 162 +-
.../query/jdoql/keywords/KeywordsAsFieldNames.java | 157 +-
.../jdo/tck/query/jdoql/keywords/SingleString.java | 124 +-
.../ThisIsReservedWordForElementOfCollection.java | 110 +-
.../query/jdoql/keywords/UppercaseLowercase.java | 98 +-
.../keywords/UseOfThisToAcessHiddenField.java | 217 +-
.../tck/query/jdoql/methods/EnumMethodOrdinal.java | 161 +-
.../query/jdoql/methods/EnumMethodToString.java | 161 +-
.../MethodsAndObjectConstructionNotSupported.java | 99 +-
.../query/jdoql/methods/StartsWithAndEndsWith.java | 183 +-
.../jdoql/methods/SupportedCollectionMethods.java | 399 +-
.../query/jdoql/methods/SupportedDateMethods.java | 257 +-
.../jdoql/methods/SupportedJDOHelperMethods.java | 385 +-
.../query/jdoql/methods/SupportedListMethods.java | 215 +-
.../jdoql/methods/SupportedLocalDateMethods.java | 243 +-
.../methods/SupportedLocalDateTimeMethods.java | 365 +-
.../jdoql/methods/SupportedLocalTimeMethods.java | 247 +-
.../query/jdoql/methods/SupportedMapMethods.java | 388 +-
.../query/jdoql/methods/SupportedMathMethods.java | 1751 +++---
.../jdoql/methods/SupportedOptionalMethods.java | 1115 ++--
.../jdoql/methods/SupportedStringMethods.java | 1030 ++--
.../query/jdoql/methods/SupportedTimeMethods.java | 287 +-
.../tck/query/jdoql/operators/BinaryAddition.java | 159 +-
.../query/jdoql/operators/BinarySubtraction.java | 167 +-
.../jdoql/operators/BitwiseBinaryOperators.java | 409 +-
.../query/jdoql/operators/BitwiseComplement.java | 140 +-
.../query/jdoql/operators/BooleanLogicalAND.java | 196 +-
.../query/jdoql/operators/BooleanLogicalOR.java | 245 +-
.../tck/query/jdoql/operators/ComparisonTests.java | 179 +-
.../tck/query/jdoql/operators/ConditionalAND.java | 198 +-
.../tck/query/jdoql/operators/ConditionalOR.java | 199 +-
.../jdo/tck/query/jdoql/operators/Division.java | 177 +-
.../jdo/tck/query/jdoql/operators/Equality.java | 3067 ++++++----
...dComparisonsBetweenDateFieldsAndParameters.java | 337 +-
...risonsBetweenPrimitivesAndWrapperInstances.java | 152 +-
...omparisonsBetweenStringFieldsAndParameters.java | 281 +-
.../jdo/tck/query/jdoql/operators/GreaterThan.java | 3425 +++++++----
.../query/jdoql/operators/GreaterThanOrEqual.java | 3443 +++++++----
.../jdo/tck/query/jdoql/operators/Instanceof.java | 169 +-
.../jdo/tck/query/jdoql/operators/LessThan.java | 3430 +++++++----
.../tck/query/jdoql/operators/LessThanOrEqual.java | 3446 +++++++----
.../query/jdoql/operators/LogicalComplement.java | 386 +-
.../jdo/tck/query/jdoql/operators/Modulo.java | 190 +-
.../tck/query/jdoql/operators/Multiplication.java | 157 +-
.../jdo/tck/query/jdoql/operators/NotEquals.java | 3097 ++++++----
.../operators/PromotionOfNumericOperands.java | 137 +-
.../tck/query/jdoql/operators/SignInversion.java | 163 +-
.../query/jdoql/operators/StringConcatenation.java | 202 +-
.../jdo/tck/query/jdoql/operators/UnaryPlus.java | 113 +-
.../jdoql/parameters/BoundParameterCheck.java | 119 +-
.../parameters/DomainObjectsAsParameters.java | 571 +-
.../query/jdoql/parameters/ImplicitParameters.java | 339 +-
.../query/jdoql/parameters/MixedParameters.java | 210 +-
.../query/jdoql/parameters/OrderOfParameters.java | 162 +-
.../parameters/ParameterBoundToDifferentPM.java | 134 +-
...eclaredWithSameNameAsFieldOfCandidateClass.java | 245 +-
.../parameters/PrimitiveParameterPassedAsNull.java | 104 +-
.../query/jdoql/subqueries/AggregateOnSize.java | 120 +-
.../jdoql/subqueries/CorrelatedSubqueries.java | 418 +-
.../CorrelatedSubqueriesWithParameters.java | 334 +-
.../subqueries/MultipleCallsReplaceSubquery.java | 126 +-
.../jdoql/subqueries/NonCorrelatedSubqueries.java | 251 +-
.../NullCandidateCollectionExpression.java | 127 +-
.../jdoql/subqueries/NullSubqueryParameter.java | 111 +-
.../jdoql/subqueries/NullVariableDeclaration.java | 111 +-
.../tck/query/jdoql/subqueries/SubqueriesTest.java | 97 +-
.../subqueries/UnmodifiedSubqueryInstance.java | 211 +-
.../tck/query/jdoql/variables/MixedVariables.java | 222 +-
.../jdoql/variables/UnconstrainedVariable.java | 133 +-
...eclaredWithSameNameAsFieldOfCandidateClass.java | 138 +-
.../query/jdoql/variables/VariablesAndFields.java | 411 +-
.../jdoql/variables/VariablesWithoutExtent.java | 159 +-
.../jdo/tck/query/result/AggregateResult.java | 1877 +++---
.../apache/jdo/tck/query/result/DefaultResult.java | 117 +-
.../apache/jdo/tck/query/result/DefaultUnique.java | 705 +--
.../query/result/DistinctCandidateInstances.java | 248 +-
.../apache/jdo/tck/query/result/DistinctQuery.java | 337 +-
.../org/apache/jdo/tck/query/result/Grouping.java | 187 +-
.../apache/jdo/tck/query/result/IfElseResult.java | 389 +-
.../jdo/tck/query/result/ImmutableQueryResult.java | 282 +-
.../jdo/tck/query/result/MethodsInResult.java | 459 +-
.../jdo/tck/query/result/NPEInResultExpr.java | 196 +-
.../apache/jdo/tck/query/result/NullResults.java | 252 +-
.../result/ProjectedSCODoesNotTrackChanges.java | 266 +-
.../tck/query/result/ResultClassRequirements.java | 986 ++--
.../jdo/tck/query/result/ResultExpressions.java | 1331 ++---
.../apache/jdo/tck/query/result/ShapeOfResult.java | 730 +--
.../org/apache/jdo/tck/query/result/Unique.java | 281 +-
.../jdo/tck/query/result/VariableInResult.java | 425 +-
.../result/VariableInResultMultipleNavigation.java | 399 +-
.../query/result/VariableInResultNavigation.java | 478 +-
.../jdo/tck/query/result/classes/FullName.java | 210 +-
.../jdo/tck/query/result/classes/LongString.java | 140 +-
.../result/classes/MissingNoArgsConstructor.java | 104 +-
.../query/result/classes/NoFieldsNoMethods.java | 22 +-
.../tck/query/result/classes/PublicLongField.java | 72 +-
.../tck/query/result/classes/PublicPutMethod.java | 86 +-
.../jdo/tck/query/sql/AllowedAPIMethods.java | 383 +-
.../apache/jdo/tck/query/sql/ExecuteWithMap.java | 322 +-
.../org/apache/jdo/tck/query/sql/NewQuery.java | 125 +-
.../apache/jdo/tck/query/sql/NoCandidateClass.java | 139 +-
.../apache/jdo/tck/query/sql/ShapeOfResult.java | 348 +-
.../AfterCompletionMethodCalledWhenCommitted.java | 195 +-
.../AfterCompletionMethodCalledWhenRolledback.java | 197 +-
.../AfterSetRollbackOnlyCommitFails.java | 67 +-
.../transactions/BeforeCompletionMethodCalled.java | 184 +-
...oreCompletionMethodNotCalledBeforeRollback.java | 175 +-
.../org/apache/jdo/tck/transactions/Commit.java | 228 +-
.../tck/transactions/GetPersistenceManager.java | 127 +-
.../jdo/tck/transactions/GetRetainValues.java | 135 +-
.../GetRollbackOnlyReturnsFalseUntilSet.java | 96 +-
.../jdo/tck/transactions/GetSynchronization.java | 192 +-
.../org/apache/jdo/tck/transactions/IsActive.java | 133 +-
.../IsActiveUntilAfterCompletionMethodCalled.java | 202 +-
.../org/apache/jdo/tck/transactions/Rollback.java | 252 +-
.../jdo/tck/transactions/SetIsolationLevel.java | 263 +-
.../tck/transactions/SetNontransactionalRead.java | 252 +-
...ntransactionalReadCalledDuringTxCompletion.java | 214 +-
...etNontransactionalReadTrueWhenNotSupported.java | 115 +-
...transactionalWriteCalledDuringTxCompletion.java | 216 +-
.../apache/jdo/tck/transactions/SetOptimistic.java | 175 +-
.../SetOptimisticCalledDuringTxCompletion.java | 210 +-
.../SetOptimisticDuringTransaction.java | 142 +-
.../SetOptimisticTrueWhenNotSupported.java | 110 +-
.../jdo/tck/transactions/SetRetainValues.java | 110 +-
.../SetRetainValuesCalledDuringTxCompletion.java | 208 +-
.../SetRetainValuesTrueWhenNotSupported.java | 115 +-
.../jdo/tck/transactions/SetSynchronization.java | 179 +-
.../tck/transactions/SetSynchronizationToNull.java | 149 +-
.../WhenNontransactionalReadIsFalse.java | 220 +-
.../apache/jdo/tck/util/BatchResultPrinter.java | 422 +-
.../org/apache/jdo/tck/util/BatchTestRunner.java | 574 +-
.../org/apache/jdo/tck/util/ClassGenerator.java | 1377 ++---
.../org/apache/jdo/tck/util/ConsoleFileOutput.java | 108 +-
.../org/apache/jdo/tck/util/ConversionHelper.java | 250 +-
.../java/org/apache/jdo/tck/util/DeepEquality.java | 93 +-
.../org/apache/jdo/tck/util/EqualityHelper.java | 1676 +++---
.../apache/jdo/tck/util/GetSupportedOptions.java | 46 +-
.../jdo/tck/util/IntegerToStringConverter.java | 107 +-
.../apache/jdo/tck/util/JDOCustomDateEditor.java | 10 +-
.../org/apache/jdo/tck/util/JDOJdk14Logger.java | 135 +-
.../jdo/tck/util/PointToStringConverter.java | 138 +-
.../org/apache/jdo/tck/util/ResultSummary.java | 348 +-
.../java/org/apache/jdo/tck/util/RogueBarrier.java | 269 +-
.../org/apache/jdo/tck/util/SystemCfgSummary.java | 133 +-
.../org/apache/jdo/tck/util/TCKFileHandler.java | 558 +-
.../jdo/tck/util/ThreadExceptionHandler.java | 101 +-
.../apache/jdo/tck/util/signature/Formatter.java | 287 +-
.../jdo/tck/util/signature/SignatureVerifier.java | 3402 +++++------
.../apache/jdo/tck/util/signature/TypeHelper.java | 433 +-
1114 files changed, 173797 insertions(+), 168862 deletions(-)
diff --git a/api/src/main/java/javax/jdo/AttributeConverter.java b/api/src/main/java/javax/jdo/AttributeConverter.java
index 61e3dcfe..ea94c3a1 100644
--- a/api/src/main/java/javax/jdo/AttributeConverter.java
+++ b/api/src/main/java/javax/jdo/AttributeConverter.java
@@ -17,44 +17,50 @@
package javax.jdo;
/**
- * Converts persistent attribute values (fields or properties) to different
- * values stored in the underlying datastore and vice versa.
- * [TBD:
+ * Converts persistent attribute values (fields or properties) to different values stored in the
+ * underlying datastore and vice versa. [TBD:
+ *
* <ul>
- * <li>should we require that converters need access to any other information, e.g metadata? passed into the constructor</li>
- * <li>otherwise we assume there is a default constructor, and is instantiable using the current JDO class loader(s)</li>
- * </ul>]
- *
+ * <li>should we require that converters need access to any other information, e.g metadata?
+ * passed into the constructor
+ * <li>otherwise we assume there is a default constructor, and is instantiable using the current
+ * JDO class loader(s)
+ * </ul>
+ *
+ * ]
+ *
* @param <A> The type of persistent attribute (field or property).
* @param <D> The type to be used in the datastore.
*/
public interface AttributeConverter<A, D> {
- /**
- * Converts the given persistent attribute value to its representation in the datastore.
- * @param attributeValue Value of attribute
- * @return Value in datastore
- */
- D convertToDatastore(A attributeValue);
+ /**
+ * Converts the given persistent attribute value to its representation in the datastore.
+ *
+ * @param attributeValue Value of attribute
+ * @return Value in datastore
+ */
+ D convertToDatastore(A attributeValue);
- /**
- * Converts the given datastore value to its representation as a persistent attribute.
- * @param datastoreValue Value in datastore
- * @return Value in attribute
- */
- A convertToAttribute(D datastoreValue);
+ /**
+ * Converts the given datastore value to its representation as a persistent attribute.
+ *
+ * @param datastoreValue Value in datastore
+ * @return Value in attribute
+ */
+ A convertToAttribute(D datastoreValue);
- /**
- * Dummy converter to represent "use the implementation default for this type" when using annotations.
- */
- public static class UseDefault implements AttributeConverter<Object, Object>
- {
- public Object convertToDatastore(Object attributeValue) {
- throw new JDOUserException("This converter is not usable.");
- }
+ /**
+ * Dummy converter to represent "use the implementation default for this type" when using
+ * annotations.
+ */
+ public static class UseDefault implements AttributeConverter<Object, Object> {
+ public Object convertToDatastore(Object attributeValue) {
+ throw new JDOUserException("This converter is not usable.");
+ }
- public Object convertToAttribute(Object datastoreValue) {
- throw new JDOUserException("This converter is not usable.");
- }
- }
+ public Object convertToAttribute(Object datastoreValue) {
+ throw new JDOUserException("This converter is not usable.");
+ }
+ }
}
diff --git a/api/src/main/java/javax/jdo/Constants.java b/api/src/main/java/javax/jdo/Constants.java
index 18169f3b..8f4a69ce 100644
--- a/api/src/main/java/javax/jdo/Constants.java
+++ b/api/src/main/java/javax/jdo/Constants.java
@@ -25,1072 +25,941 @@ package javax.jdo;
*/
public interface Constants {
- /**
- * The JDO standard package name.
- * @since 3.1
- */
- static String JAVAX_JDO = "javax.jdo";
-
- /**
- * The JDO standard property string and option string prefix.
- */
- static String JAVAX_JDO_PREFIX = JAVAX_JDO + ".";
-
- /**
- * The name of the standard service configuration resource text file containing
- * the name of an implementation of {@link PersistenceManagerFactory}.
- * Constant value is <code>META-INF/services/javax.jdo.PersistenceManagerFactory</code>.
- *
- * @since 2.1
- */
- static String SERVICE_LOOKUP_PMF_RESOURCE_NAME
- = "META-INF/services/javax.jdo.PersistenceManagerFactory";
-
- /**
- * The name of the standard service configuration resource text file containing
- * the name of an enhancer of {@link JDOEnhancer}.
- * Constant value is <code>META-INF/services/javax.jdo.JDOEnhancer</code>.
- * @since 3.0
- */
- static String SERVICE_LOOKUP_ENHANCER_RESOURCE_NAME
- = "META-INF/services/javax.jdo.JDOEnhancer";
-
- /**
- * The name of the standard JDO configuration resource file(s).
- * Constant value is <code>META-INF/jdoconfig.xml</code>.
- *
- * @since 2.1
- */
- static String JDOCONFIG_RESOURCE_NAME
- = "META-INF/jdoconfig.xml";
-
- /**
- * The standard JDO configuration schema namespace.
- * Constant value is <code>https://db.apache.org/jdo/xmlns/jdoconfig</code>.
- *
- * @since 2.1
- */
- static String JDOCONFIG_XSD_NS
- = "https://db.apache.org/jdo/xmlns/jdoconfig";
-
- /**
- * The standard JDO metadata schema namespace.
- * Constant value is <code>https://db.apache.org/jdo/xmlns/jdo</code>.
- *
- * @since 2.1
- */
- static String JDO_XSD_NS
- = "https://db.apache.org/jdo/xmlns/jdo";
-
- /**
- * The standard JDO object-repository mapping schema namespace.
- * Constant value is <code>https://db.apache.org/jdo/xmlns/orm</code>.
- *
- * @since 2.1
- */
- static String ORM_XSD_NS
- = "https://db.apache.org/jdo/xmlns/orm";
-
- /**
- * The standard JDO query schema namespace.
- * Constant value is <code>https://db.apache.org/jdo/xmlns/jdoquery</code>.
- *
- * @since 2.1
- */
- static String JDOQUERY_XSD_NS
- = "https://db.apache.org/jdo/xmlns/jdoquery";
-
- /**
- * The name of the persistence manager factory element in the JDO
- * configuration file.
- * Constant value is <code>persistence-manager-factory</code>.
- *
- * @since 2.1
- */
- static String ELEMENT_PERSISTENCE_MANAGER_FACTORY
- = "persistence-manager-factory";
-
- /**
- * The name of the persistence manager factory element's "class" attribute.
- *
- * @since 2.1
- */
- static String PMF_ATTRIBUTE_CLASS
- = "class";
- /**
- * The name of the persistence manager factory element's
- * "name" attribute.
- *
- * @since 2.1
- */
- static String PMF_ATTRIBUTE_NAME
- = "name";
- /**
- * The name of the persistence manager factory element's
- * "persistence-unit-name" attribute.
- *
- * @since 2.1
- */
- static String PMF_ATTRIBUTE_PERSISTENCE_UNIT_NAME
- = "persistence-unit-name";
- /**
- * The name of the persistence manager factory element's "optimistic"
- * attribute.
- *
- * @since 2.1
- */
- static String PMF_ATTRIBUTE_OPTIMISTIC
- = "optimistic";
- /**
- * The name of the persistence manager factory element's "readonly"
- * attribute.
- *
- * @since 2.2
- */
- static String PMF_ATTRIBUTE_READONLY
- = "readonly";
- /**
- * The name of the persistence manager factory element's "retain-values"
- * attribute.
- *
- * @since 2.1
- */
- static String PMF_ATTRIBUTE_RETAIN_VALUES
- = "retain-values";
- /**
- * The name of the persistence manager factory element's "restore-values"
- * attribute.
- *
- * @since 2.1
- */
- static String PMF_ATTRIBUTE_RESTORE_VALUES
- = "restore-values";
- /**
- * The name of the persistence manager factory element's "ignore-cache"
- * attribute.
- *
- * @since 2.1
- */
- static String PMF_ATTRIBUTE_IGNORE_CACHE
- = "ignore-cache";
- /**
- * The name of the persistence manager factory element's
- * "nontransactional-read" attribute.
- *
- * @since 2.1
- */
- static String PMF_ATTRIBUTE_NONTRANSACTIONAL_READ
- = "nontransactional-read";
- /**
- * The name of the persistence manager factory element's
- * "nontransactional-write" attribute.
- *
- * @since 2.1
- */
- static String PMF_ATTRIBUTE_NONTRANSACTIONAL_WRITE
- = "nontransactional-write";
- /**
- * The name of the persistence manager factory element's "multithreaded"
- * attribute.
- *
- * @since 2.1
- */
- static String PMF_ATTRIBUTE_MULTITHREADED
- = "multithreaded";
- /**
- * The name of the persistence manager factory element's
- * "connection-driver-name" attribute.
- *
- * @since 2.1
- */
- static String PMF_ATTRIBUTE_CONNECTION_DRIVER_NAME
- = "connection-driver-name";
- /**
- * The name of the persistence manager factory element's
- * "connection-user-name" attribute.
- *
- * @since 2.1
- */
- static String PMF_ATTRIBUTE_CONNECTION_USER_NAME
- = "connection-user-name";
- /**
- * The name of the persistence manager factory element's
- * "connection-password" attribute.
- *
- * @since 2.1
- */
- static String PMF_ATTRIBUTE_CONNECTION_PASSWORD
- = "connection-password";
- /**
- * The name of the persistence manager factory element's "connection-url"
- * attribute.
- *
- * @since 2.1
- */
- static String PMF_ATTRIBUTE_CONNECTION_URL
- = "connection-url";
- /**
- * The name of the persistence manager factory element's
- * "connection-factory-name" attribute.
- *
- * @since 2.1
- */
- static String PMF_ATTRIBUTE_CONNECTION_FACTORY_NAME
- = "connection-factory-name";
- /**
- * The name of the persistence manager factory element's
- * "connection-factory2-name" attribute.
- *
- * @since 2.1
- */
- static String PMF_ATTRIBUTE_CONNECTION_FACTORY2_NAME
- = "connection-factory2-name";
- /**
- * The name of the persistence manager factory element's
- * "detach-all-on-commit" attribute.
- *
- * @since 2.1
- */
- static String PMF_ATTRIBUTE_DETACH_ALL_ON_COMMIT
- = "detach-all-on-commit";
- /**
- * The name of the persistence manager factory element's
- * "copy-on-attach" attribute.
- *
- * @since 2.1
- */
- static String PMF_ATTRIBUTE_COPY_ON_ATTACH
- = "copy-on-attach";
- /**
- * The name of the persistence manager factory element's "mapping"
- * attribute.
- *
- * @since 2.1
- */
- static String PMF_ATTRIBUTE_MAPPING
- = "mapping";
- /**
- * The name of the persistence manager factory element's
- * "server-time-zone-id" attribute.
- *
- * @since 2.1
- */
- static String PMF_ATTRIBUTE_SERVER_TIME_ZONE_ID
- = "server-time-zone-id";
- /**
- * The name of the persistence manager factory element's
- * "datastore-read-timeout-millis" attribute.
- *
- * @since 3.0
- */
- static String PMF_ATTRIBUTE_DATASTORE_READ_TIMEOUT_MILLIS
- = "datastore-read-timeout-millis";
- /**
- * The name of the persistence manager factory element's
- * "datastore-write-timeout-millis" attribute.
- *
- * @since 3.0
- */
- static String PMF_ATTRIBUTE_DATASTORE_WRITE_TIMEOUT_MILLIS
- = "datastore-write-timeout-millis";
- /**
- * The name of the persistence manager factory property elements in the JDO
- * configuration file.
- */
- static String ELEMENT_PROPERTY
- = "property";
- /**
- * The name of the persistence manager factory property element's "name"
- * attribute.
- */
- static String PROPERTY_ATTRIBUTE_NAME
- = "name";
- /**
- * The name of the persistence manager factory property element's "value"
- * attribute.
- */
- static String PROPERTY_ATTRIBUTE_VALUE
- = "value";
-
- /**
- * The name of the instance lifecycle listener element in the JDO
- * configuration file.
- */
- static String ELEMENT_INSTANCE_LIFECYCLE_LISTENER
- = "instance-lifecycle-listener";
-
- /**
- * The name of the instance lifecycle listener element's "listener"
- * attribute.
- */
- static String INSTANCE_LIFECYCLE_LISTENER_ATTRIBUTE_LISTENER
- = "listener";
- /**
- * The name of the instance lifecycle listener element's "classes"
- * attribute.
- */
- static String INSTANCE_LIFECYCLE_LISTENER_ATTRIBUTE_CLASSES
- = "classes";
-
- /**
- * "javax.jdo.option.TransientTransactional"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_TRANSACTIONAL_TRANSIENT
- = "javax.jdo.option.TransientTransactional";
- /**
- * "javax.jdo.option.NontransactionalRead"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_NONTRANSACTIONAL_READ
- = "javax.jdo.option.NontransactionalRead";
- /**
- * "javax.jdo.option.NontransactionalWrite"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_NONTRANSACTIONAL_WRITE
- = "javax.jdo.option.NontransactionalWrite";
- /**
- * "javax.jdo.option.RetainValues"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_RETAIN_VALUES
- = "javax.jdo.option.RetainValues";
- /**
- * "javax.jdo.option.Optimistic"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_OPTIMISTIC
- = "javax.jdo.option.Optimistic";
- /**
- * "javax.jdo.option.ApplicationIdentity"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_APPLICATION_IDENTITY
- = "javax.jdo.option.ApplicationIdentity";
- /**
- * "javax.jdo.option.DatastoreIdentity"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_DATASTORE_IDENTITY
- = "javax.jdo.option.DatastoreIdentity";
- /**
- * "javax.jdo.option.NonDurableIdentity"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_NONDURABLE_IDENTITY
- = "javax.jdo.option.NonDurableIdentity";
- /**
- * "javax.jdo.option.ArrayList"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_ARRAYLIST
- = "javax.jdo.option.ArrayList";
- /**
- * "javax.jdo.option.LinkedList"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_LINKEDLIST
- = "javax.jdo.option.LinkedList";
- /**
- * "javax.jdo.option.TreeMap"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_TREEMAP
- = "javax.jdo.option.TreeMap";
- /**
- * "javax.jdo.option.TreeSet"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_TREESET
- = "javax.jdo.option.TreeSet";
- /**
- * "javax.jdo.option.Vector"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_VECTOR
- = "javax.jdo.option.Vector";
- /**
- * "javax.jdo.option.Array"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_ARRAY
- = "javax.jdo.option.Array";
- /**
- * "javax.jdo.option.NullCollection"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_NULL_COLLECTION
- = "javax.jdo.option.NullCollection";
- /**
- * "javax.jdo.option.ChangeApplicationIdentity"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_CHANGE_APPLICATION_IDENTITY
- = "javax.jdo.option.ChangeApplicationIdentity";
- /**
- * "javax.jdo.option.BinaryCompatibility"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_BINARY_COMPATIBILITY
- = "javax.jdo.option.BinaryCompatibility";
- /**
- * "javax.jdo.option.GetDataStoreConnection"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_GET_DATASTORE_CONNECTION
- = "javax.jdo.option.GetDataStoreConnection";
- /**
- * "javax.jdo.option.GetJDBCConnection"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_GET_JDBC_CONNECTION
- = "javax.jdo.option.GetJDBCConnection";
- /**
- * "javax.jdo.query.SQL"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_QUERY_SQL = "javax.jdo.query.SQL";
-
- /**
- * "javax.jdo.option.QueryCancel"
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 3.0
- */
- static String OPTION_QUERY_CANCEL = "javax.jdo.option.QueryCancel";
-
- /**
- * "javax.jdo.query.JDOQL.BitwiseOperations"
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 3.2
- */
- static String OPTION_QUERY_JDOQL_BITWISE_OPERATIONS = "javax.jdo.query.JDOQL.BitwiseOperations";
-
- /**
- * "javax.jdo.query.JDOQL.UnconstrainedQueryVariables"
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_UNCONSTRAINED_QUERY_VARIABLES = "javax.jdo.query.JDOQL.UnconstrainedQueryVariables";
-
- /**
- * "javax.jdo.option.DatastoreTimeout"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 3.0
- */
- static String OPTION_DATASTORE_TIMEOUT
- = "javax.jdo.option.DatastoreTimeout";
- /**
- * "javax.jdo.option.version.DateTime"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_VERSION_DATETIME
- = "javax.jdo.option.version.DateTime";
- /**
- * "javax.jdo.option.version.StateImage"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_VERSION_STATE_IMAGE
- = "javax.jdo.option.version.StateImage";
- /**
- * "javax.jdo.option.PreDirtyEvent"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_PREDIRTY_EVENT
- = "javax.jdo.option.PreDirtyEvent";
- /**
- * "javax.jdo.option.mapping.HeterogeneousObjectType"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_MAPPING_HETEROGENEOUS_OBJECT_TYPE
- = "javax.jdo.option.mapping.HeterogeneousObjectType";
- /**
- * "javax.jdo.option.mapping.HeterogeneousInterfaceType"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_MAPPING_HETEROGENEOUS_INTERFACE_TYPE
- = "javax.jdo.option.mapping.HeterogeneousInterfaceType";
- /**
- * "javax.jdo.option.mapping.JoinedTablePerClass"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_MAPPING_JOINED_TABLE_PER_CLASS
- = "javax.jdo.option.mapping.JoinedTablePerClass";
- /**
- * "javax.jdo.option.mapping.JoinedTablePerConcreteClass"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_MAPPING_JOINED_TABLE_PER_CONCRETE_CLASS
- = "javax.jdo.option.mapping.JoinedTablePerConcreteClass";
- /**
- * "javax.jdo.option.mapping.NonJoinedTablePerConcreteClass"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_MAPPING_NON_JOINED_TABLE_PER_CONCRETE_CLASS
- = "javax.jdo.option.mapping.NonJoinedTablePerConcreteClass";
- /**
- * "javax.jdo.option.mapping.RelationSubclassTable"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.1
- */
- static String OPTION_MAPPING_RELATION_SUBCLASS_TABLE
- = "javax.jdo.option.mapping.RelationSubclassTable";
-
- /**
- * "javax.jdo.PersistenceManagerFactoryClass"
- *
- * @see JDOHelper#getPersistenceManagerFactory(java.util.Map)
- * @since 2.1
- */
- static String PROPERTY_PERSISTENCE_MANAGER_FACTORY_CLASS
- = "javax.jdo.PersistenceManagerFactoryClass";
-
- /**
- * "VendorName"
- *
- * @see JDOEnhancer#getProperties()
- * @since 3.0
- */
- public final static String PROPERTY_ENHANCER_VENDOR_NAME
- = "VendorName";
-
- /**
- * "VersionNumber"
- *
- * @see JDOEnhancer#getProperties()
- * @since 3.0
- */
- public final static String PROPERTY_ENHANCER_VERSION_NUMBER
- = "VersionNumber";
-
- /** Exit value for no enhancer found
- * @since 3.0
- * */
- public final static int ENHANCER_NO_JDO_ENHANCER_FOUND = 2;
-
- /** Exit value for usage error
- * @since 3.0
- * */
- public final static int ENHANCER_USAGE_ERROR = 3;
-
- /** Exit value for an exception from the JDOEnhancer
- * @since 3.0
- * */
- public final static int ENHANCER_EXCEPTION = 1;
-
- /**
- * "javax.jdo.option.Optimistic"
- *
- * @see PersistenceManagerFactory#getOptimistic()
- * @since 2.1
- */
- static String PROPERTY_OPTIMISTIC
- = "javax.jdo.option.Optimistic";
- /**
- * "javax.jdo.option.ReadOnly"
- *
- * @see PersistenceManagerFactory#getReadOnly()
- * @since 2.2
- */
- static String PROPERTY_READONLY
- = "javax.jdo.option.ReadOnly";
- /**
- * "javax.jdo.option.RetainValues"
- *
- * @see PersistenceManagerFactory#getRetainValues()
- * @since 2.1
- */
- static String PROPERTY_RETAIN_VALUES
- = "javax.jdo.option.RetainValues";
- /**
- * "javax.jdo.option.RestoreValues"
- *
- * @see PersistenceManagerFactory#getRestoreValues()
- * @since 2.1
- */
- static String PROPERTY_RESTORE_VALUES
- = "javax.jdo.option.RestoreValues";
- /**
- * "javax.jdo.option.IgnoreCache"
- *
- * @see PersistenceManagerFactory#getIgnoreCache()
- * @since 2.1
- */
- static String PROPERTY_IGNORE_CACHE
- = "javax.jdo.option.IgnoreCache";
- /**
- * "javax.jdo.option.NontransactionalRead"
- *
- * @see PersistenceManagerFactory#getNontransactionalRead()
- * @since 2.1
- */
- static String PROPERTY_NONTRANSACTIONAL_READ
- = "javax.jdo.option.NontransactionalRead";
- /**
- * "javax.jdo.option.NontransactionalWrite"
- *
- * @see PersistenceManagerFactory#getNontransactionalWrite()
- * @since 2.1
- */
- static String PROPERTY_NONTRANSACTIONAL_WRITE
- = "javax.jdo.option.NontransactionalWrite";
- /**
- * "javax.jdo.option.Multithreaded"
- *
- * @see PersistenceManagerFactory#getMultithreaded()
- * @since 2.1
- */
- static String PROPERTY_MULTITHREADED
- = "javax.jdo.option.Multithreaded";
- /**
- * "javax.jdo.option.TransactionIsolationLevel"
- *
- * @since 2.2
- */
- static String PROPERTY_TRANSACTION_ISOLATION_LEVEL
- = "javax.jdo.option.TransactionIsolationLevel";
- /**
- * "javax.jdo.option.TransactionIsolationLevel.read-uncommitted"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.2
- */
- static String PROPERTY_TRANSACTION_ISOLATION_LEVEL_READ_UNCOMMITTED
- = "javax.jdo.option.TransactionIsolationLevel.read-uncommitted";
- /**
- * "javax.jdo.option.TransactionIsolationLevel.read-committed"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.2
- */
- static String PROPERTY_TRANSACTION_ISOLATION_LEVEL_READ_COMMITTED
- = "javax.jdo.option.TransactionIsolationLevel.read-committed";
- /**
- * "javax.jdo.option.TransactionIsolationLevel.repeatable-read"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.2
- */
- static String PROPERTY_TRANSACTION_ISOLATION_LEVEL_REPEATABLE_READ
- = "javax.jdo.option.TransactionIsolationLevel.repeatable-read";
- /**
- * "javax.jdo.option.TransactionIsolationLevel.snapshot"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.2
- */
- static String PROPERTY_TRANSACTION_ISOLATION_LEVEL_SNAPSHOT
- = "javax.jdo.option.TransactionIsolationLevel.snapshot";
- /**
- * "javax.jdo.option.TransactionIsolationLevel.serializable"
- *
- * @see PersistenceManagerFactory#supportedOptions()
- * @since 2.2
- */
- static String PROPERTY_TRANSACTION_ISOLATION_LEVEL_SERIALIZABLE
- = "javax.jdo.option.TransactionIsolationLevel.serializable";
- /**
- * "javax.jdo.option.DetachAllOnCommit"
- *
- * @see PersistenceManagerFactory#getDetachAllOnCommit()
- * @since 2.1
- */
- static String PROPERTY_DETACH_ALL_ON_COMMIT
- = "javax.jdo.option.DetachAllOnCommit";
- /**
- * "javax.jdo.option.CopyOnAttach"
- *
- * @see PersistenceManagerFactory#getCopyOnAttach()
- * @since 2.1
- */
- static String PROPERTY_COPY_ON_ATTACH
- = "javax.jdo.option.CopyOnAttach";
- /**
- * "javax.jdo.option.ConnectionDriverName"
- * This property might be ignored by the JDO implementation
- * because the JDBC DriverManager handles the driver name.
- * @see PersistenceManagerFactory#getConnectionDriverName()
- * @since 2.1
- */
- static String PROPERTY_CONNECTION_DRIVER_NAME
- = "javax.jdo.option.ConnectionDriverName";
- /**
- * "javax.jdo.option.ConnectionUserName"
- *
- * @see PersistenceManagerFactory#getConnectionUserName()
- * @since 2.1
- */
- static String PROPERTY_CONNECTION_USER_NAME
- = "javax.jdo.option.ConnectionUserName";
- /**
- * "javax.jdo.option.Password"
- *
- * @since 2.1
- */
- static String PROPERTY_CONNECTION_PASSWORD
- = "javax.jdo.option.ConnectionPassword";
- /**
- * "javax.jdo.option.ConnectionURL"
- *
- * @see PersistenceManagerFactory#getConnectionURL()
- * @since 2.1
- */
- static String PROPERTY_CONNECTION_URL
- = "javax.jdo.option.ConnectionURL";
- /**
- * "javax.jdo.option.ConnectionFactoryName"
- *
- * @see PersistenceManagerFactory#getConnectionFactoryName()
- * @since 2.1
- */
- static String PROPERTY_CONNECTION_FACTORY_NAME
- = "javax.jdo.option.ConnectionFactoryName";
- /**
- * "javax.jdo.option.ConnectionFactory2Name"
- *
- * @see PersistenceManagerFactory#getConnectionFactory2Name()
- * @since 2.1
- */
- static String PROPERTY_CONNECTION_FACTORY2_NAME
- = "javax.jdo.option.ConnectionFactory2Name";
- /**
- * "javax.jdo.option.Mapping"
- *
- * @see PersistenceManagerFactory#getMapping()
- * @since 2.1
- */
- static String PROPERTY_MAPPING
- = "javax.jdo.option.Mapping";
- /**
- * "javax.jdo.option.PersistenceUnitName"
- *
- * @see PersistenceManagerFactory#getPersistenceUnitName()
- * @since 2.1
- */
- static String PROPERTY_PERSISTENCE_UNIT_NAME
- = "javax.jdo.option.PersistenceUnitName";
- /**
- * "javax.jdo.option.Name"
- *
- * @see PersistenceManagerFactory#getName()
- * @since 2.1
- */
- static String PROPERTY_NAME
- = "javax.jdo.option.Name";
-
- /**
- * "javax.jdo.spi.PropertiesFileName"
- *
- * @since 3.2
- */
- static String PROPERTY_SPI_PROPERTIES_FILE_NAME
- = "javax.jdo.spi.PropertiesFileName";
-
- /**
- * "javax.jdo.option.spi.ResourceName"
- * @since 2.1
- */
- static String PROPERTY_SPI_RESOURCE_NAME
- = "javax.jdo.option.spi.ResourceName";
-
- /**
- * "javax.jdo.listener.InstanceLifecycleListener"
- *
- * @see PersistenceManagerFactory#addInstanceLifecycleListener(javax.jdo.listener.InstanceLifecycleListener,Class[])
- * @see PersistenceManagerFactory#removeInstanceLifecycleListener(javax.jdo.listener.InstanceLifecycleListener)
- */
- static String PROPERTY_INSTANCE_LIFECYCLE_LISTENER
- = "javax.jdo.listener.InstanceLifecycleListener";
-
- /**
- * Prefix used to configure
- * {@link javax.jdo.listener.InstanceLifecycleListener} instances
- * externally.
- * To configure an <code>InstanceLifecycleListener</code> via properties,
- * create a property name with the prefix of
- * this constant and append the fully qualified listener class name, then
- * set its value to the comma- or whitespace-delimited list
- * of persistence-capable classes whose instances are to be observed.
- * Use no value to indicate that instances of
- * all persistence-capable classes are to be observed.<br>
- * For example,<br>
- * <code>javax.jdo.option.InstanceLifecycleListener.com.example.MyListener=com.example.Foo,com.example.Bar</code><br>
- * is equivalent to calling<br>
- * <code>pmf.addInstanceLifecycleListener(new com.example.MyListener(), new Class[] {com.example.Foo.class, com.example.Bar.class});</code><br>
- * where <code>pmf</code> is an instance of type
- * <code>PersistenceManagerFactory</code>.
- *
- * @see javax.jdo.PersistenceManagerFactory#addInstanceLifecycleListener(javax.jdo.listener.InstanceLifecycleListener,Class[])
- * @since 2.1
- */
- static String PROPERTY_PREFIX_INSTANCE_LIFECYCLE_LISTENER
- = PROPERTY_INSTANCE_LIFECYCLE_LISTENER + ".";
-
- /**
- * Mapping "javax.jdo.mapping.Catalog"
- *
- * @since 2.1
- */
- static String PROPERTY_MAPPING_CATALOG
- = "javax.jdo.mapping.Catalog";
- /**
- * Mapping "javax.jdo.mapping.Schema"
- *
- * @since 2.1
- */
- static String PROPERTY_MAPPING_SCHEMA
- = "javax.jdo.mapping.Schema";
-
- /**
- * Specified value "javax.jdo.option.ServerTimeZoneID"
- *
- * @since 2.1
- */
- static String PROPERTY_SERVER_TIME_ZONE_ID
- = "javax.jdo.option.ServerTimeZoneID";
-
- /**
- * Specified value "javax.jdo.option.DatastoreReadTimeoutMillis"
- *
- * @since 3.0
- */
- static String PROPERTY_DATASTORE_READ_TIMEOUT_MILLIS
- = "javax.jdo.option.DatastoreReadTimeoutMillis";
-
- /**
- * Specified value "javax.jdo.option.DatastoreWriteTimeoutMillis"
- *
- * @since 3.0
- */
- static String PROPERTY_DATASTORE_WRITE_TIMEOUT_MILLIS
- = "javax.jdo.option.DatastoreWriteTimeoutMillis";
-
- /**
- * Nonconfigurable property constant "VendorName"
- *
- * @see PersistenceManagerFactory#getProperties()
- * @since 2.1
- */
- static String NONCONFIGURABLE_PROPERTY_VENDOR_NAME
- = "VendorName";
-
- /**
- * Nonconfigurable property constant "VersionNumber"
- *
- * @see PersistenceManagerFactory#getProperties()
- * @since 2.1
- */
- static String NONCONFIGURABLE_PROPERTY_VERSION_NUMBER
- = "VersionNumber";
-
- /**
- * Specified value "javax.jdo.option.TransactionType"
- *
- * @since 2.1
- */
- static String PROPERTY_TRANSACTION_TYPE
- = "javax.jdo.option.TransactionType";
-
- /**
- * The value for TransactionType to specify that transactions
- * are managed by the Java Transactions API, as documented in
- * JSR-220.
- *
- * @since 2.1
- */
- static String JTA
- = "JTA";
-
- /**
- * The value for TransactionType to specify that transactions
- * are managed by the javax.jdo.Transaction instance, similar
- * to the usage as documented in JSR-220.
- *
- * @since 2.1
- */
- static String RESOURCE_LOCAL
- = "RESOURCE_LOCAL";
-
- /**
- * The name of the resource for the DTD of the standard JDO configuration
- * file.
- *
- * @since 2.1
- */
- static String JDOCONFIG_DTD_RESOURCE
- = "javax/jdo/jdoconfig_3_0.dtd";
-
- /**
- * The name of the resource for the XML schema of the standard JDO
- * configuration file.
- *
- * @since 2.1
- */
- static String JDOCONFIG_XSD_RESOURCE
- = "javax/jdo/jdoconfig_3_0.xsd";
-
- /**
- * The name of the resource for the DTD of the standard JDO metadata file.
- *
- * @since 2.1
- */
- static String JDO_DTD_RESOURCE
- = "javax/jdo/jdo_3_0.dtd";
-
- /**
- * The name of the resource for the XML schema of the standard JDO
- * metadata file.
- *
- * @since 2.1
- */
- static String JDO_XSD_RESOURCE
- = "javax/jdo/jdo_3_0.xsd";
-
- /**
- * The name of the resource for the DTD of the standard JDO
- * object-relational mapping metadata file.
- *
- * @since 2.1
- */
- static String ORM_DTD_RESOURCE
- = "javax/jdo/orm_3_0.dtd";
-
- /**
- * The name of the resource for the XML schema of the standard JDO
- * object-relational mapping metadata file.
- *
- * @since 2.1
- */
- static String ORM_XSD_RESOURCE
- = "javax/jdo/orm_3_0.xsd";
-
- /**
- * The name of the resource for the DTD of the standard JDO query
- * metadata file.
- *
- * @since 2.1
- */
- static String JDOQUERY_DTD_RESOURCE
- = "javax/jdo/jdoquery_3_0.dtd";
-
- /**
- * The name of the resource for the XML schema of the standard JDO query
- * metadata file.
- *
- * @since 2.1
- */
- static String JDOQUERY_XSD_RESOURCE
- = "javax/jdo/jdoquery_3_0.xsd";
-
- /**
- * The name of the anonymous PersistenceManagerFactory, which
- * is the empty string.
- *
- * @since 2.1
- */
- static String ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME
- = "";
-
- /**
- * Transaction isolation level representing the ability to read
- * uncommitted data.
- * @see PersistenceManagerFactory#getTransactionIsolationLevel()
- * @see Transaction#getIsolationLevel()
- * @since 2.2
- */
- public static final String TX_READ_UNCOMMITTED = "read-uncommitted";
-
- /**
- * Transaction isolation level representing the requirement to read
- * committed data only.
- * @see PersistenceManagerFactory#getTransactionIsolationLevel()
- * @see Transaction#getIsolationLevel()
- * @since 2.2
- */
- public static final String TX_READ_COMMITTED = "read-committed";
-
- /**
- * Transaction isolation level representing the requirement to read
- * the same data in the same transaction.
- * @see PersistenceManagerFactory#getTransactionIsolationLevel()
- * @see Transaction#getIsolationLevel()
- * @since 2.2
- */
- public static final String TX_REPEATABLE_READ = "repeatable-read";
-
- /**
- * Transaction isolation level representing the requirement to keep
- * a snapshot for reading data.
- * @see PersistenceManagerFactory#getTransactionIsolationLevel()
- * @see Transaction#getIsolationLevel()
- * @since 2.2
- */
- public static final String TX_SNAPSHOT = "snapshot";
-
- /**
- * Transaction isolation level representing the requirement to serialize
- * transactions.
- * @see PersistenceManagerFactory#getTransactionIsolationLevel()
- * @see Transaction#getIsolationLevel()
- * @since 2.2
- */
- public static final String TX_SERIALIZABLE = "serializable";
+ /**
+ * The JDO standard package name.
+ *
+ * @since 3.1
+ */
+ static String JAVAX_JDO = "javax.jdo";
+
+ /** The JDO standard property string and option string prefix. */
+ static String JAVAX_JDO_PREFIX = JAVAX_JDO + ".";
+
+ /**
+ * The name of the standard service configuration resource text file containing the name of an
+ * implementation of {@link PersistenceManagerFactory}. Constant value is <code>
+ * META-INF/services/javax.jdo.PersistenceManagerFactory</code>.
+ *
+ * @since 2.1
+ */
+ static String SERVICE_LOOKUP_PMF_RESOURCE_NAME =
+ "META-INF/services/javax.jdo.PersistenceManagerFactory";
+
+ /**
+ * The name of the standard service configuration resource text file containing the name of an
+ * enhancer of {@link JDOEnhancer}. Constant value is <code>
+ * META-INF/services/javax.jdo.JDOEnhancer</code>.
+ *
+ * @since 3.0
+ */
+ static String SERVICE_LOOKUP_ENHANCER_RESOURCE_NAME = "META-INF/services/javax.jdo.JDOEnhancer";
+
+ /**
+ * The name of the standard JDO configuration resource file(s). Constant value is <code>
+ * META-INF/jdoconfig.xml</code>.
+ *
+ * @since 2.1
+ */
+ static String JDOCONFIG_RESOURCE_NAME = "META-INF/jdoconfig.xml";
+
+ /**
+ * The standard JDO configuration schema namespace. Constant value is <code>
+ * https://db.apache.org/jdo/xmlns/jdoconfig</code>.
+ *
+ * @since 2.1
+ */
+ static String JDOCONFIG_XSD_NS = "https://db.apache.org/jdo/xmlns/jdoconfig";
+
+ /**
+ * The standard JDO metadata schema namespace. Constant value is <code>
+ * https://db.apache.org/jdo/xmlns/jdo</code>.
+ *
+ * @since 2.1
+ */
+ static String JDO_XSD_NS = "https://db.apache.org/jdo/xmlns/jdo";
+
+ /**
+ * The standard JDO object-repository mapping schema namespace. Constant value is <code>
+ * https://db.apache.org/jdo/xmlns/orm</code>.
+ *
+ * @since 2.1
+ */
+ static String ORM_XSD_NS = "https://db.apache.org/jdo/xmlns/orm";
+
+ /**
+ * The standard JDO query schema namespace. Constant value is <code>
+ * https://db.apache.org/jdo/xmlns/jdoquery</code>.
+ *
+ * @since 2.1
+ */
+ static String JDOQUERY_XSD_NS = "https://db.apache.org/jdo/xmlns/jdoquery";
+
+ /**
+ * The name of the persistence manager factory element in the JDO configuration file. Constant
+ * value is <code>persistence-manager-factory</code>.
+ *
+ * @since 2.1
+ */
+ static String ELEMENT_PERSISTENCE_MANAGER_FACTORY = "persistence-manager-factory";
+
+ /**
+ * The name of the persistence manager factory element's "class" attribute.
+ *
+ * @since 2.1
+ */
+ static String PMF_ATTRIBUTE_CLASS = "class";
+ /**
+ * The name of the persistence manager factory element's "name" attribute.
+ *
+ * @since 2.1
+ */
+ static String PMF_ATTRIBUTE_NAME = "name";
+ /**
+ * The name of the persistence manager factory element's "persistence-unit-name" attribute.
+ *
+ * @since 2.1
+ */
+ static String PMF_ATTRIBUTE_PERSISTENCE_UNIT_NAME = "persistence-unit-name";
+ /**
+ * The name of the persistence manager factory element's "optimistic" attribute.
+ *
+ * @since 2.1
+ */
+ static String PMF_ATTRIBUTE_OPTIMISTIC = "optimistic";
+ /**
+ * The name of the persistence manager factory element's "readonly" attribute.
+ *
+ * @since 2.2
+ */
+ static String PMF_ATTRIBUTE_READONLY = "readonly";
+ /**
+ * The name of the persistence manager factory element's "retain-values" attribute.
+ *
+ * @since 2.1
+ */
+ static String PMF_ATTRIBUTE_RETAIN_VALUES = "retain-values";
+ /**
+ * The name of the persistence manager factory element's "restore-values" attribute.
+ *
+ * @since 2.1
+ */
+ static String PMF_ATTRIBUTE_RESTORE_VALUES = "restore-values";
+ /**
+ * The name of the persistence manager factory element's "ignore-cache" attribute.
+ *
+ * @since 2.1
+ */
+ static String PMF_ATTRIBUTE_IGNORE_CACHE = "ignore-cache";
+ /**
+ * The name of the persistence manager factory element's "nontransactional-read" attribute.
+ *
+ * @since 2.1
+ */
+ static String PMF_ATTRIBUTE_NONTRANSACTIONAL_READ = "nontransactional-read";
+ /**
+ * The name of the persistence manager factory element's "nontransactional-write" attribute.
+ *
+ * @since 2.1
+ */
+ static String PMF_ATTRIBUTE_NONTRANSACTIONAL_WRITE = "nontransactional-write";
+ /**
+ * The name of the persistence manager factory element's "multithreaded" attribute.
+ *
+ * @since 2.1
+ */
+ static String PMF_ATTRIBUTE_MULTITHREADED = "multithreaded";
+ /**
+ * The name of the persistence manager factory element's "connection-driver-name" attribute.
+ *
+ * @since 2.1
+ */
+ static String PMF_ATTRIBUTE_CONNECTION_DRIVER_NAME = "connection-driver-name";
+ /**
+ * The name of the persistence manager factory element's "connection-user-name" attribute.
+ *
+ * @since 2.1
+ */
+ static String PMF_ATTRIBUTE_CONNECTION_USER_NAME = "connection-user-name";
+ /**
+ * The name of the persistence manager factory element's "connection-password" attribute.
+ *
+ * @since 2.1
+ */
+ static String PMF_ATTRIBUTE_CONNECTION_PASSWORD = "connection-password";
+ /**
+ * The name of the persistence manager factory element's "connection-url" attribute.
+ *
+ * @since 2.1
+ */
+ static String PMF_ATTRIBUTE_CONNECTION_URL = "connection-url";
+ /**
+ * The name of the persistence manager factory element's "connection-factory-name" attribute.
+ *
+ * @since 2.1
+ */
+ static String PMF_ATTRIBUTE_CONNECTION_FACTORY_NAME = "connection-factory-name";
+ /**
+ * The name of the persistence manager factory element's "connection-factory2-name" attribute.
+ *
+ * @since 2.1
+ */
+ static String PMF_ATTRIBUTE_CONNECTION_FACTORY2_NAME = "connection-factory2-name";
+ /**
+ * The name of the persistence manager factory element's "detach-all-on-commit" attribute.
+ *
+ * @since 2.1
+ */
+ static String PMF_ATTRIBUTE_DETACH_ALL_ON_COMMIT = "detach-all-on-commit";
+ /**
+ * The name of the persistence manager factory element's "copy-on-attach" attribute.
+ *
+ * @since 2.1
+ */
+ static String PMF_ATTRIBUTE_COPY_ON_ATTACH = "copy-on-attach";
+ /**
+ * The name of the persistence manager factory element's "mapping" attribute.
+ *
+ * @since 2.1
+ */
+ static String PMF_ATTRIBUTE_MAPPING = "mapping";
+ /**
+ * The name of the persistence manager factory element's "server-time-zone-id" attribute.
+ *
+ * @since 2.1
+ */
+ static String PMF_ATTRIBUTE_SERVER_TIME_ZONE_ID = "server-time-zone-id";
+ /**
+ * The name of the persistence manager factory element's "datastore-read-timeout-millis"
+ * attribute.
+ *
+ * @since 3.0
+ */
+ static String PMF_ATTRIBUTE_DATASTORE_READ_TIMEOUT_MILLIS = "datastore-read-timeout-millis";
+ /**
+ * The name of the persistence manager factory element's "datastore-write-timeout-millis"
+ * attribute.
+ *
+ * @since 3.0
+ */
+ static String PMF_ATTRIBUTE_DATASTORE_WRITE_TIMEOUT_MILLIS = "datastore-write-timeout-millis";
+ /**
+ * The name of the persistence manager factory property elements in the JDO configuration file.
+ */
+ static String ELEMENT_PROPERTY = "property";
+ /** The name of the persistence manager factory property element's "name" attribute. */
+ static String PROPERTY_ATTRIBUTE_NAME = "name";
+ /** The name of the persistence manager factory property element's "value" attribute. */
+ static String PROPERTY_ATTRIBUTE_VALUE = "value";
+
+ /** The name of the instance lifecycle listener element in the JDO configuration file. */
+ static String ELEMENT_INSTANCE_LIFECYCLE_LISTENER = "instance-lifecycle-listener";
+
+ /** The name of the instance lifecycle listener element's "listener" attribute. */
+ static String INSTANCE_LIFECYCLE_LISTENER_ATTRIBUTE_LISTENER = "listener";
+ /** The name of the instance lifecycle listener element's "classes" attribute. */
+ static String INSTANCE_LIFECYCLE_LISTENER_ATTRIBUTE_CLASSES = "classes";
+
+ /**
+ * "javax.jdo.option.TransientTransactional"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_TRANSACTIONAL_TRANSIENT = "javax.jdo.option.TransientTransactional";
+ /**
+ * "javax.jdo.option.NontransactionalRead"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_NONTRANSACTIONAL_READ = "javax.jdo.option.NontransactionalRead";
+ /**
+ * "javax.jdo.option.NontransactionalWrite"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_NONTRANSACTIONAL_WRITE = "javax.jdo.option.NontransactionalWrite";
+ /**
+ * "javax.jdo.option.RetainValues"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_RETAIN_VALUES = "javax.jdo.option.RetainValues";
+ /**
+ * "javax.jdo.option.Optimistic"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_OPTIMISTIC = "javax.jdo.option.Optimistic";
+ /**
+ * "javax.jdo.option.ApplicationIdentity"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_APPLICATION_IDENTITY = "javax.jdo.option.ApplicationIdentity";
+ /**
+ * "javax.jdo.option.DatastoreIdentity"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_DATASTORE_IDENTITY = "javax.jdo.option.DatastoreIdentity";
+ /**
+ * "javax.jdo.option.NonDurableIdentity"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_NONDURABLE_IDENTITY = "javax.jdo.option.NonDurableIdentity";
+ /**
+ * "javax.jdo.option.ArrayList"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_ARRAYLIST = "javax.jdo.option.ArrayList";
+ /**
+ * "javax.jdo.option.LinkedList"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_LINKEDLIST = "javax.jdo.option.LinkedList";
+ /**
+ * "javax.jdo.option.TreeMap"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_TREEMAP = "javax.jdo.option.TreeMap";
+ /**
+ * "javax.jdo.option.TreeSet"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_TREESET = "javax.jdo.option.TreeSet";
+ /**
+ * "javax.jdo.option.Vector"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_VECTOR = "javax.jdo.option.Vector";
+ /**
+ * "javax.jdo.option.Array"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_ARRAY = "javax.jdo.option.Array";
+ /**
+ * "javax.jdo.option.NullCollection"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_NULL_COLLECTION = "javax.jdo.option.NullCollection";
+ /**
+ * "javax.jdo.option.ChangeApplicationIdentity"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_CHANGE_APPLICATION_IDENTITY = "javax.jdo.option.ChangeApplicationIdentity";
+ /**
+ * "javax.jdo.option.BinaryCompatibility"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_BINARY_COMPATIBILITY = "javax.jdo.option.BinaryCompatibility";
+ /**
+ * "javax.jdo.option.GetDataStoreConnection"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_GET_DATASTORE_CONNECTION = "javax.jdo.option.GetDataStoreConnection";
+ /**
+ * "javax.jdo.option.GetJDBCConnection"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_GET_JDBC_CONNECTION = "javax.jdo.option.GetJDBCConnection";
+ /**
+ * "javax.jdo.query.SQL"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_QUERY_SQL = "javax.jdo.query.SQL";
+
+ /**
+ * "javax.jdo.option.QueryCancel"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 3.0
+ */
+ static String OPTION_QUERY_CANCEL = "javax.jdo.option.QueryCancel";
+
+ /**
+ * "javax.jdo.query.JDOQL.BitwiseOperations"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 3.2
+ */
+ static String OPTION_QUERY_JDOQL_BITWISE_OPERATIONS = "javax.jdo.query.JDOQL.BitwiseOperations";
+
+ /**
+ * "javax.jdo.query.JDOQL.UnconstrainedQueryVariables"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_UNCONSTRAINED_QUERY_VARIABLES =
+ "javax.jdo.query.JDOQL.UnconstrainedQueryVariables";
+
+ /**
+ * "javax.jdo.option.DatastoreTimeout"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 3.0
+ */
+ static String OPTION_DATASTORE_TIMEOUT = "javax.jdo.option.DatastoreTimeout";
+ /**
+ * "javax.jdo.option.version.DateTime"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_VERSION_DATETIME = "javax.jdo.option.version.DateTime";
+ /**
+ * "javax.jdo.option.version.StateImage"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_VERSION_STATE_IMAGE = "javax.jdo.option.version.StateImage";
+ /**
+ * "javax.jdo.option.PreDirtyEvent"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_PREDIRTY_EVENT = "javax.jdo.option.PreDirtyEvent";
+ /**
+ * "javax.jdo.option.mapping.HeterogeneousObjectType"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_MAPPING_HETEROGENEOUS_OBJECT_TYPE =
+ "javax.jdo.option.mapping.HeterogeneousObjectType";
+ /**
+ * "javax.jdo.option.mapping.HeterogeneousInterfaceType"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_MAPPING_HETEROGENEOUS_INTERFACE_TYPE =
+ "javax.jdo.option.mapping.HeterogeneousInterfaceType";
+ /**
+ * "javax.jdo.option.mapping.JoinedTablePerClass"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_MAPPING_JOINED_TABLE_PER_CLASS =
+ "javax.jdo.option.mapping.JoinedTablePerClass";
+ /**
+ * "javax.jdo.option.mapping.JoinedTablePerConcreteClass"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_MAPPING_JOINED_TABLE_PER_CONCRETE_CLASS =
+ "javax.jdo.option.mapping.JoinedTablePerConcreteClass";
+ /**
+ * "javax.jdo.option.mapping.NonJoinedTablePerConcreteClass"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_MAPPING_NON_JOINED_TABLE_PER_CONCRETE_CLASS =
+ "javax.jdo.option.mapping.NonJoinedTablePerConcreteClass";
+ /**
+ * "javax.jdo.option.mapping.RelationSubclassTable"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.1
+ */
+ static String OPTION_MAPPING_RELATION_SUBCLASS_TABLE =
+ "javax.jdo.option.mapping.RelationSubclassTable";
+
+ /**
+ * "javax.jdo.PersistenceManagerFactoryClass"
+ *
+ * @see JDOHelper#getPersistenceManagerFactory(java.util.Map)
+ * @since 2.1
+ */
+ static String PROPERTY_PERSISTENCE_MANAGER_FACTORY_CLASS =
+ "javax.jdo.PersistenceManagerFactoryClass";
+
+ /**
+ * "VendorName"
+ *
+ * @see JDOEnhancer#getProperties()
+ * @since 3.0
+ */
+ public static final String PROPERTY_ENHANCER_VENDOR_NAME = "VendorName";
+
+ /**
+ * "VersionNumber"
+ *
+ * @see JDOEnhancer#getProperties()
+ * @since 3.0
+ */
+ public static final String PROPERTY_ENHANCER_VERSION_NUMBER = "VersionNumber";
+
+ /**
+ * Exit value for no enhancer found
+ *
+ * @since 3.0
+ */
+ public static final int ENHANCER_NO_JDO_ENHANCER_FOUND = 2;
+
+ /**
+ * Exit value for usage error
+ *
+ * @since 3.0
+ */
+ public static final int ENHANCER_USAGE_ERROR = 3;
+
+ /**
+ * Exit value for an exception from the JDOEnhancer
+ *
+ * @since 3.0
+ */
+ public static final int ENHANCER_EXCEPTION = 1;
+
+ /**
+ * "javax.jdo.option.Optimistic"
+ *
+ * @see PersistenceManagerFactory#getOptimistic()
+ * @since 2.1
+ */
+ static String PROPERTY_OPTIMISTIC = "javax.jdo.option.Optimistic";
+ /**
+ * "javax.jdo.option.ReadOnly"
+ *
+ * @see PersistenceManagerFactory#getReadOnly()
+ * @since 2.2
+ */
+ static String PROPERTY_READONLY = "javax.jdo.option.ReadOnly";
+ /**
+ * "javax.jdo.option.RetainValues"
+ *
+ * @see PersistenceManagerFactory#getRetainValues()
+ * @since 2.1
+ */
+ static String PROPERTY_RETAIN_VALUES = "javax.jdo.option.RetainValues";
+ /**
+ * "javax.jdo.option.RestoreValues"
+ *
+ * @see PersistenceManagerFactory#getRestoreValues()
+ * @since 2.1
+ */
+ static String PROPERTY_RESTORE_VALUES = "javax.jdo.option.RestoreValues";
+ /**
+ * "javax.jdo.option.IgnoreCache"
+ *
+ * @see PersistenceManagerFactory#getIgnoreCache()
+ * @since 2.1
+ */
+ static String PROPERTY_IGNORE_CACHE = "javax.jdo.option.IgnoreCache";
+ /**
+ * "javax.jdo.option.NontransactionalRead"
+ *
+ * @see PersistenceManagerFactory#getNontransactionalRead()
+ * @since 2.1
+ */
+ static String PROPERTY_NONTRANSACTIONAL_READ = "javax.jdo.option.NontransactionalRead";
+ /**
+ * "javax.jdo.option.NontransactionalWrite"
+ *
+ * @see PersistenceManagerFactory#getNontransactionalWrite()
+ * @since 2.1
+ */
+ static String PROPERTY_NONTRANSACTIONAL_WRITE = "javax.jdo.option.NontransactionalWrite";
+ /**
+ * "javax.jdo.option.Multithreaded"
+ *
+ * @see PersistenceManagerFactory#getMultithreaded()
+ * @since 2.1
+ */
+ static String PROPERTY_MULTITHREADED = "javax.jdo.option.Multithreaded";
+ /**
+ * "javax.jdo.option.TransactionIsolationLevel"
+ *
+ * @since 2.2
+ */
+ static String PROPERTY_TRANSACTION_ISOLATION_LEVEL = "javax.jdo.option.TransactionIsolationLevel";
+ /**
+ * "javax.jdo.option.TransactionIsolationLevel.read-uncommitted"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.2
+ */
+ static String PROPERTY_TRANSACTION_ISOLATION_LEVEL_READ_UNCOMMITTED =
+ "javax.jdo.option.TransactionIsolationLevel.read-uncommitted";
+ /**
+ * "javax.jdo.option.TransactionIsolationLevel.read-committed"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.2
+ */
+ static String PROPERTY_TRANSACTION_ISOLATION_LEVEL_READ_COMMITTED =
+ "javax.jdo.option.TransactionIsolationLevel.read-committed";
+ /**
+ * "javax.jdo.option.TransactionIsolationLevel.repeatable-read"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.2
+ */
+ static String PROPERTY_TRANSACTION_ISOLATION_LEVEL_REPEATABLE_READ =
+ "javax.jdo.option.TransactionIsolationLevel.repeatable-read";
+ /**
+ * "javax.jdo.option.TransactionIsolationLevel.snapshot"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.2
+ */
+ static String PROPERTY_TRANSACTION_ISOLATION_LEVEL_SNAPSHOT =
+ "javax.jdo.option.TransactionIsolationLevel.snapshot";
+ /**
+ * "javax.jdo.option.TransactionIsolationLevel.serializable"
+ *
+ * @see PersistenceManagerFactory#supportedOptions()
+ * @since 2.2
+ */
+ static String PROPERTY_TRANSACTION_ISOLATION_LEVEL_SERIALIZABLE =
+ "javax.jdo.option.TransactionIsolationLevel.serializable";
+ /**
+ * "javax.jdo.option.DetachAllOnCommit"
+ *
+ * @see PersistenceManagerFactory#getDetachAllOnCommit()
+ * @since 2.1
+ */
+ static String PROPERTY_DETACH_ALL_ON_COMMIT = "javax.jdo.option.DetachAllOnCommit";
+ /**
+ * "javax.jdo.option.CopyOnAttach"
+ *
+ * @see PersistenceManagerFactory#getCopyOnAttach()
+ * @since 2.1
+ */
+ static String PROPERTY_COPY_ON_ATTACH = "javax.jdo.option.CopyOnAttach";
+ /**
+ * "javax.jdo.option.ConnectionDriverName" This property might be ignored by the JDO
+ * implementation because the JDBC DriverManager handles the driver name.
+ *
+ * @see PersistenceManagerFactory#getConnectionDriverName()
+ * @since 2.1
+ */
+ static String PROPERTY_CONNECTION_DRIVER_NAME = "javax.jdo.option.ConnectionDriverName";
+ /**
+ * "javax.jdo.option.ConnectionUserName"
+ *
+ * @see PersistenceManagerFactory#getConnectionUserName()
+ * @since 2.1
+ */
+ static String PROPERTY_CONNECTION_USER_NAME = "javax.jdo.option.ConnectionUserName";
+ /**
+ * "javax.jdo.option.Password"
+ *
+ * @since 2.1
+ */
+ static String PROPERTY_CONNECTION_PASSWORD = "javax.jdo.option.ConnectionPassword";
+ /**
+ * "javax.jdo.option.ConnectionURL"
+ *
+ * @see PersistenceManagerFactory#getConnectionURL()
+ * @since 2.1
+ */
+ static String PROPERTY_CONNECTION_URL = "javax.jdo.option.ConnectionURL";
+ /**
+ * "javax.jdo.option.ConnectionFactoryName"
+ *
+ * @see PersistenceManagerFactory#getConnectionFactoryName()
+ * @since 2.1
+ */
+ static String PROPERTY_CONNECTION_FACTORY_NAME = "javax.jdo.option.ConnectionFactoryName";
+ /**
+ * "javax.jdo.option.ConnectionFactory2Name"
+ *
+ * @see PersistenceManagerFactory#getConnectionFactory2Name()
+ * @since 2.1
+ */
+ static String PROPERTY_CONNECTION_FACTORY2_NAME = "javax.jdo.option.ConnectionFactory2Name";
+ /**
+ * "javax.jdo.option.Mapping"
+ *
+ * @see PersistenceManagerFactory#getMapping()
+ * @since 2.1
+ */
+ static String PROPERTY_MAPPING = "javax.jdo.option.Mapping";
+ /**
+ * "javax.jdo.option.PersistenceUnitName"
+ *
+ * @see PersistenceManagerFactory#getPersistenceUnitName()
+ * @since 2.1
+ */
+ static String PROPERTY_PERSISTENCE_UNIT_NAME = "javax.jdo.option.PersistenceUnitName";
+ /**
+ * "javax.jdo.option.Name"
+ *
+ * @see PersistenceManagerFactory#getName()
+ * @since 2.1
+ */
+ static String PROPERTY_NAME = "javax.jdo.option.Name";
+
+ /**
+ * "javax.jdo.spi.PropertiesFileName"
+ *
+ * @since 3.2
+ */
+ static String PROPERTY_SPI_PROPERTIES_FILE_NAME = "javax.jdo.spi.PropertiesFileName";
+
+ /**
+ * "javax.jdo.option.spi.ResourceName"
+ *
+ * @since 2.1
+ */
+ static String PROPERTY_SPI_RESOURCE_NAME = "javax.jdo.option.spi.ResourceName";
+
+ /**
+ * "javax.jdo.listener.InstanceLifecycleListener"
+ *
+ * @see
+ * PersistenceManagerFactory#addInstanceLifecycleListener(javax.jdo.listener.InstanceLifecycleListener,Class[])
+ * @see
+ * PersistenceManagerFactory#removeInstanceLifecycleListener(javax.jdo.listener.InstanceLifecycleListener)
+ */
+ static String PROPERTY_INSTANCE_LIFECYCLE_LISTENER =
+ "javax.jdo.listener.InstanceLifecycleListener";
+
+ /**
+ * Prefix used to configure {@link javax.jdo.listener.InstanceLifecycleListener} instances
+ * externally. To configure an <code>InstanceLifecycleListener</code> via properties, create a
+ * property name with the prefix of this constant and append the fully qualified listener class
+ * name, then set its value to the comma- or whitespace-delimited list of persistence-capable
+ * classes whose instances are to be observed. Use no value to indicate that instances of all
+ * persistence-capable classes are to be observed.<br>
+ * For example,<br>
+ * <code>
+ * javax.jdo.option.InstanceLifecycleListener.com.example.MyListener=com.example.Foo,com.example.Bar
+ * </code><br>
+ * is equivalent to calling<br>
+ * <code>
+ * pmf.addInstanceLifecycleListener(new com.example.MyListener(), new Class[] {com.example.Foo.class, com.example.Bar.class});
+ * </code><br>
+ * where <code>pmf</code> is an instance of type <code>PersistenceManagerFactory</code>.
+ *
+ * @see
+ * javax.jdo.PersistenceManagerFactory#addInstanceLifecycleListener(javax.jdo.listener.InstanceLifecycleListener,Class[])
+ * @since 2.1
+ */
+ static String PROPERTY_PREFIX_INSTANCE_LIFECYCLE_LISTENER =
+ PROPERTY_INSTANCE_LIFECYCLE_LISTENER + ".";
+
+ /**
+ * Mapping "javax.jdo.mapping.Catalog"
+ *
+ * @since 2.1
+ */
+ static String PROPERTY_MAPPING_CATALOG = "javax.jdo.mapping.Catalog";
+ /**
+ * Mapping "javax.jdo.mapping.Schema"
+ *
+ * @since 2.1
+ */
+ static String PROPERTY_MAPPING_SCHEMA = "javax.jdo.mapping.Schema";
+
+ /**
+ * Specified value "javax.jdo.option.ServerTimeZoneID"
+ *
+ * @since 2.1
+ */
+ static String PROPERTY_SERVER_TIME_ZONE_ID = "javax.jdo.option.ServerTimeZoneID";
+
+ /**
+ * Specified value "javax.jdo.option.DatastoreReadTimeoutMillis"
+ *
+ * @since 3.0
+ */
+ static String PROPERTY_DATASTORE_READ_TIMEOUT_MILLIS =
+ "javax.jdo.option.DatastoreReadTimeoutMillis";
+
+ /**
+ * Specified value "javax.jdo.option.DatastoreWriteTimeoutMillis"
+ *
+ * @since 3.0
+ */
+ static String PROPERTY_DATASTORE_WRITE_TIMEOUT_MILLIS =
+ "javax.jdo.option.DatastoreWriteTimeoutMillis";
+
+ /**
+ * Nonconfigurable property constant "VendorName"
+ *
+ * @see PersistenceManagerFactory#getProperties()
+ * @since 2.1
+ */
+ static String NONCONFIGURABLE_PROPERTY_VENDOR_NAME = "VendorName";
+
+ /**
+ * Nonconfigurable property constant "VersionNumber"
+ *
+ * @see PersistenceManagerFactory#getProperties()
+ * @since 2.1
+ */
+ static String NONCONFIGURABLE_PROPERTY_VERSION_NUMBER = "VersionNumber";
+
+ /**
+ * Specified value "javax.jdo.option.TransactionType"
+ *
+ * @since 2.1
+ */
+ static String PROPERTY_TRANSACTION_TYPE = "javax.jdo.option.TransactionType";
+
+ /**
+ * The value for TransactionType to specify that transactions are managed by the Java Transactions
+ * API, as documented in JSR-220.
+ *
+ * @since 2.1
+ */
+ static String JTA = "JTA";
+
+ /**
+ * The value for TransactionType to specify that transactions are managed by the
+ * javax.jdo.Transaction instance, similar to the usage as documented in JSR-220.
+ *
+ * @since 2.1
+ */
+ static String RESOURCE_LOCAL = "RESOURCE_LOCAL";
+
+ /**
+ * The name of the resource for the DTD of the standard JDO configuration file.
+ *
+ * @since 2.1
+ */
+ static String JDOCONFIG_DTD_RESOURCE = "javax/jdo/jdoconfig_3_0.dtd";
+
+ /**
+ * The name of the resource for the XML schema of the standard JDO configuration file.
+ *
+ * @since 2.1
+ */
+ static String JDOCONFIG_XSD_RESOURCE = "javax/jdo/jdoconfig_3_0.xsd";
+
+ /**
+ * The name of the resource for the DTD of the standard JDO metadata file.
+ *
+ * @since 2.1
+ */
+ static String JDO_DTD_RESOURCE = "javax/jdo/jdo_3_0.dtd";
+
+ /**
+ * The name of the resource for the XML schema of the standard JDO metadata file.
+ *
+ * @since 2.1
+ */
+ static String JDO_XSD_RESOURCE = "javax/jdo/jdo_3_0.xsd";
+
+ /**
+ * The name of the resource for the DTD of the standard JDO object-relational mapping metadata
+ * file.
+ *
+ * @since 2.1
+ */
+ static String ORM_DTD_RESOURCE = "javax/jdo/orm_3_0.dtd";
+
+ /**
+ * The name of the resource for the XML schema of the standard JDO object-relational mapping
+ * metadata file.
+ *
+ * @since 2.1
+ */
+ static String ORM_XSD_RESOURCE = "javax/jdo/orm_3_0.xsd";
+
+ /**
+ * The name of the resource for the DTD of the standard JDO query metadata file.
+ *
+ * @since 2.1
+ */
+ static String JDOQUERY_DTD_RESOURCE = "javax/jdo/jdoquery_3_0.dtd";
+
+ /**
+ * The name of the resource for the XML schema of the standard JDO query metadata file.
+ *
+ * @since 2.1
+ */
+ static String JDOQUERY_XSD_RESOURCE = "javax/jdo/jdoquery_3_0.xsd";
+
+ /**
+ * The name of the anonymous PersistenceManagerFactory, which is the empty string.
+ *
+ * @since 2.1
+ */
+ static String ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME = "";
+
+ /**
+ * Transaction isolation level representing the ability to read uncommitted data.
+ *
+ * @see PersistenceManagerFactory#getTransactionIsolationLevel()
+ * @see Transaction#getIsolationLevel()
+ * @since 2.2
+ */
+ public static final String TX_READ_UNCOMMITTED = "read-uncommitted";
+
+ /**
+ * Transaction isolation level representing the requirement to read committed data only.
+ *
+ * @see PersistenceManagerFactory#getTransactionIsolationLevel()
+ * @see Transaction#getIsolationLevel()
+ * @since 2.2
+ */
+ public static final String TX_READ_COMMITTED = "read-committed";
+
+ /**
+ * Transaction isolation level representing the requirement to read the same data in the same
+ * transaction.
+ *
+ * @see PersistenceManagerFactory#getTransactionIsolationLevel()
+ * @see Transaction#getIsolationLevel()
+ * @since 2.2
+ */
+ public static final String TX_REPEATABLE_READ = "repeatable-read";
+
+ /**
+ * Transaction isolation level representing the requirement to keep a snapshot for reading data.
+ *
+ * @see PersistenceManagerFactory#getTransactionIsolationLevel()
+ * @see Transaction#getIsolationLevel()
+ * @since 2.2
+ */
+ public static final String TX_SNAPSHOT = "snapshot";
+
+ /**
+ * Transaction isolation level representing the requirement to serialize transactions.
+ *
+ * @see PersistenceManagerFactory#getTransactionIsolationLevel()
+ * @see Transaction#getIsolationLevel()
+ * @since 2.2
+ */
+ public static final String TX_SERIALIZABLE = "serializable";
}
diff --git a/api/src/main/java/javax/jdo/Enhancer.java b/api/src/main/java/javax/jdo/Enhancer.java
index 19d14ec2..be8104cc 100644
--- a/api/src/main/java/javax/jdo/Enhancer.java
+++ b/api/src/main/java/javax/jdo/Enhancer.java
@@ -38,419 +38,440 @@ import static javax.jdo.Constants.PROPERTY_ENHANCER_VERSION_NUMBER;
import javax.jdo.spi.I18NHelper;
/**
- * Main class to invoke a JDO Enhancer.
- * The enhancer is invoked with the following command line:
+ * Main class to invoke a JDO Enhancer. The enhancer is invoked with the following command line:
+ *
* <pre>
* java -cp {classpath} javax.jdo.Enhancer {options} {directory, file, or resource names}
* </pre>
- * <classpath> must contain the jdo specification jar, the implementation jar and any
- * implementation dependencies, the statically-compiled classes, and the jdo
- * metadata files loadable as resources.
- *
- * <options> include:
- * <ul><li>? : print usage to stderr and exit
- * </li><li>-h : print usage to stderr and exit
- * </li><li>-help : print usage to stderr and exit
- * </li><li>-pu <persistence-unit-name> : the name of a persistence unit
- * </li><li>-d <target directory> : write the enhanced classes to the specified directory
- * </li><li>-checkonly : just check the classes for enhancement status
- * </li><li>-v : verbose output
- * </li><li>-r : recurse through directories to find all classes and metadata files to enhance
- * </li><li>-cp <enhancer class loader path> : if not already included in the java class loader,
- * this parameter must contain the statically-compiled classes, and the jdo metadata
- * files loadable as resources
- * </li></ul><directory, file, or resource names>
- * <ul><li>Directory names must not end in ".jdo", ".jar", or ".class"
- * </li><li>Directories will be searched for files with suffixes ".jdo", ".jar", and ".class"
- * </li><li>Directories will be searched recursively if the -r option is set
- * </li></ul>
- *
+ *
+ * <classpath> must contain the jdo specification jar, the implementation jar and any
+ * implementation dependencies, the statically-compiled classes, and the jdo metadata files loadable
+ * as resources.
+ *
+ * <p><options> include:
+ *
+ * <ul>
+ * <li>? : print usage to stderr and exit
+ * <li>-h : print usage to stderr and exit
+ * <li>-help : print usage to stderr and exit
+ * <li>-pu <persistence-unit-name> : the name of a persistence unit
+ * <li>-d <target directory> : write the enhanced classes to the specified directory
+ * <li>-checkonly : just check the classes for enhancement status
+ * <li>-v : verbose output
+ * <li>-r : recurse through directories to find all classes and metadata files to enhance
+ * <li>-cp <enhancer class loader path> : if not already included in the java class loader,
+ * this parameter must contain the statically-compiled classes, and the jdo metadata files
+ * loadable as resources
+ * </ul>
+ *
+ * <directory, file, or resource names>
+ *
+ * <ul>
+ * <li>Directory names must not end in ".jdo", ".jar", or ".class"
+ * <li>Directories will be searched for files with suffixes ".jdo", ".jar", and ".class"
+ * <li>Directories will be searched recursively if the -r option is set
+ * </ul>
+ *
* @since 3.0
*/
public class Enhancer {
- /** The Internationalization message helper. */
- private final static I18NHelper msg =
- I18NHelper.getInstance ("javax.jdo.Bundle"); //NOI18N
+ /** The Internationalization message helper. */
+ private static final I18NHelper msg = I18NHelper.getInstance("javax.jdo.Bundle"); // NOI18N
+
+ /** New Line */
+ private char NL = '\n'; // NOI18N
+ /** Jar file suffix */
+ private String JAR_FILE_SUFFIX = ".jar"; // NOI18N
+ /** JDO Metadata file suffix */
+ private String JDO_FILE_SUFFIX = ".jdo"; // NOI18N
+ /** Class file suffix */
+ private String CLASS_FILE_SUFFIX = ".class"; // NOI18N
- /** New Line */
- private char NL = '\n'; //NOI18N
- /** Jar file suffix */
- private String JAR_FILE_SUFFIX = ".jar"; //NOI18N
- /** JDO Metadata file suffix */
- private String JDO_FILE_SUFFIX = ".jdo"; //NOI18N
- /** Class file suffix */
- private String CLASS_FILE_SUFFIX = ".class"; //NOI18N
+ /** Error indicator */
+ private boolean error = false;
+ /** If set, process parameters, print usage, and exit. */
+ private boolean printAndExit = false;
- /** Error indicator */
- private boolean error = false;
- /** If set, process parameters, print usage, and exit. */
- private boolean printAndExit = false;
+ /** Persistence Units */
+ private List<String> persistenceUnitNames = new ArrayList<String>();
+ /** Target Directory Parameter */
+ private String directoryName = null;
+ /** ClassLoader for JDOEnhancer */
+ private ClassLoader loader = null;
+ /** Classpath (-cp) parameter */
+ private String classPath = null;
+ /** Check Only flag */
+ private boolean checkOnly = false;
+ /** Verbose flag */
+ private boolean verbose = false;
+ /** Recurse flag */
+ private boolean recurse = false;
+ /** Error messages should be empty unless there is an error */
+ private StringBuilder errorBuffer = new StringBuilder();
+ /** Verbose messages are always collected but only output if verbose flag is set */
+ private StringBuilder verboseBuffer = new StringBuilder();
+ /** File Names */
+ private List<String> fileNames = new ArrayList<String>();
+ /** Class File Names */
+ private List<String> classFileNames = new ArrayList<String>();
+ /** JDO File Names */
+ private List<String> jdoFileNames = new ArrayList<String>();
+ /** Jar File Names */
+ private List<String> jarFileNames = new ArrayList<String>();
+ /** The number of classes validated by the JDOEnhancer */
+ private int numberOfValidatedClasses = 0;
+ /** The number of classes enhanced by the JDOEnhancer */
+ private int numberOfEnhancedClasses = 0;
- /** Persistence Units */
- private List<String> persistenceUnitNames = new ArrayList<String>();
- /** Target Directory Parameter */
- private String directoryName = null;
- /** ClassLoader for JDOEnhancer */
- private ClassLoader loader = null;
- /** Classpath (-cp) parameter */
- private String classPath = null;
- /** Check Only flag */
- private boolean checkOnly = false;
- /** Verbose flag */
- private boolean verbose = false;
- /** Recurse flag */
- private boolean recurse = false;
- /** Error messages should be empty unless there is an error */
- private StringBuilder errorBuffer = new StringBuilder();
- /** Verbose messages are always collected but only output if verbose flag is set */
- private StringBuilder verboseBuffer = new StringBuilder();
- /** File Names */
- private List<String> fileNames = new ArrayList<String>();
- /** Class File Names */
- private List<String> classFileNames = new ArrayList<String>();
- /** JDO File Names */
- private List<String> jdoFileNames = new ArrayList<String>();
- /** Jar File Names */
- private List<String> jarFileNames = new ArrayList<String>();
- /** The number of classes validated by the JDOEnhancer */
- private int numberOfValidatedClasses = 0;
- /** The number of classes enhanced by the JDOEnhancer */
- private int numberOfEnhancedClasses = 0;
+ /** The properties from the JDOEnhancer */
+ private Properties properties;
- /** The properties from the JDOEnhancer */
- private Properties properties;
+ /**
+ * Run the enhancer from the command line.
+ *
+ * @param args command line arguments
+ */
+ public static void main(String[] args) {
+ Enhancer enhancerMain = new Enhancer();
+ enhancerMain.run(args);
+ }
- /** Run the enhancer from the command line.
- *
- * @param args command line arguments
- */
- public static void main (String[] args) {
- Enhancer enhancerMain = new Enhancer();
- enhancerMain.run(args);
+ /**
+ * Execute the enhancer.
+ *
+ * @param args the command line arguments
+ */
+ private void run(String[] args) {
+ // processArgs will exit if errors or help
+ processArgs(args);
+ JDOEnhancer enhancer = null;
+ try {
+ enhancer = JDOHelper.getEnhancer();
+ } catch (JDOException jdoex) {
+ jdoex.printStackTrace(); // outputs to stderr
+ exit(ENHANCER_NO_JDO_ENHANCER_FOUND);
}
- /** Execute the enhancer.
- *
- * @param args the command line arguments
- */
- private void run(String[] args) {
- // processArgs will exit if errors or help
- processArgs(args);
- JDOEnhancer enhancer = null;
- try {
- enhancer = JDOHelper.getEnhancer();
- } catch (JDOException jdoex) {
- jdoex.printStackTrace(); // outputs to stderr
- exit(ENHANCER_NO_JDO_ENHANCER_FOUND);
+ try {
+ // provide verbose property settings of the JDOEnhancer we just loaded
+ properties = enhancer.getProperties();
+ addVerboseMessage("MSG_EnhancerClass", enhancer.getClass().getName()); // NOI18N
+ addVerboseMessage(
+ "MSG_EnhancerProperty",
+ PROPERTY_ENHANCER_VENDOR_NAME, // NOI18N
+ properties.getProperty(PROPERTY_ENHANCER_VENDOR_NAME));
+ addVerboseMessage(
+ "MSG_EnhancerProperty",
+ PROPERTY_ENHANCER_VERSION_NUMBER, // NOI18N
+ properties.getProperty(PROPERTY_ENHANCER_VERSION_NUMBER));
+ Set<Entry<Object, Object>> props = properties.entrySet();
+ Iterator<Entry<Object, Object>> entries = props.iterator();
+ while (entries.hasNext()) {
+ Entry<Object, Object> entry = entries.next();
+ if (!(PROPERTY_ENHANCER_VENDOR_NAME.equals(entry.getKey())
+ || PROPERTY_ENHANCER_VERSION_NUMBER.equals(entry.getKey()))) {
+ addVerboseMessage(
+ "MSG_EnhancerProperty",
+ (String) entry.getKey(), // NOI18N
+ (String) entry.getValue());
}
+ }
+ enhancer.setVerbose(verbose);
+ if (loader != null) {
+ enhancer.setClassLoader(loader);
+ }
- try {
- // provide verbose property settings of the JDOEnhancer we just loaded
- properties = enhancer.getProperties();
- addVerboseMessage("MSG_EnhancerClass", enhancer.getClass().getName()); //NOI18N
- addVerboseMessage("MSG_EnhancerProperty", PROPERTY_ENHANCER_VENDOR_NAME, //NOI18N
- properties.getProperty(PROPERTY_ENHANCER_VENDOR_NAME));
- addVerboseMessage("MSG_EnhancerProperty", PROPERTY_ENHANCER_VERSION_NUMBER, //NOI18N
- properties.getProperty(PROPERTY_ENHANCER_VERSION_NUMBER));
- Set<Entry<Object, Object>> props = properties.entrySet();
- Iterator<Entry<Object, Object>> entries = props.iterator();
- while (entries.hasNext()) {
- Entry<Object, Object> entry = entries.next();
- if (!(PROPERTY_ENHANCER_VENDOR_NAME.equals(entry.getKey()) ||
- PROPERTY_ENHANCER_VERSION_NUMBER.equals(entry.getKey()))) {
- addVerboseMessage("MSG_EnhancerProperty", (String)entry.getKey(), //NOI18N
- (String)entry.getValue());
- }
- }
- enhancer.setVerbose(verbose);
- if (loader != null) {
- enhancer.setClassLoader(loader);
- }
-
- int numberOfClasses = classFileNames.size();
- if (numberOfClasses != 0) {
- enhancer.addClasses(classFileNames.toArray(new String[numberOfClasses]));
- }
- int numberOfFiles = jdoFileNames.size();
- if (numberOfFiles != 0) {
- enhancer.addFiles(jdoFileNames.toArray(new String[numberOfFiles]));
- }
- if (0 < jarFileNames.size()) {
- for (String jarFileName : jarFileNames) {
- enhancer.addJar(jarFileName);
- }
- }
- if (persistenceUnitNames != null) {
- for (String persistenceUnitName: persistenceUnitNames) {
- enhancer.addPersistenceUnit(persistenceUnitName);
- }
- }
- if (directoryName != null) {
- enhancer.setOutputDirectory(directoryName);
- }
- if (checkOnly) {
- numberOfValidatedClasses = enhancer.validate();
- addVerboseMessage("MSG_EnhancerValidatedClasses", numberOfValidatedClasses); //NOI18N
- } else {
- numberOfEnhancedClasses = enhancer.enhance();
- addVerboseMessage("MSG_EnhancerEnhancedClasses", numberOfEnhancedClasses); //NOI18N
- }
- exit(0); // good exit
- } catch (Exception ex) {
- ex.printStackTrace(); // outputs to stderr
- exit(ENHANCER_EXCEPTION); // error exit
+ int numberOfClasses = classFileNames.size();
+ if (numberOfClasses != 0) {
+ enhancer.addClasses(classFileNames.toArray(new String[numberOfClasses]));
+ }
+ int numberOfFiles = jdoFileNames.size();
+ if (numberOfFiles != 0) {
+ enhancer.addFiles(jdoFileNames.toArray(new String[numberOfFiles]));
+ }
+ if (0 < jarFileNames.size()) {
+ for (String jarFileName : jarFileNames) {
+ enhancer.addJar(jarFileName);
}
+ }
+ if (persistenceUnitNames != null) {
+ for (String persistenceUnitName : persistenceUnitNames) {
+ enhancer.addPersistenceUnit(persistenceUnitName);
+ }
+ }
+ if (directoryName != null) {
+ enhancer.setOutputDirectory(directoryName);
+ }
+ if (checkOnly) {
+ numberOfValidatedClasses = enhancer.validate();
+ addVerboseMessage("MSG_EnhancerValidatedClasses", numberOfValidatedClasses); // NOI18N
+ } else {
+ numberOfEnhancedClasses = enhancer.enhance();
+ addVerboseMessage("MSG_EnhancerEnhancedClasses", numberOfEnhancedClasses); // NOI18N
+ }
+ exit(0); // good exit
+ } catch (Exception ex) {
+ ex.printStackTrace(); // outputs to stderr
+ exit(ENHANCER_EXCEPTION); // error exit
}
+ }
- /** Process the command line arguments and exit if there is a usage request or an error.
- *
- * @param args the command line arguments
- */
- private void processArgs(String[] args) {
- parseArgs(args);
- parseFiles(fileNames.toArray(new String[fileNames.size()]), true, recurse);
- loader = prepareClassLoader(classPath);
- if (error) {
- addErrorMessage(msg.msg("MSG_EnhancerUsage")); //NOI18N
- exit(ENHANCER_USAGE_ERROR); // error exit
- }
- if (printAndExit) {
- addVerboseMessage("MSG_EnhancerUsage"); //NOI18N
- exit(0); // good exit
- }
+ /**
+ * Process the command line arguments and exit if there is a usage request or an error.
+ *
+ * @param args the command line arguments
+ */
+ private void processArgs(String[] args) {
+ parseArgs(args);
+ parseFiles(fileNames.toArray(new String[fileNames.size()]), true, recurse);
+ loader = prepareClassLoader(classPath);
+ if (error) {
+ addErrorMessage(msg.msg("MSG_EnhancerUsage")); // NOI18N
+ exit(ENHANCER_USAGE_ERROR); // error exit
+ }
+ if (printAndExit) {
+ addVerboseMessage("MSG_EnhancerUsage"); // NOI18N
+ exit(0); // good exit
}
+ }
- /** Parse the command line arguments. Put the results into fields.
- *
- * @param args the command line arguments
- */
- private void parseArgs(String[] args) {
- boolean doneWithOptions = false;
- fileNames = new ArrayList<String>();
- for (int i = 0; i < args.length; ++i) {
- String arg = args[i];
- // if first argument is ? then simply print usage and return.
- if ("?".equals(arg)) {
- printAndExit = true;
- return;
+ /**
+ * Parse the command line arguments. Put the results into fields.
+ *
+ * @param args the command line arguments
+ */
+ private void parseArgs(String[] args) {
+ boolean doneWithOptions = false;
+ fileNames = new ArrayList<String>();
+ for (int i = 0; i < args.length; ++i) {
+ String arg = args[i];
+ // if first argument is ? then simply print usage and return.
+ if ("?".equals(arg)) {
+ printAndExit = true;
+ return;
+ }
+ if (!doneWithOptions) {
+ if (arg.startsWith("-")) { // NOI18N
+ String option = arg.substring(1);
+ if ("help".equals(option)) { // NOI18N
+ addVerboseMessage("MSG_EnhancerProcessing", "-help"); // NOI18N
+ setPrintAndExit();
+ } else if ("h".equals(option)) { // NOI18N
+ addVerboseMessage("MSG_EnhancerProcessing", "-h"); // NOI18N
+ setPrintAndExit();
+ } else if ("v".equals(option)) { // NOI18N
+ addVerboseMessage("MSG_EnhancerProcessing", "-v"); // NOI18N
+ verbose = true;
+ } else if ("verbose".equals(option)) { // NOI18N
+ addVerboseMessage("MSG_EnhancerProcessing", "-verbose"); // NOI18N
+ verbose = true;
+ } else if ("pu".equals(option)) { // NOI18N
+ if (hasNextArgument("MSG_EnhancerProcessing", "-pu", i, args.length)) { // NOI18N
+ String puName = args[++i];
+ addVerboseMessage("MSG_EnhancerPersistenceUnitName", puName); // NOI18N
+ persistenceUnitNames.add(puName);
+ } else {
+ setError();
}
- if (!doneWithOptions) {
- if (arg.startsWith("-")) { //NOI18N
- String option = arg.substring(1);
- if ("help".equals(option)) { //NOI18N
- addVerboseMessage("MSG_EnhancerProcessing", "-help"); //NOI18N
- setPrintAndExit();
- } else if ("h".equals(option)) { //NOI18N
- addVerboseMessage("MSG_EnhancerProcessing", "-h"); //NOI18N
- setPrintAndExit();
- } else if ("v".equals(option)) { //NOI18N
- addVerboseMessage("MSG_EnhancerProcessing", "-v"); //NOI18N
- verbose = true;
- } else if ("verbose".equals(option)) { //NOI18N
- addVerboseMessage("MSG_EnhancerProcessing", "-verbose"); //NOI18N
- verbose = true;
- } else if ("pu".equals(option)) { //NOI18N
- if (hasNextArgument("MSG_EnhancerProcessing", "-pu", i, args.length)) { //NOI18N
- String puName = args[++i];
- addVerboseMessage("MSG_EnhancerPersistenceUnitName", puName); //NOI18N
- persistenceUnitNames.add(puName);
- } else {
- setError();
- }
- } else if ("cp".equals(option)) { //NOI18N
- if (hasNextArgument("MSG_EnhancerProcessing", "-cp", i, args.length)) { //NOI18N
- classPath = args[++i];
- addVerboseMessage("MSG_EnhancerClassPath", classPath); //NOI18N
- } else {
- setError();
- }
- } else if ("d".equals(option)) { //NOI18N
- if (hasNextArgument("MSG_EnhancerProcessing", "-d", i, args.length)) { //NOI18N
- directoryName = args[++i];
- addVerboseMessage("MSG_EnhancerOutputDirectory", directoryName); //NOI18N
- } else {
- setError();
- }
- } else if ("checkonly".equals(option)) { //NOI18N
- addVerboseMessage("MSG_EnhancerProcessing", "-checkonly"); //NOI18N
- checkOnly = true;
- } else if ("r".equals(option)) { //NOI18N
- addVerboseMessage("MSG_EnhancerProcessing", "-r"); //NOI18N
- recurse = true;
- } else {
- setError();
- addErrorMessage(msg.msg("ERR_EnhancerUnrecognizedOption", option)); //NOI18N
- }
- } else {
- doneWithOptions = true;
- fileNames.add(arg);
- }
+ } else if ("cp".equals(option)) { // NOI18N
+ if (hasNextArgument("MSG_EnhancerProcessing", "-cp", i, args.length)) { // NOI18N
+ classPath = args[++i];
+ addVerboseMessage("MSG_EnhancerClassPath", classPath); // NOI18N
} else {
- fileNames.add(arg);
+ setError();
}
- }
- }
-
- /** Check whether there is another parameter (the argument for an option
- * that requires an argument).
- * @param msgId the message id for an error message
- * @param where the parameter for the message
- * @param i the index into the parameter array
- * @param length the length of the parameter array
- * @return
- */
- private boolean hasNextArgument(String msgId, String where, int i, int length) {
- if (i + 1 >= length) {
+ } else if ("d".equals(option)) { // NOI18N
+ if (hasNextArgument("MSG_EnhancerProcessing", "-d", i, args.length)) { // NOI18N
+ directoryName = args[++i];
+ addVerboseMessage("MSG_EnhancerOutputDirectory", directoryName); // NOI18N
+ } else {
+ setError();
+ }
+ } else if ("checkonly".equals(option)) { // NOI18N
+ addVerboseMessage("MSG_EnhancerProcessing", "-checkonly"); // NOI18N
+ checkOnly = true;
+ } else if ("r".equals(option)) { // NOI18N
+ addVerboseMessage("MSG_EnhancerProcessing", "-r"); // NOI18N
+ recurse = true;
+ } else {
setError();
- addErrorMessage(msg.msg(msgId, where));
- addErrorMessage(msg.msg("ERR_EnhancerRequiredArgumentMissing")); //NOI18N
- return false;
+ addErrorMessage(msg.msg("ERR_EnhancerUnrecognizedOption", option)); // NOI18N
+ }
+ } else {
+ doneWithOptions = true;
+ fileNames.add(arg);
}
- return true;
+ } else {
+ fileNames.add(arg);
+ }
}
+ }
- /**
- * Files can be one of four types:
- * <ol><li>directory: the directory is examined for files of the following types
- * </li><li>.class: this is a java class file
- * </li><li>.jdo: this is a jdo metadata file
- * </li><li>.jar: this is a jar file
- * </li></ol>
- * If the recursion flag is set, directories contained in directories are examined,
- * recursively.
- */
- private void parseFiles(String[] fileNames, boolean search, boolean recurse) {
- for (String fileName: fileNames) {
- if (fileName.endsWith(JAR_FILE_SUFFIX)) {
- // add to jar file names
- jarFileNames.add(fileName);
- addVerboseMessage("MSG_EnhancerJarFileName", fileName); //NOI18N
- } else if (fileName.endsWith(JDO_FILE_SUFFIX)) {
- // add to jdo file names
- jdoFileNames.add(fileName);
- addVerboseMessage("MSG_EnhancerJDOFileName", fileName); //NOI18N
- } else if (fileName.endsWith(CLASS_FILE_SUFFIX)) {
- // add to class file names
- classFileNames.add(fileName);
- addVerboseMessage("MSG_EnhancerClassFileName", fileName); //NOI18N
- } else {
- // assume a directory if no recognized suffix
- File directoryFile = new File(fileName);
- if (directoryFile.isDirectory() && search) {
- String directoryPath = directoryFile.getAbsolutePath();
- String[] files = directoryFile.list();
- String[] pathName = new String[1];
- if (files != null) {
- for (String file: files) {
- pathName[0] = directoryPath + '/' + file;
- parseFiles(pathName, recurse, recurse);
- }
- }
- }
- }
- }
+ /**
+ * Check whether there is another parameter (the argument for an option that requires an
+ * argument).
+ *
+ * @param msgId the message id for an error message
+ * @param where the parameter for the message
+ * @param i the index into the parameter array
+ * @param length the length of the parameter array
+ * @return
+ */
+ private boolean hasNextArgument(String msgId, String where, int i, int length) {
+ if (i + 1 >= length) {
+ setError();
+ addErrorMessage(msg.msg(msgId, where));
+ addErrorMessage(msg.msg("ERR_EnhancerRequiredArgumentMissing")); // NOI18N
+ return false;
}
+ return true;
+ }
- /** Prepare the class loader from the classPath specified
- *
- * @param classPath the classPath string from the "-cp classPath" option
- * @return the class loader
- */
- private ClassLoader prepareClassLoader(String classPath) {
- if (classPath == null)
- return null;
- ClassLoader result = null;
- // separate classPath using system class path separator
- String separator = System.getProperty("path.separator");
- String[] paths = classPath.split(separator);
- List<URL> urls = new ArrayList<URL>();
- for (String path: paths) {
- // for each path construct a URL from the File
- File file = new File(path);
- URI uri = file.toURI();
- try {
- URL url = uri.toURL();
- addVerboseMessage("MSG_EnhancerClassPath", url.toString());
- urls.add(url);
- } catch (MalformedURLException e) {
- setError();
- addErrorMessage(msg.msg("ERR_EnhancerBadClassPath", file));
+ /**
+ * Files can be one of four types:
+ *
+ * <ol>
+ * <li>directory: the directory is examined for files of the following types
+ * <li>.class: this is a java class file
+ * <li>.jdo: this is a jdo metadata file
+ * <li>.jar: this is a jar file
+ * </ol>
+ *
+ * If the recursion flag is set, directories contained in directories are examined, recursively.
+ */
+ private void parseFiles(String[] fileNames, boolean search, boolean recurse) {
+ for (String fileName : fileNames) {
+ if (fileName.endsWith(JAR_FILE_SUFFIX)) {
+ // add to jar file names
+ jarFileNames.add(fileName);
+ addVerboseMessage("MSG_EnhancerJarFileName", fileName); // NOI18N
+ } else if (fileName.endsWith(JDO_FILE_SUFFIX)) {
+ // add to jdo file names
+ jdoFileNames.add(fileName);
+ addVerboseMessage("MSG_EnhancerJDOFileName", fileName); // NOI18N
+ } else if (fileName.endsWith(CLASS_FILE_SUFFIX)) {
+ // add to class file names
+ classFileNames.add(fileName);
+ addVerboseMessage("MSG_EnhancerClassFileName", fileName); // NOI18N
+ } else {
+ // assume a directory if no recognized suffix
+ File directoryFile = new File(fileName);
+ if (directoryFile.isDirectory() && search) {
+ String directoryPath = directoryFile.getAbsolutePath();
+ String[] files = directoryFile.list();
+ String[] pathName = new String[1];
+ if (files != null) {
+ for (String file : files) {
+ pathName[0] = directoryPath + '/' + file;
+ parseFiles(pathName, recurse, recurse);
}
+ }
}
- result = new URLClassLoader(urls.toArray(new URL[urls.size()]), null);
- return result;
+ }
}
+ }
- /** Add a message to stderr.
- *
- * @param message the internationalized message to add
- */
- private void addErrorMessage(String message) {
- errorBuffer.append(message);
- errorBuffer.append(NL);
+ /**
+ * Prepare the class loader from the classPath specified
+ *
+ * @param classPath the classPath string from the "-cp classPath" option
+ * @return the class loader
+ */
+ private ClassLoader prepareClassLoader(String classPath) {
+ if (classPath == null) return null;
+ ClassLoader result = null;
+ // separate classPath using system class path separator
+ String separator = System.getProperty("path.separator");
+ String[] paths = classPath.split(separator);
+ List<URL> urls = new ArrayList<URL>();
+ for (String path : paths) {
+ // for each path construct a URL from the File
+ File file = new File(path);
+ URI uri = file.toURI();
+ try {
+ URL url = uri.toURL();
+ addVerboseMessage("MSG_EnhancerClassPath", url.toString());
+ urls.add(url);
+ } catch (MalformedURLException e) {
+ setError();
+ addErrorMessage(msg.msg("ERR_EnhancerBadClassPath", file));
+ }
}
+ result = new URLClassLoader(urls.toArray(new URL[urls.size()]), null);
+ return result;
+ }
- /** Set the error flag.
- *
- */
- private void setError() {
- error = true;
- }
+ /**
+ * Add a message to stderr.
+ *
+ * @param message the internationalized message to add
+ */
+ private void addErrorMessage(String message) {
+ errorBuffer.append(message);
+ errorBuffer.append(NL);
+ }
- /** Set the print-and-exit flag.
- *
- */
- private void setPrintAndExit() {
- printAndExit = true;
- }
+ /** Set the error flag. */
+ private void setError() {
+ error = true;
+ }
- /** Exit this process.
- *
- * @param exitValue the process exit value
- */
- private void exit(int exitValue) {
- System.out.print(verboseBuffer.toString());
- System.err.print(errorBuffer.toString());
- System.exit(exitValue);
- }
+ /** Set the print-and-exit flag. */
+ private void setPrintAndExit() {
+ printAndExit = true;
+ }
- /** Add a message to the verbose message buffer.
- *
- * @param msgId the message id
- * @param where the parameter
- */
- private void addVerboseMessage(String msgId, String... where) {
- verboseBuffer.append(msg.msg(msgId, where));
- verboseBuffer.append(NL);
- }
+ /**
+ * Exit this process.
+ *
+ * @param exitValue the process exit value
+ */
+ private void exit(int exitValue) {
+ System.out.print(verboseBuffer.toString());
+ System.err.print(errorBuffer.toString());
+ System.exit(exitValue);
+ }
- /** Add a message to the verbose message buffer.
- *
- * @param msgId the message id
- * @param where the parameter
- */
- private void addVerboseMessage(String msgId, String where) {
- verboseBuffer.append(msg.msg(msgId, where));
- verboseBuffer.append(NL);
- }
+ /**
+ * Add a message to the verbose message buffer.
+ *
+ * @param msgId the message id
+ * @param where the parameter
+ */
+ private void addVerboseMessage(String msgId, String... where) {
+ verboseBuffer.append(msg.msg(msgId, where));
+ verboseBuffer.append(NL);
+ }
- /** Add a message to the verbose message buffer.
- *
- * @param msgId the message id
- */
- private void addVerboseMessage(String msgId) {
- verboseBuffer.append(msg.msg(msgId));
- verboseBuffer.append(NL);
- }
+ /**
+ * Add a message to the verbose message buffer.
+ *
+ * @param msgId the message id
+ * @param where the parameter
+ */
+ private void addVerboseMessage(String msgId, String where) {
+ verboseBuffer.append(msg.msg(msgId, where));
+ verboseBuffer.append(NL);
+ }
- /** Add a message to the verbose message buffer.
- *
- * @param msgId the message id
- * @param where the parameter
- */
- private void addVerboseMessage(String msgId, int where) {
- addVerboseMessage(msgId, String.valueOf(where));
- }
+ /**
+ * Add a message to the verbose message buffer.
+ *
+ * @param msgId the message id
+ */
+ private void addVerboseMessage(String msgId) {
+ verboseBuffer.append(msg.msg(msgId));
+ verboseBuffer.append(NL);
+ }
+ /**
+ * Add a message to the verbose message buffer.
+ *
+ * @param msgId the message id
+ * @param where the parameter
+ */
+ private void addVerboseMessage(String msgId, int where) {
+ addVerboseMessage(msgId, String.valueOf(where));
+ }
}
diff --git a/api/src/main/java/javax/jdo/Extent.java b/api/src/main/java/javax/jdo/Extent.java
index 120200f3..573cdcf7 100644
--- a/api/src/main/java/javax/jdo/Extent.java
+++ b/api/src/main/java/javax/jdo/Extent.java
@@ -5,13 +5,13 @@
* 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
- *
+ *
* https://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
+ *
+ * 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.
*/
@@ -25,75 +25,90 @@ package javax.jdo;
import java.lang.Iterable;
import java.util.Iterator;
-/** Instances of the <code>Extent</code> class represent the entire collection
- * of instances in the data store of the candidate class or interface
- * possibly including its subclasses or subinterfaces.
- * <P>The <code>Extent</code> instance has two possible uses:
+/**
+ * Instances of the <code>Extent</code> class represent the entire collection of instances in the
+ * data store of the candidate class or interface possibly including its subclasses or
+ * subinterfaces.
+ *
+ * <p>The <code>Extent</code> instance has two possible uses:
+ *
* <ol>
- * <li>to iterate all instances of a particular class or interface
- * <li>to execute a <code>Query</code> in the data store over all instances
- * of a particular class or interface
+ * <li>to iterate all instances of a particular class or interface
+ * <li>to execute a <code>Query</code> in the data store over all instances of a particular class
+ * or interface
* </ol>
+ *
* @version 2.1
*/
public interface Extent<E> extends Iterable<E>, AutoCloseable {
-
- /** Returns an iterator over all the instances in the <code>Extent</code>.
- * The behavior of the returned iterator might depend on the setting of the
- * <code>ignoreCache</code> flag in the owning <code>PersistenceManager</code>.
- * @return an iterator over all instances in the <code>Extent</code>
- */
- Iterator<E> iterator();
- /** Returns whether this <code>Extent</code> was defined to contain subclasses.
- * @return true if this <code>Extent</code> was defined to contain instances
- * that are of a subclass type.
- */
- boolean hasSubclasses();
+ /**
+ * Returns an iterator over all the instances in the <code>Extent</code>. The behavior of the
+ * returned iterator might depend on the setting of the <code>ignoreCache</code> flag in the
+ * owning <code>PersistenceManager</code>.
+ *
+ * @return an iterator over all instances in the <code>Extent</code>
+ */
+ Iterator<E> iterator();
- /** An <code>Extent</code> contains all instances of a particular class
- * or interface in the data
- * store; this method returns the <code>Class</code> of the instances
- * represented by this Extent.
- * @return the <code>Class</code> of instances of this <code>Extent</code>.
- */
- Class<E> getCandidateClass();
+ /**
+ * Returns whether this <code>Extent</code> was defined to contain subclasses.
+ *
+ * @return true if this <code>Extent</code> was defined to contain instances that are of a
+ * subclass type.
+ */
+ boolean hasSubclasses();
- /** An <code>Extent</code> is managed by a <code>PersistenceManager</code>;
- * this method gives access to the owning <code>PersistenceManager</code>.
- * @return the owning <code>PersistenceManager</code>
- */
- PersistenceManager getPersistenceManager();
-
- /** Close all <code>Iterator</code>s associated with this <code>Extent</code> instance.
- * <code>Iterator</code>s closed by this method will return <code>false</code>
- * to <code>hasNext()</code> and will throw
- * <code>NoSuchElementException</code> on <code>next()</code>.
- * The <code>Extent</code> instance can still be used
- * as a parameter of <code>Query.setExtent</code>, and to get an <code>Iterator</code>.
- */
- void closeAll ();
-
- /** Close an <code>Iterator</code> associated with this <code>Extent</code> instance.
- * <code>Iterator</code>s closed by this method will return <code>false</code>
- * to <code>hasNext()</code> and will throw <code>NoSuchElementException</code>
- * on <code>next()</code>. The <code>Extent</code> instance can still be used
- * as a parameter of <code>Query.setExtent</code>, and to get an <code>Iterator</code>.
- * @param it an <code>Iterator</code> obtained by the method
- * <code>iterator()</code> on this <code>Extent</code> instance.
- */
- void close (Iterator<E> it);
+ /**
+ * An <code>Extent</code> contains all instances of a particular class or interface in the data
+ * store; this method returns the <code>Class</code> of the instances represented by this Extent.
+ *
+ * @return the <code>Class</code> of instances of this <code>Extent</code>.
+ */
+ Class<E> getCandidateClass();
- /**
- * Don't use this method directly; use <code>closeAll()</code> instead. It is intended for use with try-with-resources.
- * @throws Exception if this resource cannot be closed
- */
- void close() throws Exception;
+ /**
+ * An <code>Extent</code> is managed by a <code>PersistenceManager</code>; this method gives
+ * access to the owning <code>PersistenceManager</code>.
+ *
+ * @return the owning <code>PersistenceManager</code>
+ */
+ PersistenceManager getPersistenceManager();
- /** Get the fetch plan associated with this Extent.
- * @return the fetch plan
- * @since 2.0
- */
- FetchPlan getFetchPlan();
-}
+ /**
+ * Close all <code>Iterator</code>s associated with this <code>Extent</code> instance. <code>
+ * Iterator</code>s closed by this method will return <code>false</code> to <code>hasNext()</code>
+ * and will throw <code>NoSuchElementException</code> on <code>next()</code>. The <code>Extent
+ * </code> instance can still be used as a parameter of <code>Query.setExtent</code>, and to get
+ * an <code>Iterator</code>.
+ */
+ void closeAll();
+
+ /**
+ * Close an <code>Iterator</code> associated with this <code>Extent</code> instance. <code>
+ * Iterator</code>s closed by this method will return <code>false</code> to <code>hasNext()</code>
+ * and will throw <code>NoSuchElementException</code> on <code>next()</code>. The <code>Extent
+ * </code> instance can still be used as a parameter of <code>Query.setExtent</code>, and to get
+ * an <code>Iterator</code>.
+ *
+ * @param it an <code>Iterator</code> obtained by the method <code>iterator()</code> on this
+ * <code>Extent</code> instance.
+ */
+ void close(Iterator<E> it);
+ /**
+ * Don't use this method directly; use <code>closeAll()</code> instead. It is intended for use
+ * with try-with-resources.
+ *
+ * @throws Exception if this resource cannot be closed
+ */
+ void close() throws Exception;
+
+ /**
+ * Get the fetch plan associated with this Extent.
+ *
+ * @return the fetch plan
+ * @since 2.0
+ */
+ FetchPlan getFetchPlan();
+}
diff --git a/api/src/main/java/javax/jdo/FetchGroup.java b/api/src/main/java/javax/jdo/FetchGroup.java
index ca4d2ace..2e7827bc 100644
--- a/api/src/main/java/javax/jdo/FetchGroup.java
+++ b/api/src/main/java/javax/jdo/FetchGroup.java
@@ -5,13 +5,13 @@
* 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
- *
+ *
* https://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
+ *
+ * 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.
*/
@@ -19,265 +19,269 @@
* FetchGroup.java
*
*/
-
+
package javax.jdo;
import java.util.Set;
/**
- * FetchGroup represents a named fetch group for a specific class or
- * interface. A fetch group instance identifies the name of the class or
- * interface, the list of members (fields or properties) to be fetched when
- * the fetch group is active, and the recursion depth for each member.
- * <p>
- * Fetch groups are updated using methods on this interface. An instance of
- * a class implementing this interface can be obtained from
- * {@link PersistenceManager#getFetchGroup} or
- * {@link PersistenceManagerFactory#getFetchGroup}.
- * <p>
- * A FetchGroup can be unscoped or can be in one of two scopes (the
- * {@link PersistenceManager} or the {@link PersistenceManagerFactory} scope).
- * Unscoped FetchGroups do not affect any behavior.
- * A FetchGroup in PersistenceManager scope hides the corresponding
- * FetchGroup in the PersistenceManagerFactory scope.
- * <ul><li>When a FetchGroup is obtained via
- * {@link PersistenceManager#getFetchGroup},
- * it is immediately in scope of its <code>PersistenceManager</code>.
- * Subsequent modifications of the FetchGroup
- * immediately affect <code>FetchPlan</code>s that contain the
- * <code>FetchGroup</code>.
- * </li><li>When a FetchGroup is obtained via
- * {@link PersistenceManagerFactory#getFetchGroup}, it is unscoped.
- * </li><li>When a FetchGroup is added to the set of active FetchGroups via
- * {@link PersistenceManagerFactory#addFetchGroups}, it is put in scope of the
- * <code>PersistenceManagerFactory</code>.
- * </li><li>When a FetchGroup is removed from the set of active FetchGroups via
- * {@link PersistenceManagerFactory#removeFetchGroups},
- * {@link PersistenceManagerFactory#removeAllFetchGroups}, or replaced via
- * {@link PersistenceManagerFactory#addFetchGroups}, it is unscoped.
- * </li></ul>
+ * FetchGroup represents a named fetch group for a specific class or interface. A fetch group
+ * instance identifies the name of the class or interface, the list of members (fields or
+ * properties) to be fetched when the fetch group is active, and the recursion depth for each
+ * member.
+ *
+ * <p>Fetch groups are updated using methods on this interface. An instance of a class implementing
+ * this interface can be obtained from {@link PersistenceManager#getFetchGroup} or {@link
+ * PersistenceManagerFactory#getFetchGroup}.
+ *
+ * <p>A FetchGroup can be unscoped or can be in one of two scopes (the {@link PersistenceManager} or
+ * the {@link PersistenceManagerFactory} scope). Unscoped FetchGroups do not affect any behavior. A
+ * FetchGroup in PersistenceManager scope hides the corresponding FetchGroup in the
+ * PersistenceManagerFactory scope.
+ *
+ * <ul>
+ * <li>When a FetchGroup is obtained via {@link PersistenceManager#getFetchGroup}, it is
+ * immediately in scope of its <code>PersistenceManager</code>. Subsequent modifications of
+ * the FetchGroup immediately affect <code>FetchPlan</code>s that contain the <code>FetchGroup
+ * </code>.
+ * <li>When a FetchGroup is obtained via {@link PersistenceManagerFactory#getFetchGroup}, it is
+ * unscoped.
+ * <li>When a FetchGroup is added to the set of active FetchGroups via {@link
+ * PersistenceManagerFactory#addFetchGroups}, it is put in scope of the <code>
+ * PersistenceManagerFactory</code>.
+ * <li>When a FetchGroup is removed from the set of active FetchGroups via {@link
+ * PersistenceManagerFactory#removeFetchGroups}, {@link
+ * PersistenceManagerFactory#removeAllFetchGroups}, or replaced via {@link
+ * PersistenceManagerFactory#addFetchGroups}, it is unscoped.
+ * </ul>
+ *
* @version 2.2
* @since 2.2
*/
public interface FetchGroup {
- /**
- * For use with {@link #addCategory} and {@link #removeCategory} calls.
- * This category includes members defined in the default fetch group
- * in xml or annotations. Redefining the default fetch group via the API
- * does not affect the members defined by this category.
- * <p>
- * Using this category also sets the fetch-depth for the members in the
- * default fetch group.</p>
- * @since 2.2
- */
- public static final String DEFAULT = "default";
+ /**
+ * For use with {@link #addCategory} and {@link #removeCategory} calls. This category includes
+ * members defined in the default fetch group in xml or annotations. Redefining the default fetch
+ * group via the API does not affect the members defined by this category.
+ *
+ * <p>Using this category also sets the fetch-depth for the members in the default fetch group.
+ *
+ * @since 2.2
+ */
+ public static final String DEFAULT = "default";
- /**
- * For use with {@link #addCategory} and {@link #removeCategory} calls.
- * This category includes members of all relationship types.
- * @since 2.2
- */
- public static final String RELATIONSHIP = "relationship";
+ /**
+ * For use with {@link #addCategory} and {@link #removeCategory} calls. This category includes
+ * members of all relationship types.
+ *
+ * @since 2.2
+ */
+ public static final String RELATIONSHIP = "relationship";
- /**
- * For use with {@link #addCategory} and {@link #removeCategory} calls.
- * This category includes members of all multi-valued types, including
- * Collection, array, and Map types of basic and relationship types.
- * @since 2.2
- */
- public static final String MULTIVALUED = "multivalued";
+ /**
+ * For use with {@link #addCategory} and {@link #removeCategory} calls. This category includes
+ * members of all multi-valued types, including Collection, array, and Map types of basic and
+ * relationship types.
+ *
+ * @since 2.2
+ */
+ public static final String MULTIVALUED = "multivalued";
- /**
- * For use with {@link #addCategory} and {@link #removeCategory} calls.
- * This category includes members of all primitive and immutable
- * object class types as defined in section 6.4 of the specification,
- * including String, Locale, Currency, BigDecimal, and BigInteger;
- * as well as Date and its jdbc subtypes and Enum types.
- * @since 2.2
- */
- public static final String BASIC = "basic";
+ /**
+ * For use with {@link #addCategory} and {@link #removeCategory} calls. This category includes
+ * members of all primitive and immutable object class types as defined in section 6.4 of the
+ * specification, including String, Locale, Currency, BigDecimal, and BigInteger; as well as Date
+ * and its jdbc subtypes and Enum types.
+ *
+ * @since 2.2
+ */
+ public static final String BASIC = "basic";
- /**
- * For use with {@link #addCategory} and {@link #removeCategory} calls.
- * This category includes all members in the persistent type.
- * <p>
- * Using this category also sets the fetch-depth for the members in the
- * default fetch group.</p>
- * @since 2.2
- */
- public static final String ALL = "all";
+ /**
+ * For use with {@link #addCategory} and {@link #removeCategory} calls. This category includes all
+ * members in the persistent type.
+ *
+ * <p>Using this category also sets the fetch-depth for the members in the default fetch group.
+ *
+ * @since 2.2
+ */
+ public static final String ALL = "all";
- /**
- * Return the hashCode for this instance. The hash code should combine both
- * the class and fetch group name. The hash codes for two equal instances
- * must be identical.
- * @return the hash code
- * @since 2.2
- */
- int hashCode();
+ /**
+ * Return the hashCode for this instance. The hash code should combine both the class and fetch
+ * group name. The hash codes for two equal instances must be identical.
+ *
+ * @return the hash code
+ * @since 2.2
+ */
+ int hashCode();
- /**
- * Return whether this instance is equal to the other. The equals method
- * must compare the class for identity and the fetch group name for
- * equality.
- * @return whether this instance is equal to the other
- * @since 2.2
- */
- boolean equals(Object other);
+ /**
+ * Return whether this instance is equal to the other. The equals method must compare the class
+ * for identity and the fetch group name for equality.
+ *
+ * @return whether this instance is equal to the other
+ * @since 2.2
+ */
+ boolean equals(Object other);
- /**
- * Get the name of this FetchGroup. The name is set only in the
- * factory method.
- * @return the name
- * @since 2.2
- */
- String getName();
+ /**
+ * Get the name of this FetchGroup. The name is set only in the factory method.
+ *
+ * @return the name
+ * @since 2.2
+ */
+ String getName();
- /**
- * Get the persistent type (class or interface) of this FetchGroup.
- * The persistent type is set only in the factory method(s).
- * @return the persistent type
- * @since 2.2
- */
- Class getType();
+ /**
+ * Get the persistent type (class or interface) of this FetchGroup. The persistent type is set
+ * only in the factory method(s).
+ *
+ * @return the persistent type
+ * @since 2.2
+ */
+ Class getType();
- /**
- * Get the post-load property of this FetchGroup.
- * @return the post-load property
- * @since 2.2
- */
- boolean getPostLoad();
+ /**
+ * Get the post-load property of this FetchGroup.
+ *
+ * @return the post-load property
+ * @since 2.2
+ */
+ boolean getPostLoad();
- /**
- * Set the post-load property of this FetchGroup.
- * @param postLoad Whether to post load this fetch group
- * @return the FetchGroup
- * @throws JDOUserException if the FetchGroup is unmodifiable
- * @since 2.2
- */
- FetchGroup setPostLoad(boolean postLoad);
+ /**
+ * Set the post-load property of this FetchGroup.
+ *
+ * @param postLoad Whether to post load this fetch group
+ * @return the FetchGroup
+ * @throws JDOUserException if the FetchGroup is unmodifiable
+ * @since 2.2
+ */
+ FetchGroup setPostLoad(boolean postLoad);
- /**
- * Add the member (field or property) to the set of members in this
- * FetchGroup.
- * @param memberName the name of a member to add to the FetchGroup
- * @return the FetchGroup
- * @throws JDOUserException if the parameter is not a member of the
- * persistent type
- * @throws JDOUserException if the FetchGroup is unmodifiable
- * @since 2.2
- */
- FetchGroup addMember(String memberName);
+ /**
+ * Add the member (field or property) to the set of members in this FetchGroup.
+ *
+ * @param memberName the name of a member to add to the FetchGroup
+ * @return the FetchGroup
+ * @throws JDOUserException if the parameter is not a member of the persistent type
+ * @throws JDOUserException if the FetchGroup is unmodifiable
+ * @since 2.2
+ */
+ FetchGroup addMember(String memberName);
- /**
- * Add the member (field or property) to the set of members in this
- * FetchGroup. Duplicates are ignored.
- * @param memberNames the names of members to add to the FetchGroup
- * @return the FetchGroup
- * @throws JDOUserException if any parameter is not a member of the
- * persistent type
- * @throws JDOUserException if the FetchGroup is unmodifiable
- * @since 2.2
- */
- FetchGroup addMembers(String... memberNames);
+ /**
+ * Add the member (field or property) to the set of members in this FetchGroup. Duplicates are
+ * ignored.
+ *
+ * @param memberNames the names of members to add to the FetchGroup
+ * @return the FetchGroup
+ * @throws JDOUserException if any parameter is not a member of the persistent type
+ * @throws JDOUserException if the FetchGroup is unmodifiable
+ * @since 2.2
+ */
+ FetchGroup addMembers(String... memberNames);
- /**
- * Remove the member (field or property) from the set of members in this FetchGroup.
- * @param memberName Name of the member of the class to remove from the FetchGroup.
- * @return the FetchGroup
- * @throws JDOUserException if the parameter is not a member of the persistent type
- * @throws JDOUserException if the FetchGroup is unmodifiable
- * @since 2.2
- */
- FetchGroup removeMember(String memberName);
+ /**
+ * Remove the member (field or property) from the set of members in this FetchGroup.
+ *
+ * @param memberName Name of the member of the class to remove from the FetchGroup.
+ * @return the FetchGroup
+ * @throws JDOUserException if the parameter is not a member of the persistent type
+ * @throws JDOUserException if the FetchGroup is unmodifiable
+ * @since 2.2
+ */
+ FetchGroup removeMember(String memberName);
- /**
- * Remove the member (field or property) from the set of members in this
- * FetchGroup. Duplicates in the parameter list are eliminated before
- * removing them from the membership.
- * @param memberNames Member names of the class to remove from this FetchGroup.
- * @return the FetchGroup
- * @throws JDOUserException if any parameter is not a member of the persistent type
- * @throws JDOUserException if the FetchGroup is unmodifiable
- * @since 2.2
- */
- FetchGroup removeMembers(String... memberNames);
+ /**
+ * Remove the member (field or property) from the set of members in this FetchGroup. Duplicates in
+ * the parameter list are eliminated before removing them from the membership.
+ *
+ * @param memberNames Member names of the class to remove from this FetchGroup.
+ * @return the FetchGroup
+ * @throws JDOUserException if any parameter is not a member of the persistent type
+ * @throws JDOUserException if the FetchGroup is unmodifiable
+ * @since 2.2
+ */
+ FetchGroup removeMembers(String... memberNames);
- /**
- * Add the members (fields or properties) of the named category
- * to the set of members in this FetchGroup. This method first
- * resolves the category name to a set of members and then adds
- * the members as if {@link #addMembers} was called. After this
- * method executes, the category is not remembered.
- * @param categoryName Category to add to this FetchGroup.
- * @return the FetchGroup
- * @throws JDOUserException if the FetchGroup is unmodifiable
- * @since 2.2
- */
- FetchGroup addCategory(String categoryName);
+ /**
+ * Add the members (fields or properties) of the named category to the set of members in this
+ * FetchGroup. This method first resolves the category name to a set of members and then adds the
+ * members as if {@link #addMembers} was called. After this method executes, the category is not
+ * remembered.
+ *
+ * @param categoryName Category to add to this FetchGroup.
+ * @return the FetchGroup
+ * @throws JDOUserException if the FetchGroup is unmodifiable
+ * @since 2.2
+ */
+ FetchGroup addCategory(String categoryName);
- /**
- * Remove the members (fields or properties) of the named category
- * from the set of members in this FetchGroup. This method first
- * resolves the category name to a set of members and then removes
- * the members as if {@link #removeMembers} was called. After this
- * method executes, the category is not remembered.
- * @param categoryName Category to remove from this FetchGroup.
- * @return the FetchGroup
- * @throws JDOUserException if the FetchGroup is unmodifiable
- * @since 2.2
- */
- FetchGroup removeCategory(String categoryName);
+ /**
+ * Remove the members (fields or properties) of the named category from the set of members in this
+ * FetchGroup. This method first resolves the category name to a set of members and then removes
+ * the members as if {@link #removeMembers} was called. After this method executes, the category
+ * is not remembered.
+ *
+ * @param categoryName Category to remove from this FetchGroup.
+ * @return the FetchGroup
+ * @throws JDOUserException if the FetchGroup is unmodifiable
+ * @since 2.2
+ */
+ FetchGroup removeCategory(String categoryName);
- /**
- * Set the recursion-depth for this member. The default is 1. A value of 0
- * means don't fetch the member (as if the member were omitted entirely).
- * A value of -1 means fetch all instances reachable via this member.
- * @return the FetchGroup
- * @param memberName the name of the field or property
- * @param recursionDepth the value for the recursion-depth property
- * @throws JDOUserException if the member does not exist
- * @throws JDOUserException if the FetchGroup is unmodifiable
- * @since 2.2
- */
- FetchGroup setRecursionDepth(String memberName, int recursionDepth);
+ /**
+ * Set the recursion-depth for this member. The default is 1. A value of 0 means don't fetch the
+ * member (as if the member were omitted entirely). A value of -1 means fetch all instances
+ * reachable via this member.
+ *
+ * @return the FetchGroup
+ * @param memberName the name of the field or property
+ * @param recursionDepth the value for the recursion-depth property
+ * @throws JDOUserException if the member does not exist
+ * @throws JDOUserException if the FetchGroup is unmodifiable
+ * @since 2.2
+ */
+ FetchGroup setRecursionDepth(String memberName, int recursionDepth);
- /**
- * Get the recursion-depth for this member.
- * @param memberName the name of the field or property
- * @return the recursion-depth for this member
- * @throws JDOUserException if the member is not in the FetchGroup
- * @since 2.2
- */
- int getRecursionDepth(String memberName);
+ /**
+ * Get the recursion-depth for this member.
+ *
+ * @param memberName the name of the field or property
+ * @return the recursion-depth for this member
+ * @throws JDOUserException if the member is not in the FetchGroup
+ * @since 2.2
+ */
+ int getRecursionDepth(String memberName);
- /**
- * Return an immutable Set of String containing the names of all members.
- * The Set is a copy of the currently defined members and will not change
- * based on subsequent changes to the membership in the FetchGroup.
- * @return an immutable Set containing the names of all members
- * in the FetchGroup
- * @since 2.2
- */
- Set getMembers();
+ /**
+ * Return an immutable Set of String containing the names of all members. The Set is a copy of the
+ * currently defined members and will not change based on subsequent changes to the membership in
+ * the FetchGroup.
+ *
+ * @return an immutable Set containing the names of all members in the FetchGroup
+ * @since 2.2
+ */
+ Set getMembers();
- /**
- * Make this FetchGroup unmodifiable. If already unmodifiable, this method
- * has no effect.
- * @return the FetchGroup
- * @since 2.2
- */
- FetchGroup setUnmodifiable();
+ /**
+ * Make this FetchGroup unmodifiable. If already unmodifiable, this method has no effect.
+ *
+ * @return the FetchGroup
+ * @since 2.2
+ */
+ FetchGroup setUnmodifiable();
- /**
- * Return whether this FetchGroup is unmodifiable. If so, methods
- * {@link #setPostLoad}, {@link #addMember}, {@link #removeMember},
- * {@link #addMembers}, {@link #removeMembers},
- * {@link #addCategory}, and {@link #removeCategory}
- * will throw {@link JDOUserException}.
- * @return whether the FetchGroup is unmodifiable
- * @since 2.2
- */
- boolean isUnmodifiable();
+ /**
+ * Return whether this FetchGroup is unmodifiable. If so, methods {@link #setPostLoad}, {@link
+ * #addMember}, {@link #removeMember}, {@link #addMembers}, {@link #removeMembers}, {@link
+ * #addCategory}, and {@link #removeCategory} will throw {@link JDOUserException}.
+ *
+ * @return whether the FetchGroup is unmodifiable
+ * @since 2.2
+ */
+ boolean isUnmodifiable();
}
diff --git a/api/src/main/java/javax/jdo/FetchPlan.java b/api/src/main/java/javax/jdo/FetchPlan.java
index 85ea6722..0548b5cd 100644
--- a/api/src/main/java/javax/jdo/FetchPlan.java
+++ b/api/src/main/java/javax/jdo/FetchPlan.java
@@ -5,13 +5,13 @@
* 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
- *
+ *
* https://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
+ *
+ * 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.
*/
@@ -19,211 +19,221 @@
* FetchPlan.java
*
*/
-
+
package javax.jdo;
import java.util.Collection;
import java.util.Set;
/**
- * Fetch groups are activated using methods on this interface. An
- * instance of this interface can be obtained from {@link
- * PersistenceManager#getFetchPlan}, {@link Extent#getFetchPlan}, and
- * {@link Query#getFetchPlan}. When a <code>Query</code> or
- * <code>Extent</code> is retrieved from a
- * <code>PersistenceManager</code>, its <code>FetchPlan</code> is
- * initialized to the same settings as that of the
- * <code>PersistenceManager</code>. Subsequent modifications of the
- * <code>Query</code> or <code>Extent</code>'s <code>FetchPlan</code>
- * are not reflected in the <code>FetchPlan</code> of the
- * <code>PersistenceManager</code>.
+ * Fetch groups are activated using methods on this interface. An instance of this interface can be
+ * obtained from {@link PersistenceManager#getFetchPlan}, {@link Extent#getFetchPlan}, and {@link
+ * Query#getFetchPlan}. When a <code>Query</code> or <code>Extent</code> is retrieved from a <code>
+ * PersistenceManager</code>, its <code>FetchPlan</code> is initialized to the same settings as that
+ * of the <code>PersistenceManager</code>. Subsequent modifications of the <code>Query</code> or
+ * <code>Extent</code>'s <code>FetchPlan</code> are not reflected in the <code>FetchPlan</code> of
+ * the <code>PersistenceManager</code>.
+ *
* @version 2.0
* @since 2.0
*/
public interface FetchPlan {
- /**
- * For use with {@link #addGroup}, {@link #removeGroup}, and the
- * various {@link #setGroups} calls. Value: <code>default</code>.
- * @since 2.0
- */
- public static final String DEFAULT = "default";
-
- /**
- * For use with {@link #addGroup}, {@link #removeGroup}, and the
- * various {@link #setGroups} calls. Value: <code>all</code>.
- * @since 2.0
- */
- public static final String ALL = "all";
-
- /**
- * For use with {@link PersistenceManager#detachCopy} and
- * {@link #setDetachmentOptions}. Specifies that
- * fields that are loaded but not in the current fetch plan should
- * be unloaded prior to detachment.
- * @since 2.0
- */
- public static final int DETACH_UNLOAD_FIELDS = 2;
-
- /**
- * For use with {@link PersistenceManager#detachCopy} and
- * {@link #setDetachmentOptions}. Specifies that
- * fields that are not loaded but are in the current fetch plan should
- * be loaded prior to detachment.
- * @since 2.0
- */
- public static final int DETACH_LOAD_FIELDS = 1;
-
- /**
- * For use with {@link #setFetchSize}. Value: -1.
- * @since 2.0
- */
- public static final int FETCH_SIZE_GREEDY = -1;
-
- /**
- * For use with {@link #setFetchSize}. Value: 0.
- * @since 2.0
- */
- public static final int FETCH_SIZE_OPTIMAL = 0;
-
- /**
- * Add the fetch group to the set of active fetch groups.
- * @param fetchGroupName Name of the FetchGroup to add
- * @return the FetchPlan
- * @since 2.0
- */
- FetchPlan addGroup(String fetchGroupName);
-
- /**
- * Remove the fetch group from the set active fetch groups.
- * @param fetchGroupName Name of the FetchGroup to remove
- * @return the FetchPlan
- * @since 2.0
- */
- FetchPlan removeGroup(String fetchGroupName);
-
- /**
- * Remove all active groups leaving no active fetch group.
- * @return the FetchPlan
- * @since 2.0
- */
- FetchPlan clearGroups();
-
- /**
- * Return an immutable Set containing the names
- * of all active fetch groups. The Set is a copy of
- * the currently active groups and will not change
- * based on subsequent changes to the groups.
- * @return an immutable Set containing the names
- * of all currently active fetch groups
- * @since 2.0
- */
- Set getGroups();
-
- /**
- * Set a collection of groups.
- * @param fetchGroupNames a collection of names of fetch groups
- * @return the FetchPlan
- * @since 2.0
- */
- FetchPlan setGroups(Collection fetchGroupNames);
-
- /**
- * Set a collection of groups.
- * @param fetchGroupNames a String array of names of fetch groups
- * @return the FetchPlan
- * @since 2.0
- */
- FetchPlan setGroups(String... fetchGroupNames);
-
- /**
- * Set the active fetch groups to the single named fetch group.
- * @param fetchGroupName the single fetch group
- * @return the FetchPlan
- * @since 2.0
- */
- FetchPlan setGroup(String fetchGroupName);
-
- /**
- * Set the maximum fetch depth when fetching.
- * A value of 0 has no meaning and will throw a JDOUserException.
- * A value of -1 means that no limit is placed on fetching.
- * A positive integer will result in that number of references from the
- * initial object to be fetched.
- * @param fetchDepth the depth
- * @return the FetchPlan
- * @since 2.0
- */
- FetchPlan setMaxFetchDepth(int fetchDepth);
-
- /**
- * Return the maximum fetch depth used when fetching instances.
- * @return the maximum fetch depth
- * @since 2.0
- */
- int getMaxFetchDepth();
-
- /**
- * Set the roots for DetachAllOnCommit.
- * @param roots Collection of the detachment roots.
- * @return This FetchPlan
- * @since 2.0
- */
- FetchPlan setDetachmentRoots(Collection roots);
-
- /**
- * Get the roots for DetachAllOnCommit.
- * @return Collection of detachment roots.
- * @since 2.0
- */
- Collection getDetachmentRoots();
-
- /**
- * Set the root classes for DetachAllOnCommit.
- * @param rootClasses The root classes.
- * @return This FetchPlan
- * @since 2.0
- */
- FetchPlan setDetachmentRootClasses(Class... rootClasses);
-
- /**
- * Get the root classes for DetachAllOnCommit.
- * @return The detachment root classes
- * @since 2.0
- */
- Class[] getDetachmentRootClasses();
-
- /**
- * Set the fetch size for large result set support. Use
- * {@link #FETCH_SIZE_OPTIMAL} to unset, and {@link #FETCH_SIZE_GREEDY}
- * to force loading of everything.
- * @param fetchSize the fetch size
- * @return the FetchPlan
- * @since 2.0
- */
- FetchPlan setFetchSize(int fetchSize);
-
- /**
- * Return the fetch size, or {@link #FETCH_SIZE_OPTIMAL} if not set,
- * or {@link #FETCH_SIZE_GREEDY} to fetch all.
- * @return the fetch size
- * @since 2.0
- */
- int getFetchSize();
-
- /**
- * Set options to be used during detachment. Options are {@link
- * #DETACH_LOAD_FIELDS} and {@link #DETACH_UNLOAD_FIELDS}.
- * @param options Options for use during detachment.
- * @return This FetchPlan
- */
- FetchPlan setDetachmentOptions(int options);
-
- /**
- * Get options used during detachment.
- * @return Options to use during detachment.
- */
- int getDetachmentOptions();
-
+ /**
+ * For use with {@link #addGroup}, {@link #removeGroup}, and the various {@link #setGroups} calls.
+ * Value: <code>default</code>.
+ *
+ * @since 2.0
+ */
+ public static final String DEFAULT = "default";
+
+ /**
+ * For use with {@link #addGroup}, {@link #removeGroup}, and the various {@link #setGroups} calls.
+ * Value: <code>all</code>.
+ *
+ * @since 2.0
+ */
+ public static final String ALL = "all";
+
+ /**
+ * For use with {@link PersistenceManager#detachCopy} and {@link #setDetachmentOptions}. Specifies
+ * that fields that are loaded but not in the current fetch plan should be unloaded prior to
+ * detachment.
+ *
+ * @since 2.0
+ */
+ public static final int DETACH_UNLOAD_FIELDS = 2;
+
+ /**
+ * For use with {@link PersistenceManager#detachCopy} and {@link #setDetachmentOptions}. Specifies
+ * that fields that are not loaded but are in the current fetch plan should be loaded prior to
+ * detachment.
+ *
+ * @since 2.0
+ */
+ public static final int DETACH_LOAD_FIELDS = 1;
+
+ /**
+ * For use with {@link #setFetchSize}. Value: -1.
+ *
+ * @since 2.0
+ */
+ public static final int FETCH_SIZE_GREEDY = -1;
+
+ /**
+ * For use with {@link #setFetchSize}. Value: 0.
+ *
+ * @since 2.0
+ */
+ public static final int FETCH_SIZE_OPTIMAL = 0;
+
+ /**
+ * Add the fetch group to the set of active fetch groups.
+ *
+ * @param fetchGroupName Name of the FetchGroup to add
+ * @return the FetchPlan
+ * @since 2.0
+ */
+ FetchPlan addGroup(String fetchGroupName);
+
+ /**
+ * Remove the fetch group from the set active fetch groups.
+ *
+ * @param fetchGroupName Name of the FetchGroup to remove
+ * @return the FetchPlan
+ * @since 2.0
+ */
+ FetchPlan removeGroup(String fetchGroupName);
+
+ /**
+ * Remove all active groups leaving no active fetch group.
+ *
+ * @return the FetchPlan
+ * @since 2.0
+ */
+ FetchPlan clearGroups();
+
+ /**
+ * Return an immutable Set containing the names of all active fetch groups. The Set is a copy of
+ * the currently active groups and will not change based on subsequent changes to the groups.
+ *
+ * @return an immutable Set containing the names of all currently active fetch groups
+ * @since 2.0
+ */
+ Set getGroups();
+
+ /**
+ * Set a collection of groups.
+ *
+ * @param fetchGroupNames a collection of names of fetch groups
+ * @return the FetchPlan
+ * @since 2.0
+ */
+ FetchPlan setGroups(Collection fetchGroupNames);
+
+ /**
+ * Set a collection of groups.
+ *
+ * @param fetchGroupNames a String array of names of fetch groups
+ * @return the FetchPlan
+ * @since 2.0
+ */
+ FetchPlan setGroups(String... fetchGroupNames);
+
+ /**
+ * Set the active fetch groups to the single named fetch group.
+ *
+ * @param fetchGroupName the single fetch group
+ * @return the FetchPlan
+ * @since 2.0
+ */
+ FetchPlan setGroup(String fetchGroupName);
+
+ /**
+ * Set the maximum fetch depth when fetching. A value of 0 has no meaning and will throw a
+ * JDOUserException. A value of -1 means that no limit is placed on fetching. A positive integer
+ * will result in that number of references from the initial object to be fetched.
+ *
+ * @param fetchDepth the depth
+ * @return the FetchPlan
+ * @since 2.0
+ */
+ FetchPlan setMaxFetchDepth(int fetchDepth);
+
+ /**
+ * Return the maximum fetch depth used when fetching instances.
+ *
+ * @return the maximum fetch depth
+ * @since 2.0
+ */
+ int getMaxFetchDepth();
+
+ /**
+ * Set the roots for DetachAllOnCommit.
+ *
+ * @param roots Collection of the detachment roots.
+ * @return This FetchPlan
+ * @since 2.0
+ */
+ FetchPlan setDetachmentRoots(Collection roots);
+
+ /**
+ * Get the roots for DetachAllOnCommit.
+ *
+ * @return Collection of detachment roots.
+ * @since 2.0
+ */
+ Collection getDetachmentRoots();
+
+ /**
+ * Set the root classes for DetachAllOnCommit.
+ *
+ * @param rootClasses The root classes.
+ * @return This FetchPlan
+ * @since 2.0
+ */
+ FetchPlan setDetachmentRootClasses(Class... rootClasses);
+
+ /**
+ * Get the root classes for DetachAllOnCommit.
+ *
+ * @return The detachment root classes
+ * @since 2.0
+ */
+ Class[] getDetachmentRootClasses();
+
+ /**
+ * Set the fetch size for large result set support. Use {@link #FETCH_SIZE_OPTIMAL} to unset, and
+ * {@link #FETCH_SIZE_GREEDY} to force loading of everything.
+ *
+ * @param fetchSize the fetch size
+ * @return the FetchPlan
+ * @since 2.0
+ */
+ FetchPlan setFetchSize(int fetchSize);
+
+ /**
+ * Return the fetch size, or {@link #FETCH_SIZE_OPTIMAL} if not set, or {@link #FETCH_SIZE_GREEDY}
+ * to fetch all.
+ *
+ * @return the fetch size
+ * @since 2.0
+ */
+ int getFetchSize();
+
+ /**
+ * Set options to be used during detachment. Options are {@link #DETACH_LOAD_FIELDS} and {@link
+ * #DETACH_UNLOAD_FIELDS}.
+ *
+ * @param options Options for use during detachment.
+ * @return This FetchPlan
+ */
+ FetchPlan setDetachmentOptions(int options);
+
+ /**
+ * Get options used during detachment.
+ *
+ * @return Options to use during detachment.
+ */
+ int getDetachmentOptions();
}
-
diff --git a/api/src/main/java/javax/jdo/InstanceCallbacks.java b/api/src/main/java/javax/jdo/InstanceCallbacks.java
index 640e963e..2aad32ab 100644
--- a/api/src/main/java/javax/jdo/InstanceCallbacks.java
+++ b/api/src/main/java/javax/jdo/InstanceCallbacks.java
@@ -5,13 +5,13 @@
* 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
- *
+ *
* https://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
+ *
+ * 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.
*/
@@ -19,53 +19,44 @@
* InstanceCallbacks.java
*
*/
-
+
package javax.jdo;
-/** A <code>PersistenceCapable</code> class that provides callback methods for life
- * cycle events implements this interface.
+/**
+ * A <code>PersistenceCapable</code> class that provides callback methods for life cycle events
+ * implements this interface.
*
- * <P>For JDO 2.0, <code>InstanceCallbacks</code> has been refactored to extend
- * four other interfaces, without changing any of the methods or semantics.
- * This allows fine-grained control over callbacks, for
- * example to allow a class to implement the load callback without
- * implementing any of the other callbacks. For backward compatibility
- * with JDO 1.0, the <code>InstanceCallbacks</code> interface is preserved.
+ * <p>For JDO 2.0, <code>InstanceCallbacks</code> has been refactored to extend four other
+ * interfaces, without changing any of the methods or semantics. This allows fine-grained control
+ * over callbacks, for example to allow a class to implement the load callback without implementing
+ * any of the other callbacks. For backward compatibility with JDO 1.0, the <code>InstanceCallbacks
+ * </code> interface is preserved.
*
- * <P>Classes which include non-persistent fields whose values depend
- * on the values of persistent fields require callbacks on specific
- * JDO instance life cycle events in order to correctly populate the
- * values in these fields.
+ * <p>Classes which include non-persistent fields whose values depend on the values of persistent
+ * fields require callbacks on specific JDO instance life cycle events in order to correctly
+ * populate the values in these fields.
*
- * <P>The callbacks might also be used if the persistent instances
- * need to be put into the runtime infrastructure of the application.
- * For example, a persistent instance might notify other instances
- * on changes to state. The persistent instance might be in a list of
- * managed instances. When the persistent instance is made hollow,
- * it can no longer generate change events, and the persistent
- * instance should be removed from the list of managed instances.
+ * <p>The callbacks might also be used if the persistent instances need to be put into the runtime
+ * infrastructure of the application. For example, a persistent instance might notify other
+ * instances on changes to state. The persistent instance might be in a list of managed instances.
+ * When the persistent instance is made hollow, it can no longer generate change events, and the
+ * persistent instance should be removed from the list of managed instances.
*
- * <P>To implement this, the application programmer would implement
- * <code>jdoPostLoad</code> to put itself into the list of managed
- * instances, and implement <code>jdoPreClear</code> to remove itself from
- * the list. With JDO 1.0, the domain class would be declared to implement
- * <code>InstanceCallbacks</code>. With JDO 2.0, the domain class
- * would be declared to implement
- * <code>javax.jdo.listener.LoadCallback</code> and
- * <code>javax.jdo.listener.ClearCallback</code>.
+ * <p>To implement this, the application programmer would implement <code>jdoPostLoad</code> to put
+ * itself into the list of managed instances, and implement <code>jdoPreClear</code> to remove
+ * itself from the list. With JDO 1.0, the domain class would be declared to implement <code>
+ * InstanceCallbacks</code>. With JDO 2.0, the domain class would be declared to implement <code>
+ * javax.jdo.listener.LoadCallback</code> and <code>javax.jdo.listener.ClearCallback</code>.
*
- * <P>Note that JDO does not manage the state of non-persistent
- * fields, and when a JDO instance transitions to hollow, JDO clears
- * the persistent fields. It is the programmer's responsibility to
- * clear non-persistent fields so that garbage collection of
- * referred instances can occur.
+ * <p>Note that JDO does not manage the state of non-persistent fields, and when a JDO instance
+ * transitions to hollow, JDO clears the persistent fields. It is the programmer's responsibility to
+ * clear non-persistent fields so that garbage collection of referred instances can occur.
*
* @since 1.0
* @version 2.0
*/
-public interface InstanceCallbacks
- extends javax.jdo.listener.ClearCallback,
+public interface InstanceCallbacks
+ extends javax.jdo.listener.ClearCallback,
javax.jdo.listener.DeleteCallback,
javax.jdo.listener.LoadCallback,
- javax.jdo.listener.StoreCallback {
-}
+ javax.jdo.listener.StoreCallback {}
diff --git a/api/src/main/java/javax/jdo/JDOCanRetryException.java b/api/src/main/java/javax/jdo/JDOCanRetryException.java
index 8296fc39..59d10e5a 100644
--- a/api/src/main/java/javax/jdo/JDOCanRetryException.java
+++ b/api/src/main/java/javax/jdo/JDOCanRetryException.java
@@ -5,13 +5,13 @@
* 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
- *
+ *
* https://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
+ *
+ * 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.
*/
@@ -22,74 +22,81 @@
package javax.jdo;
-/** This is the base class for exceptions that can be retried.
+/**
+ * This is the base class for exceptions that can be retried.
*
* @version 1.0
*/
public class JDOCanRetryException extends JDOException {
- private static final long serialVersionUID = 3046202905626157173L;
+ private static final long serialVersionUID = 3046202905626157173L;
+
+ /** Constructs a new <code>JDOCanRetryException</code> without a detail message. */
+ public JDOCanRetryException() {}
+
+ /**
+ * Constructs a new <code>JDOCanRetryException</code> with the specified detail message.
+ *
+ * @param msg the detail message.
+ */
+ public JDOCanRetryException(String msg) {
+ super(msg);
+ }
+
+ /**
+ * Constructs a new <code>JDOCanRetryException</code> with the specified detail message and nested
+ * <code>Throwable</code>s.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable[]</code>.
+ */
+ public JDOCanRetryException(String msg, Throwable[] nested) {
+ super(msg, nested);
+ }
- /**
- * Constructs a new <code>JDOCanRetryException</code> without a detail message.
- */
- public JDOCanRetryException() {
- }
+ /**
+ * Constructs a new <code>JDOCanRetryException</code> with the specified detail message and nested
+ * <code>Throwable</code>s.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable</code>.
+ */
+ public JDOCanRetryException(String msg, Throwable nested) {
+ super(msg, nested);
+ }
- /**
- * Constructs a new <code>JDOCanRetryException</code> with the specified detail message.
- * @param msg the detail message.
- */
- public JDOCanRetryException(String msg) {
- super(msg);
- }
+ /**
+ * Constructs a new <code>JDOCanRetryException</code> with the specified detail message and failed
+ * object.
+ *
+ * @param msg the detail message.
+ * @param failed the failed object.
+ */
+ public JDOCanRetryException(String msg, Object failed) {
+ super(msg, failed);
+ }
- /**
- * Constructs a new <code>JDOCanRetryException</code> with the specified detail
- * message and nested <code>Throwable</code>s.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable[]</code>.
- */
- public JDOCanRetryException(String msg, Throwable[] nested) {
- super(msg, nested);
- }
-
- /**
- * Constructs a new <code>JDOCanRetryException</code> with the specified detail
- * message and nested <code>Throwable</code>s.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable</code>.
- */
- public JDOCanRetryException(String msg, Throwable nested) {
- super(msg, nested);
- }
-
- /** Constructs a new <code>JDOCanRetryException</code> with the specified detail message
- * and failed object.
- * @param msg the detail message.
- * @param failed the failed object.
- */
- public JDOCanRetryException(String msg, Object failed) {
- super(msg, failed);
- }
-
- /** Constructs a new <code>JDOCanRetryException</code> with the specified detail message,
- * nested <code>Throwable</code>s, and failed object.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable[]</code>.
- * @param failed the failed object.
- */
- public JDOCanRetryException(String msg, Throwable[] nested, Object failed) {
- super(msg, nested, failed);
- }
+ /**
+ * Constructs a new <code>JDOCanRetryException</code> with the specified detail message, nested
+ * <code>Throwable</code>s, and failed object.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable[]</code>.
+ * @param failed the failed object.
+ */
+ public JDOCanRetryException(String msg, Throwable[] nested, Object failed) {
+ super(msg, nested, failed);
+ }
- /** Constructs a new <code>JDOCanRetryException</code> with the specified detail message,
- * nested <code>Throwable</code>s, and failed object.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable</code>.
- * @param failed the failed object.
- */
- public JDOCanRetryException(String msg, Throwable nested, Object failed) {
- super(msg, nested, failed);
- }
+ /**
+ * Constructs a new <code>JDOCanRetryException</code> with the specified detail message, nested
+ * <code>Throwable</code>s, and failed object.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable</code>.
+ * @param failed the failed object.
+ */
+ public JDOCanRetryException(String msg, Throwable nested, Object failed) {
+ super(msg, nested, failed);
+ }
}
diff --git a/api/src/main/java/javax/jdo/JDODataStoreException.java b/api/src/main/java/javax/jdo/JDODataStoreException.java
index 4437d10a..b08c4703 100644
--- a/api/src/main/java/javax/jdo/JDODataStoreException.java
+++ b/api/src/main/java/javax/jdo/JDODataStoreException.java
@@ -5,13 +5,13 @@
* 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
- *
+ *
* https://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
+ *
+ * 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.
*/
@@ -22,78 +22,81 @@
package javax.jdo;
-/** This class represents data store exceptions that can be retried.
+/**
+ * This class represents data store exceptions that can be retried.
*
* @version 1.0
*/
public class JDODataStoreException extends JDOCanRetryException {
- private static final long serialVersionUID = -8728485891077403354L;
+ private static final long serialVersionUID = -8728485891077403354L;
- /**
- * Constructs a new <code>JDODataStoreException</code> without a detail message.
- */
- public JDODataStoreException() {
- }
+ /** Constructs a new <code>JDODataStoreException</code> without a detail message. */
+ public JDODataStoreException() {}
- /**
- * Constructs a new <code>JDODataStoreException</code> with the specified detail message.
- * @param msg the detail message.
- */
- public JDODataStoreException(String msg) {
- super(msg);
- }
+ /**
+ * Constructs a new <code>JDODataStoreException</code> with the specified detail message.
+ *
+ * @param msg the detail message.
+ */
+ public JDODataStoreException(String msg) {
+ super(msg);
+ }
- /**
- * Constructs a new <code>JDODataStoreException</code> with the specified
- * detail message and nested <code>Throwable</code>s.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable[]</code>.
- */
- public JDODataStoreException(String msg, Throwable[] nested) {
- super(msg, nested);
- }
+ /**
+ * Constructs a new <code>JDODataStoreException</code> with the specified detail message and
+ * nested <code>Throwable</code>s.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable[]</code>.
+ */
+ public JDODataStoreException(String msg, Throwable[] nested) {
+ super(msg, nested);
+ }
- /**
- * Constructs a new <code>JDODataStoreException</code> with the specified
- * detail message and nested <code>Throwable</code>s.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable</code>.
- */
- public JDODataStoreException(String msg, Throwable nested) {
- super(msg, nested);
- }
+ /**
+ * Constructs a new <code>JDODataStoreException</code> with the specified detail message and
+ * nested <code>Throwable</code>s.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable</code>.
+ */
+ public JDODataStoreException(String msg, Throwable nested) {
+ super(msg, nested);
+ }
- /**
- * Constructs a new <code>JDODataStoreException</code> with the specified detail message
- * and failed object.
- * @param msg the detail message.
- * @param failed the failed object.
- */
- public JDODataStoreException(String msg, Object failed) {
- super(msg, failed);
- }
-
- /**
- * Constructs a new <code>JDODataStoreException</code> with the specified detail message,
- * nested <code>Throwable</code>s, and failed object.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable[]</code>.
- * @param failed the failed object.
- */
- public JDODataStoreException(String msg, Throwable[] nested, Object failed) {
- super(msg, nested, failed);
- }
+ /**
+ * Constructs a new <code>JDODataStoreException</code> with the specified detail message and
+ * failed object.
+ *
+ * @param msg the detail message.
+ * @param failed the failed object.
+ */
+ public JDODataStoreException(String msg, Object failed) {
+ super(msg, failed);
+ }
- /**
- * Constructs a new <code>JDODataStoreException</code> with the specified detail message,
- * nested <code>Throwable</code>s, and failed object.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable</code>.
- * @param failed the failed object.
- */
- public JDODataStoreException(String msg, Throwable nested, Object failed) {
- super(msg, nested, failed);
- }
-}
+ /**
+ * Constructs a new <code>JDODataStoreException</code> with the specified detail message, nested
+ * <code>Throwable</code>s, and failed object.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable[]</code>.
+ * @param failed the failed object.
+ */
+ public JDODataStoreException(String msg, Throwable[] nested, Object failed) {
+ super(msg, nested, failed);
+ }
+ /**
+ * Constructs a new <code>JDODataStoreException</code> with the specified detail message, nested
+ * <code>Throwable</code>s, and failed object.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable</code>.
+ * @param failed the failed object.
+ */
+ public JDODataStoreException(String msg, Throwable nested, Object failed) {
+ super(msg, nested, failed);
+ }
+}
diff --git a/api/src/main/java/javax/jdo/JDODetachedFieldAccessException.java b/api/src/main/java/javax/jdo/JDODetachedFieldAccessException.java
index 011f6cda..72fd5b2e 100644
--- a/api/src/main/java/javax/jdo/JDODetachedFieldAccessException.java
+++ b/api/src/main/java/javax/jdo/JDODetachedFieldAccessException.java
@@ -5,13 +5,13 @@
* 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
- *
+ *
* https://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
+ *
+ * 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.
*/
@@ -22,61 +22,67 @@
package javax.jdo;
-/** This class represents exceptions caused by access of an unloaded field while
- * the instance is detached.
+/**
+ * This class represents exceptions caused by access of an unloaded field while the instance is
+ * detached.
*
* @version 2.0
* @since 2.0
*/
public class JDODetachedFieldAccessException extends JDOUserException {
- private static final long serialVersionUID = 5035418119865472625L;
+ private static final long serialVersionUID = 5035418119865472625L;
+
+ /**
+ * Constructs a new <code>JDODetachedFieldAccessException</code> without a detail message.
+ *
+ * @since 2.0
+ */
+ public JDODetachedFieldAccessException() {}
- /**
- * Constructs a new <code>JDODetachedFieldAccessException</code> without a detail message.
- * @since 2.0
- */
- public JDODetachedFieldAccessException() {
- }
+ /**
+ * Constructs a new <code>JDODetachedFieldAccessException</code> with the specified detail
+ * message.
+ *
+ * @param msg the detail message.
+ * @since 2.0
+ */
+ public JDODetachedFieldAccessException(String msg) {
+ super(msg);
+ }
- /**
- * Constructs a new <code>JDODetachedFieldAccessException</code> with the
- * specified detail message.
- * @param msg the detail message.
- * @since 2.0
- */
- public JDODetachedFieldAccessException(String msg) {
- super(msg);
- }
+ /**
+ * Constructs a new <code>JDODetachedFieldAccessException</code> with the specified detail message
+ * and failed object.
+ *
+ * @param msg the detail message.
+ * @param failed the failed object.
+ */
+ public JDODetachedFieldAccessException(String msg, Object failed) {
+ super(msg, failed);
+ }
- /** Constructs a new <code>JDODetachedFieldAccessException</code>
- * with the specified detail message and failed object.
- * @param msg the detail message.
- * @param failed the failed object.
- */
- public JDODetachedFieldAccessException(String msg, Object failed) {
- super(msg, failed);
- }
-
- /**
- * Constructs a new <code>JDODetachedFieldAccessException</code> with the
- * specified detail message and nested <code>Throwable</code>s.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable[]</code>.
- * @since 2.0
- */
- public JDODetachedFieldAccessException(String msg, Throwable[] nested) {
- super(msg, nested);
- }
+ /**
+ * Constructs a new <code>JDODetachedFieldAccessException</code> with the specified detail message
+ * and nested <code>Throwable</code>s.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable[]</code>.
+ * @since 2.0
+ */
+ public JDODetachedFieldAccessException(String msg, Throwable[] nested) {
+ super(msg, nested);
+ }
- /**
- * Constructs a new <code>JDODetachedFieldAccessException</code> with the
- * specified detail message and nested <code>Throwable</code>s.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable</code>.
- * @since 2.0
- */
- public JDODetachedFieldAccessException(String msg, Throwable nested) {
- super(msg, nested);
- }
+ /**
+ * Constructs a new <code>JDODetachedFieldAccessException</code> with the specified detail message
+ * and nested <code>Throwable</code>s.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable</code>.
+ * @since 2.0
+ */
+ public JDODetachedFieldAccessException(String msg, Throwable nested) {
+ super(msg, nested);
+ }
}
diff --git a/api/src/main/java/javax/jdo/JDOEnhanceException.java b/api/src/main/java/javax/jdo/JDOEnhanceException.java
index dc8ed535..56afd05c 100644
--- a/api/src/main/java/javax/jdo/JDOEnhanceException.java
+++ b/api/src/main/java/javax/jdo/JDOEnhanceException.java
@@ -18,49 +18,43 @@ package javax.jdo;
/**
* Exception thrown when an error occurs during enhancement.
+ *
* @since 3.0
*/
-public class JDOEnhanceException extends JDOException
-{
- private static final long serialVersionUID = 7953336394264555958L;
+public class JDOEnhanceException extends JDOException {
+ private static final long serialVersionUID = 7953336394264555958L;
- /**
- * Constructs a new <code>JDOEnhanceException</code> without a
- * detail message.
- */
- public JDOEnhanceException()
- {
- }
+ /** Constructs a new <code>JDOEnhanceException</code> without a detail message. */
+ public JDOEnhanceException() {}
- /**
- * Constructs a new <code>JDOEnhanceException</code> with the
- * specified detail message.
- * @param msg the detail message.
- */
- public JDOEnhanceException(String msg)
- {
- super(msg);
- }
+ /**
+ * Constructs a new <code>JDOEnhanceException</code> with the specified detail message.
+ *
+ * @param msg the detail message.
+ */
+ public JDOEnhanceException(String msg) {
+ super(msg);
+ }
- /**
- * Constructs a new <code>JDOEnhanceException</code> with the
- * specified detail message and nested <code>Throwable</code>s.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable[]</code>.
- */
- public JDOEnhanceException(String msg, Throwable[] nested)
- {
- super(msg, nested);
- }
+ /**
+ * Constructs a new <code>JDOEnhanceException</code> with the specified detail message and nested
+ * <code>Throwable</code>s.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable[]</code>.
+ */
+ public JDOEnhanceException(String msg, Throwable[] nested) {
+ super(msg, nested);
+ }
- /**
- * Constructs a new <code>JDOEnhanceException</code> with the
- * specified detail message and nested <code>Throwable</code>s.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable</code>.
- */
- public JDOEnhanceException(String msg, Throwable nested)
- {
- super(msg, nested);
- }
+ /**
+ * Constructs a new <code>JDOEnhanceException</code> with the specified detail message and nested
+ * <code>Throwable</code>s.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable</code>.
+ */
+ public JDOEnhanceException(String msg, Throwable nested) {
+ super(msg, nested);
+ }
}
diff --git a/api/src/main/java/javax/jdo/JDOEnhancer.java b/api/src/main/java/javax/jdo/JDOEnhancer.java
index 08deb809..ac53c995 100644
--- a/api/src/main/java/javax/jdo/JDOEnhancer.java
+++ b/api/src/main/java/javax/jdo/JDOEnhancer.java
@@ -23,130 +23,140 @@ import javax.jdo.metadata.JDOMetadata;
/**
* Interface for a JDO Enhancer.
+ *
* @since 3.0
*/
-public interface JDOEnhancer extends ClassFileTransformer
-{
- /**
- * Return non-configurable properties of this JDOEnhancer.
- * Properties with keys "VendorName" and "VersionNumber" are required.
- * Other keys are optional.
- * @return the non-configurable properties of this JDOEnhancer.
- */
- Properties getProperties();
-
- /**
- * Whether to provide verbose output
- * @param flag Verbose?
- * @return The enhancer
- */
- JDOEnhancer setVerbose(boolean flag);
-
- /**
- * Mutator to set the location where enhanced classes are written.
- * Mutator to set the location where enhanced classes are written.
- * If this method is not called, classes will be enhanced in place,
- * overwriting the existing classes. If overwriting classes in a jar file,
- * the existing files in the jar file will be written unchanged except
- * for the enhanced classes. The directory name can be absolute or relative.
- * @param dirName Name of the directory
- * @return The enhancer
- */
- JDOEnhancer setOutputDirectory(String dirName);
-
- /**
- * Mutator to set the class loader to use for loading classes.
- * @param loader ClassLoader to use
- * @return The enhancer
- */
- JDOEnhancer setClassLoader(ClassLoader loader);
-
- /**
- * Add a persistence-unit to the items to be enhanced.
- * @param persistenceUnit Name of the persistence unit
- * @return The enhancer
- */
- JDOEnhancer addPersistenceUnit(String persistenceUnit);
-
- /**
- * Add an in-memory class to the items to be enhanced.
- * The class name should be of the form "mydomain.MyClass".
- * @param className Name of the class
- * @param bytes The bytes of the class
- * @return The enhancer
- */
- JDOEnhancer addClass(String className, byte[] bytes);
-
- /**
- * Add class(es) to the items to be enhanced.
- * The class names can be absolute file names, relative file names, or
- * names of CLASSPATH resources.
- * @param classNames Names of the classes
- * @return The enhancer
- */
- JDOEnhancer addClasses(String... classNames);
-
- /**
- * Add metadata file(s) to the items to be enhanced.
- * The metadata file names can be absolute file names, relative file names, or
- * names of CLASSPATH resources. They should be JDO XML metadata files.
- * @param metadataFiles Names of the files
- * @return The enhancer
- */
- JDOEnhancer addFiles(String... metadataFiles);
-
- /**
- * Add a jar file to the items to be enhanced.
- * The jar file name can be absolute, or relative or a CLASSPATH resource.
- * @param jarFileName Name of the jar file
- * @return The enhancer
- */
- JDOEnhancer addJar(String jarFileName);
-
- /**
- * Method to enhance the items specified using addJar, addFiles, addClasses, addClass,
- * addPersistenceUnit.
- * @return Number of classes enhanced
- * @throws JDOEnhanceException if an error occurs during enhancement. If multiple
- * errors occur then the nested exceptions provides this detail.
- */
- int enhance();
-
- /**
- * Method to validate the items specified using addJar, addFiles, addClasses, addClass,
- * addPersistenceUnit.
- * @return Number of classes validated
- * @throws JDOEnhanceException if an error occurs during validation. If multiple
- * errors occur then the nested exceptions provides this detail.
- */
- int validate();
-
- /**
- * Method to retrieve the (enhanced) bytes of the specified class.
- * Only applies to the classes enhanced in the most recent enhance() call.
- * If no enhance has yet been performed will throw a JDOEnhanceException.
- * If the specified class hasn't been enhanced then will throw a JDOEnhanceException.
- * @param className Name of the class (of the form "mydomain.MyClass")
- * @return Enhanced bytes
- */
- byte[] getEnhancedBytes(String className);
-
- /**
- * Method to register metadata with the enhancement process managed by this
- * <code>JDOEnhancer</code>.
- * Metadata can be created using the method {@link #newMetadata}.
- * If there is already metadata registered for a class contained in this metadata
- * object then a JDOUserException will be thrown.
- * @param metadata The Metadata to register.
- * @since 3.0
- */
- void registerMetadata(JDOMetadata metadata);
-
- /**
- * Method to return a new metadata object that can be subsequently modified
- * and registered with the enhancement process using the method {@link #registerMetadata}.
- * @return The metadata
- * @since 3.0
- */
- JDOMetadata newMetadata();
+public interface JDOEnhancer extends ClassFileTransformer {
+ /**
+ * Return non-configurable properties of this JDOEnhancer. Properties with keys "VendorName" and
+ * "VersionNumber" are required. Other keys are optional.
+ *
+ * @return the non-configurable properties of this JDOEnhancer.
+ */
+ Properties getProperties();
+
+ /**
+ * Whether to provide verbose output
+ *
+ * @param flag Verbose?
+ * @return The enhancer
+ */
+ JDOEnhancer setVerbose(boolean flag);
+
+ /**
+ * Mutator to set the location where enhanced classes are written. Mutator to set the location
+ * where enhanced classes are written. If this method is not called, classes will be enhanced in
+ * place, overwriting the existing classes. If overwriting classes in a jar file, the existing
+ * files in the jar file will be written unchanged except for the enhanced classes. The directory
+ * name can be absolute or relative.
+ *
+ * @param dirName Name of the directory
+ * @return The enhancer
+ */
+ JDOEnhancer setOutputDirectory(String dirName);
+
+ /**
+ * Mutator to set the class loader to use for loading classes.
+ *
+ * @param loader ClassLoader to use
+ * @return The enhancer
+ */
+ JDOEnhancer setClassLoader(ClassLoader loader);
+
+ /**
+ * Add a persistence-unit to the items to be enhanced.
+ *
+ * @param persistenceUnit Name of the persistence unit
+ * @return The enhancer
+ */
+ JDOEnhancer addPersistenceUnit(String persistenceUnit);
+
+ /**
+ * Add an in-memory class to the items to be enhanced. The class name should be of the form
+ * "mydomain.MyClass".
+ *
+ * @param className Name of the class
+ * @param bytes The bytes of the class
+ * @return The enhancer
+ */
+ JDOEnhancer addClass(String className, byte[] bytes);
+
+ /**
+ * Add class(es) to the items to be enhanced. The class names can be absolute file names, relative
+ * file names, or names of CLASSPATH resources.
+ *
+ * @param classNames Names of the classes
+ * @return The enhancer
+ */
+ JDOEnhancer addClasses(String... classNames);
+
+ /**
+ * Add metadata file(s) to the items to be enhanced. The metadata file names can be absolute file
+ * names, relative file names, or names of CLASSPATH resources. They should be JDO XML metadata
+ * files.
+ *
+ * @param metadataFiles Names of the files
+ * @return The enhancer
+ */
+ JDOEnhancer addFiles(String... metadataFiles);
+
+ /**
+ * Add a jar file to the items to be enhanced. The jar file name can be absolute, or relative or a
+ * CLASSPATH resource.
+ *
+ * @param jarFileName Name of the jar file
+ * @return The enhancer
+ */
+ JDOEnhancer addJar(String jarFileName);
+
+ /**
+ * Method to enhance the items specified using addJar, addFiles, addClasses, addClass,
+ * addPersistenceUnit.
+ *
+ * @return Number of classes enhanced
+ * @throws JDOEnhanceException if an error occurs during enhancement. If multiple errors occur
+ * then the nested exceptions provides this detail.
+ */
+ int enhance();
+
+ /**
+ * Method to validate the items specified using addJar, addFiles, addClasses, addClass,
+ * addPersistenceUnit.
+ *
+ * @return Number of classes validated
+ * @throws JDOEnhanceException if an error occurs during validation. If multiple errors occur then
+ * the nested exceptions provides this detail.
+ */
+ int validate();
+
+ /**
+ * Method to retrieve the (enhanced) bytes of the specified class. Only applies to the classes
+ * enhanced in the most recent enhance() call. If no enhance has yet been performed will throw a
+ * JDOEnhanceException. If the specified class hasn't been enhanced then will throw a
+ * JDOEnhanceException.
+ *
+ * @param className Name of the class (of the form "mydomain.MyClass")
+ * @return Enhanced bytes
+ */
+ byte[] getEnhancedBytes(String className);
+
+ /**
+ * Method to register metadata with the enhancement process managed by this <code>JDOEnhancer
+ * </code>. Metadata can be created using the method {@link #newMetadata}. If there is already
+ * metadata registered for a class contained in this metadata object then a JDOUserException will
+ * be thrown.
+ *
+ * @param metadata The Metadata to register.
+ * @since 3.0
+ */
+ void registerMetadata(JDOMetadata metadata);
+
+ /**
+ * Method to return a new metadata object that can be subsequently modified and registered with
+ * the enhancement process using the method {@link #registerMetadata}.
+ *
+ * @return The metadata
+ * @since 3.0
+ */
+ JDOMetadata newMetadata();
}
diff --git a/api/src/main/java/javax/jdo/JDOException.java b/api/src/main/java/javax/jdo/JDOException.java
index 18007f6c..3ea68ec9 100644
--- a/api/src/main/java/javax/jdo/JDOException.java
+++ b/api/src/main/java/javax/jdo/JDOException.java
@@ -5,13 +5,13 @@
* 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
- *
+ *
* https://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
+ *
+ * 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.
*/
@@ -24,275 +24,291 @@ package javax.jdo;
import javax.jdo.spi.I18NHelper;
-/** This is the root of all JDO Exceptions. It contains an optional detail
- * message, an optional nested <code>Throwable</code> array and an optional failed object.
+/**
+ * This is the root of all JDO Exceptions. It contains an optional detail message, an optional
+ * nested <code>Throwable</code> array and an optional failed object.
+ *
* @author Craig Russell
* @version 1.0.2
*/
public class JDOException extends java.lang.RuntimeException {
- private static final long serialVersionUID = 1950979275859696534L;
+ private static final long serialVersionUID = 1950979275859696534L;
- /** This exception was generated because of an exception in the runtime library.
- * @serial the nested <code>Throwable</code> array
- */
- Throwable[] nested;
-
- /** This exception may be the result of incorrect parameters supplied to an API.
- * This is the object from which the user can determine the cause of the problem.
- * @serial the failed <code>Object</code>
- */
- Object failed;
+ /**
+ * This exception was generated because of an exception in the runtime library.
+ *
+ * @serial the nested <code>Throwable</code> array
+ */
+ Throwable[] nested;
- /**
- * The Internationalization message helper.
- */
- private static I18NHelper msg = I18NHelper.getInstance ("javax.jdo.Bundle"); //NOI18N
+ /**
+ * This exception may be the result of incorrect parameters supplied to an API. This is the object
+ * from which the user can determine the cause of the problem.
+ *
+ * @serial the failed <code>Object</code>
+ */
+ Object failed;
- /**
- * Flag indicating whether printStackTrace is being executed.
- */
- private boolean inPrintStackTrace = false;
-
- /**
- * Constructs a new <code>JDOException</code> without a detail message.
- */
- public JDOException() {
- }
+ /** The Internationalization message helper. */
+ private static I18NHelper msg = I18NHelper.getInstance("javax.jdo.Bundle"); // NOI18N
- /**
- * Constructs a new <code>JDOException</code> with the specified detail message.
- * @param msg the detail message.
- */
- public JDOException(String msg) {
- super(msg);
- }
+ /** Flag indicating whether printStackTrace is being executed. */
+ private boolean inPrintStackTrace = false;
- /** Constructs a new <code>JDOException</code> with the specified detail message
- * and nested <code>Throwable</code>s.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable[]</code>.
- */
- public JDOException(String msg, Throwable[] nested) {
- super(msg);
- this.nested = nested;
- }
-
- /** Constructs a new <code>JDOException</code> with the specified detail message
- * and nested <code>Throwable</code>.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable</code>.
- */
- public JDOException(String msg, Throwable nested) {
- super(msg);
- this.nested = new Throwable[] {nested};
- }
-
- /** Constructs a new <code>JDOException</code> with the specified detail message
- * and failed object.
- * @param msg the detail message.
- * @param failed the failed object.
- */
- public JDOException(String msg, Object failed) {
- super(msg);
- this.failed = failed;
- }
-
- /** Constructs a new <code>JDOException</code> with the specified detail message,
- * nested <code>Throwable</code>s, and failed object.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable[]</code>.
- * @param failed the failed object.
- */
- public JDOException(String msg, Throwable[] nested, Object failed) {
- super(msg);
- this.nested = nested;
- this.failed = failed;
- }
-
- /** Constructs a new <code>JDOException</code> with the specified detail message,
- * nested <code>Throwable</code>, and failed object.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable</code>.
- * @param failed the failed object.
- */
- public JDOException(String msg, Throwable nested, Object failed) {
- super(msg);
- this.nested = new Throwable[] {nested};
- this.failed = failed;
- }
-
- /**
- * The exception may include a failed object.
- * @return the failed object.
- */
- public Object getFailedObject() {
- return failed;
- }
-
- /** The exception may have been caused by multiple exceptions in the runtime.
- * If multiple objects caused the problem, each failed object will have
- * its own <code>Exception</code>.
- * @return the nested Throwable array.
- */
- public Throwable[] getNestedExceptions() {
- return nested;
+ /** Constructs a new <code>JDOException</code> without a detail message. */
+ public JDOException() {}
+
+ /**
+ * Constructs a new <code>JDOException</code> with the specified detail message.
+ *
+ * @param msg the detail message.
+ */
+ public JDOException(String msg) {
+ super(msg);
+ }
+
+ /**
+ * Constructs a new <code>JDOException</code> with the specified detail message and nested <code>
+ * Throwable</code>s.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable[]</code>.
+ */
+ public JDOException(String msg, Throwable[] nested) {
+ super(msg);
+ this.nested = nested;
+ }
+
+ /**
+ * Constructs a new <code>JDOException</code> with the specified detail message and nested <code>
+ * Throwable</code>.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable</code>.
+ */
+ public JDOException(String msg, Throwable nested) {
+ super(msg);
+ this.nested = new Throwable[] {nested};
+ }
+
+ /**
+ * Constructs a new <code>JDOException</code> with the specified detail message and failed object.
+ *
+ * @param msg the detail message.
+ * @param failed the failed object.
+ */
+ public JDOException(String msg, Object failed) {
+ super(msg);
+ this.failed = failed;
+ }
+
+ /**
+ * Constructs a new <code>JDOException</code> with the specified detail message, nested <code>
+ * Throwable</code>s, and failed object.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable[]</code>.
+ * @param failed the failed object.
+ */
+ public JDOException(String msg, Throwable[] nested, Object failed) {
+ super(msg);
+ this.nested = nested;
+ this.failed = failed;
+ }
+
+ /**
+ * Constructs a new <code>JDOException</code> with the specified detail message, nested <code>
+ * Throwable</code>, and failed object.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable</code>.
+ * @param failed the failed object.
+ */
+ public JDOException(String msg, Throwable nested, Object failed) {
+ super(msg);
+ this.nested = new Throwable[] {nested};
+ this.failed = failed;
+ }
+
+ /**
+ * The exception may include a failed object.
+ *
+ * @return the failed object.
+ */
+ public Object getFailedObject() {
+ return failed;
+ }
+
+ /**
+ * The exception may have been caused by multiple exceptions in the runtime. If multiple objects
+ * caused the problem, each failed object will have its own <code>Exception</code>.
+ *
+ * @return the nested Throwable array.
+ */
+ public Throwable[] getNestedExceptions() {
+ return nested;
+ }
+
+ /**
+ * Often there is only one nested exception, and this method returns it. If there are more than
+ * one, then this method returns the first nested exception. If there is no nested exception, then
+ * null is returned.
+ *
+ * @return the first or only nested Throwable.
+ * @since 1.0.1
+ */
+ public synchronized Throwable getCause() {
+ // super.printStackTrace calls getCause to handle the cause.
+ // Returning null prevents the superclass from handling the cause;
+ // instead the local implementation of printStackTrace should
+ // handle the cause. Otherwise, the cause is printed twice.
+ if (nested == null || nested.length == 0 || inPrintStackTrace) {
+ return null;
+ } else {
+ return nested[0];
}
-
- /** Often there is only one nested exception, and this method returns it.
- * If there are more than one, then this method returns the first nested
- * exception. If there is no nested exception, then null is returned.
- * @return the first or only nested Throwable.
- * @since 1.0.1
- */
- public synchronized Throwable getCause() {
- // super.printStackTrace calls getCause to handle the cause.
- // Returning null prevents the superclass from handling the cause;
- // instead the local implementation of printStackTrace should
- // handle the cause. Otherwise, the cause is printed twice.
- if (nested == null || nested.length == 0 || inPrintStackTrace) {
- return null;
+ }
+
+ /**
+ * JDK 1.4 includes a new chaining mechanism for Throwable, but since JDO has its own "legacy"
+ * chaining mechanism, the "standard" mechanism cannot be used. This method always throws a
+ * JDOFatalInternalException.
+ *
+ * @param cause ignored.
+ * @return never.
+ */
+ public Throwable initCause(Throwable cause) {
+ throw new JDOFatalInternalException(msg.msg("ERR_CannotInitCause"));
+ }
+
+ /**
+ * The <code>String</code> representation includes the name of the class, the descriptive comment
+ * (if any), the <code>String</code> representation of the failed <code>Object</code> (if any),
+ * and the <code>String</code> representation of the nested <code>Throwable</code>s (if any).
+ *
+ * @return the <code>String</code>.
+ */
+ public synchronized String toString() {
+ int len = nested == null ? 0 : nested.length;
+ // calculate approximate size of the String to return
+ StringBuffer sb = new StringBuffer(10 + 100 * len);
+ sb.append(super.toString());
+ // include failed object information
+ if (failed != null) {
+ sb.append("\n").append(msg.msg("MSG_FailedObject"));
+ String failedToString = null;
+ try {
+ failedToString = failed.toString();
+ } catch (Exception ex) {
+ // include the information from the exception thrown by failed.toString
+ Object objectId = JDOHelper.getObjectId(failed);
+ if (objectId == null) {
+ failedToString =
+ msg.msg(
+ "MSG_ExceptionGettingFailedToString", // NOI18N
+ exceptionToString(ex));
} else {
- return nested[0];
+ // include the ObjectId information
+ String objectIdToString = null;
+ try {
+ objectIdToString = objectId.toString();
+ } catch (Exception ex2) {
+ objectIdToString = exceptionToString(ex2);
+ }
+ failedToString =
+ msg.msg(
+ "MSG_ExceptionGettingFailedToStringObjectId", // NOI18N
+ exceptionToString(ex),
+ objectIdToString);
}
+ }
+ sb.append(failedToString);
}
-
- /** JDK 1.4 includes a new chaining mechanism for Throwable, but since
- * JDO has its own "legacy" chaining mechanism, the "standard" mechanism
- * cannot be used. This method always throws a JDOFatalInternalException.
- * @param cause ignored.
- * @return never.
- */
- public Throwable initCause(Throwable cause) {
- throw new JDOFatalInternalException(msg.msg("ERR_CannotInitCause"));
- }
-
- /** The <code>String</code> representation includes the name of the class,
- * the descriptive comment (if any),
- * the <code>String</code> representation of the failed <code>Object</code> (if any),
- * and the <code>String</code> representation of the nested <code>Throwable</code>s (if any).
- * @return the <code>String</code>.
- */
- public synchronized String toString() {
- int len = nested==null?0:nested.length;
- // calculate approximate size of the String to return
- StringBuffer sb = new StringBuffer (10 + 100 * len);
- sb.append (super.toString());
- // include failed object information
- if (failed != null) {
- sb.append ("\n").append (msg.msg ("MSG_FailedObject"));
- String failedToString = null;
- try {
- failedToString = failed.toString();
- } catch (Exception ex) {
- // include the information from the exception thrown by failed.toString
- Object objectId = JDOHelper.getObjectId(failed);
- if (objectId == null) {
- failedToString = msg.msg("MSG_ExceptionGettingFailedToString", //NOI18N
- exceptionToString(ex));
- }
- else {
- // include the ObjectId information
- String objectIdToString = null;
- try {
- objectIdToString = objectId.toString();
- }
- catch (Exception ex2) {
- objectIdToString = exceptionToString(ex2);
- }
- failedToString = msg.msg("MSG_ExceptionGettingFailedToStringObjectId", //NOI18N
- exceptionToString(ex), objectIdToString);
- }
- }
- sb.append (failedToString);
- }
- // include nested Throwable information, but only if not called by
- // printStackTrace; the stacktrace will include the cause anyway.
- if (len > 0 && !inPrintStackTrace) {
- sb.append ("\n").append (msg.msg ("MSG_NestedThrowables")).append ("\n");
- Throwable exception = nested[0];
- sb.append (exception==null?"null":exception.toString()); //NOI18N
- for (int i=1; i<len; ++i) {
- sb.append ("\n"); //NOI18N
- exception = nested[i];
- sb.append (exception==null?"null":exception.toString()); //NOI18N
- }
- }
- return sb.toString();
- }
-
- /**
- * Prints this <code>JDOException</code> and its backtrace to the
- * standard error output.
- * Print nested Throwables' stack trace as well.
- */
- public void printStackTrace() {
- printStackTrace (System.err);
+ // include nested Throwable information, but only if not called by
+ // printStackTrace; the stacktrace will include the cause anyway.
+ if (len > 0 && !inPrintStackTrace) {
+ sb.append("\n").append(msg.msg("MSG_NestedThrowables")).append("\n");
+ Throwable exception = nested[0];
+ sb.append(exception == null ? "null" : exception.toString()); // NOI18N
+ for (int i = 1; i < len; ++i) {
+ sb.append("\n"); // NOI18N
+ exception = nested[i];
+ sb.append(exception == null ? "null" : exception.toString()); // NOI18N
+ }
}
+ return sb.toString();
+ }
+
+ /**
+ * Prints this <code>JDOException</code> and its backtrace to the standard error output. Print
+ * nested Throwables' stack trace as well.
+ */
+ public void printStackTrace() {
+ printStackTrace(System.err);
+ }
- /**
- * Prints this <code>JDOException</code> and its backtrace to the
- * specified print stream.
- * Print nested Throwables' stack trace as well.
- * @param s <code>PrintStream</code> to use for output
- */
- public synchronized void printStackTrace(java.io.PrintStream s) {
- int len = nested==null?0:nested.length;
- synchronized (s) {
- inPrintStackTrace = true;
- super.printStackTrace(s);
- if (len > 0) {
- s.println (msg.msg ("MSG_NestedThrowablesStackTrace"));
- for (int i=0; i<len; ++i) {
- Throwable exception = nested[i];
- if (exception != null) {
- exception.printStackTrace(s);
- }
- }
- }
- inPrintStackTrace = false;
+ /**
+ * Prints this <code>JDOException</code> and its backtrace to the specified print stream. Print
+ * nested Throwables' stack trace as well.
+ *
+ * @param s <code>PrintStream</code> to use for output
+ */
+ public synchronized void printStackTrace(java.io.PrintStream s) {
+ int len = nested == null ? 0 : nested.length;
+ synchronized (s) {
+ inPrintStackTrace = true;
+ super.printStackTrace(s);
+ if (len > 0) {
+ s.println(msg.msg("MSG_NestedThrowablesStackTrace"));
+ for (int i = 0; i < len; ++i) {
+ Throwable exception = nested[i];
+ if (exception != null) {
+ exception.printStackTrace(s);
+ }
}
+ }
+ inPrintStackTrace = false;
}
+ }
- /**
- * Prints this <code>JDOException</code> and its backtrace to the specified
- * print writer.
- * Print nested Throwables' stack trace as well.
- * @param s <code>PrintWriter</code> to use for output
- */
- public synchronized void printStackTrace(java.io.PrintWriter s) {
- int len = nested==null?0:nested.length;
- synchronized (s) {
- inPrintStackTrace = true;
- super.printStackTrace(s);
- if (len > 0) {
- s.println (msg.msg ("MSG_NestedThrowablesStackTrace"));
- for (int i=0; i<len; ++i) {
- Throwable exception = nested[i];
- if (exception != null) {
- exception.printStackTrace(s);
- }
- }
- }
- inPrintStackTrace = false;
+ /**
+ * Prints this <code>JDOException</code> and its backtrace to the specified print writer. Print
+ * nested Throwables' stack trace as well.
+ *
+ * @param s <code>PrintWriter</code> to use for output
+ */
+ public synchronized void printStackTrace(java.io.PrintWriter s) {
+ int len = nested == null ? 0 : nested.length;
+ synchronized (s) {
+ inPrintStackTrace = true;
+ super.printStackTrace(s);
+ if (len > 0) {
+ s.println(msg.msg("MSG_NestedThrowablesStackTrace"));
+ for (int i = 0; i < len; ++i) {
+ Throwable exception = nested[i];
+ if (exception != null) {
+ exception.printStackTrace(s);
+ }
}
+ }
+ inPrintStackTrace = false;
}
+ }
- /**
- * Helper method returning a short description of the exception passed
- * as an argument. The returned string has the format defined by
- * Throwable.toString. If the exception has a non-null detail message
- * string, then it returns the name of exception class concatenated
- * with ": " concatenated with the detailed message. Otherwise it
- * returns the name of exception class.
- * @param ex the exception to be represented.
- * @return a string representation of the exception passed as an argument.
- */
- private static String exceptionToString(Exception ex)
- {
- if (ex == null) return null;
- String s = ex.getClass().getName();
- String message = ex.getMessage();
- return (message != null) ? (s + ": " + message) : s;
- }
+ /**
+ * Helper method returning a short description of the exception passed as an argument. The
+ * returned string has the format defined by Throwable.toString. If the exception has a non-null
+ * detail message string, then it returns the name of exception class concatenated with ": "
+ * concatenated with the detailed message. Otherwise it returns the name of exception class.
+ *
+ * @param ex the exception to be represented.
+ * @return a string representation of the exception passed as an argument.
+ */
+ private static String exceptionToString(Exception ex) {
+ if (ex == null) return null;
+ String s = ex.getClass().getName();
+ String message = ex.getMessage();
+ return (message != null) ? (s + ": " + message) : s;
+ }
}
diff --git a/api/src/main/java/javax/jdo/JDOFatalDataStoreException.java b/api/src/main/java/javax/jdo/JDOFatalDataStoreException.java
index 538ca3e3..feb72f78 100644
--- a/api/src/main/java/javax/jdo/JDOFatalDataStoreException.java
+++ b/api/src/main/java/javax/jdo/JDOFatalDataStoreException.java
@@ -5,13 +5,13 @@
* 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
- *
+ *
* https://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
+ *
+ * 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.
*/
@@ -22,77 +22,81 @@
package javax.jdo;
-/** This class represents data store exceptions that cannot be retried.
+/**
+ * This class represents data store exceptions that cannot be retried.
*
* @version 1.0.1
*/
public class JDOFatalDataStoreException extends JDOFatalException {
- private static final long serialVersionUID = 8953679366316248154L;
+ private static final long serialVersionUID = 8953679366316248154L;
- /**
- * Constructs a new <code>JDOFatalDataStoreException</code> without a detail message.
- */
- public JDOFatalDataStoreException() {
- }
+ /** Constructs a new <code>JDOFatalDataStoreException</code> without a detail message. */
+ public JDOFatalDataStoreException() {}
- /**
- * Constructs a new <code>JDOFatalDataStoreException</code> with the specified detail message.
- * @param msg the detail message.
- */
- public JDOFatalDataStoreException(String msg) {
- super(msg);
- }
+ /**
+ * Constructs a new <code>JDOFatalDataStoreException</code> with the specified detail message.
+ *
+ * @param msg the detail message.
+ */
+ public JDOFatalDataStoreException(String msg) {
+ super(msg);
+ }
- /** Constructs a new <code>JDOFatalDataStoreException</code> with the specified detail message
- * and failed object.
- * @param msg the detail message.
- * @param failed the failed object.
- */
- public JDOFatalDataStoreException(String msg, Object failed) {
- super(msg, failed);
- }
-
- /**
- * Constructs a new <code>JDOFatalDataStoreException</code> with the specified
- * detail message and nested <code>Throwable</code>s.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable[]</code>.
- */
- public JDOFatalDataStoreException(String msg, Throwable[] nested) {
- super(msg, nested);
- }
+ /**
+ * Constructs a new <code>JDOFatalDataStoreException</code> with the specified detail message and
+ * failed object.
+ *
+ * @param msg the detail message.
+ * @param failed the failed object.
+ */
+ public JDOFatalDataStoreException(String msg, Object failed) {
+ super(msg, failed);
+ }
- /**
- * Constructs a new <code>JDOFatalDataStoreException</code> with the specified
- * detail message and nested <code>Throwable</code>s.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable</code>.
- */
- public JDOFatalDataStoreException(String msg, Throwable nested) {
- super(msg, nested);
- }
-
- /**
- * Constructs a new <code>JDOFatalDataStoreException</code> with the specified
- * detail message, nested <code>Throwable</code>s, and failed object.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable[]</code>.
- * @param failed the failed object.
- */
- public JDOFatalDataStoreException(String msg, Throwable[] nested, Object failed) {
- super(msg, nested, failed);
- }
+ /**
+ * Constructs a new <code>JDOFatalDataStoreException</code> with the specified detail message and
+ * nested <code>Throwable</code>s.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable[]</code>.
+ */
+ public JDOFatalDataStoreException(String msg, Throwable[] nested) {
+ super(msg, nested);
+ }
- /**
- * Constructs a new <code>JDOFatalDataStoreException</code> with the specified
- * detail message, nested <code>Throwable</code>s, and failed object.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable</code>.
- * @param failed the failed object.
- */
- public JDOFatalDataStoreException(String msg, Throwable nested, Object failed) {
- super(msg, nested, failed);
- }
-}
+ /**
+ * Constructs a new <code>JDOFatalDataStoreException</code> with the specified detail message and
+ * nested <code>Throwable</code>s.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable</code>.
+ */
+ public JDOFatalDataStoreException(String msg, Throwable nested) {
+ super(msg, nested);
+ }
+ /**
+ * Constructs a new <code>JDOFatalDataStoreException</code> with the specified detail message,
+ * nested <code>Throwable</code>s, and failed object.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable[]</code>.
+ * @param failed the failed object.
+ */
+ public JDOFatalDataStoreException(String msg, Throwable[] nested, Object failed) {
+ super(msg, nested, failed);
+ }
+
+ /**
+ * Constructs a new <code>JDOFatalDataStoreException</code> with the specified detail message,
+ * nested <code>Throwable</code>s, and failed object.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable</code>.
+ * @param failed the failed object.
+ */
+ public JDOFatalDataStoreException(String msg, Throwable nested, Object failed) {
+ super(msg, nested, failed);
+ }
+}
diff --git a/api/src/main/java/javax/jdo/JDOFatalException.java b/api/src/main/java/javax/jdo/JDOFatalException.java
index 6247306c..eb39889e 100644
--- a/api/src/main/java/javax/jdo/JDOFatalException.java
+++ b/api/src/main/java/javax/jdo/JDOFatalException.java
@@ -5,13 +5,13 @@
* 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
- *
+ *
* https://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
+ *
+ * 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.
*/
@@ -22,75 +22,82 @@
package javax.jdo;
-/** This class represents exceptions that are fatal; that is, the condition
- * that caused it cannot be bypassed even if the operation is retried.
+/**
+ * This class represents exceptions that are fatal; that is, the condition that caused it cannot be
+ * bypassed even if the operation is retried.
*
* @version 1.0
*/
public class JDOFatalException extends JDOException {
- private static final long serialVersionUID = -414371106009364006L;
+ private static final long serialVersionUID = -414371106009364006L;
+
+ /** Constructs a new <code>JDOFatalException</code> without a detail message. */
+ public JDOFatalException() {}
+
+ /**
+ * Constructs a new <code>JDOFatalException</code> with the specified detail message.
+ *
+ * @param msg the detail message.
+ */
+ public JDOFatalException(String msg) {
+ super(msg);
+ }
+
+ /**
+ * Constructs a new <code>JDOFatalException</code> with the specified detail message and nested
+ * <code>Throwable</code>s.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable[]</code>.
+ */
+ public JDOFatalException(String msg, Throwable[] nested) {
+ super(msg, nested);
+ }
- /**
- * Constructs a new <code>JDOFatalException</code> without a detail message.
- */
- public JDOFatalException() {
- }
+ /**
+ * Constructs a new <code>JDOFatalException</code> with the specified detail message and nested
+ * <code>Throwable</code>s.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable</code>.
+ */
+ public JDOFatalException(String msg, Throwable nested) {
+ super(msg, nested);
+ }
- /**
- * Constructs a new <code>JDOFatalException</code> with the specified detail message.
- * @param msg the detail message.
- */
- public JDOFatalException(String msg) {
- super(msg);
- }
+ /**
+ * Constructs a new <code>JDOFatalException</code> with the specified detail message and failed
+ * object.
+ *
+ * @param msg the detail message.
+ * @param failed the failed object.
+ */
+ public JDOFatalException(String msg, Object failed) {
+ super(msg, failed);
+ }
- /**
- * Constructs a new <code>JDOFatalException</code> with the specified detail
- * message and nested <code>Throwable</code>s.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable[]</code>.
- */
- public JDOFatalException(String msg, Throwable[] nested) {
- super(msg, nested);
- }
-
- /**
- * Constructs a new <code>JDOFatalException</code> with the specified detail
- * message and nested <code>Throwable</code>s.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable</code>.
- */
- public JDOFatalException(String msg, Throwable nested) {
- super(msg, nested);
- }
-
- /** Constructs a new <code>JDOFatalException</code> with the specified detail message
- * and failed object.
- * @param msg the detail message.
- * @param failed the failed object.
- */
- public JDOFatalException(String msg, Object failed) {
- super(msg, failed);
- }
-
- /** Constructs a new <code>JDOFatalException</code> with the specified detail message,
- * nested <code>Throwable</code>s, and failed object.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable[]</code>.
- * @param failed the failed object.
- */
- public JDOFatalException(String msg, Throwable[] nested, Object failed) {
- super(msg, nested, failed);
- }
+ /**
+ * Constructs a new <code>JDOFatalException</code> with the specified detail message, nested
+ * <code>Throwable</code>s, and failed object.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable[]</code>.
+ * @param failed the failed object.
+ */
+ public JDOFatalException(String msg, Throwable[] nested, Object failed) {
+ super(msg, nested, failed);
+ }
- /** Constructs a new <code>JDOFatalException</code> with the specified detail message,
- * nested <code>Throwable</code>s, and failed object.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable</code>.
- * @param failed the failed object.
- */
- public JDOFatalException(String msg, Throwable nested, Object failed) {
- super(msg, nested, failed);
- }
+ /**
+ * Constructs a new <code>JDOFatalException</code> with the specified detail message, nested
+ * <code>Throwable</code>s, and failed object.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable</code>.
+ * @param failed the failed object.
+ */
+ public JDOFatalException(String msg, Throwable nested, Object failed) {
+ super(msg, nested, failed);
+ }
}
diff --git a/api/src/main/java/javax/jdo/JDOFatalInternalException.java b/api/src/main/java/javax/jdo/JDOFatalInternalException.java
index 5ba042e5..b239d638 100644
--- a/api/src/main/java/javax/jdo/JDOFatalInternalException.java
+++ b/api/src/main/java/javax/jdo/JDOFatalInternalException.java
@@ -5,13 +5,13 @@
* 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
- *
+ *
* https://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
+ *
+ * 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.
*/
@@ -22,79 +22,82 @@
package javax.jdo;
-/** This class represents errors in the implementation for which no user
- * error handling is possible. The error should be reported to the JDO
- * vendor for corrective action.
+/**
+ * This class represents errors in the implementation for which no user error handling is possible.
+ * The error should be reported to the JDO vendor for corrective action.
*
* @version 1.0
*/
public class JDOFatalInternalException extends JDOFatalException {
- private static final long serialVersionUID = -2315924677228266735L;
+ private static final long serialVersionUID = -2315924677228266735L;
- /**
- * Constructs a new <code>JDOFatalInternalException</code> without a detail message.
- */
- public JDOFatalInternalException() {
- }
+ /** Constructs a new <code>JDOFatalInternalException</code> without a detail message. */
+ public JDOFatalInternalException() {}
- /**
- * Constructs a new <code>JDOFatalInternalException</code> with the specified detail message.
- * @param msg the detail message.
- */
- public JDOFatalInternalException(String msg) {
- super(msg);
- }
+ /**
+ * Constructs a new <code>JDOFatalInternalException</code> with the specified detail message.
+ *
+ * @param msg the detail message.
+ */
+ public JDOFatalInternalException(String msg) {
+ super(msg);
+ }
- /**
- * Constructs a new <code>JDOFatalInternalException</code> with the specified
- * detail message and nested <code>Throwable</code>s.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable[]</code>.
- */
- public JDOFatalInternalException(String msg, Throwable[] nested) {
- super(msg, nested);
- }
+ /**
+ * Constructs a new <code>JDOFatalInternalException</code> with the specified detail message and
+ * nested <code>Throwable</code>s.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable[]</code>.
+ */
+ public JDOFatalInternalException(String msg, Throwable[] nested) {
+ super(msg, nested);
+ }
- /**
- * Constructs a new <code>JDOFatalInternalException</code> with the specified
- * detail message and nested <code>Throwable</code>s.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable</code>.
- */
- public JDOFatalInternalException(String msg, Throwable nested) {
- super(msg, nested);
- }
+ /**
+ * Constructs a new <code>JDOFatalInternalException</code> with the specified detail message and
+ * nested <code>Throwable</code>s.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable</code>.
+ */
+ public JDOFatalInternalException(String msg, Throwable nested) {
+ super(msg, nested);
+ }
- /**
- * Constructs a new <code>JDOFatalInternalException</code>
- * with the specified detail message and failed object.
- * @param msg the detail message.
- * @param failed the failed object.
- */
- public JDOFatalInternalException(String msg, Object failed) {
- super(msg, failed);
- }
+ /**
+ * Constructs a new <code>JDOFatalInternalException</code> with the specified detail message and
+ * failed object.
+ *
+ * @param msg the detail message.
+ * @param failed the failed object.
+ */
+ public JDOFatalInternalException(String msg, Object failed) {
+ super(msg, failed);
+ }
- /**
- * Constructs a new <code>JDOFatalInternalException</code> with the specified
- * detail message, nested <code>Throwable</code>s, and failed object.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable[]</code>.
- * @param failed the failed object.
- */
- public JDOFatalInternalException(String msg, Throwable[] nested, Object failed) {
- super(msg, nested, failed);
- }
+ /**
+ * Constructs a new <code>JDOFatalInternalException</code> with the specified detail message,
+ * nested <code>Throwable</code>s, and failed object.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable[]</code>.
+ * @param failed the failed object.
+ */
+ public JDOFatalInternalException(String msg, Throwable[] nested, Object failed) {
+ super(msg, nested, failed);
+ }
- /**
- * Constructs a new <code>JDOFatalInternalException</code> with the specified
- * detail message, nested <code>Throwable</code>s, and failed object.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable</code>.
- * @param failed the failed object.
- */
- public JDOFatalInternalException(String msg, Throwable nested, Object failed) {
- super(msg, nested, failed);
- }
+ /**
+ * Constructs a new <code>JDOFatalInternalException</code> with the specified detail message,
+ * nested <code>Throwable</code>s, and failed object.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable</code>.
+ * @param failed the failed object.
+ */
+ public JDOFatalInternalException(String msg, Throwable nested, Object failed) {
+ super(msg, nested, failed);
+ }
}
diff --git a/api/src/main/java/javax/jdo/JDOFatalUserException.java b/api/src/main/java/javax/jdo/JDOFatalUserException.java
index 8dc1434d..f43cfd2c 100644
--- a/api/src/main/java/javax/jdo/JDOFatalUserException.java
+++ b/api/src/main/java/javax/jdo/JDOFatalUserException.java
@@ -5,13 +5,13 @@
* 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
- *
+ *
* https://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
+ *
+ * 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.
*/
@@ -22,75 +22,81 @@
package javax.jdo;
-/** This class represents user errors that cannot be retried.
+/**
+ * This class represents user errors that cannot be retried.
*
* @version 1.0
*/
public class JDOFatalUserException extends JDOFatalException {
- private static final long serialVersionUID = -7451285498620809419L;
+ private static final long serialVersionUID = -7451285498620809419L;
- /**
- * Constructs a new <code>JDOFatalUserException</code> without a detail message.
- */
- public JDOFatalUserException() {
- }
+ /** Constructs a new <code>JDOFatalUserException</code> without a detail message. */
+ public JDOFatalUserException() {}
- /**
- * Constructs a new <code>JDOFatalUserException</code> with the specified detail message.
- * @param msg the detail message.
- */
- public JDOFatalUserException(String msg) {
- super(msg);
- }
+ /**
+ * Constructs a new <code>JDOFatalUserException</code> with the specified detail message.
+ *
+ * @param msg the detail message.
+ */
+ public JDOFatalUserException(String msg) {
+ super(msg);
+ }
- /**
- * Constructs a new <code>JDOFatalUserException</code> with the specified
- * detail message and nested <code>Throwable</code>s.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable[]</code>.
- */
- public JDOFatalUserException(String msg, Throwable[] nested) {
- super(msg, nested);
- }
-
- /**
- * Constructs a new <code>JDOFatalUserException</code> with the specified
- * detail message and nested <code>Throwable</code>s.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable</code>.
- */
- public JDOFatalUserException(String msg, Throwable nested) {
- super(msg, nested);
- }
-
- /** Constructs a new <code>JDOFatalUserException</code> with the specified
- * detail message and failed object.
- * @param msg the detail message.
- * @param failed the failed object.
- */
- public JDOFatalUserException(String msg, Object failed) {
- super(msg, failed);
- }
-
- /** Constructs a new <code>JDOFatalUserException</code> with the specified
- * detail message, nested <code>Throwable</code>s, and failed object.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable[]</code>.
- * @param failed the failed object.
- */
- public JDOFatalUserException(String msg, Throwable[] nested, Object failed) {
- super(msg, nested, failed);
- }
-
- /** Constructs a new <code>JDOFatalUserException</code> with the specified
- * detail message, nested <code>Throwable</code>s, and failed object.
- * @param msg the detail message.
- * @param nested the nested <code>Throwable</code>.
- * @param failed the failed object.
- */
- public JDOFatalUserException(String msg, Throwable nested, Object failed) {
- super(msg, nested, failed);
- }
-}
+ /**
+ * Constructs a new <code>JDOFatalUserException</code> with the specified detail message and
+ * nested <code>Throwable</code>s.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable[]</code>.
+ */
+ public JDOFatalUserException(String msg, Throwable[] nested) {
+ super(msg, nested);
+ }
+
+ /**
+ * Constructs a new <code>JDOFatalUserException</code> with the specified detail message and
+ * nested <code>Throwable</code>s.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable</code>.
+ */
+ public JDOFatalUserException(String msg, Throwable nested) {
+ super(msg, nested);
+ }
+ /**
+ * Constructs a new <code>JDOFatalUserException</code> with the specified detail message and
+ * failed object.
+ *
+ * @param msg the detail message.
+ * @param failed the failed object.
+ */
+ public JDOFatalUserException(String msg, Object failed) {
+ super(msg, failed);
+ }
+
+ /**
+ * Constructs a new <code>JDOFatalUserException</code> with the specified detail message, nested
+ * <code>Throwable</code>s, and failed object.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable[]</code>.
+ * @param failed the failed object.
+ */
+ public JDOFatalUserException(String msg, Throwable[] nested, Object failed) {
+ super(msg, nested, failed);
+ }
+
+ /**
+ * Constructs a new <code>JDOFatalUserException</code> with the specified detail message, nested
+ * <code>Throwable</code>s, and failed object.
+ *
+ * @param msg the detail message.
+ * @param nested the nested <code>Throwable</code>.
+ * @param failed the failed object.
+ */
+ public JDOFatalUserException(String msg, Throwable nested, Object failed) {
+ super(msg, nested, failed);
+ }
+}
diff --git a/api/src/main/java/javax/jdo/JDOHelper.java b/api/src/main/java/javax/jdo/JDOHelper.java
index 892d4683..d43e298b 100644
--- a/api/src/main/java/javax/jdo/JDOHelper.java
+++ b/api/src/main/java/javax/jdo/JDOHelper.java
@@ -5,13 +5,13 @@
* 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
- *
+ *
* https://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
+ *
+ * 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.
*/
@@ -19,7 +19,7 @@
* JDOHelper.java
*
*/
-
+
package javax.jdo;
import java.io.BufferedReader;
@@ -69,1806 +69,1614 @@ import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
-
/**
- * This class can be used by a JDO-aware application to call the JDO behavior
- * of <code>PersistenceCapable</code> instances without declaring them to be
- * <code>PersistenceCapable</code>.
- * <P>It is also used to acquire a <code>PersistenceManagerFactory</code> via
- * various methods.
- * <P>This helper class defines static methods that allow a JDO-aware
- * application to examine the runtime state of instances. For example,
- * an application can discover whether the instance is persistent,
- * transactional, dirty, new, deleted, or detached; and to get its associated
- * <code>PersistenceManager</code> if it has one.
- *
+ * This class can be used by a JDO-aware application to call the JDO behavior of <code>
+ * PersistenceCapable</code> instances without declaring them to be <code>PersistenceCapable</code>.
+ *
+ * <p>It is also used to acquire a <code>PersistenceManagerFactory</code> via various methods.
+ *
+ * <p>This helper class defines static methods that allow a JDO-aware application to examine the
+ * runtime state of instances. For example, an application can discover whether the instance is
+ * persistent, transactional, dirty, new, deleted, or detached; and to get its associated <code>
+ * PersistenceManager</code> if it has one.
+ *
* @version 2.1
*/
public class JDOHelper implements Constants {
- /**
- * A mapping from jdoconfig.xsd element attributes to PMF properties.
- */
- static final Map<String, String> ATTRIBUTE_PROPERTY_XREF
- = createAttributePropertyXref();
-
- /** The Internationalization message helper.
- */
- private final static I18NHelper msg =
- I18NHelper.getInstance ("javax.jdo.Bundle"); //NOI18N
-
- /**
- * Creates a map from jdoconfig.xsd element attributes to PMF properties.
- * @return An unmodifiable Map of jdoconfig.xsd element attributes to PMF
- * properties.
- */
- static Map<String, String> createAttributePropertyXref() {
- Map<String, String> xref = new HashMap<String,String>();
-
- xref.put(
- PMF_ATTRIBUTE_CLASS,
- PROPERTY_PERSISTENCE_MANAGER_FACTORY_CLASS);
- xref.put(
- PMF_ATTRIBUTE_CONNECTION_DRIVER_NAME,
- PROPERTY_CONNECTION_DRIVER_NAME);
- xref.put(
- PMF_ATTRIBUTE_CONNECTION_FACTORY_NAME,
- PROPERTY_CONNECTION_FACTORY_NAME);
- xref.put(
- PMF_ATTRIBUTE_CONNECTION_FACTORY2_NAME,
- PROPERTY_CONNECTION_FACTORY2_NAME);
- xref.put(
- PMF_ATTRIBUTE_CONNECTION_PASSWORD,
- PROPERTY_CONNECTION_PASSWORD);
- xref.put(
- PMF_ATTRIBUTE_CONNECTION_URL,
- PROPERTY_CONNECTION_URL);
- xref.put(
- PMF_ATTRIBUTE_CONNECTION_USER_NAME,
- PROPERTY_CONNECTION_USER_NAME);
- xref.put(
- PMF_ATTRIBUTE_IGNORE_CACHE,
- PROPERTY_IGNORE_CACHE);
- xref.put(
- PMF_ATTRIBUTE_MAPPING,
- PROPERTY_MAPPING);
- xref.put(
- PMF_ATTRIBUTE_MULTITHREADED,
- PROPERTY_MULTITHREADED);
- xref.put(
- PMF_ATTRIBUTE_NONTRANSACTIONAL_READ,
- PROPERTY_NONTRANSACTIONAL_READ);
- xref.put(
- PMF_ATTRIBUTE_NONTRANSACTIONAL_WRITE,
- PROPERTY_NONTRANSACTIONAL_WRITE);
- xref.put(
- PMF_ATTRIBUTE_OPTIMISTIC,
- PROPERTY_OPTIMISTIC);
- xref.put(
- PMF_ATTRIBUTE_PERSISTENCE_UNIT_NAME,
- PROPERTY_PERSISTENCE_UNIT_NAME);
- xref.put(
- PMF_ATTRIBUTE_NAME,
- PROPERTY_NAME);
- xref.put(
- PMF_ATTRIBUTE_RESTORE_VALUES,
- PROPERTY_RESTORE_VALUES);
- xref.put(
- PMF_ATTRIBUTE_RETAIN_VALUES,
- PROPERTY_RETAIN_VALUES);
- xref.put(
- PMF_ATTRIBUTE_DETACH_ALL_ON_COMMIT,
- PROPERTY_DETACH_ALL_ON_COMMIT);
- xref.put(
- PMF_ATTRIBUTE_SERVER_TIME_ZONE_ID,
- PROPERTY_SERVER_TIME_ZONE_ID);
- xref.put(
- PMF_ATTRIBUTE_DATASTORE_READ_TIMEOUT_MILLIS,
- PROPERTY_DATASTORE_READ_TIMEOUT_MILLIS);
- xref.put(
- PMF_ATTRIBUTE_DATASTORE_WRITE_TIMEOUT_MILLIS,
- PROPERTY_DATASTORE_WRITE_TIMEOUT_MILLIS);
-
- return Collections.unmodifiableMap(xref);
- }
-
- /** The JDOImplHelper instance used for handling non-binary-compatible
- * implementations.
- */
- private static JDOImplHelper implHelper = (JDOImplHelper)
- doPrivileged(
- new PrivilegedAction<JDOImplHelper> () {
- public JDOImplHelper run () {
- return JDOImplHelper.getInstance();
+ /** A mapping from jdoconfig.xsd element attributes to PMF properties. */
+ static final Map<String, String> ATTRIBUTE_PROPERTY_XREF = createAttributePropertyXref();
+
+ /** The Internationalization message helper. */
+ private static final I18NHelper msg = I18NHelper.getInstance("javax.jdo.Bundle"); // NOI18N
+
+ /**
+ * Creates a map from jdoconfig.xsd element attributes to PMF properties.
+ *
+ * @return An unmodifiable Map of jdoconfig.xsd element attributes to PMF properties.
+ */
+ static Map<String, String> createAttributePropertyXref() {
+ Map<String, String> xref = new HashMap<String, String>();
+
+ xref.put(PMF_ATTRIBUTE_CLASS, PROPERTY_PERSISTENCE_MANAGER_FACTORY_CLASS);
+ xref.put(PMF_ATTRIBUTE_CONNECTION_DRIVER_NAME, PROPERTY_CONNECTION_DRIVER_NAME);
+ xref.put(PMF_ATTRIBUTE_CONNECTION_FACTORY_NAME, PROPERTY_CONNECTION_FACTORY_NAME);
+ xref.put(PMF_ATTRIBUTE_CONNECTION_FACTORY2_NAME, PROPERTY_CONNECTION_FACTORY2_NAME);
+ xref.put(PMF_ATTRIBUTE_CONNECTION_PASSWORD, PROPERTY_CONNECTION_PASSWORD);
+ xref.put(PMF_ATTRIBUTE_CONNECTION_URL, PROPERTY_CONNECTION_URL);
+ xref.put(PMF_ATTRIBUTE_CONNECTION_USER_NAME, PROPERTY_CONNECTION_USER_NAME);
+ xref.put(PMF_ATTRIBUTE_IGNORE_CACHE, PROPERTY_IGNORE_CACHE);
+ xref.put(PMF_ATTRIBUTE_MAPPING, PROPERTY_MAPPING);
+ xref.put(PMF_ATTRIBUTE_MULTITHREADED, PROPERTY_MULTITHREADED);
+ xref.put(PMF_ATTRIBUTE_NONTRANSACTIONAL_READ, PROPERTY_NONTRANSACTIONAL_READ);
+ xref.put(PMF_ATTRIBUTE_NONTRANSACTIONAL_WRITE, PROPERTY_NONTRANSACTIONAL_WRITE);
+ xref.put(PMF_ATTRIBUTE_OPTIMISTIC, PROPERTY_OPTIMISTIC);
+ xref.put(PMF_ATTRIBUTE_PERSISTENCE_UNIT_NAME, PROPERTY_PERSISTENCE_UNIT_NAME);
+ xref.put(PMF_ATTRIBUTE_NAME, PROPERTY_NAME);
+ xref.put(PMF_ATTRIBUTE_RESTORE_VALUES, PROPERTY_RESTORE_VALUES);
+ xref.put(PMF_ATTRIBUTE_RETAIN_VALUES, PROPERTY_RETAIN_VALUES);
+ xref.put(PMF_ATTRIBUTE_DETACH_ALL_ON_COMMIT, PROPERTY_DETACH_ALL_ON_COMMIT);
+ xref.put(PMF_ATTRIBUTE_SERVER_TIME_ZONE_ID, PROPERTY_SERVER_TIME_ZONE_ID);
+ xref.put(PMF_ATTRIBUTE_DATASTORE_READ_TIMEOUT_MILLIS, PROPERTY_DATASTORE_READ_TIMEOUT_MILLIS);
+ xref.put(PMF_ATTRIBUTE_DATASTORE_WRITE_TIMEOUT_MILLIS, PROPERTY_DATASTORE_WRITE_TIMEOUT_MILLIS);
+
+ return Collections.unmodifiableMap(xref);
+ }
+
+ /** The JDOImplHelper instance used for handling non-binary-compatible implementations. */
+ private static JDOImplHelper implHelper =
+ (JDOImplHelper)
+ doPrivileged(
+ new PrivilegedAction<JDOImplHelper>() {
+ public JDOImplHelper run() {
+ return JDOImplHelper.getInstance();
}
- }
- );
-
- /** The singleton instance of JDOHelper.
- * @since 2.1
- */
- private static JDOHelper instance = new JDOHelper();
-
- /**
- * Return the singleton instance of JDOHelper. This instance is
- * thread-safe.
- * @since 2.1
- * @return the thread-safe singleton JDOHelper
- */
- public static JDOHelper getInstance() {
- return instance;
- }
-
- /** Some applications might prefer to use instance
- * methods instead of static methods.
- * @since 2.1
- */
- public JDOHelper() {}
-
- /** The stateless instance used for handling non-binary-compatible
- * implementations of getPersistenceManager.
- */
- static StateInterrogationObjectReturn getPersistenceManager =
- new StateInterrogationObjectReturn() {
- public Object get(Object pc, StateInterrogation si) {
- return si.getPersistenceManager(pc);
- }
- };
-
- /** The stateless instance used for handling non-binary-compatible
- * implementations of getObjectId.
- */
- static StateInterrogationObjectReturn getObjectId =
- new StateInterrogationObjectReturn() {
- public Object get(Object pc, StateInterrogation si) {
- return si.getObjectId(pc);
- }
- };
-
- /** The stateless instance used for handling non-binary-compatible
- * implementations of getTransactionalObjectId.
- */
- static StateInterrogationObjectReturn getTransactionalObjectId =
- new StateInterrogationObjectReturn() {
- public Object get(Object pc, StateInterrogation si) {
- return si.getTransactionalObjectId(pc);
- }
- };
-
- /** The stateless instance used for handling non-binary-compatible
- * implementations of getVersion.
- */
- static StateInterrogationObjectReturn getVersion =
- new StateInterrogationObjectReturn() {
- public Object get(Object pc, StateInterrogation si) {
- return si.getVersion(pc);
- }
- };
-
- /** The stateless instance used for handling non-binary-compatible
- * implementations of isPersistent.
- */
- static StateInterrogationBooleanReturn isPersistent =
- new StateInterrogationBooleanReturn() {
- public Boolean is(Object pc, StateInterrogation si) {
- return si.isPersistent(pc);
- }
- };
-
- /** The stateless instance used for handling non-binary-compatible
- * implementations of isTransactional.
- */
- static StateInterrogationBooleanReturn isTransactional =
- new StateInterrogationBooleanReturn() {
- public Boolean is(Object pc, StateInterrogation si) {
- return si.isTransactional(pc);
- }
- };
-
- /** The stateless instance used for handling non-binary-compatible
- * implementations of isDirty.
- */
- static StateInterrogationBooleanReturn isDirty =
- new StateInterrogationBooleanReturn() {
- public Boolean is(Object pc, StateInterrogation si) {
- return si.isDirty(pc);
- }
- };
-
- /** The stateless instance used for handling non-binary-compatible
- * implementations of isNew.
- */
- static StateInterrogationBooleanReturn isNew =
- new StateInterrogationBooleanReturn() {
- public Boolean is(Object pc, StateInterrogation si) {
- return si.isNew(pc);
- }
- };
-
- /** The stateless instance used for handling non-binary-compatible
- * implementations of isDeleted.
- */
- static StateInterrogationBooleanReturn isDeleted =
- new StateInterrogationBooleanReturn() {
- public Boolean is(Object pc, StateInterrogation si) {
- return si.isDeleted(pc);
- }
- };
-
- /** The stateless instance used for handling non-binary-compatible
- * implementations of isDetached.
- */
- static StateInterrogationBooleanReturn isDetached =
- new StateInterrogationBooleanReturn() {
- public Boolean is(Object pc, StateInterrogation si) {
- return si.isDetached(pc);
- }
- };
-
- /** Return the associated <code>PersistenceManager</code> if there is one.
- * Transactional and persistent instances return the associated
- * <code>PersistenceManager</code>.
- *
- * <P>Transient non-transactional instances and instances of classes
- * that do not implement <code>PersistenceCapable</code> return
- * <code>null</code>.
- * @see PersistenceCapable#jdoGetPersistenceManager()
- * @param pc the <code>PersistenceCapable</code> instance.
- * @return the <code>PersistenceManager</code> associated with the parameter
- * instance.
- */
- public static PersistenceManager getPersistenceManager(Object pc) {
- if (pc instanceof PersistenceCapable) {
- return ((PersistenceCapable)pc).jdoGetPersistenceManager();
- } else {
- return (PersistenceManager)
- implHelper.nonBinaryCompatibleGet(pc, getPersistenceManager);
+ });
+
+ /**
+ * The singleton instance of JDOHelper.
+ *
+ * @since 2.1
+ */
+ private static JDOHelper instance = new JDOHelper();
+
+ /**
+ * Return the singleton instance of JDOHelper. This instance is thread-safe.
+ *
+ * @since 2.1
+ * @return the thread-safe singleton JDOHelper
+ */
+ public static JDOHelper getInstance() {
+ return instance;
+ }
+
+ /**
+ * Some applications might prefer to use instance methods instead of static methods.
+ *
+ * @since 2.1
+ */
+ public JDOHelper() {}
+
+ /**
+ * The stateless instance used for handling non-binary-compatible implementations of
+ * getPersistenceManager.
+ */
+ static StateInterrogationObjectReturn getPersistenceManager =
+ new StateInterrogationObjectReturn() {
+ public Object get(Object pc, StateInterrogation si) {
+ return si.getPersistenceManager(pc);
}
- }
-
- /** Explicitly mark the parameter instance and field dirty.
- * Normally, <code>PersistenceCapable</code> classes are able to detect
- * changes made to their fields. However, if a reference to an array is
- * given to a method outside the class, and the array is modified, then the
- * persistent instance is not aware of the change. This API allows the
- * application to notify the instance that a change was made to a field.
- *
- * <P>Transient instances and instances of classes
- * that do not implement <code>PersistenceCapable</code> ignore this method.
- * @see PersistenceCapable#jdoMakeDirty(String fieldName)
- * @param pc the <code>PersistenceCapable</code> instance.
- * @param fieldName the name of the field to be marked dirty.
- */
- public static void makeDirty(Object pc, String fieldName) {
- if (pc instanceof PersistenceCapable) {
- ((PersistenceCapable)pc).jdoMakeDirty(fieldName);
- } else {
- implHelper.nonBinaryCompatibleMakeDirty(pc, fieldName);
+ };
+
+ /**
+ * The stateless instance used for handling non-binary-compatible implementations of getObjectId.
+ */
+ static StateInterrogationObjectReturn getObjectId =
+ new StateInterrogationObjectReturn() {
+ public Object get(Object pc, StateInterrogation si) {
+ return si.getObjectId(pc);
}
- }
-
- /** Return a copy of the JDO identity associated with the parameter
- * instance.
- *
- * <P>Persistent instances of <code>PersistenceCapable</code> classes have a
- * JDO identity managed by the <code>PersistenceManager</code>. This method
- * returns a copy of the ObjectId that represents the JDO identity.
- *
- * <P>Transient instances and instances of classes that do not implement
- * <code>PersistenceCapable</code> return <code>null</code>.
- *
- * <P>The ObjectId may be serialized
- * and later restored, and used with a <code>PersistenceManager</code> from
- * the same JDO implementation to locate a persistent instance with the same
- * data store identity.
- *
- * <P>If the JDO identity is managed by the application, then the ObjectId
- * may be used with a <code>PersistenceManager</code> from any JDO
- * implementation that supports the <code>PersistenceCapable</code> class.
- *
- * <P>If the JDO identity is not managed by the application or the data
- * store, then the ObjectId returned is only valid within the current
- * transaction.
- *<P>
- * @see PersistenceManager#getObjectId(Object pc)
- * @see PersistenceCapable#jdoGetObjectId()
- * @see PersistenceManager#getObjectById(Object oid, boolean validate)
- * @param pc the PersistenceCapable instance.
- * @return a copy of the ObjectId of the parameter instance as of the
- * beginning of the transaction.
- */
- public static Object getObjectId(Object pc) {
- if (pc instanceof PersistenceCapable) {
- return ((PersistenceCapable)pc).jdoGetObjectId();
- } else {
- return implHelper.nonBinaryCompatibleGet(pc, getObjectId);
+ };
+
+ /**
+ * The stateless instance used for handling non-binary-compatible implementations of
+ * getTransactionalObjectId.
+ */
+ static StateInterrogationObjectReturn getTransactionalObjectId =
+ new StateInterrogationObjectReturn() {
+ public Object get(Object pc, StateInterrogation si) {
+ return si.getTransactionalObjectId(pc);
}
- }
-
- /** Get object ids for a collection of instances. For each instance
- * in the parameter, the getObjectId method is called. This method
- * returns one identity instance for each element
- * in the parameter. The order of iteration of the returned
- * Collection exactly matches the order of iteration of the
- * parameter Collection.
- * @param pcs the persistence-capable instances
- * @return the object ids of the parameters
- * @see #getObjectId(Object pc)
- * @see #getObjectIds(Object[] pcs)
- * @since 2.0
- */
- public static Collection<Object> getObjectIds(Collection<?> pcs) {
- ArrayList<Object> result = new ArrayList<Object>();
- for (Iterator<?> it = pcs.iterator(); it.hasNext();) {
- result.add(getObjectId(it.next()));
+ };
+
+ /**
+ * The stateless instance used for handling non-binary-compatible implementations of getVersion.
+ */
+ static StateInterrogationObjectReturn getVersion =
+ new StateInterrogationObjectReturn() {
+ public Object get(Object pc, StateInterrogation si) {
+ return si.getVersion(pc);
}
- return result;
- }
+ };
+
+ /**
+ * The stateless instance used for handling non-binary-compatible implementations of isPersistent.
+ */
+ static StateInterrogationBooleanReturn isPersistent =
+ new StateInterrogationBooleanReturn() {
+ public Boolean is(Object pc, StateInterrogation si) {
+ return si.isPersistent(pc);
+ }
+ };
+
+ /**
+ * The stateless instance used for handling non-binary-compatible implementations of
+ * isTransactional.
+ */
+ static StateInterrogationBooleanReturn isTransactional =
+ new StateInterrogationBooleanReturn() {
+ public Boolean is(Object pc, StateInterrogation si) {
+ return si.isTransactional(pc);
+ }
+ };
- /** Get object ids for an array of instances. For each instance
- * in the parameter, the getObjectId method is called. This method
- * returns one identity instance for each element
- * in the parameter. The order of instances of the returned
- * array exactly matches the order of instances of the
- * parameter array.
- * @param pcs the persistence-capable instances
- * @return the object ids of the parameters
- * @see #getObjectId(Object pc)
- * @see #getObjectIds(Collection pcs)
- * @since 2.0
- */
- public static Object[] getObjectIds(Object[] pcs) {
- Object[] result = new Object[pcs.length];
- for (int i = 0; i < pcs.length; ++i) {
- result[i] = getObjectId(pcs[i]);
+ /** The stateless instance used for handling non-binary-compatible implementations of isDirty. */
+ static StateInterrogationBooleanReturn isDirty =
+ new StateInterrogationBooleanReturn() {
+ public Boolean is(Object pc, StateInterrogation si) {
+ return si.isDirty(pc);
}
- return result;
- }
+ };
- /** Return a copy of the JDO identity associated with the parameter
- * instance.
- *
- * @see PersistenceCapable#jdoGetTransactionalObjectId()
- * @see PersistenceManager#getObjectById(Object oid, boolean validate)
- * @param pc the <code>PersistenceCapable</code> instance.
- * @return a copy of the ObjectId of the parameter instance as modified in
- * this transaction.
- */
- public static Object getTransactionalObjectId(Object pc) {
- if (pc instanceof PersistenceCapable) {
- return ((PersistenceCapable)pc).jdoGetTransactionalObjectId();
- } else {
- return implHelper.nonBinaryCompatibleGet(
- pc, getTransactionalObjectId);
+ /** The stateless instance used for handling non-binary-compatible implementations of isNew. */
+ static StateInterrogationBooleanReturn isNew =
+ new StateInterrogationBooleanReturn() {
+ public Boolean is(Object pc, StateInterrogation si) {
+ return si.isNew(pc);
}
- }
-
- /**
- * Return the version of the instance.
- * @since 2.0
- * @param pc the instance
- * @return the version of the instance
- */
- public static Object getVersion (Object pc) {
- if (pc instanceof PersistenceCapable) {
- return ((PersistenceCapable)pc).jdoGetVersion();
- } else {
- return implHelper.nonBinaryCompatibleGet(pc, getVersion);
+ };
+
+ /**
+ * The stateless instance used for handling non-binary-compatible implementations of isDeleted.
+ */
+ static StateInterrogationBooleanReturn isDeleted =
+ new StateInterrogationBooleanReturn() {
+ public Boolean is(Object pc, StateInterrogation si) {
+ return si.isDeleted(pc);
}
- }
- /** Tests whether the parameter instance is dirty.
- *
- * Instances that have been modified, deleted, or newly
- * made persistent in the current transaction return <code>true</code>.
- *
- *<P>Transient instances and instances of classes that do not implement
- * <code>PersistenceCapable</code> return <code>false</code>.
- *<P>
- * @see javax.jdo.spi.StateManager#makeDirty(PersistenceCapable pc,
- * String fieldName)
- * @see PersistenceCapable#jdoIsDirty()
- * @param pc the <code>PersistenceCapable</code> instance.
- * @return <code>true</code> if the parameter instance has been modified in
- * the current transaction.
- */
- public static boolean isDirty(Object pc) {
- if (pc instanceof PersistenceCapable) {
- return ((PersistenceCapable)pc).jdoIsDirty();
- } else {
- return implHelper.nonBinaryCompatibleIs(pc, isDirty);
+ };
+
+ /**
+ * The stateless instance used for handling non-binary-compatible implementations of isDetached.
+ */
+ static StateInterrogationBooleanReturn isDetached =
+ new StateInterrogationBooleanReturn() {
+ public Boolean is(Object pc, StateInterrogation si) {
+ return si.isDetached(pc);
}
+ };
+
+ /**
+ * Return the associated <code>PersistenceManager</code> if there is one. Transactional and
+ * persistent instances return the associated <code>PersistenceManager</code>.
+ *
+ * <p>Transient non-transactional instances and instances of classes that do not implement <code>
+ * PersistenceCapable</code> return <code>null</code>.
+ *
+ * @see PersistenceCapable#jdoGetPersistenceManager()
+ * @param pc the <code>PersistenceCapable</code> instance.
+ * @return the <code>PersistenceManager</code> associated with the parameter instance.
+ */
+ public static PersistenceManager getPersistenceManager(Object pc) {
+ if (pc instanceof PersistenceCapable) {
+ return ((PersistenceCapable) pc).jdoGetPersistenceManager();
+ } else {
+ return (PersistenceManager) implHelper.nonBinaryCompatibleGet(pc, getPersistenceManager);
}
-
- /** Tests whether the parameter instance is transactional.
- *
- * Instances whose state is associated with the current transaction
- * return true.
- *
- *<P>Transient instances and instances of classes that do not implement
- * <code>PersistenceCapable</code> return <code>false</code>.
- * @see PersistenceCapable#jdoIsTransactional()
- * @param pc the <code>PersistenceCapable</code> instance.
- * @return <code>true</code> if the parameter instance is transactional.
- */
- public static boolean isTransactional(Object pc) {
- if (pc instanceof PersistenceCapable) {
- return ((PersistenceCapable)pc).jdoIsTransactional();
- } else {
- return implHelper.nonBinaryCompatibleIs(pc, isTransactional);
- }
+ }
+
+ /**
+ * Explicitly mark the parameter instance and field dirty. Normally, <code>PersistenceCapable
+ * </code> classes are able to detect changes made to their fields. However, if a reference to an
+ * array is given to a method outside the class, and the array is modified, then the persistent
+ * instance is not aware of the change. This API allows the application to notify the instance
+ * that a change was made to a field.
+ *
+ * <p>Transient instances and instances of classes that do not implement <code>PersistenceCapable
+ * </code> ignore this method.
+ *
+ * @see PersistenceCapable#jdoMakeDirty(String fieldName)
+ * @param pc the <code>PersistenceCapable</code> instance.
+ * @param fieldName the name of the field to be marked dirty.
+ */
+ public static void makeDirty(Object pc, String fieldName) {
+ if (pc instanceof PersistenceCapable) {
+ ((PersistenceCapable) pc).jdoMakeDirty(fieldName);
+ } else {
+ implHelper.nonBinaryCompatibleMakeDirty(pc, fieldName);
}
-
- /** Tests whether the parameter instance is persistent.
- *
- * Instances that represent persistent objects in the data store
- * return <code>true</code>.
- *
- *<P>Transient instances and instances of classes that do not implement
- * <code>PersistenceCapable</code> return <code>false</code>.
- *<P>
- * @see PersistenceManager#makePersistent(Object pc)
- * @see PersistenceCapable#jdoIsPersistent()
- * @param pc the <code>PersistenceCapable</code> instance.
- * @return <code>true</code> if the parameter instance is persistent.
- */
- public static boolean isPersistent(Object pc) {
- if (pc instanceof PersistenceCapable) {
- return ((PersistenceCapable)pc).jdoIsPersistent();
- } else {
- return implHelper.nonBinaryCompatibleIs(pc, isPersistent);
- }
+ }
+
+ /**
+ * Return a copy of the JDO identity associated with the parameter instance.
+ *
+ * <p>Persistent instances of <code>PersistenceCapable</code> classes have a JDO identity managed
+ * by the <code>PersistenceManager</code>. This method returns a copy of the ObjectId that
+ * represents the JDO identity.
+ *
+ * <p>Transient instances and instances of classes that do not implement <code>PersistenceCapable
+ * </code> return <code>null</code>.
+ *
+ * <p>The ObjectId may be serialized and later restored, and used with a <code>PersistenceManager
+ * </code> from the same JDO implementation to locate a persistent instance with the same data
+ * store identity.
+ *
+ * <p>If the JDO identity is managed by the application, then the ObjectId may be used with a
+ * <code>PersistenceManager</code> from any JDO implementation that supports the <code>
+ * PersistenceCapable</code> class.
+ *
+ * <p>If the JDO identity is not managed by the application or the data store, then the ObjectId
+ * returned is only valid within the current transaction.
+ *
+ * <p>
+ *
+ * @see PersistenceManager#getObjectId(Object pc)
+ * @see PersistenceCapable#jdoGetObjectId()
+ * @see PersistenceManager#getObjectById(Object oid, boolean validate)
+ * @param pc the PersistenceCapable instance.
+ * @return a copy of the ObjectId of the parameter instance as of the beginning of the
+ * transaction.
+ */
+ public static Object getObjectId(Object pc) {
+ if (pc instanceof PersistenceCapable) {
+ return ((PersistenceCapable) pc).jdoGetObjectId();
+ } else {
+ return implHelper.nonBinaryCompatibleGet(pc, getObjectId);
}
-
- /** Tests whether the parameter instance has been newly made persistent.
- *
- * Instances that have been made persistent in the current transaction
- * return <code>true</code>.
- *
- *<P>Transient instances and instances of classes that do not implement
- * <code>PersistenceCapable</code> return <code>false</code>.
- *<P>
- * @see PersistenceManager#makePersistent(Object pc)
- * @see PersistenceCapable#jdoIsNew()
- * @param pc the <code>PersistenceCapable</code> instance.
- * @return <code>true</code> if the parameter instance was made persistent
- * in the current transaction.
- */
- public static boolean isNew(Object pc) {
- if (pc instanceof PersistenceCapable) {
- return ((PersistenceCapable)pc).jdoIsNew();
- } else {
- return implHelper.nonBinaryCompatibleIs(pc, isNew);
- }
+ }
+
+ /**
+ * Get object ids for a collection of instances. For each instance in the parameter, the
+ * getObjectId method is called. This method returns one identity instance for each element in the
+ * parameter. The order of iteration of the returned Collection exactly matches the order of
+ * iteration of the parameter Collection.
+ *
+ * @param pcs the persistence-capable instances
+ * @return the object ids of the parameters
+ * @see #getObjectId(Object pc)
+ * @see #getObjectIds(Object[] pcs)
+ * @since 2.0
+ */
+ public static Collection<Object> getObjectIds(Collection<?> pcs) {
+ ArrayList<Object> result = new ArrayList<Object>();
+ for (Iterator<?> it = pcs.iterator(); it.hasNext(); ) {
+ result.add(getObjectId(it.next()));
}
-
- /** Tests whether the parameter instance has been deleted.
- *
- * Instances that have been deleted in the current transaction return
- * <code>true</code>.
- *
- *<P>Transient instances and instances of classes that do not implement
- * <code>PersistenceCapable</code> return <code>false</code>.
- *<P>
- * @see PersistenceManager#deletePersistent(Object pc)
- * @see PersistenceCapable#jdoIsDeleted()
- * @param pc the <code>PersistenceCapable</code> instance.
- * @return <code>true</code> if the parameter instance was deleted
- * in the current transaction.
- */
- public static boolean isDeleted(Object pc) {
- if (pc instanceof PersistenceCapable) {
- return ((PersistenceCapable)pc).jdoIsDeleted();
- } else {
- return implHelper.nonBinaryCompatibleIs(pc, isDeleted);
- }
+ return result;
+ }
+
+ /**
+ * Get object ids for an array of instances. For each instance in the parameter, the getObjectId
+ * method is called. This method returns one identity instance for each element in the parameter.
+ * The order of instances of the returned array exactly matches the order of instances of the
+ * parameter array.
+ *
+ * @param pcs the persistence-capable instances
+ * @return the object ids of the parameters
+ * @see #getObjectId(Object pc)
+ * @see #getObjectIds(Collection pcs)
+ * @since 2.0
+ */
+ public static Object[] getObjectIds(Object[] pcs) {
+ Object[] result = new Object[pcs.length];
+ for (int i = 0; i < pcs.length; ++i) {
+ result[i] = getObjectId(pcs[i]);
}
-
- /**
- * Tests whether the parameter instance has been detached.
- *
- * Instances that have been detached return true.
- *
- * <P>Transient instances return false.
- * <P>
- * @see PersistenceCapable#jdoIsDetached()
- * @return <code>true</code> if this instance is detached.
- * @since 2.0
- * @param pc the instance
- */
- public static boolean isDetached(Object pc) {
- if (pc instanceof PersistenceCapable) {
- return ((PersistenceCapable)pc).jdoIsDetached();
- } else {
- return implHelper.nonBinaryCompatibleIs(pc, isDetached);
- }
+ return result;
+ }
+
+ /**
+ * Return a copy of the JDO identity associated with the parameter instance.
+ *
+ * @see PersistenceCapable#jdoGetTransactionalObjectId()
+ * @see PersistenceManager#getObjectById(Object oid, boolean validate)
+ * @param pc the <code>PersistenceCapable</code> instance.
+ * @return a copy of the ObjectId of the parameter instance as modified in this transaction.
+ */
+ public static Object getTransactionalObjectId(Object pc) {
+ if (pc instanceof PersistenceCapable) {
+ return ((PersistenceCapable) pc).jdoGetTransactionalObjectId();
+ } else {
+ return implHelper.nonBinaryCompatibleGet(pc, getTransactionalObjectId);
}
-
- /** Accessor for the state of the passed object.
- * @param pc The object
- * @return The object state
- * @since 2.1
- */
- public static ObjectState getObjectState(Object pc) {
- if (pc == null) {
- return null;
- }
-
- if (isDetached(pc)) {
- if (isDirty(pc)) {
- // Detached Dirty
- return ObjectState.DETACHED_DIRTY;
- }
- else {
- // Detached Not Dirty
- return ObjectState.DETACHED_CLEAN;
- }
- }
- else {
- if (isPersistent(pc)) {
- if (isTransactional(pc)) {
- if (isDirty(pc)) {
- if (isNew(pc)) {
- if (isDeleted(pc)) {
- // Persistent Transactional Dirty New Deleted
- return ObjectState.PERSISTENT_NEW_DELETED;
- } else {
- // Persistent Transactional Dirty New Not Deleted
- return ObjectState.PERSISTENT_NEW;
- }
- } else {
- if (isDeleted(pc)) {
- // Persistent Transactional Dirty Not New Deleted
- return ObjectState.PERSISTENT_DELETED;
- } else {
- // Persistent Transactional Dirty Not New Not Deleted
- return ObjectState.PERSISTENT_DIRTY;
- }
- }
- } else {
- // Persistent Transactional Not Dirty
- return ObjectState.PERSISTENT_CLEAN;
- }
- }
- else {
- if (isDirty(pc)) {
- // Persistent Nontransactional Dirty
- return ObjectState.PERSISTENT_NONTRANSACTIONAL_DIRTY;
- }
- else {
- // Persistent Nontransactional Not Dirty
- return ObjectState.HOLLOW_PERSISTENT_NONTRANSACTIONAL;
- }
- }
- }
- else {
- if (isTransactional(pc)) {
- if (isDirty(pc)) {
- // Not Persistent Transactional Dirty
- return ObjectState.TRANSIENT_DIRTY;
- } else {
- // Not Persistent Transactional Not Dirty
- return ObjectState.TRANSIENT_CLEAN;
- }
- }
- else {
- // Not Persistent Not Transactional
- return ObjectState.TRANSIENT;
- }
- }
- }
+ }
+
+ /**
+ * Return the version of the instance.
+ *
+ * @since 2.0
+ * @param pc the instance
+ * @return the version of the instance
+ */
+ public static Object getVersion(Object pc) {
+ if (pc instanceof PersistenceCapable) {
+ return ((PersistenceCapable) pc).jdoGetVersion();
+ } else {
+ return implHelper.nonBinaryCompatibleGet(pc, getVersion);
}
-
- /** Get the anonymous <code>PersistenceManagerFactory</code> configured via
- * the standard configuration file resource "META-INF/jdoconfig.xml", using
- * the current thread's context class loader
- * to locate the configuration file resource(s).
- * @return the anonymous <code>PersistenceManagerFactory</code>.
- * @since 2.1
- * @see #getPersistenceManagerFactory(Map,String,ClassLoader,ClassLoader)
- */
- public static PersistenceManagerFactory getPersistenceManagerFactory() {
- ClassLoader cl = getContextClassLoader();
- return getPersistenceManagerFactory(
- null, ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, cl, cl);
+ }
+ /**
+ * Tests whether the parameter instance is dirty.
+ *
+ * <p>Instances that have been modified, deleted, or newly made persistent in the current
+ * transaction return <code>true</code>.
+ *
+ * <p>Transient instances and instances of classes that do not implement <code>PersistenceCapable
+ * </code> return <code>false</code>.
+ *
+ * <p>
+ *
+ * @see javax.jdo.spi.StateManager#makeDirty(PersistenceCapable pc, String fieldName)
+ * @see PersistenceCapable#jdoIsDirty()
+ * @param pc the <code>PersistenceCapable</code> instance.
+ * @return <code>true</code> if the parameter instance has been modified in the current
+ * transaction.
+ */
+ public static boolean isDirty(Object pc) {
+ if (pc instanceof PersistenceCapable) {
+ return ((PersistenceCapable) pc).jdoIsDirty();
+ } else {
+ return implHelper.nonBinaryCompatibleIs(pc, isDirty);
}
-
- /** Get the anonymous <code>PersistenceManagerFactory</code> configured via
- * the standard configuration file resource "META-INF/jdoconfig.xml", using
- * the given class loader.
- * @return the anonymous <code>PersistenceManagerFactory</code>.
- * @param pmfClassLoader the ClassLoader used to load resources and classes
- * @since 2.1
- * @see #getPersistenceManagerFactory(Map,String,ClassLoader,ClassLoader)
- */
- public static PersistenceManagerFactory getPersistenceManagerFactory(
- ClassLoader pmfClassLoader) {
- return getPersistenceManagerFactory(
- null,
- ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME,
- pmfClassLoader, pmfClassLoader);
+ }
+
+ /**
+ * Tests whether the parameter instance is transactional.
+ *
+ * <p>Instances whose state is associated with the current transaction return true.
+ *
+ * <p>Transient instances and instances of classes that do not implement <code>PersistenceCapable
+ * </code> return <code>false</code>.
+ *
+ * @see PersistenceCapable#jdoIsTransactional()
+ * @param pc the <code>PersistenceCapable</code> instance.
+ * @return <code>true</code> if the parameter instance is transactional.
+ */
+ public static boolean isTransactional(Object pc) {
+ if (pc instanceof PersistenceCapable) {
+ return ((PersistenceCapable) pc).jdoIsTransactional();
+ } else {
+ return implHelper.nonBinaryCompatibleIs(pc, isTransactional);
}
-
- /** Get a <code>PersistenceManagerFactory</code> based on a <code>Properties</code>
- * instance, using the current thread's context class loader to locate the
- * <code>PersistenceManagerFactory</code> class.
- * @return the <code>PersistenceManagerFactory</code>.
- * @param props a <code>Properties</code> instance with properties of the
- * <code>PersistenceManagerFactory</code>.
- * @see #getPersistenceManagerFactory(java.util.Map,ClassLoader)
- */
- public static PersistenceManagerFactory getPersistenceManagerFactory
- (Map<?, ?> props) {
- return getPersistenceManagerFactory(
- null, props, getContextClassLoader());
+ }
+
+ /**
+ * Tests whether the parameter instance is persistent.
+ *
+ * <p>Instances that represent persistent objects in the data store return <code>true</code>.
+ *
+ * <p>Transient instances and instances of classes that do not implement <code>PersistenceCapable
+ * </code> return <code>false</code>.
+ *
+ * <p>
+ *
+ * @see PersistenceManager#makePersistent(Object pc)
+ * @see PersistenceCapable#jdoIsPersistent()
+ * @param pc the <code>PersistenceCapable</code> instance.
+ * @return <code>true</code> if the parameter instance is persistent.
+ */
+ public static boolean isPersistent(Object pc) {
+ if (pc instanceof PersistenceCapable) {
+ return ((PersistenceCapable) pc).jdoIsPersistent();
+ } else {
+ return implHelper.nonBinaryCompatibleIs(pc, isPersistent);
}
-
-
- /** Get a <code>PersistenceManagerFactory</code> based on a
- * <code>Map</code> and a class loader.
- * This method delegates to the getPersistenceManagerFactory
- * method that takes a Map of overrides and a Map of properties,
- * passing null as the overrides parameter.
- * @see #getPersistenceManagerFactory(java.util.Map, java.util.Map, ClassLoader)
- * @return the <code>PersistenceManagerFactory</code>.
- * @param props a <code>Map</code> with properties of the
- * <code>PersistenceManagerFactory</code>.
- * @param pmfClassLoader the class loader used to load the
- * <code>PersistenceManagerFactory</code> class
- * @since 1.0
- */
- public static PersistenceManagerFactory getPersistenceManagerFactory
- (Map<?, ?> props, ClassLoader pmfClassLoader) {
- return getPersistenceManagerFactory(
- null, props, pmfClassLoader);
+ }
+
+ /**
+ * Tests whether the parameter instance has been newly made persistent.
+ *
+ * <p>Instances that have been made persistent in the current transaction return <code>true</code>
+ * .
+ *
+ * <p>Transient instances and instances of classes that do not implement <code>PersistenceCapable
+ * </code> return <code>false</code>.
+ *
+ * <p>
+ *
+ * @see PersistenceManager#makePersistent(Object pc)
+ * @see PersistenceCapable#jdoIsNew()
+ * @param pc the <code>PersistenceCapable</code> instance.
+ * @return <code>true</code> if the parameter instance was made persistent in the current
+ * transaction.
+ */
+ public static boolean isNew(Object pc) {
+ if (pc instanceof PersistenceCapable) {
+ return ((PersistenceCapable) pc).jdoIsNew();
+ } else {
+ return implHelper.nonBinaryCompatibleIs(pc, isNew);
+ }
+ }
+
+ /**
+ * Tests whether the parameter instance has been deleted.
+ *
+ * <p>Instances that have been deleted in the current transaction return <code>true</code>.
+ *
+ * <p>Transient instances and instances of classes that do not implement <code>PersistenceCapable
+ * </code> return <code>false</code>.
+ *
+ * <p>
+ *
+ * @see PersistenceManager#deletePersistent(Object pc)
+ * @see PersistenceCapable#jdoIsDeleted()
+ * @param pc the <code>PersistenceCapable</code> instance.
+ * @return <code>true</code> if the parameter instance was deleted in the current transaction.
+ */
+ public static boolean isDeleted(Object pc) {
+ if (pc instanceof PersistenceCapable) {
+ return ((PersistenceCapable) pc).jdoIsDeleted();
+ } else {
+ return implHelper.nonBinaryCompatibleIs(pc, isDeleted);
+ }
+ }
+
+ /**
+ * Tests whether the parameter instance has been detached.
+ *
+ * <p>Instances that have been detached return true.
+ *
+ * <p>Transient instances return false.
+ *
+ * <p>
+ *
+ * @see PersistenceCapable#jdoIsDetached()
+ * @return <code>true</code> if this instance is detached.
+ * @since 2.0
+ * @param pc the instance
+ */
+ public static boolean isDetached(Object pc) {
+ if (pc instanceof PersistenceCapable) {
+ return ((PersistenceCapable) pc).jdoIsDetached();
+ } else {
+ return implHelper.nonBinaryCompatibleIs(pc, isDetached);
+ }
+ }
+
+ /**
+ * Accessor for the state of the passed object.
+ *
+ * @param pc The object
+ * @return The object state
+ * @since 2.1
+ */
+ public static ObjectState getObjectState(Object pc) {
+ if (pc == null) {
+ return null;
}
- /**
- * Get a <code>PersistenceManagerFactory</code> based on a
- * <code>Map</code> of overrides, a <code>Map</code> of
- * properties, and a class loader.
- * The following are standard key names:
- * <BR><code>"javax.jdo.PersistenceManagerFactoryClass"
- * <BR>"javax.jdo.option.Optimistic",
- * <BR>"javax.jdo.option.RetainValues",
- * <BR>"javax.jdo.option.RestoreValues",
- * <BR>"javax.jdo.option.IgnoreCache",
- * <BR>"javax.jdo.option.NontransactionalRead",
- * <BR>"javax.jdo.option.NontransactionalWrite",
- * <BR>"javax.jdo.option.Multithreaded",
- * <BR>"javax.jdo.option.ConnectionUserName",
- * <BR>"javax.jdo.option.ConnectionPassword",
- * <BR>"javax.jdo.option.ConnectionURL",
- * <BR>"javax.jdo.option.ConnectionFactoryName",
- * <BR>"javax.jdo.option.ConnectionFactory2Name",
- * <BR>"javax.jdo.option.Mapping",
- * <BR>"javax.jdo.mapping.Catalog",
- * <BR>"javax.jdo.mapping.Schema",
- * <BR>"javax.jdo.option.PersistenceUnitName",
- * <BR>"javax.jdo.option.DetachAllOnCommit",
- * <BR>"javax.jdo.option.CopyOnAttach",
- * <BR>"javax.jdo.option.ReadOnly",
- * <BR>"javax.jdo.option.TransactionIsolationLevel",
- * <BR>"javax.jdo.option.TransactionType",
- * <BR>"javax.jdo.option.ServerTimeZoneID",
- * <BR>"javax.jdo.option.DatastoreReadTimeoutMillis",
- * <BR>"javax.jdo.option.DatastoreWriteTimeoutMillis",
- * <BR>"javax.jdo.option.Name".
- * </code>
- * and properties of the form
- * <BR><code>javax.jdo.option.InstanceLifecycleListener.{listenerClass}[=[{pcClasses}]]</code>
- * where <code>{listenerClass}</code> is the fully qualified name of a
- * class that implements
- * {@link javax.jdo.listener.InstanceLifecycleListener}, and
- * <code>{pcClasses}</code> is an optional comma- or whitespace-delimited
- * list of persistence-capable classes to be observed; the absence of a
- * value for a property of this form means that instances of all
- * persistence-capable classes will be observed by an instance of the given
- * listener class.
- * <P>JDO implementations
- * are permitted to define key values of their own. Any key values not
- * recognized by the implementation must be ignored. Key values that are
- * recognized but not supported by an implementation must result in a
- * <code>JDOFatalUserException</code> thrown by the method.
- * <P>The returned <code>PersistenceManagerFactory</code> is not
- * configurable (the <code>set<I>XXX</I></code> methods will throw an
- * exception).
- * <P>JDO implementations might manage a map of instantiated
- * <code>PersistenceManagerFactory</code> instances based on specified
- * property key values, and return a previously instantiated
- * <code>PersistenceManagerFactory</code> instance. In this case, the
- * properties of the returned instance must exactly match the requested
- * properties.
- * @param overrides Overrides of properties
- * @param props a <code>Properties</code> instance with properties of the
- * <code>PersistenceManagerFactory</code>.
- * @param pmfClassLoader the class loader to use to load the
- * <code>PersistenceManagerFactory</code> class
- * @return the <code>PersistenceManagerFactory</code>.
- * @throws JDOFatalUserException if
- * <ul><li>the pmfClassLoader passed is invalid; or
- * </li><li>a valid class name cannot be obtained from
- * either <code>props</code> or system resources
- * (an entry in META-INF/services/javax.jdo.PersistenceManagerFactory); or
- * </li><li>all implementations throw an exception.
- * </li></ul>
- * @since 2.1
- */
- protected static PersistenceManagerFactory getPersistenceManagerFactory
- (Map<?, ?> overrides, Map<?, ?> props, ClassLoader pmfClassLoader) {
-
- List<Throwable> exceptions = new ArrayList<Throwable>();
- if (pmfClassLoader == null)
- throw new JDOFatalUserException (msg.msg (
- "EXC_GetPMFNullLoader")); //NOI18N
-
- JDOImplHelper.assertOnlyKnownStandardProperties(overrides);
- JDOImplHelper.assertOnlyKnownStandardProperties(props);
-
- // first try to get the class name from the properties object.
- String pmfClassName = (String) props.get (
- PROPERTY_PERSISTENCE_MANAGER_FACTORY_CLASS);
-
- if (!isNullOrBlank(pmfClassName)) {
- // a valid name was returned from the properties.
- return invokeGetPersistenceManagerFactoryOnImplementation(
- pmfClassName, overrides, props, pmfClassLoader);
-
- } else {
- /*
- * If you have a jar file that provides the jdo implementation,
- * a file naming the implementation goes into the file
- * packaged into the jar file, called
- * META-INF/services/javax.jdo.PersistenceManagerFactory.
- * The contents of the file is a string that is the PMF class name,
- * null or blank.
- * For each file in pmfClassLoader named
- * META-INF/services/javax.jdo.PersistenceManagerFactory,
- * this method will try to invoke the getPersistenceManagerFactory
- * method of the implementation class.
- * Return the factory if a valid class name is extracted from
- * resources and the invocation returns an instance.
- * Otherwise add the exception thrown to
- * an exception list.
- */
- Enumeration<URL> urls = null;
- try {
- urls = getResources(pmfClassLoader,
- SERVICE_LOOKUP_PMF_RESOURCE_NAME);
- } catch (Throwable ex) {
- exceptions.add(ex);
+ if (isDetached(pc)) {
+ if (isDirty(pc)) {
+ // Detached Dirty
+ return ObjectState.DETACHED_DIRTY;
+ } else {
+ // Detached Not Dirty
+ return ObjectState.DETACHED_CLEAN;
+ }
+ } else {
+ if (isPersistent(pc)) {
+ if (isTransactional(pc)) {
+ if (isDirty(pc)) {
+ if (isNew(pc)) {
+ if (isDeleted(pc)) {
+ // Persistent Transactional Dirty New Deleted
+ return ObjectState.PERSISTENT_NEW_DELETED;
+ } else {
+ // Persistent Transactional Dirty New Not Deleted
+ return ObjectState.PERSISTENT_NEW;
+ }
+ } else {
+ if (isDeleted(pc)) {
+ // Persistent Transactional Dirty Not New Deleted
+ return ObjectState.PERSISTENT_DELETED;
+ } else {
+ // Persistent Transactional Dirty Not New Not Deleted
+ return ObjectState.PERSISTENT_DIRTY;
+ }
}
+ } else {
+ // Persistent Transactional Not Dirty
+ return ObjectState.PERSISTENT_CLEAN;
+ }
+ } else {
+ if (isDirty(pc)) {
+ // Persistent Nontransactional Dirty
+ return ObjectState.PERSISTENT_NONTRANSACTIONAL_DIRTY;
+ } else {
+ // Persistent Nontransactional Not Dirty
+ return ObjectState.HOLLOW_PERSISTENT_NONTRANSACTIONAL;
+ }
+ }
+ } else {
+ if (isTransactional(pc)) {
+ if (isDirty(pc)) {
+ // Not Persistent Transactional Dirty
+ return ObjectState.TRANSIENT_DIRTY;
+ } else {
+ // Not Persistent Transactional Not Dirty
+ return ObjectState.TRANSIENT_CLEAN;
+ }
+ } else {
+ // Not Persistent Not Transactional
+ return ObjectState.TRANSIENT;
+ }
+ }
+ }
+ }
+
+ /**
+ * Get the anonymous <code>PersistenceManagerFactory</code> configured via the standard
+ * configuration file resource "META-INF/jdoconfig.xml", using the current thread's context class
+ * loader to locate the configuration file resource(s).
+ *
+ * @return the anonymous <code>PersistenceManagerFactory</code>.
+ * @since 2.1
+ * @see #getPersistenceManagerFactory(Map,String,ClassLoader,ClassLoader)
+ */
+ public static PersistenceManagerFactory getPersistenceManagerFactory() {
+ ClassLoader cl = getContextClassLoader();
+ return getPersistenceManagerFactory(null, ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, cl, cl);
+ }
+
+ /**
+ * Get the anonymous <code>PersistenceManagerFactory</code> configured via the standard
+ * configuration file resource "META-INF/jdoconfig.xml", using the given class loader.
+ *
+ * @return the anonymous <code>PersistenceManagerFactory</code>.
+ * @param pmfClassLoader the ClassLoader used to load resources and classes
+ * @since 2.1
+ * @see #getPersistenceManagerFactory(Map,String,ClassLoader,ClassLoader)
+ */
+ public static PersistenceManagerFactory getPersistenceManagerFactory(ClassLoader pmfClassLoader) {
+ return getPersistenceManagerFactory(
+ null, ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, pmfClassLoader, pmfClassLoader);
+ }
+
+ /**
+ * Get a <code>PersistenceManagerFactory</code> based on a <code>Properties</code> instance, using
+ * the current thread's context class loader to locate the <code>PersistenceManagerFactory</code>
+ * class.
+ *
+ * @return the <code>PersistenceManagerFactory</code>.
+ * @param props a <code>Properties</code> instance with properties of the <code>
+ * PersistenceManagerFactory</code>.
+ * @see #getPersistenceManagerFactory(java.util.Map,ClassLoader)
+ */
+ public static PersistenceManagerFactory getPersistenceManagerFactory(Map<?, ?> props) {
+ return getPersistenceManagerFactory(null, props, getContextClassLoader());
+ }
+
+ /**
+ * Get a <code>PersistenceManagerFactory</code> based on a <code>Map</code> and a class loader.
+ * This method delegates to the getPersistenceManagerFactory method that takes a Map of overrides
+ * and a Map of properties, passing null as the overrides parameter.
+ *
+ * @see #getPersistenceManagerFactory(java.util.Map, java.util.Map, ClassLoader)
+ * @return the <code>PersistenceManagerFactory</code>.
+ * @param props a <code>Map</code> with properties of the <code>PersistenceManagerFactory</code>.
+ * @param pmfClassLoader the class loader used to load the <code>PersistenceManagerFactory</code>
+ * class
+ * @since 1.0
+ */
+ public static PersistenceManagerFactory getPersistenceManagerFactory(
+ Map<?, ?> props, ClassLoader pmfClassLoader) {
+ return getPersistenceManagerFactory(null, props, pmfClassLoader);
+ }
+
+ /**
+ * Get a <code>PersistenceManagerFactory</code> based on a <code>Map</code> of overrides, a <code>
+ * Map</code> of properties, and a class loader. The following are standard key names: <br>
+ * <code>"javax.jdo.PersistenceManagerFactoryClass"
+ * <BR>"javax.jdo.option.Optimistic",
+ * <BR>"javax.jdo.option.RetainValues",
+ * <BR>"javax.jdo.option.RestoreValues",
+ * <BR>"javax.jdo.option.IgnoreCache",
+ * <BR>"javax.jdo.option.NontransactionalRead",
+ * <BR>"javax.jdo.option.NontransactionalWrite",
+ * <BR>"javax.jdo.option.Multithreaded",
+ * <BR>"javax.jdo.option.ConnectionUserName",
+ * <BR>"javax.jdo.option.ConnectionPassword",
+ * <BR>"javax.jdo.option.ConnectionURL",
+ * <BR>"javax.jdo.option.ConnectionFactoryName",
+ * <BR>"javax.jdo.option.ConnectionFactory2Name",
+ * <BR>"javax.jdo.option.Mapping",
+ * <BR>"javax.jdo.mapping.Catalog",
+ * <BR>"javax.jdo.mapping.Schema",
+ * <BR>"javax.jdo.option.PersistenceUnitName",
+ * <BR>"javax.jdo.option.DetachAllOnCommit",
+ * <BR>"javax.jdo.option.CopyOnAttach",
+ * <BR>"javax.jdo.option.ReadOnly",
+ * <BR>"javax.jdo.option.TransactionIsolationLevel",
+ * <BR>"javax.jdo.option.TransactionType",
+ * <BR>"javax.jdo.option.ServerTimeZoneID",
+ * <BR>"javax.jdo.option.DatastoreReadTimeoutMillis",
+ * <BR>"javax.jdo.option.DatastoreWriteTimeoutMillis",
+ * <BR>"javax.jdo.option.Name".
+ * </code> and properties of the form <br>
+ * <code>javax.jdo.option.InstanceLifecycleListener.{listenerClass}[=[{pcClasses}]]</code> where
+ * <code>{listenerClass}</code> is the fully qualified name of a class that implements {@link
+ * javax.jdo.listener.InstanceLifecycleListener}, and <code>{pcClasses}</code> is an optional
+ * comma- or whitespace-delimited list of persistence-capable classes to be observed; the absence
+ * of a value for a property of this form means that instances of all persistence-capable classes
+ * will be observed by an instance of the given listener class.
+ *
+ * <p>JDO implementations are permitted to define key values of their own. Any key values not
+ * recognized by the implementation must be ignored. Key values that are recognized but not
+ * supported by an implementation must result in a <code>JDOFatalUserException</code> thrown by
+ * the method.
+ *
+ * <p>The returned <code>PersistenceManagerFactory</code> is not configurable (the <code>
+ * set<I>XXX</I></code> methods will throw an exception).
+ *
+ * <p>JDO implementations might manage a map of instantiated <code>PersistenceManagerFactory
+ * </code> instances based on specified property key values, and return a previously instantiated
+ * <code>PersistenceManagerFactory</code> instance. In this case, the properties of the returned
+ * instance must exactly match the requested properties.
+ *
+ * @param overrides Overrides of properties
+ * @param props a <code>Properties</code> instance with properties of the <code>
+ * PersistenceManagerFactory</code>.
+ * @param pmfClassLoader the class loader to use to load the <code>PersistenceManagerFactory
+ * </code> class
+ * @return the <code>PersistenceManagerFactory</code>.
+ * @throws JDOFatalUserException if
+ * <ul>
+ * <li>the pmfClassLoader passed is invalid; or
+ * <li>a valid class name cannot be obtained from either <code>props</code> or system
+ * resources (an entry in META-INF/services/javax.jdo.PersistenceManagerFactory); or
+ * <li>all implementations throw an exception.
+ * </ul>
+ *
+ * @since 2.1
+ */
+ protected static PersistenceManagerFactory getPersistenceManagerFactory(
+ Map<?, ?> overrides, Map<?, ?> props, ClassLoader pmfClassLoader) {
+
+ List<Throwable> exceptions = new ArrayList<Throwable>();
+ if (pmfClassLoader == null)
+ throw new JDOFatalUserException(msg.msg("EXC_GetPMFNullLoader")); // NOI18N
+
+ JDOImplHelper.assertOnlyKnownStandardProperties(overrides);
+ JDOImplHelper.assertOnlyKnownStandardProperties(props);
+
+ // first try to get the class name from the properties object.
+ String pmfClassName = (String) props.get(PROPERTY_PERSISTENCE_MANAGER_FACTORY_CLASS);
+
+ if (!isNullOrBlank(pmfClassName)) {
+ // a valid name was returned from the properties.
+ return invokeGetPersistenceManagerFactoryOnImplementation(
+ pmfClassName, overrides, props, pmfClassLoader);
+
+ } else {
+ /*
+ * If you have a jar file that provides the jdo implementation,
+ * a file naming the implementation goes into the file
+ * packaged into the jar file, called
+ * META-INF/services/javax.jdo.PersistenceManagerFactory.
+ * The contents of the file is a string that is the PMF class name,
+ * null or blank.
+ * For each file in pmfClassLoader named
+ * META-INF/services/javax.jdo.PersistenceManagerFactory,
+ * this method will try to invoke the getPersistenceManagerFactory
+ * method of the implementation class.
+ * Return the factory if a valid class name is extracted from
+ * resources and the invocation returns an instance.
+ * Otherwise add the exception thrown to
+ * an exception list.
+ */
+ Enumeration<URL> urls = null;
+ try {
+ urls = getResources(pmfClassLoader, SERVICE_LOOKUP_PMF_RESOURCE_NAME);
+ } catch (Throwable ex) {
+ exceptions.add(ex);
+ }
- if (urls != null){
- while (urls.hasMoreElements()) {
-
- try {
- pmfClassName = getClassNameFromURL(
- (URL) urls.nextElement());
+ if (urls != null) {
+ while (urls.hasMoreElements()) {
- // return the implementation that is valid.
- PersistenceManagerFactory pmf =
- invokeGetPersistenceManagerFactoryOnImplementation(
- pmfClassName, overrides, props, pmfClassLoader);
- return pmf;
+ try {
+ pmfClassName = getClassNameFromURL((URL) urls.nextElement());
- } catch (Throwable ex) {
+ // return the implementation that is valid.
+ PersistenceManagerFactory pmf =
+ invokeGetPersistenceManagerFactoryOnImplementation(
+ pmfClassName, overrides, props, pmfClassLoader);
+ return pmf;
- // remember exceptions from failed pmf invocations
- exceptions.add(ex);
+ } catch (Throwable ex) {
- }
- }
- }
+ // remember exceptions from failed pmf invocations
+ exceptions.add(ex);
+ }
}
-
- // no PMF class name in props and no services.
-
- throw new JDOFatalUserException(msg.msg(
- "EXC_GetPMFNoPMFClassNamePropertyOrPUNameProperty"),
- (Throwable[])
- exceptions.toArray(new Throwable[exceptions.size()]));
+ }
}
- /** Get a class name from a URL. The URL is from getResources with
- * e.g. META-INF/services/javax.jdo.PersistenceManagerFactory as the
- * parameter. Parse the file, removing blank lines, comment lines,
- * and comments.
- * @param url the URL of the services file
- * @return the name of the class contained in the file
- * @throws java.io.IOException Throw if an error occurs on accessing this URL
- * @since 2.1
- */
- protected static String getClassNameFromURL (URL url)
- throws IOException {
- InputStream is = openStream(url);
- BufferedReader reader = new BufferedReader(new InputStreamReader(is));
- String line = null;
- try {
- while ((line = reader.readLine()) != null) {
- line = line.trim();
- if (line.length() == 0 || line.startsWith("#")) {
- continue;
- }
- // else assume first line of text is the PMF class name
- String[] tokens = line.split("\\s");
- String pmfClassName = tokens[0];
- int indexOfComment = pmfClassName.indexOf("#");
- if (indexOfComment == -1) {
- return pmfClassName;
- }
- // else pmfClassName has a comment at the end of it -- remove
- return pmfClassName.substring(0, indexOfComment);
- }
- return null;
- } finally {
- try {
- reader.close();
- }
- catch (IOException x) {
- // gulp
- }
+ // no PMF class name in props and no services.
+
+ throw new JDOFatalUserException(
+ msg.msg("EXC_GetPMFNoPMFClassNamePropertyOrPUNameProperty"),
+ (Throwable[]) exceptions.toArray(new Throwable[exceptions.size()]));
+ }
+
+ /**
+ * Get a class name from a URL. The URL is from getResources with e.g.
+ * META-INF/services/javax.jdo.PersistenceManagerFactory as the parameter. Parse the file,
+ * removing blank lines, comment lines, and comments.
+ *
+ * @param url the URL of the services file
+ * @return the name of the class contained in the file
+ * @throws java.io.IOException Throw if an error occurs on accessing this URL
+ * @since 2.1
+ */
+ protected static String getClassNameFromURL(URL url) throws IOException {
+ InputStream is = openStream(url);
+ BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+ String line = null;
+ try {
+ while ((line = reader.readLine()) != null) {
+ line = line.trim();
+ if (line.length() == 0 || line.startsWith("#")) {
+ continue;
}
+ // else assume first line of text is the PMF class name
+ String[] tokens = line.split("\\s");
+ String pmfClassName = tokens[0];
+ int indexOfComment = pmfClassName.indexOf("#");
+ if (indexOfComment == -1) {
+ return pmfClassName;
+ }
+ // else pmfClassName has a comment at the end of it -- remove
+ return pmfClassName.substring(0, indexOfComment);
+ }
+ return null;
+ } finally {
+ try {
+ reader.close();
+ } catch (IOException x) {
+ // gulp
+ }
}
-
- /**
- * Returns a named {@link PersistenceManagerFactory} or persistence unit.
- * @since 2.1
- * @see #getPersistenceManagerFactory(Map,String,ClassLoader,ClassLoader)
- * @param name Name of the PMF
- * @return PersistenceManagerFactory
- */
- public static PersistenceManagerFactory getPersistenceManagerFactory
- (String name) {
- ClassLoader cl = getContextClassLoader();
- return getPersistenceManagerFactory(null, name, cl, cl);
+ }
+
+ /**
+ * Returns a named {@link PersistenceManagerFactory} or persistence unit.
+ *
+ * @since 2.1
+ * @see #getPersistenceManagerFactory(Map,String,ClassLoader,ClassLoader)
+ * @param name Name of the PMF
+ * @return PersistenceManagerFactory
+ */
+ public static PersistenceManagerFactory getPersistenceManagerFactory(String name) {
+ ClassLoader cl = getContextClassLoader();
+ return getPersistenceManagerFactory(null, name, cl, cl);
+ }
+
+ /**
+ * Returns a named {@link PersistenceManagerFactory} or persistence unit.
+ *
+ * @since 1.0
+ * @see #getPersistenceManagerFactory(Map,String,ClassLoader,ClassLoader)
+ * @param name Name of the PMF
+ * @param loader ClassLoader to use
+ * @return PersistenceManagerFactory
+ */
+ public static PersistenceManagerFactory getPersistenceManagerFactory(
+ String name, ClassLoader loader) {
+
+ return getPersistenceManagerFactory(null, name, loader, loader);
+ }
+
+ /**
+ * Returns a named {@link PersistenceManagerFactory} or persistence unit.
+ *
+ * @since 2.0
+ * @see #getPersistenceManagerFactory(Map,String,ClassLoader,ClassLoader)
+ * @param name Name of the PMF
+ * @param resourceLoader ClassLoader to use for loading resources
+ * @param pmfLoader ClassLoader to use for loading the PMF
+ * @return PersistenceManagerFactory
+ */
+ public static PersistenceManagerFactory getPersistenceManagerFactory(
+ String name, ClassLoader resourceLoader, ClassLoader pmfLoader) {
+
+ return getPersistenceManagerFactory(null, name, resourceLoader, pmfLoader);
+ }
+
+ /**
+ * Returns a named {@link PersistenceManagerFactory} or persistence unit.
+ *
+ * @since 2.1
+ * @see #getPersistenceManagerFactory(Map,String,ClassLoader,ClassLoader)
+ * @param name Name of the PMF
+ * @param overrides Property overrides
+ * @return PersistenceManagerFactory
+ */
+ public static PersistenceManagerFactory getPersistenceManagerFactory(
+ Map<?, ?> overrides, String name) {
+
+ ClassLoader cl = getContextClassLoader();
+ return getPersistenceManagerFactory(overrides, name, cl, cl);
+ }
+
+ /**
+ * Returns a named {@link PersistenceManagerFactory} or persistence unit.
+ *
+ * @since 2.1
+ * @see #getPersistenceManagerFactory(Map,String,ClassLoader,ClassLoader)
+ * @param overrides Property overrides
+ * @param name Name of the PMF
+ * @param resourceLoader ClassLoader to use for loading resources
+ * @return The PMF
+ */
+ public static PersistenceManagerFactory getPersistenceManagerFactory(
+ Map<?, ?> overrides, String name, ClassLoader resourceLoader) {
+
+ return getPersistenceManagerFactory(overrides, name, resourceLoader, resourceLoader);
+ }
+
+ /**
+ * Returns a {@link PersistenceManagerFactory} configured based on the properties stored in the
+ * resource at <code>name</code>, or, if not found, returns a {@link PersistenceManagerFactory}
+ * with the given name or, if not found, returns a <code>javax.persistence.EntityManagerFactory
+ * </code> cast to a {@link PersistenceManagerFactory}. If the name given is null or consists only
+ * of whitespace, it is interpreted as {@link
+ * Constants#ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME}. The following are standard key names:
+ * <br>
+ * <code>"javax.jdo.PersistenceManagerFactoryClass"
+ * <BR>"javax.jdo.option.Optimistic",
+ * <BR>"javax.jdo.option.RetainValues",
+ * <BR>"javax.jdo.option.RestoreValues",
+ * <BR>"javax.jdo.option.IgnoreCache",
+ * <BR>"javax.jdo.option.NontransactionalRead",
+ * <BR>"javax.jdo.option.NontransactionalWrite",
+ * <BR>"javax.jdo.option.Multithreaded",
+ * <BR>"javax.jdo.option.ConnectionUserName",
+ * <BR>"javax.jdo.option.ConnectionPassword",
+ * <BR>"javax.jdo.option.ConnectionURL",
+ * <BR>"javax.jdo.option.ConnectionFactoryName",
+ * <BR>"javax.jdo.option.ConnectionFactory2Name",
+ * <BR>"javax.jdo.option.Mapping",
+ * <BR>"javax.jdo.mapping.Catalog",
+ * <BR>"javax.jdo.mapping.Schema",
+ * <BR>"javax.jdo.option.PersistenceUnitName".
+ * <BR>"javax.jdo.option.DetachAllOnCommit".
+ * <BR>"javax.jdo.option.CopyOnAttach".
+ * <BR>"javax.jdo.option.TransactionType".
+ * <BR>"javax.jdo.option.ServerTimeZoneID".
+ * <BR>"javax.jdo.option.DatastoreReadTimeoutMillis",
+ * <BR>"javax.jdo.option.DatastoreWriteTimeoutMillis",
+ * <BR>"javax.jdo.option.Name".
+ * </code> and properties of the form <br>
+ * <code>javax.jdo.option.InstanceLifecycleListener.{listenerClass}[=[{pcClasses}]]</code> where
+ * <code>{listenerClass}</code> is the fully qualified name of a class that implements {@link
+ * javax.jdo.listener.InstanceLifecycleListener}, and <code>{pcClasses}</code> is an optional
+ * comma- or whitespace-delimited list of persistence-capable classes to be observed; the absence
+ * of a value for a property of this form means that instances of all persistence-capable classes
+ * will be observed by an instance of the given listener class.
+ *
+ * <p>JDO implementations are permitted to define key values of their own. Any key values not
+ * recognized by the implementation must be ignored. Key values that are recognized but not
+ * supported by an implementation must result in a <code>JDOFatalUserException</code> thrown by
+ * the method.
+ *
+ * <p>The returned <code>PersistenceManagerFactory</code> is not configurable (the <code>
+ * set<I>XXX</I></code> methods will throw an exception).
+ *
+ * <p>This method loads the properties found at <code>name</code>, if any, via <code>
+ * resourceLoader</code>, and creates a {@link PersistenceManagerFactory} with <code>pmfLoader
+ * </code>. Any exceptions thrown during resource loading will be wrapped in a {@link
+ * JDOFatalUserException}. If multiple PMFs with the requested name are found, a {@link
+ * JDOFatalUserException} is thrown.
+ *
+ * @since 2.1
+ * @param overrides a Map containing properties that override properties defined in any resources
+ * loaded according to the "name" parameter
+ * @param name interpreted as the name of the resource containing the PMF properties, the name of
+ * the PMF, or the persistence unit name, in that order; if name is null, blank or whitespace,
+ * it is interpreted as indicating the anonymous {@link PersistenceManagerFactory}.
+ * @param resourceLoader the class loader to use to load properties file resources; must be
+ * non-null if <code>name</code> is non-null or blank
+ * @param pmfLoader the class loader to use to load the {@link PersistenceManagerFactory} or
+ * <code>javax.persistence.EntityManagerFactory</code> classes
+ * @return the {@link PersistenceManagerFactory} with properties in the given resource, with the
+ * given name, or with the given persitence unit name
+ * @see Constants#ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME
+ */
+ public static PersistenceManagerFactory getPersistenceManagerFactory(
+ Map<?, ?> overrides, String name, ClassLoader resourceLoader, ClassLoader pmfLoader) {
+ if (pmfLoader == null)
+ throw new JDOFatalUserException(msg.msg("EXC_GetPMFNullPMFLoader")); // NOI18N
+ if (resourceLoader == null) {
+ throw new JDOFatalUserException(msg.msg("EXC_GetPMFNullPropsLoader")); // NOI18N
}
- /**
- * Returns a named {@link PersistenceManagerFactory} or persistence unit.
- * @since 1.0
- * @see #getPersistenceManagerFactory(Map,String,ClassLoader,ClassLoader)
- * @param name Name of the PMF
- * @param loader ClassLoader to use
- * @return PersistenceManagerFactory
- */
- public static PersistenceManagerFactory getPersistenceManagerFactory
- (String name, ClassLoader loader) {
-
- return getPersistenceManagerFactory(null, name, loader, loader);
+ Map<Object, Object> props = null;
+ // trim spaces from name and ensure non-null
+ name = (name == null ? ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME : name.trim());
+ if (!ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME.equals(name)) {
+ props = loadPropertiesFromResource(resourceLoader, name);
}
- /**
- * Returns a named {@link PersistenceManagerFactory} or persistence unit.
- * @since 2.0
- * @see #getPersistenceManagerFactory(Map,String,ClassLoader,ClassLoader)
- * @param name Name of the PMF
- * @param resourceLoader ClassLoader to use for loading resources
- * @param pmfLoader ClassLoader to use for loading the PMF
- * @return PersistenceManagerFactory
- */
- public static PersistenceManagerFactory getPersistenceManagerFactory
- (String name, ClassLoader resourceLoader, ClassLoader pmfLoader) {
-
- return getPersistenceManagerFactory(
- null, name, resourceLoader, pmfLoader);
+ if (props != null) {
+ // add the SPI property to inform the implementation that
+ // the PMF was configured by the given resource name
+ // and not via named PMF for proper deserialization
+ props.put(PROPERTY_SPI_RESOURCE_NAME, name);
+ props.remove(PROPERTY_NAME);
+ return getPersistenceManagerFactory(overrides, props, pmfLoader);
}
-
- /**
- * Returns a named {@link PersistenceManagerFactory} or persistence unit.
- * @since 2.1
- * @see #getPersistenceManagerFactory(Map,String,ClassLoader,ClassLoader)
- * @param name Name of the PMF
- * @param overrides Property overrides
- * @return PersistenceManagerFactory
- */
- public static PersistenceManagerFactory getPersistenceManagerFactory
- (Map<?, ?> overrides, String name) {
-
- ClassLoader cl = getContextClassLoader();
- return getPersistenceManagerFactory(overrides, name, cl, cl);
+ // props were null; try getting from jdoconfig.xml
+ props = getPropertiesFromJdoconfig(name, resourceLoader);
+ if (props != null) {
+ // inform the impl that the config came from a jdoconfig.xml
+ // element with the given name
+ props.put(PROPERTY_NAME, name);
+ props.remove(PROPERTY_SPI_RESOURCE_NAME);
+ // we have loaded a Properties, delegate to implementation
+ return getPersistenceManagerFactory(overrides, props, pmfLoader);
}
-
- /**
- * Returns a named {@link PersistenceManagerFactory} or persistence unit.
- * @since 2.1
- * @see #getPersistenceManagerFactory(Map,String,ClassLoader,ClassLoader)
- * @param overrides Property overrides
- * @param name Name of the PMF
- * @param resourceLoader ClassLoader to use for loading resources
- * @return The PMF
- */
- public static PersistenceManagerFactory getPersistenceManagerFactory
- (Map<?, ?> overrides, String name, ClassLoader resourceLoader) {
-
- return getPersistenceManagerFactory(
- overrides, name, resourceLoader, resourceLoader);
+ // no properties found; last try to see if name is a JPA PU name
+ if (!ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME.equals(name)) {
+ props = new Properties();
+ props.put(PROPERTY_PERSISTENCE_UNIT_NAME, name);
+ return getPersistenceManagerFactory(overrides, props, pmfLoader);
}
-
-
- /**
- * Returns a {@link PersistenceManagerFactory} configured based
- * on the properties stored in the resource at
- * <code>name</code>, or, if not found, returns a
- * {@link PersistenceManagerFactory} with the given
- * name or, if not found, returns a
- * <code>javax.persistence.EntityManagerFactory</code> cast to a
- * {@link PersistenceManagerFactory}. If the name given is null or consists
- * only of whitespace, it is interpreted as
- * {@link Constants#ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME}.
- * The following are standard key names:
- * <BR><code>"javax.jdo.PersistenceManagerFactoryClass"
- * <BR>"javax.jdo.option.Optimistic",
- * <BR>"javax.jdo.option.RetainValues",
- * <BR>"javax.jdo.option.RestoreValues",
- * <BR>"javax.jdo.option.IgnoreCache",
- * <BR>"javax.jdo.option.NontransactionalRead",
- * <BR>"javax.jdo.option.NontransactionalWrite",
- * <BR>"javax.jdo.option.Multithreaded",
- * <BR>"javax.jdo.option.ConnectionUserName",
- * <BR>"javax.jdo.option.ConnectionPassword",
- * <BR>"javax.jdo.option.ConnectionURL",
- * <BR>"javax.jdo.option.ConnectionFactoryName",
- * <BR>"javax.jdo.option.ConnectionFactory2Name",
- * <BR>"javax.jdo.option.Mapping",
- * <BR>"javax.jdo.mapping.Catalog",
- * <BR>"javax.jdo.mapping.Schema",
- * <BR>"javax.jdo.option.PersistenceUnitName".
- * <BR>"javax.jdo.option.DetachAllOnCommit".
- * <BR>"javax.jdo.option.CopyOnAttach".
- * <BR>"javax.jdo.option.TransactionType".
- * <BR>"javax.jdo.option.ServerTimeZoneID".
- * <BR>"javax.jdo.option.DatastoreReadTimeoutMillis",
- * <BR>"javax.jdo.option.DatastoreWriteTimeoutMillis",
- * <BR>"javax.jdo.option.Name".
- * </code>
- * and properties of the form
- * <BR><code>javax.jdo.option.InstanceLifecycleListener.{listenerClass}[=[{pcClasses}]]</code>
- * where <code>{listenerClass}</code> is the fully qualified name of a
- * class that implements
- * {@link javax.jdo.listener.InstanceLifecycleListener}, and
- * <code>{pcClasses}</code> is an optional comma- or whitespace-delimited
- * list of persistence-capable classes to be observed; the absence of a
- * value for a property of this form means that instances of all
- * persistence-capable classes will be observed by an instance of the given
- * listener class.
- * <P>JDO implementations
- * are permitted to define key values of their own. Any key values not
- * recognized by the implementation must be ignored. Key values that are
- * recognized but not supported by an implementation must result in a
- * <code>JDOFatalUserException</code> thrown by the method.
- * <P>The returned <code>PersistenceManagerFactory</code> is not
- * configurable (the <code>set<I>XXX</I></code> methods will throw an
- * exception).
- *
- * This method loads the properties found at <code>name</code>, if any, via
- * <code>resourceLoader</code>, and creates a {@link
- * PersistenceManagerFactory} with <code>pmfLoader</code>. Any
- * exceptions thrown during resource loading will
- * be wrapped in a {@link JDOFatalUserException}.
- * If multiple PMFs with the requested name are found, a
- * {@link JDOFatalUserException} is thrown.
- * @since 2.1
- * @param overrides a Map containing properties that override properties
- * defined in any resources loaded according to the "name" parameter
- * @param name interpreted as the name of the resource containing the PMF
- * properties, the name of the PMF, or the persistence unit name, in that
- * order; if name is null, blank or whitespace, it is interpreted as
- * indicating the anonymous {@link PersistenceManagerFactory}.
- * @param resourceLoader the class loader to use to load properties file
- * resources; must be non-null if <code>name</code> is non-null or blank
- * @param pmfLoader the class loader to use to load the
- * {@link PersistenceManagerFactory} or
- * <code>javax.persistence.EntityManagerFactory</code> classes
- * @return the {@link PersistenceManagerFactory} with properties in the
- * given resource, with the given name, or with the given persitence unit name
- * @see Constants#ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME
- */
- public static PersistenceManagerFactory getPersistenceManagerFactory(
- Map<?, ?> overrides,
- String name,
- ClassLoader resourceLoader,
- ClassLoader pmfLoader) {
- if (pmfLoader == null)
- throw new JDOFatalUserException (msg.msg (
- "EXC_GetPMFNullPMFLoader")); //NOI18N
- if (resourceLoader == null) {
- throw new JDOFatalUserException(msg.msg(
- "EXC_GetPMFNullPropsLoader")); //NOI18N
- }
- Map<Object,Object> props = null;
- // trim spaces from name and ensure non-null
- name = (name == null?ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME:name.trim());
- if (!ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME.equals(name)) {
- props = loadPropertiesFromResource(resourceLoader, name);
+ // no PMF found; give up
+ throw new JDOFatalUserException(
+ msg.msg("EXC_NoPMFConfigurableViaPropertiesOrXML", name)); // NOI18N
+ }
+
+ /**
+ * Invoke the getPersistenceManagerFactory method on the implementation. If the overrides
+ * parameter to this method is not null, the static method with Map overrides, Map properties
+ * parameters will be invoked. If the overrides parameter to this method is null, the static
+ * method with Map properties parameter will be invoked.
+ *
+ * @param pmfClassName the name of the implementation factory class
+ * @param overrides a Map of overrides
+ * @param properties a Map of properties
+ * @param cl the class loader to use to load the implementation class
+ * @return the PersistenceManagerFactory
+ */
+ protected static PersistenceManagerFactory invokeGetPersistenceManagerFactoryOnImplementation(
+ String pmfClassName, Map<?, ?> overrides, Map<?, ?> properties, ClassLoader cl) {
+ if (overrides != null) {
+ // overrides is not null; use getPersistenceManagerFactory(Map overrides, Map props)
+ try {
+ Class<?> implClass = forName(pmfClassName, true, cl);
+ Method m =
+ getMethod(
+ implClass,
+ "getPersistenceManagerFactory", // NOI18N
+ new Class[] {Map.class, Map.class});
+ PersistenceManagerFactory pmf =
+ (PersistenceManagerFactory) invoke(m, null, new Object[] {overrides, properties});
+ if (pmf == null) {
+ throw new JDOFatalInternalException(msg.msg("EXC_GetPMFNullPMF", pmfClassName)); // NOI18N
}
-
- if (props != null) {
- // add the SPI property to inform the implementation that
- // the PMF was configured by the given resource name
- // and not via named PMF for proper deserialization
- props.put(PROPERTY_SPI_RESOURCE_NAME, name);
- props.remove(PROPERTY_NAME);
- return getPersistenceManagerFactory(overrides, props, pmfLoader);
- }
- // props were null; try getting from jdoconfig.xml
- props = getPropertiesFromJdoconfig(name, resourceLoader);
- if (props != null) {
- // inform the impl that the config came from a jdoconfig.xml
- // element with the given name
- props.put(PROPERTY_NAME, name);
- props.remove(PROPERTY_SPI_RESOURCE_NAME);
- // we have loaded a Properties, delegate to implementation
- return getPersistenceManagerFactory(overrides, props, pmfLoader);
- }
- // no properties found; last try to see if name is a JPA PU name
- if (!ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME.equals(name)) {
- props = new Properties();
- props.put(PROPERTY_PERSISTENCE_UNIT_NAME, name);
- return getPersistenceManagerFactory(overrides, props, pmfLoader);
- }
-
- // no PMF found; give up
- throw new JDOFatalUserException (msg.msg (
- "EXC_NoPMFConfigurableViaPropertiesOrXML", name)); //NOI18N
- }
-
- /** Invoke the getPersistenceManagerFactory method on the implementation.
- * If the overrides parameter to this method is not null, the static method
- * with Map overrides, Map properties parameters will be invoked.
- * If the overrides parameter to this method is null, the static method
- * with Map properties parameter will be invoked.
- * @param pmfClassName the name of the implementation factory class
- * @param overrides a Map of overrides
- * @param properties a Map of properties
- * @param cl the class loader to use to load the implementation class
- * @return the PersistenceManagerFactory
- */
- protected static PersistenceManagerFactory
- invokeGetPersistenceManagerFactoryOnImplementation(
- String pmfClassName, Map<?, ?> overrides, Map<?, ?> properties, ClassLoader cl) {
- if (overrides != null) {
- // overrides is not null; use getPersistenceManagerFactory(Map overrides, Map props)
- try {
- Class<?> implClass = forName(pmfClassName, true, cl);
- Method m = getMethod(implClass,
- "getPersistenceManagerFactory", //NOI18N
- new Class[]{Map.class, Map.class});
- PersistenceManagerFactory pmf =
- (PersistenceManagerFactory) invoke(m,
- null, new Object[]{overrides, properties});
- if (pmf == null) {
- throw new JDOFatalInternalException(msg.msg (
- "EXC_GetPMFNullPMF", pmfClassName)); //NOI18N
- }
- return pmf;
-
- } catch (ClassNotFoundException e) {
- throw new JDOFatalUserException(msg.msg(
- "EXC_GetPMFClassNotFound", pmfClassName), e); //NOI18N
- } catch (NoSuchMethodException e) {
- throw new JDOFatalInternalException(msg.msg(
- "EXC_GetPMFNoSuchMethod2", pmfClassName), e); //NOI18N
- } catch (NullPointerException e) {
- throw new JDOFatalInternalException (msg.msg(
- "EXC_GetPMFNullPointerException", pmfClassName), e); //NOI18N
- } catch (IllegalAccessException e) {
- throw new JDOFatalUserException(msg.msg(
- "EXC_GetPMFIllegalAccess", pmfClassName), e); //NOI18N
- } catch (ClassCastException e) {
- throw new JDOFatalInternalException (msg.msg(
- "EXC_GetPMFClassCastException", pmfClassName), e); //NOI18N
- } catch (InvocationTargetException ite) {
- Throwable nested = ite.getTargetException();
- if (nested instanceof JDOException) {
- throw (JDOException)nested;
- } else throw new JDOFatalInternalException (msg.msg(
- "EXC_GetPMFUnexpectedException"), ite); //NOI18N
- }
- } else {
- // overrides is null; use getPersistenceManagerFactory(Map props)
- try {
- Class<?> implClass = forName(pmfClassName, true, cl);
- Method m = getMethod(implClass,
- "getPersistenceManagerFactory", //NOI18N
- new Class[]{Map.class});
- PersistenceManagerFactory pmf =
- (PersistenceManagerFactory) invoke(m,
- null, new Object[]{properties});
- if (pmf == null) {
- throw new JDOFatalInternalException(msg.msg (
- "EXC_GetPMFNullPMF", pmfClassName)); //NOI18N
- }
- return pmf;
- } catch (ClassNotFoundException e) {
- throw new JDOFatalUserException(msg.msg(
- "EXC_GetPMFClassNotFound", pmfClassName), e); //NOI18N
- } catch (NoSuchMethodException e) {
- throw new JDOFatalInternalException(msg.msg(
- "EXC_GetPMFNoSuchMethod", pmfClassName), e); //NOI18N
- } catch (NullPointerException e) {
- throw new JDOFatalInternalException (msg.msg(
- "EXC_GetPMFNullPointerException", pmfClassName), e); //NOI18N
- } catch (IllegalAccessException e) {
- throw new JDOFatalUserException(msg.msg(
- "EXC_GetPMFIllegalAccess", pmfClassName), e); //NOI18N
- } catch (ClassCastException e) {
- throw new JDOFatalInternalException (msg.msg(
- "EXC_GetPMFClassCastException", pmfClassName), e); //NOI18N
- } catch (InvocationTargetException ite) {
- Throwable nested = ite.getTargetException();
- if (nested instanceof JDOException) {
- throw (JDOException)nested;
- } else throw new JDOFatalInternalException (msg.msg(
- "EXC_GetPMFUnexpectedException"), ite); //NOI18N
- }
+ return pmf;
+
+ } catch (ClassNotFoundException e) {
+ throw new JDOFatalUserException(
+ msg.msg("EXC_GetPMFClassNotFound", pmfClassName), e); // NOI18N
+ } catch (NoSuchMethodException e) {
+ throw new JDOFatalInternalException(
+ msg.msg("EXC_GetPMFNoSuchMethod2", pmfClassName), e); // NOI18N
+ } catch (NullPointerException e) {
+ throw new JDOFatalInternalException(
+ msg.msg("EXC_GetPMFNullPointerException", pmfClassName), e); // NOI18N
+ } catch (IllegalAccessException e) {
+ throw new JDOFatalUserException(
+ msg.msg("EXC_GetPMFIllegalAccess", pmfClassName), e); // NOI18N
+ } catch (ClassCastException e) {
+ throw new JDOFatalInternalException(
+ msg.msg("EXC_GetPMFClassCastException", pmfClassName), e); // NOI18N
+ } catch (InvocationTargetException ite) {
+ Throwable nested = ite.getTargetException();
+ if (nested instanceof JDOException) {
+ throw (JDOException) nested;
+ } else
+ throw new JDOFatalInternalException(
+ msg.msg("EXC_GetPMFUnexpectedException"), ite); // NOI18N
+ }
+ } else {
+ // overrides is null; use getPersistenceManagerFactory(Map props)
+ try {
+ Class<?> implClass = forName(pmfClassName, true, cl);
+ Method m =
+ getMethod(
+ implClass,
+ "getPersistenceManagerFactory", // NOI18N
+ new Class[] {Map.class});
+ PersistenceManagerFactory pmf =
+ (PersistenceManagerFactory) invoke(m, null, new Object[] {properties});
+ if (pmf == null) {
+ throw new JDOFatalInternalException(msg.msg("EXC_GetPMFNullPMF", pmfClassName)); // NOI18N
}
+ return pmf;
+ } catch (ClassNotFoundException e) {
+ throw new JDOFatalUserException(
+ msg.msg("EXC_GetPMFClassNotFound", pmfClassName), e); // NOI18N
+ } catch (NoSuchMethodException e) {
+ throw new JDOFatalInternalException(
+ msg.msg("EXC_GetPMFNoSuchMethod", pmfClassName), e); // NOI18N
+ } catch (NullPointerException e) {
+ throw new JDOFatalInternalException(
+ msg.msg("EXC_GetPMFNullPointerException", pmfClassName), e); // NOI18N
+ } catch (IllegalAccessException e) {
+ throw new JDOFatalUserException(
+ msg.msg("EXC_GetPMFIllegalAccess", pmfClassName), e); // NOI18N
+ } catch (ClassCastException e) {
+ throw new JDOFatalInternalException(
+ msg.msg("EXC_GetPMFClassCastException", pmfClassName), e); // NOI18N
+ } catch (InvocationTargetException ite) {
+ Throwable nested = ite.getTargetException();
+ if (nested instanceof JDOException) {
+ throw (JDOException) nested;
+ } else
+ throw new JDOFatalInternalException(
+ msg.msg("EXC_GetPMFUnexpectedException"), ite); // NOI18N
+ }
}
-
- /** Load a Properties instance by name from the class loader.
- *
- * @param resourceLoader the class loader from which to load the properties
- * @param name the name of the resource
- * @return a Properties instance or null if no resource is found
- */
- protected static Map<Object,Object> loadPropertiesFromResource(
- ClassLoader resourceLoader, String name) {
- InputStream in = null;
- Properties props = null;
- // try to load resources from properties file
+ }
+
+ /**
+ * Load a Properties instance by name from the class loader.
+ *
+ * @param resourceLoader the class loader from which to load the properties
+ * @param name the name of the resource
+ * @return a Properties instance or null if no resource is found
+ */
+ protected static Map<Object, Object> loadPropertiesFromResource(
+ ClassLoader resourceLoader, String name) {
+ InputStream in = null;
+ Properties props = null;
+ // try to load resources from properties file
+ try {
+ in = getResourceAsStream(resourceLoader, name);
+ if (in != null) {
+ // then some kind of resource was found by the given name;
+ // assume that it's a properties file
+ props = new Properties();
+ ((Properties) props).load(in);
+ }
+ } catch (IOException ioe) {
+ throw new JDOFatalUserException(msg.msg("EXC_GetPMFIOExceptionRsrc", name), ioe); // NOI18N
+ } finally {
+ if (in != null) {
try {
- in = getResourceAsStream(resourceLoader, name);
- if (in != null) {
- // then some kind of resource was found by the given name;
- // assume that it's a properties file
- props = new Properties();
- ((Properties) props).load(in);
- }
+ in.close();
} catch (IOException ioe) {
- throw new JDOFatalUserException(msg.msg(
- "EXC_GetPMFIOExceptionRsrc", name), ioe); //NOI18N
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException ioe) {
- }
- }
}
- return props;
- }
-
- /**
- * @see #getNamedPMFProperties(String,ClassLoader,String)
- * @since 2.1
- * @param name Name of the PMF
- * @param resourceLoader ClassLoader to use for loading resources
- * @return The properties for this PMF
- */
- protected static Map<Object,Object> getPropertiesFromJdoconfig(
- String name,
- ClassLoader resourceLoader) {
- return getNamedPMFProperties(name, resourceLoader, JDOCONFIG_RESOURCE_NAME);
+ }
}
-
- /**
- * Find and return the named {@link PersistenceManagerFactory}'s properties,
- * or null if not found.
- * If multiple named PMF property sets with
- * the given name are found (including anonymous ones), throw
- * {@link JDOFatalUserException}.
- * This method is here only to facilitate testing; the parameter
- * "jdoconfigResourceName" in public usage should always have the value
- * given in the constant {@link Constants#JDOCONFIG_RESOURCE_NAME}.
- *
- * @param name The persistence unit name; null is disallowed.
- * @param resourceLoader The ClassLoader used to load the standard JDO
- * configuration file.
- * @param jdoconfigResourceName The name of the configuration file to read.
- * In public usage, this should always be the value of
- * {@link Constants#JDOCONFIG_RESOURCE_NAME}.
- * @return The named <code>PersistenceManagerFactory</code> properties if
- * found, null if not.
- * @since 2.1
- * @throws JDOFatalUserException if multiple named PMF property sets are
- * found with the given name, or any other exception is encountered.
- */
- protected static Map<Object,Object> getNamedPMFProperties(
- String name,
- ClassLoader resourceLoader,
- String jdoconfigResourceName) {
- // key is PU name, value is Map of PU properties
- Map<String,Map<Object,Object>> propertiesByNameInAllConfigs
- = new HashMap<String,Map<Object,Object>>();
- try {
- URL firstFoundConfigURL = null;
-
- // get all JDO configurations
- Enumeration<URL> resources =
- getResources(resourceLoader, jdoconfigResourceName);
-
- if (resources.hasMoreElements()) {
- ArrayList<URL> processedResources = new ArrayList<URL>();
-
- // get ready to parse XML
- DocumentBuilderFactory factory = getDocumentBuilderFactory();
- do {
- URL currentConfigURL = resources.nextElement();
- if (processedResources.contains(currentConfigURL)) {
- continue;
- }
- else {
- processedResources.add(currentConfigURL);
- }
-
- Map<String,Map<Object,Object>> propertiesByNameInCurrentConfig =
- readNamedPMFProperties(
- currentConfigURL,
- name,
- factory);
-
- // try to detect duplicate requested PU
- if (propertiesByNameInCurrentConfig.containsKey(name)) {
- // possible dup -- check for it
- if (firstFoundConfigURL == null) {
- firstFoundConfigURL = currentConfigURL;
- }
-
- if (propertiesByNameInAllConfigs.containsKey(name))
- throw new JDOFatalUserException (msg.msg(
- "EXC_DuplicateRequestedNamedPMFFoundInDifferentConfigs",
- "".equals(name)
- ? "(anonymous)"
- : name,
- firstFoundConfigURL.toExternalForm(),
- currentConfigURL.toExternalForm())); //NOI18N
- }
- // no dups -- add found PUs to all PUs and keep going
- propertiesByNameInAllConfigs
- .putAll(propertiesByNameInCurrentConfig);
- } while (resources.hasMoreElements());
+ return props;
+ }
+
+ /**
+ * @see #getNamedPMFProperties(String,ClassLoader,String)
+ * @since 2.1
+ * @param name Name of the PMF
+ * @param resourceLoader ClassLoader to use for loading resources
+ * @return The properties for this PMF
+ */
+ protected static Map<Object, Object> getPropertiesFromJdoconfig(
+ String name, ClassLoader resourceLoader) {
+ return getNamedPMFProperties(name, resourceLoader, JDOCONFIG_RESOURCE_NAME);
+ }
+
+ /**
+ * Find and return the named {@link PersistenceManagerFactory}'s properties, or null if not found.
+ * If multiple named PMF property sets with the given name are found (including anonymous ones),
+ * throw {@link JDOFatalUserException}. This method is here only to facilitate testing; the
+ * parameter "jdoconfigResourceName" in public usage should always have the value given in the
+ * constant {@link Constants#JDOCONFIG_RESOURCE_NAME}.
+ *
+ * @param name The persistence unit name; null is disallowed.
+ * @param resourceLoader The ClassLoader used to load the standard JDO configuration file.
+ * @param jdoconfigResourceName The name of the configuration file to read. In public usage, this
+ * should always be the value of {@link Constants#JDOCONFIG_RESOURCE_NAME}.
+ * @return The named <code>PersistenceManagerFactory</code> properties if found, null if not.
+ * @since 2.1
+ * @throws JDOFatalUserException if multiple named PMF property sets are found with the given
+ * name, or any other exception is encountered.
+ */
+ protected static Map<Object, Object> getNamedPMFProperties(
+ String name, ClassLoader resourceLoader, String jdoconfigResourceName) {
+ // key is PU name, value is Map of PU properties
+ Map<String, Map<Object, Object>> propertiesByNameInAllConfigs =
+ new HashMap<String, Map<Object, Object>>();
+ try {
+ URL firstFoundConfigURL = null;
+
+ // get all JDO configurations
+ Enumeration<URL> resources = getResources(resourceLoader, jdoconfigResourceName);
+
+ if (resources.hasMoreElements()) {
+ ArrayList<URL> processedResources = new ArrayList<URL>();
+
+ // get ready to parse XML
+ DocumentBuilderFactory factory = getDocumentBuilderFactory();
+ do {
+ URL currentConfigURL = resources.nextElement();
+ if (processedResources.contains(currentConfigURL)) {
+ continue;
+ } else {
+ processedResources.add(currentConfigURL);
+ }
+
+ Map<String, Map<Object, Object>> propertiesByNameInCurrentConfig =
+ readNamedPMFProperties(currentConfigURL, name, factory);
+
+ // try to detect duplicate requested PU
+ if (propertiesByNameInCurrentConfig.containsKey(name)) {
+ // possible dup -- check for it
+ if (firstFoundConfigURL == null) {
+ firstFoundConfigURL = currentConfigURL;
}
- }
- catch (FactoryConfigurationError e) {
- throw new JDOFatalUserException(
- msg.msg("ERR_NoDocumentBuilderFactory"), e);
- }
- catch (IOException ioe) {
- throw new JDOFatalUserException (msg.msg (
- "EXC_GetPMFIOExceptionRsrc", name), ioe); //NOI18N
- }
- // done with reading all config resources;
- // return what we found, which may very well be null
- return (Map<Object,Object>) propertiesByNameInAllConfigs.get(name);
+ if (propertiesByNameInAllConfigs.containsKey(name))
+ throw new JDOFatalUserException(
+ msg.msg(
+ "EXC_DuplicateRequestedNamedPMFFoundInDifferentConfigs",
+ "".equals(name) ? "(anonymous)" : name,
+ firstFoundConfigURL.toExternalForm(),
+ currentConfigURL.toExternalForm())); // NOI18N
+ }
+ // no dups -- add found PUs to all PUs and keep going
+ propertiesByNameInAllConfigs.putAll(propertiesByNameInCurrentConfig);
+ } while (resources.hasMoreElements());
+ }
+ } catch (FactoryConfigurationError e) {
+ throw new JDOFatalUserException(msg.msg("ERR_NoDocumentBuilderFactory"), e);
+ } catch (IOException ioe) {
+ throw new JDOFatalUserException(msg.msg("EXC_GetPMFIOExceptionRsrc", name), ioe); // NOI18N
}
+ // done with reading all config resources;
+ // return what we found, which may very well be null
+ return (Map<Object, Object>) propertiesByNameInAllConfigs.get(name);
+ }
- protected static DocumentBuilderFactory getDocumentBuilderFactory() {
- @SuppressWarnings("static-access")
- DocumentBuilderFactory factory =
- implHelper.getRegisteredDocumentBuilderFactory();
- if (factory == null) {
- factory = getDefaultDocumentBuilderFactory();
- }
- return factory;
+ protected static DocumentBuilderFactory getDocumentBuilderFactory() {
+ @SuppressWarnings("static-access")
+ DocumentBuilderFactory factory = implHelper.getRegisteredDocumentBuilderFactory();
+ if (factory == null) {
+ factory = getDefaultDocumentBuilderFactory();
}
-
- protected static DocumentBuilderFactory getDefaultDocumentBuilderFactory() {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setIgnoringComments(true);
- factory.setNamespaceAware(true);
- factory.setValidating(false);
- factory.setIgnoringElementContentWhitespace(true);
- factory.setExpandEntityReferences(true);
-
- return factory;
+ return factory;
+ }
+
+ protected static DocumentBuilderFactory getDefaultDocumentBuilderFactory() {
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ factory.setIgnoringComments(true);
+ factory.setNamespaceAware(true);
+ factory.setValidating(false);
+ factory.setIgnoringElementContentWhitespace(true);
+ factory.setExpandEntityReferences(true);
+
+ return factory;
+ }
+
+ protected static ErrorHandler getErrorHandler() {
+ @SuppressWarnings("static-access")
+ ErrorHandler handler = implHelper.getRegisteredErrorHandler();
+ if (handler == null) {
+ handler = getDefaultErrorHandler();
}
+ return handler;
+ }
- protected static ErrorHandler getErrorHandler() {
- @SuppressWarnings("static-access")
- ErrorHandler handler = implHelper.getRegisteredErrorHandler();
- if (handler == null) {
- handler = getDefaultErrorHandler();
- }
- return handler;
- }
-
- protected static ErrorHandler getDefaultErrorHandler() {
- return new ErrorHandler() {
- public void error(SAXParseException exception)
- throws SAXException {
- throw exception;
- }
+ protected static ErrorHandler getDefaultErrorHandler() {
+ return new ErrorHandler() {
+ public void error(SAXParseException exception) throws SAXException {
+ throw exception;
+ }
- public void fatalError(SAXParseException exception)
- throws SAXException {
- throw exception;
- }
+ public void fatalError(SAXParseException exception) throws SAXException {
+ throw exception;
+ }
- public void warning(SAXParseException exception)
- throws SAXException {
- // gulp: ignore warnings
- }
- };
- }
+ public void warning(SAXParseException exception) throws SAXException {
+ // gulp: ignore warnings
+ }
+ };
+ }
+
+ /**
+ * Reads JDO configuration file, creates a Map for each persistence-manager-factory, then returns
+ * the map.
+ *
+ * @param url URL of a JDO configuration file compliant with javax/jdo/jdoconfig.xsd.
+ * @param requestedPMFName The name of the requested persistence unit (allows for fail-fast).
+ * @param factory The <code>DocumentBuilderFactory</code> to use for XML parsing.
+ * @return a Map<String,Map> holding persistence unit configurations; for the anonymous
+ * persistence unit, the value of the String key is the empty string, "".
+ */
+ protected static Map<String, Map<Object, Object>> readNamedPMFProperties(
+ URL url, String requestedPMFName, DocumentBuilderFactory factory) {
+ requestedPMFName = requestedPMFName == null ? "" : requestedPMFName.trim();
+
+ Map<String, Map<Object, Object>> propertiesByName = new HashMap<String, Map<Object, Object>>();
+ InputStream in = null;
+ try {
+ DocumentBuilder builder = factory.newDocumentBuilder();
+ builder.setErrorHandler(getErrorHandler());
+
+ in = openStream(url);
+ Document doc = builder.parse(in);
+
+ Element root = doc.getDocumentElement();
+ if (root == null) {
+ throw new JDOFatalUserException(
+ msg.msg("EXC_InvalidJDOConfigNoRoot", url.toExternalForm()));
+ }
+ NodeList pmfs = root.getElementsByTagName(ELEMENT_PERSISTENCE_MANAGER_FACTORY);
- /**
- * Reads JDO configuration file, creates a Map for each
- * persistence-manager-factory, then returns the map.
- * @param url URL of a JDO configuration file compliant with javax/jdo/jdoconfig.xsd.
- * @param requestedPMFName The name of the requested
- * persistence unit (allows for fail-fast).
- * @param factory The <code>DocumentBuilderFactory</code> to use for XML parsing.
- * @return a Map<String,Map> holding persistence unit configurations; for the
- * anonymous persistence unit, the value of the String key is the empty string, "".
- */
- protected static Map<String,Map<Object,Object>> readNamedPMFProperties(
- URL url,
- String requestedPMFName,
- DocumentBuilderFactory factory) {
- requestedPMFName = requestedPMFName == null
- ? ""
- : requestedPMFName.trim();
-
- Map<String,Map<Object,Object>>
- propertiesByName = new HashMap<String,Map<Object,Object>>();
- InputStream in = null;
- try {
- DocumentBuilder builder = factory.newDocumentBuilder();
- builder.setErrorHandler(getErrorHandler());
+ for (int i = 0; i < pmfs.getLength(); i++) {
+ Node pmfElement = pmfs.item(i);
- in = openStream(url);
- Document doc = builder.parse(in);
+ Properties pmfPropertiesFromAttributes = readPropertiesFromPMFElementAttributes(pmfElement);
- Element root = doc.getDocumentElement();
- if (root == null) {
- throw new JDOFatalUserException(
- msg.msg("EXC_InvalidJDOConfigNoRoot", url.toExternalForm())
- );
- }
+ Properties pmfPropertiesFromElements = readPropertiesFromPMFSubelements(pmfElement, url);
- NodeList pmfs = root.getElementsByTagName(
- ELEMENT_PERSISTENCE_MANAGER_FACTORY);
-
- for(int i = 0; i < pmfs.getLength(); i++) {
- Node pmfElement = pmfs.item(i);
-
- Properties pmfPropertiesFromAttributes
- = readPropertiesFromPMFElementAttributes(pmfElement);
-
- Properties pmfPropertiesFromElements
- = readPropertiesFromPMFSubelements(pmfElement, url);
-
- // for informative error handling, get name (or names) now
- String pmfNameFromAtts =
- pmfPropertiesFromAttributes.getProperty(PROPERTY_NAME);
- String pmfNameFromElem =
- pmfPropertiesFromElements.getProperty(PROPERTY_NAME);
-
- String pmfName = null;
- if (isNullOrBlank(pmfNameFromAtts)) {
- // no PMF name attribute given
- if (!isNullOrBlank(pmfNameFromElem)) {
- // PMF name element was given
- pmfName = pmfNameFromElem;
- }
- else {
- // PMF name not given at all, means the "anonymous" PMF
- pmfName = ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME;
- }
- }
- else {
- // PMF name given in an attribute
- if (!isNullOrBlank(pmfNameFromElem)) {
- // exception -- PMF name given as both att & elem
- throw new JDOFatalUserException(
- msg.msg(
- "EXC_DuplicatePMFNamePropertyFoundWithinConfig",
- pmfNameFromAtts,
- pmfNameFromElem,
- url.toExternalForm()));
- }
- pmfName = pmfNameFromAtts;
- }
- pmfName = pmfName == null ? "" : pmfName.trim();
-
- // check for duplicate properties among atts & elems
- if (requestedPMFName.equals(pmfName)) {
- Iterator<?> it =
... 370315 lines suppressed ...