db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject [db-jdo] branch master updated: Fixed javadoc warnings
Date Sun, 23 Feb 2020 16:57:45 GMT
This is an automated email from the ASF dual-hosted git repository.

mbo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/db-jdo.git


The following commit(s) were added to refs/heads/master by this push:
     new e7fb27c  Fixed javadoc warnings
e7fb27c is described below

commit e7fb27c41d0f7ee3168ea5b1d66f6cf29175f76f
Author: Michael Bouschen <mbo@apache.org>
AuthorDate: Sun Feb 23 17:57:15 2020 +0100

    Fixed javadoc warnings
---
 api/src/test/java/javax/jdo/EnhancerTest.java      |   5 +-
 .../java/javax/jdo/util/BatchResultPrinter.java    |  17 +-
 tck/src/main/java/org/apache/jdo/tck/JDO_Test.java | 258 +++++++++++++++------
 .../java/org/apache/jdo/tck/api/SignatureTest.java |   3 +-
 .../jdo/tck/api/fetchgroup/FetchGroupTest.java     |   3 -
 .../AbstractInstanceLifecycleListener.java         |   6 +-
 .../AccessOtherInstancesInPrestore.java            |   5 +-
 .../AccessingFieldsInPredelete.java                |   5 +-
 .../api/instancecallbacks/CallingJdoPostload.java  |   6 +-
 .../api/instancecallbacks/CallingJdoPreclear.java  |   5 +-
 .../api/instancecallbacks/CallingJdoPredelete.java |   6 +-
 .../api/instancecallbacks/CallingJdoPrestore.java  |   6 +-
 ...ationOfNontransactionalNonpersistentFields.java |   6 +-
 .../NoAccessToFieldsAfterPredelete.java            |   6 +-
 .../apache/jdo/tck/api/jdohelper/GetObjectId.java  |   3 +-
 .../apache/jdo/tck/api/jdohelper/GetObjectIds.java |   6 +-
 .../tck/api/jdohelper/GetPersistenceManager.java   |   3 +-
 .../api/jdohelper/GetTransactionalObjectId.java    |   5 +-
 .../apache/jdo/tck/api/jdohelper/IsDeleted.java    |   3 +-
 .../jdo/tck/api/jdohelper/IsDeletedFalse.java      |   3 +-
 .../org/apache/jdo/tck/api/jdohelper/IsDirty.java  |   3 +-
 .../apache/jdo/tck/api/jdohelper/IsDirtyFalse.java |   3 +-
 .../org/apache/jdo/tck/api/jdohelper/IsNew.java    |   3 +-
 .../apache/jdo/tck/api/jdohelper/IsPersistent.java |   3 +-
 .../jdo/tck/api/jdohelper/IsTransactional.java     |   3 +-
 .../tck/api/jdohelper/IsTransactionalFalse.java    |   5 +-
 .../apache/jdo/tck/api/jdohelper/MakeDirty.java    |   3 +-
 .../ChangingObjectIdHasNoEffectOnInstance.java     |   4 +-
 .../DataStoreConnectionThrows.java                 |  10 +-
 .../api/persistencemanager/DatastoreTimeout.java   |  23 +-
 .../persistencemanager/GetPutRemoveUserObject.java |   4 +-
 .../OneInstanceOfObjectPerPersistenceManager.java  |  67 ++----
 .../api/persistencemanager/OptimisticFailure.java  |  11 +-
 .../persistencemanager/PersistenceManagerTest.java |  45 +++-
 .../jdo/tck/api/persistencemanager/ThreadSafe.java |  18 +-
 ...llingEvictAllWithCollectionContainingNulls.java |   6 +-
 ...ingRefreshAllWithCollectionContainingNulls.java |   4 +-
 .../cache/EvictAllWithNoParameters.java            |   6 +-
 .../EvictingCollectionOfInstancesSideEffects.java  |   9 +-
 .../cache/EvictingWithRestoreValuesFalse.java      |  13 +-
 .../cache/EvictingWithRetainValuesFalse.java       |  15 +-
 .../PassingNullToEvictAllThrowsException.java      |   5 +-
 .../cache/PassingNullToEvictHasNoEffect.java       |   5 +-
 .../PassingNullToRefreshAllThrowsException.java    |   5 +-
 .../cache/PassingNullToRefreshHasNoEffect.java     |   5 +-
 .../cache/RefreshAllNoParameterSideEffects.java    |  16 +-
 .../cache/RefreshAllSideEffects.java               |  14 +-
 .../cache/RefreshAllWithNoParameters.java          |   4 +-
 .../cache/RefreshSideEffects.java                  |  13 +-
 .../tck/api/persistencemanager/cache/Retrieve.java |   7 +-
 .../detach/CopyOnAttachFalse.java                  |   2 -
 .../persistencemanager/detach/DetachSerialize.java |   5 +-
 .../api/persistencemanager/detach/DetachTest.java  |  47 +++-
 .../detach/SetDetachAllOnCommit.java               |   4 +-
 .../extent/GetExtentWithSubclasses.java            |   3 +-
 .../fetchplan/AbstractFetchPlanTest.java           |  35 ++-
 .../fetchplan/FetchPlanInterface.java              |  27 ++-
 .../fetchplan/FetchPlanIsCopy.java                 |  13 +-
 .../flags/SetIgnoreCacheToFalse.java               |   6 +-
 .../flags/SetIgnoreCacheToTrue.java                |   6 +-
 .../flags/SetMultithreadedFalse.java               |   6 +-
 .../flags/SetMultithreadedTrue.java                |   6 +-
 .../flags/SettingFlagsWithTransactionInstance.java |   2 +-
 .../getobject/GetObjectsById.java                  |   3 +-
 .../lifecycle/MakeTransactional.java               |  10 +-
 ...ctionalANontransactionalPersistentInstance.java |   6 +-
 ...eTransactionalPriorToTransactionRolledback.java |   5 +-
 ...keTransactionalWithinTransactionRolledback.java |  17 +-
 .../nullargs/PersistenceManagerNullsTest.java      |  40 ++--
 .../persistencemanagerfactory/AbstractGetPMF.java  |   7 +-
 ...erGetPersistenceManagerNoSetMethodsSucceed.java |   5 +-
 .../CloseFailsIfTransactionActive.java             |  20 +-
 .../FlushThrowsIfReadOnly.java                     |   3 +-
 ...sistenceManagerFactoryByPropertiesInstance.java |   3 +-
 .../config/JDOConfigListener.java                  |   9 +-
 .../config/Jdoconfig.java                          |  15 +-
 .../config/Persistence.java                        |  10 +-
 .../apache/jdo/tck/enhancement/EnhancerTest.java   |  28 ++-
 .../org/apache/jdo/tck/extents/ExtentTest.java     |  60 +++--
 .../tck/lifecycle/HollowInstanceMaintainsPK.java   |   3 +-
 ...ltiplePMsReturnInstancesRepresentingSamePC.java |   5 +-
 .../tck/lifecycle/NontransactionalWriteTest.java   |  12 +-
 ...tIdNotModifiedWhenObjectIdInstanceModified.java |   3 +-
 .../PMReturnsIdenticalInstancesForEqualObjIds.java |   5 +-
 .../PMsCanSharePCClassesButNotPCInstances.java     |   3 +-
 .../apache/jdo/tck/lifecycle/StateTransitions.java |  83 +++++--
 .../lifecycle/StateTransitionsReturnedObjects.java |  83 +++++--
 .../jdo/tck/mapping/AbstractRelationshipTest.java  |   3 +-
 .../apache/jdo/tck/mapping/CompletenessTest.java   |   3 +-
 .../jdo/tck/mapping/CompletenessTestJPA.java       |   3 +-
 .../jdo/tck/mapping/CompletenessTestList.java      |   3 +-
 .../jdo/tck/mapping/CompletenessTestMap.java       |   3 +-
 .../jdo/tck/mapping/CompletenessTestOrder.java     |   3 +-
 .../mapping/Relationship1To1AllRelationships.java  |   1 +
 .../mapping/Relationship1To1NoRelationships.java   |   1 +
 .../Relationship1ToManyAllRelationships.java       |   1 +
 .../Relationship1ToManyNoRelationships.java        |   1 +
 .../RelationshipManyToManyAllRelationships.java    |   1 +
 .../RelationshipManyToManyNoRelationships.java     |   1 +
 .../tck/mapping/RelationshipNegative1To1Test.java  |   1 +
 .../mapping/RelationshipNegative1ToManyTest.java   |   1 +
 .../SecondClassObjectsTrackTheirChanges.java       |   3 +-
 .../models/fieldtypes/TestArrayCollections.java    |   3 +-
 .../fieldtypes/TestArrayListCollections.java       |   3 +-
 .../fieldtypes/TestCollectionCollections.java      |   3 +-
 .../models/fieldtypes/TestFieldsOfBigDecimal.java  |   5 +-
 .../models/fieldtypes/TestFieldsOfBigInteger.java  |   5 +-
 .../tck/models/fieldtypes/TestFieldsOfBoolean.java |   5 +-
 .../tck/models/fieldtypes/TestFieldsOfByte.java    |   5 +-
 .../models/fieldtypes/TestFieldsOfCharacter.java   |   5 +-
 .../tck/models/fieldtypes/TestFieldsOfDate.java    |   5 +-
 .../tck/models/fieldtypes/TestFieldsOfDouble.java  |   7 +-
 .../tck/models/fieldtypes/TestFieldsOfFloat.java   |   5 +-
 .../tck/models/fieldtypes/TestFieldsOfInteger.java |   7 +-
 .../tck/models/fieldtypes/TestFieldsOfLocale.java  |   5 +-
 .../tck/models/fieldtypes/TestFieldsOfLong.java    |   5 +-
 .../tck/models/fieldtypes/TestFieldsOfObject.java  |   5 +-
 .../fieldtypes/TestFieldsOfPrimitiveboolean.java   |   5 +-
 .../fieldtypes/TestFieldsOfPrimitivebyte.java      |   5 +-
 .../fieldtypes/TestFieldsOfPrimitivechar.java      |   5 +-
 .../fieldtypes/TestFieldsOfPrimitivedouble.java    |   5 +-
 .../fieldtypes/TestFieldsOfPrimitivefloat.java     |   5 +-
 .../fieldtypes/TestFieldsOfPrimitiveint.java       |   5 +-
 .../fieldtypes/TestFieldsOfPrimitivelong.java      |   5 +-
 .../fieldtypes/TestFieldsOfPrimitiveshort.java     |   5 +-
 .../tck/models/fieldtypes/TestFieldsOfShort.java   |   5 +-
 .../models/fieldtypes/TestFieldsOfSimpleClass.java |   5 +-
 .../models/fieldtypes/TestFieldsOfSimpleEnum.java  |   5 +-
 .../fieldtypes/TestFieldsOfSimpleInterface.java    |   5 +-
 .../tck/models/fieldtypes/TestFieldsOfString.java  |   5 +-
 .../TestHashMapStringKeyCollections.java           |   5 +-
 .../TestHashMapStringValueCollections.java         |   5 +-
 .../models/fieldtypes/TestHashSetCollections.java  |   5 +-
 .../TestHashtableStringKeyCollections.java         |   5 +-
 .../TestHashtableStringValueCollections.java       |   5 +-
 .../fieldtypes/TestLinkedListCollections.java      |   5 +-
 .../tck/models/fieldtypes/TestListCollections.java |   5 +-
 .../fieldtypes/TestMapStringKeyCollections.java    |   5 +-
 .../fieldtypes/TestMapStringValueCollections.java  |   5 +-
 .../tck/models/fieldtypes/TestSetCollections.java  |   5 +-
 .../TestTreeMapStringKeyCollections.java           |   5 +-
 .../TestTreeMapStringValueCollections.java         |   5 +-
 .../models/fieldtypes/TestTreeSetCollections.java  |   5 +-
 .../models/fieldtypes/TestVectorCollections.java   |   5 +-
 .../inheritance/FieldWithSameNameInSuperclass.java |   5 +-
 ...rsistentFieldsAreNonPersistentInSubclasses.java |   3 +-
 .../inheritance/NonpersistentSuperClass.java       |   3 +-
 ...ceCapableFlexibilityInInheritanceHierarchy.java |   3 +-
 .../PersistentFieldsArePersistentInSubClasses.java |   3 +-
 ...actionalFieldsAreTransactionalInSubclasses.java |   3 +-
 .../org/apache/jdo/tck/pc/company/Company.java     |   7 +-
 .../tck/pc/company/CompanyFactoryAbstractImpl.java |   5 +-
 .../CompanyFactoryAnnotatedAbstractDelegator.java  |   3 +-
 .../pc/company/CompanyFactoryConcreteClass.java    |   4 +
 .../jdo/tck/pc/company/CompanyFactoryPMClass.java  |   3 +-
 .../tck/pc/company/CompanyFactoryPMInterface.java  |   3 +-
 .../jdo/tck/pc/company/CompanyModelReader.java     |   1 +
 .../org/apache/jdo/tck/pc/company/Department.java  |   7 +-
 .../org/apache/jdo/tck/pc/company/Employee.java    |   7 +-
 .../org/apache/jdo/tck/pc/company/Project.java     |   7 +-
 .../CompanyFactoryAnnotatedFCAppConcrete.java      |   5 +-
 .../CompanyFactoryAnnotatedFCAppPM.java            |   5 +-
 ...CompanyFactoryAnnotatedFCConcreteDelegator.java |   5 +-
 .../CompanyFactoryAnnotatedFCDSConcrete.java       |   5 +-
 .../CompanyFactoryAnnotatedFCDSPM.java             |   5 +-
 .../CompanyFactoryAnnotatedFCPMDelegator.java      |   5 +-
 .../CompanyFactoryAnnotatedPMFieldClass.java       |   3 +-
 .../tck/pc/companyAnnotatedFC/FCAppCompany.java    |   7 +-
 .../tck/pc/companyAnnotatedFC/FCAppDepartment.java |   7 +-
 .../tck/pc/companyAnnotatedFC/FCAppEmployee.java   |   7 +-
 .../tck/pc/companyAnnotatedFC/FCAppProject.java    |   7 +-
 .../jdo/tck/pc/companyAnnotatedFC/FCDSCompany.java |   9 +-
 .../tck/pc/companyAnnotatedFC/FCDSDepartment.java  |   7 +-
 .../tck/pc/companyAnnotatedFC/FCDSEmployee.java    |   7 +-
 .../jdo/tck/pc/companyAnnotatedFC/FCDSProject.java |   7 +-
 .../CompanyFactoryAnnotatedJPAAppConcrete.java     |   5 +-
 .../CompanyFactoryAnnotatedJPAAppPM.java           |   5 +-
 .../CompanyFactoryAnnotatedPMFieldClassJPA.java    |   3 +-
 .../tck/pc/companyAnnotatedJPA/JPAAppCompany.java  |   9 +-
 .../pc/companyAnnotatedJPA/JPAAppDepartment.java   |   7 +-
 .../tck/pc/companyAnnotatedJPA/JPAAppEmployee.java |   7 +-
 .../tck/pc/companyAnnotatedJPA/JPAAppPerson.java   |  12 +-
 .../pc/companyAnnotatedJPA/JPAAppPhoneNumber.java  |   1 +
 .../tck/pc/companyAnnotatedJPA/JPAAppProject.java  |   7 +-
 .../CompanyFactoryAnnotatedPCAppConcrete.java      |   5 +-
 .../CompanyFactoryAnnotatedPCAppPM.java            |   5 +-
 ...CompanyFactoryAnnotatedPCConcreteDelegator.java |   5 +-
 .../CompanyFactoryAnnotatedPCDSConcrete.java       |   5 +-
 .../CompanyFactoryAnnotatedPCDSPM.java             |   5 +-
 .../CompanyFactoryAnnotatedPCPMDelegator.java      |   5 +-
 .../tck/pc/companyAnnotatedPC/PCAppCompany.java    |   9 +-
 .../tck/pc/companyAnnotatedPC/PCAppDepartment.java |   7 +-
 .../tck/pc/companyAnnotatedPC/PCAppEmployee.java   |   7 +-
 .../tck/pc/companyAnnotatedPC/PCAppProject.java    |   7 +-
 .../jdo/tck/pc/companyAnnotatedPC/PCDSCompany.java |   9 +-
 .../tck/pc/companyAnnotatedPC/PCDSDepartment.java  |   7 +-
 .../tck/pc/companyAnnotatedPC/PCDSEmployee.java    |   7 +-
 .../jdo/tck/pc/companyAnnotatedPC/PCDSProject.java |   7 +-
 .../CompanyFactoryAnnotatedPIAppPM.java            |   3 +-
 .../CompanyFactoryAnnotatedPIDSPM.java             |   5 +-
 .../CompanyFactoryAnnotatedPIPMDelegator.java      |   5 +-
 .../CompanyFactoryAnnotatedPMInterface.java        |   3 +-
 .../jdo/tck/pc/companyListWithoutJoin/Company.java |   9 +-
 .../CompanyFactoryAbstractImpl.java                |   7 +-
 .../CompanyFactoryConcreteClass.java               |   4 +
 .../CompanyFactoryPMClass.java                     |   3 +-
 .../CompanyFactoryPMInterface.java                 |   3 +-
 .../companyListWithoutJoin/CompanyModelReader.java |   1 +
 .../tck/pc/companyListWithoutJoin/Employee.java    |   7 +-
 .../jdo/tck/pc/companyMapWithoutJoin/Company.java  |   9 +-
 .../CompanyFactoryAbstractImpl.java                |   5 +-
 .../CompanyFactoryConcreteClass.java               |   4 +
 .../CompanyFactoryPMClass.java                     |   3 +-
 .../CompanyFactoryPMInterface.java                 |   3 +-
 .../companyMapWithoutJoin/CompanyModelReader.java  |   1 +
 .../jdo/tck/pc/companyMapWithoutJoin/Employee.java |   7 +-
 .../pc/companyMapWithoutJoin/FullTimeEmployee.java |   1 +
 .../pc/companyMapWithoutJoin/PartTimeEmployee.java |   1 +
 .../org/apache/jdo/tck/pc/mylib/MylibReader.java   |   1 +
 .../jdo/tck/pc/order/OrderFactoryAbstractImpl.java |   5 +-
 .../tck/pc/order/OrderFactoryConcreteClass.java    |   4 +
 .../jdo/tck/pc/order/OrderFactoryPMClass.java      |   3 +-
 .../jdo/tck/pc/order/OrderFactoryPMInterface.java  |   3 +-
 .../apache/jdo/tck/pc/order/OrderModelReader.java  |   1 +
 .../apache/jdo/tck/pc/shoppingcart/Product.java    |  10 +-
 .../PCPointSingleFieldByte.java                    |   4 +-
 .../PCPointSingleFieldCharacter.java               |   4 +-
 .../PCPointSingleFieldDate.java                    |   4 +-
 .../PCPointSingleFieldInteger.java                 |   4 +-
 .../PCPointSingleFieldLong.java                    |   4 +-
 .../PCPointSingleFieldPrimitivebyte.java           |   4 +-
 .../PCPointSingleFieldPrimitivechar.java           |   4 +-
 .../PCPointSingleFieldPrimitiveint.java            |   4 +-
 .../PCPointSingleFieldPrimitivelong.java           |   4 +-
 .../PCPointSingleFieldPrimitiveshort.java          |   4 +-
 .../PCPointSingleFieldShort.java                   |   4 +-
 .../PCPointSingleFieldString.java                  |   4 +-
 .../jdo/tck/pc/singlefieldidentity/Person.java     |   2 +-
 .../apache/jdo/tck/query/QueryElementHolder.java   |   4 +
 .../java/org/apache/jdo/tck/query/QueryTest.java   | 137 +++++++----
 .../apache/jdo/tck/query/api/AutoCloseable.java    |   3 +-
 .../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   |   4 +-
 .../jdo/tck/query/api/DeclareParameters.java       |   3 +-
 .../org/apache/jdo/tck/query/api/ExecuteQuery.java |   3 +-
 .../jdo/tck/query/api/ExecuteQueryWithArray.java   |   3 +-
 .../jdo/tck/query/api/ExecuteQueryWithMap.java     |   3 +-
 .../apache/jdo/tck/query/api/GetIgnoreCache.java   |   2 +-
 ...sistenceManagerFromRestoredSerializedQuery.java |   5 +-
 .../jdo/tck/query/api/MetadataSearchOrder.java     |   5 +-
 .../apache/jdo/tck/query/api/NewNamedQuery.java    |   5 +-
 ...ryFromExistingQueryBoundToPMFromSameVendor.java |   3 +-
 .../api/NewQueryFromRestoredSerializedQuery.java   |   8 +-
 .../jdo/tck/query/api/NewQuerySingleString.java    |   3 +-
 .../tck/query/api/NewQueryWithCandidateClass.java  |   3 +-
 .../NewQueryWithCandidateClassAndCollection.java   |   3 +-
 .../api/NewQueryWithCandidateClassAndExtent.java   |   3 +-
 .../api/NewQueryWithCandidateClassAndFilter.java   |   3 +-
 ...NewQueryWithCandidateClassCollectionFilter.java |   3 +-
 .../jdo/tck/query/api/NewQueryWithExtent.java      |   3 +-
 .../tck/query/api/NewQueryWithExtentAndFilter.java |   3 +-
 .../api/NewQueryWithSpecifiedLanguageAndQuery.java |   3 +-
 .../org/apache/jdo/tck/query/api/QueryCancel.java  |  13 +-
 .../apache/jdo/tck/query/api/QueryExtentions.java  |   5 +-
 .../apache/jdo/tck/query/api/SampleQueries.java    |   5 +-
 .../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  |   5 +-
 .../org/apache/jdo/tck/query/api/SetOrdering.java  |   3 +-
 .../org/apache/jdo/tck/query/api/SetRange.java     |   5 +-
 .../org/apache/jdo/tck/query/api/SetResult.java    |   5 +-
 .../apache/jdo/tck/query/api/SetResultClass.java   |   5 +-
 .../org/apache/jdo/tck/query/api/SetUnique.java    |   5 +-
 .../tck/query/api/SetterReplacePreviousValues.java |   5 +-
 .../jdo/tck/query/api/SingleStringQuery.java       |   5 +-
 .../jdo/tck/query/api/UnmodifiableQuery.java       |   5 +-
 .../jdo/tck/query/delete/DeleteCallback.java       |   5 +-
 .../jdo/tck/query/delete/DeletePersistentAll.java  |   5 +-
 .../jdo/tck/query/delete/DeleteQueryElements.java  |   5 +-
 .../java/org/apache/jdo/tck/query/jdoql/Cast.java  |   5 +-
 .../query/jdoql/CharacterAndStringLiterals.java    |   3 +-
 .../jdoql/ComparingCollectionFieldToNull.java      |   5 +-
 ...omparingPersistentAndNonPersistentInstance.java |   5 +-
 .../tck/query/jdoql/DenoteUniquenessInFilter.java  |   5 +-
 ...gMultipleQueriesSimultaneouslyIsThreadSafe.java |   3 +-
 .../org/apache/jdo/tck/query/jdoql/Having.java     |   5 +-
 .../query/jdoql/IdentifiersEqualFieldNames.java    |   2 +-
 .../apache/jdo/tck/query/jdoql/IfElseInFilter.java |   5 +-
 .../jdo/tck/query/jdoql/IgnoreCacheFalse.java      |   5 +-
 ...ctiveQueryInstanceInSamePersistenceManager.java |   3 +-
 .../tck/query/jdoql/MultipleIdenticalImports.java  |   5 +-
 .../tck/query/jdoql/NamespaceOfIdentifiers.java    |   3 +-
 .../query/jdoql/NavigationComparisonWithNull.java  |  11 +-
 .../jdoql/NavigationThroughACollectionField.java   |   5 +-
 .../jdoql/NavigationThroughANullValuedField.java   |   5 +-
 ...NavigationThroughReferencesUsesDotOperator.java |   3 +-
 .../apache/jdo/tck/query/jdoql/NegativeRange.java  |   4 +-
 .../jdoql/NullCollectionsAndContainsMethod.java    |   5 +-
 .../tck/query/jdoql/NullCollectionsAndIsEmpty.java |   5 +-
 .../jdo/tck/query/jdoql/OrderingSpecification.java |   3 +-
 .../jdoql/ParenthesesMarkOperatorPrecedence.java   |   3 +-
 .../apache/jdo/tck/query/jdoql/PositiveRange.java  |   2 +-
 .../jdo/tck/query/jdoql/QueryIsSerializable.java   |   9 +-
 .../jdoql/QueryResultPassedToAnotherQuery.java     |   3 +-
 .../jdo/tck/query/jdoql/QueryWithNoFilter.java     |   3 +-
 .../apache/jdo/tck/query/jdoql/RangeAsString.java  |   3 +-
 ...ializedQueryInstanceLosesAssociationWithPM.java |   5 +-
 .../query/jdoql/SeparateNamespaceForTypeNames.java |   5 +-
 .../jdoql/WhiteSpaceIsACharacterAndIgnored.java    |   3 +-
 .../jdo/tck/query/jdoql/keywords/SingleString.java |   3 +-
 .../ThisIsReservedWordForElementOfCollection.java  |   3 +-
 .../keywords/UseOfThisToAcessHiddenField.java      |   3 +-
 .../tck/query/jdoql/methods/EnumMethodOrdinal.java |   5 +-
 .../query/jdoql/methods/EnumMethodToString.java    |   3 +-
 .../query/jdoql/methods/StartsWithAndEndsWith.java |   5 +-
 .../jdoql/methods/SupportedCollectionMethods.java  |   3 +-
 .../query/jdoql/methods/SupportedDateMethods.java  |   3 +-
 .../jdoql/methods/SupportedJDOHelperMethods.java   |   5 +-
 .../query/jdoql/methods/SupportedListMethods.java  |   3 +-
 .../jdoql/methods/SupportedLocalDateMethods.java   |   3 +-
 .../methods/SupportedLocalDateTimeMethods.java     |   3 +-
 .../jdoql/methods/SupportedLocalTimeMethods.java   |   3 +-
 .../query/jdoql/methods/SupportedMapMethods.java   |   3 +-
 .../query/jdoql/methods/SupportedMathMethods.java  |   3 +-
 .../jdoql/methods/SupportedOptionalMethods.java    |   3 +-
 .../jdoql/methods/SupportedStringMethods.java      |   3 +-
 .../query/jdoql/methods/SupportedTimeMethods.java  |   5 +-
 .../tck/query/jdoql/operators/BinaryAddition.java  |   3 +-
 .../query/jdoql/operators/BinarySubtraction.java   |   3 +-
 .../jdoql/operators/BitwiseBinaryOperators.java    |   5 +-
 .../query/jdoql/operators/BitwiseComplement.java   |   3 +-
 .../query/jdoql/operators/BooleanLogicalAND.java   |   3 +-
 .../query/jdoql/operators/BooleanLogicalOR.java    |   3 +-
 .../tck/query/jdoql/operators/ComparisonTests.java |  23 +-
 .../tck/query/jdoql/operators/ConditionalAND.java  |   3 +-
 .../tck/query/jdoql/operators/ConditionalOR.java   |   3 +-
 .../jdo/tck/query/jdoql/operators/Division.java    |   3 +-
 ...dComparisonsBetweenDateFieldsAndParameters.java |   5 +-
 ...risonsBetweenPrimitivesAndWrapperInstances.java |   3 +-
 ...omparisonsBetweenStringFieldsAndParameters.java |   5 +-
 .../jdo/tck/query/jdoql/operators/Instanceof.java  |   4 +-
 .../jdo/tck/query/jdoql/operators/LessThan.java    |   2 +-
 .../query/jdoql/operators/LogicalComplement.java   |   3 +-
 .../jdo/tck/query/jdoql/operators/Modulo.java      |   3 +-
 .../tck/query/jdoql/operators/Multiplication.java  |   3 +-
 .../operators/PromotionOfNumericOperands.java      |   3 +-
 .../tck/query/jdoql/operators/SignInversion.java   |   3 +-
 .../query/jdoql/operators/StringConcatenation.java |   5 +-
 .../jdo/tck/query/jdoql/operators/UnaryPlus.java   |   3 +-
 .../parameters/DomainObjectsAsParameters.java      |   5 +-
 .../query/jdoql/parameters/ImplicitParameters.java |   5 +-
 .../query/jdoql/parameters/OrderOfParameters.java  |   5 +-
 .../parameters/ParameterBoundToDifferentPM.java    |   5 +-
 ...eclaredWithSameNameAsFieldOfCandidateClass.java |   3 +-
 .../parameters/PrimitiveParameterPassedAsNull.java |   3 +-
 .../query/jdoql/subqueries/AggregateOnSize.java    |   6 +-
 .../jdoql/subqueries/CorrelatedSubqueries.java     |   3 +-
 .../CorrelatedSubqueriesWithParameters.java        |   7 +-
 .../subqueries/MultipleCallsReplaceSubquery.java   |   8 +-
 .../jdoql/subqueries/NonCorrelatedSubqueries.java  |   5 +-
 .../NullCandidateCollectionExpression.java         |   5 +-
 .../jdoql/subqueries/NullSubqueryParameter.java    |   5 +-
 .../jdoql/subqueries/NullVariableDeclaration.java  |   2 +-
 .../subqueries/UnmodifiedSubqueryInstance.java     |   5 +-
 .../tck/query/jdoql/variables/MixedVariables.java  |   3 +-
 .../jdoql/variables/UnconstrainedVariable.java     |   5 +-
 .../query/jdoql/variables/VariablesAndFields.java  |   3 +-
 .../jdoql/variables/VariablesWithoutExtent.java    |   5 +-
 .../jdo/tck/query/result/AggregateResult.java      |   5 +-
 .../apache/jdo/tck/query/result/DefaultResult.java |   3 +-
 .../apache/jdo/tck/query/result/DefaultUnique.java |   2 +-
 .../query/result/DistinctCandidateInstances.java   |   3 +-
 .../apache/jdo/tck/query/result/DistinctQuery.java |   4 +-
 .../org/apache/jdo/tck/query/result/Grouping.java  |   5 +-
 .../apache/jdo/tck/query/result/IfElseResult.java  |   3 +-
 .../jdo/tck/query/result/ImmutableQueryResult.java |   3 +-
 .../jdo/tck/query/result/MethodsInResult.java      |   3 +-
 .../jdo/tck/query/result/NPEInResultExpr.java      |   3 +-
 .../apache/jdo/tck/query/result/NullResults.java   |   3 +-
 .../result/ProjectedSCODoesNotTrackChanges.java    |   5 +-
 .../tck/query/result/ResultClassRequirements.java  |   2 +-
 .../jdo/tck/query/result/ResultExpressions.java    |   3 +-
 .../apache/jdo/tck/query/result/ShapeOfResult.java |   5 +-
 .../org/apache/jdo/tck/query/result/Unique.java    |   3 +-
 .../jdo/tck/query/result/VariableInResult.java     |   3 +-
 .../result/VariableInResultMultipleNavigation.java |   3 +-
 .../query/result/VariableInResultNavigation.java   |   4 +-
 .../jdo/tck/query/sql/AllowedAPIMethods.java       |   5 +-
 .../apache/jdo/tck/query/sql/ExecuteWithMap.java   |   5 +-
 .../org/apache/jdo/tck/query/sql/NewQuery.java     |   3 +-
 .../apache/jdo/tck/query/sql/NoCandidateClass.java |   3 +-
 .../apache/jdo/tck/query/sql/ShapeOfResult.java    |   5 +-
 .../AfterCompletionMethodCalledWhenCommitted.java  |  12 +-
 .../AfterCompletionMethodCalledWhenRolledback.java |  12 +-
 .../transactions/BeforeCompletionMethodCalled.java |  14 +-
 ...oreCompletionMethodNotCalledBeforeRollback.java |  12 +-
 .../org/apache/jdo/tck/transactions/Commit.java    |  14 +-
 .../tck/transactions/GetPersistenceManager.java    |   3 +-
 .../jdo/tck/transactions/GetRetainValues.java      |   4 +-
 .../jdo/tck/transactions/GetSynchronization.java   |   8 +-
 .../org/apache/jdo/tck/transactions/IsActive.java  |   5 +-
 .../IsActiveUntilAfterCompletionMethodCalled.java  |   8 +-
 .../org/apache/jdo/tck/transactions/Rollback.java  |  12 +-
 .../tck/transactions/SetNontransactionalRead.java  |   8 +-
 ...ntransactionalReadCalledDuringTxCompletion.java |  18 +-
 ...etNontransactionalReadTrueWhenNotSupported.java |   5 +-
 ...transactionalWriteCalledDuringTxCompletion.java |  12 +-
 .../apache/jdo/tck/transactions/SetOptimistic.java |   4 +-
 .../SetOptimisticCalledDuringTxCompletion.java     |  12 +-
 .../SetOptimisticDuringTransaction.java            |   5 +-
 .../SetOptimisticTrueWhenNotSupported.java         |   5 +-
 .../jdo/tck/transactions/SetRetainValues.java      |   5 +-
 .../SetRetainValuesCalledDuringTxCompletion.java   |  12 +-
 .../SetRetainValuesTrueWhenNotSupported.java       |   5 +-
 .../jdo/tck/transactions/SetSynchronization.java   |  10 +-
 .../tck/transactions/SetSynchronizationToNull.java |  10 +-
 .../WhenNontransactionalReadIsFalse.java           |   7 +-
 .../apache/jdo/tck/util/BatchResultPrinter.java    |  12 +-
 .../org/apache/jdo/tck/util/BatchTestRunner.java   |  49 ++--
 .../org/apache/jdo/tck/util/JDOJdk14Logger.java    |   7 +-
 .../org/apache/jdo/tck/util/SystemCfgSummary.java  |   2 +-
 .../org/apache/jdo/tck/util/TCKFileAppender.java   |  26 ++-
 .../org/apache/jdo/tck/util/TCKFileHandler.java    |   8 +-
 .../java/org/apache/jdo/tck/util/TestSelector.java |  23 +-
 .../jdo/tck/util/ThreadExceptionHandler.java       |   7 +-
 .../jdo/tck/util/signature/SignatureVerifier.java  | 198 ++++++++++++++--
 .../apache/jdo/tck/util/signature/TypeHelper.java  |  52 ++++-
 432 files changed, 2363 insertions(+), 1018 deletions(-)

diff --git a/api/src/test/java/javax/jdo/EnhancerTest.java b/api/src/test/java/javax/jdo/EnhancerTest.java
index 6ce0248..4adf138 100644
--- a/api/src/test/java/javax/jdo/EnhancerTest.java
+++ b/api/src/test/java/javax/jdo/EnhancerTest.java
@@ -43,7 +43,10 @@ public class EnhancerTest extends AbstractTest {
     /** The maven basedir identifying the directory of the execution environment. */
     private static String basedir = System.getProperty("basedir");
 
-    /** */
+    /**
+     * Main
+     * @param args command line arguments
+     */
     public static void main(String args[]) {
         BatchTestRunner.run(EnhancerTest.class);
     }
diff --git a/api/src/test/java/javax/jdo/util/BatchResultPrinter.java b/api/src/test/java/javax/jdo/util/BatchResultPrinter.java
index aa5a428..91002aa 100644
--- a/api/src/test/java/javax/jdo/util/BatchResultPrinter.java
+++ b/api/src/test/java/javax/jdo/util/BatchResultPrinter.java
@@ -53,7 +53,10 @@ public class BatchResultPrinter
         getWriter().println();
     }
         
-    /** Called when a test case is started. */
+    /**
+     * Called when a test case is started.
+     * @param test test case
+     */
     public void startTest(Test test) {
         String testName;
         if (test instanceof TestCase) {
@@ -65,12 +68,18 @@ public class BatchResultPrinter
         getWriter().print("RUN " + testName);
     }
         
-    /** */
+    /**
+     *
+     * @param runTime time
+     */
     protected void printHeader(long runTime) {
         getWriter().println("Time: "+elapsedTimeAsString(runTime));
     }
-        
-    /** */
+
+    /**
+     *
+     * @param result the result
+     */
     protected void printFooter(TestResult result) {
         if (result.wasSuccessful()) {
             getWriter().print("OK");
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 9efd830..1f73ca1 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
@@ -58,7 +58,6 @@ import junit.framework.TestCase;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.util.ClassUtils;
 
 public abstract class JDO_Test extends TestCase {
     public static final int TRANSIENT                           = 0;
@@ -486,7 +485,12 @@ public abstract class JDO_Test extends TestCase {
         }
     }
 
-    /** */
+    /**
+     * Returns a collection of persistence instances of the specified class.
+     * @param pm the PersistenceManager
+     * @param pcClass the class object of the PersistenceCapabale class
+     * @return a Collection of persistence objects
+     */
     protected Collection getAllObjects(PersistenceManager pm, Class pcClass) {
         Collection col = new Vector() ;
         Query query = pm.newQuery();
@@ -510,8 +514,7 @@ public abstract class JDO_Test extends TestCase {
      * @return field <code>pmf</code> if it is not <code>null</code>, 
      * else sets field <code>pmf</code> to a new instance and returns that instance.
      */
-    protected PersistenceManagerFactory getPMF()
-    {
+    protected PersistenceManagerFactory getPMF() {
         if (pmf == null) {
             PMFPropertiesObject = loadProperties(PMFProperties); // will exit here if no properties
             pmf = JDOHelper.getPersistenceManagerFactory(PMFPropertiesObject);
@@ -522,8 +525,7 @@ public abstract class JDO_Test extends TestCase {
         return pmf;
     }
 
-    protected Class getPMFClass()
-    {
+    protected Class getPMFClass() {
         if (pmf != null) {
             return pmf.getClass();
         }
@@ -547,8 +549,7 @@ public abstract class JDO_Test extends TestCase {
      * @return field <code>pmf</code> if it is not <code>null</code>, 
      * else sets field <code>pmf</code> to a new instance and returns that instance.
      */
-    protected PersistenceManagerFactory getUnconfiguredPMF()
-    {
+    protected PersistenceManagerFactory getUnconfiguredPMF() {
         if (pmf == null) {
             String name = null;
             try {
@@ -572,6 +573,7 @@ public abstract class JDO_Test extends TestCase {
     /**
      * Get the <code>PersistenceManager</code> instance 
      * for the implementation under test.
+     * @return the PersistenceManager
      */
     protected PersistenceManager getPM() {
         if (pm == null) {
@@ -587,8 +589,7 @@ public abstract class JDO_Test extends TestCase {
      * multiple PersistenceManager instances around, in case the
      * PersistenceManagerFactory performs PersistenceManager pooling.  
      */
-    protected void cleanupPM() 
-    {
+    protected void cleanupPM() {
         cleanupPM(pm);
         pm = null;
     }
@@ -597,9 +598,9 @@ public abstract class JDO_Test extends TestCase {
      * This method cleans up the specified 
      * <code>PersistenceManager</code>. If the pm still has an open
      * transaction, it will be rolled back, before closing the pm.
+     * @param pm the PersistenceManager
      */
-    protected static void cleanupPM(PersistenceManager pm) 
-    {
+    protected static void cleanupPM(PersistenceManager pm) {
         if ((pm != null) && !pm.isClosed()) {
             if (pm.currentTransaction().isActive()) {
                 pm.currentTransaction().rollback();
@@ -640,8 +641,10 @@ public abstract class JDO_Test extends TestCase {
             throw failure;
     }
 
-    /** Closes the pmf passed as a parameter. 
+    /**
+     * Closes the pmf passed as a parameter.
      * This must be done in a doPrivileged block.
+     * @param PMF the PersistenceManagerFactory
      */
     public static void closePMF(final PersistenceManagerFactory PMF) {
         if (PMF != null) {
@@ -658,8 +661,12 @@ public abstract class JDO_Test extends TestCase {
         }
     }
 
-
-    /** */
+    /**
+     * Returns failed PersistenceManagers
+     * @param assertionFailure failure
+     * @param ex exception
+     * @return failed PersistenceManagers
+     */
     protected static PersistenceManager[] getFailedPersistenceManagers(
         String assertionFailure, JDOException ex) {
         Throwable[] nesteds = ex.getNestedExceptions();
@@ -681,9 +688,10 @@ public abstract class JDO_Test extends TestCase {
 
     /**
      * This method load Properties from a given file.
+     * @param fileName the name of the properties file
+     * @return a Properties instance with the loaded properties
      */
-    protected Properties loadProperties(String fileName)
-    {
+    protected Properties loadProperties(String fileName) {
         if (fileName == null) {
             fileName = System.getProperty("user.home") + "/.jdo/PMFProperties.properties";
         }
@@ -710,9 +718,11 @@ public abstract class JDO_Test extends TestCase {
         return props;
     }
 
-    /** 
+    /**
      * Prints the specified msg (if debug is true), before it aborts the
      * test case.
+     * @param assertionFailure the assertion failure
+     * @param msg the message text
      */
     public void fail(String assertionFailure, String msg) {
         if (debug) logger.debug(msg);
@@ -723,6 +733,7 @@ public abstract class JDO_Test extends TestCase {
 
     /**
      * Dump the supportedOptions to the a file in the specified directory.
+     * @param directory the directory the options are dumped to
      */
     public static void dumpSupportedOptions(String directory) {
         if (supportedOptions == null)
@@ -764,176 +775,262 @@ public abstract class JDO_Test extends TestCase {
         }
     }
 
-    /** Reports whether TransientTransactional is supported. */
+    /**
+     * Reports whether TransientTransactional is supported.
+     * @return true if TransientTransactional is supported.
+     */
     public boolean isTransientTransactionalSupported() {
         return supportedOptions.contains(
             "javax.jdo.option.TransientTransactional");
     }
     
-    /** Reports whether NontransactionalRead is supported. */
+    /**
+     * Reports whether NontransactionalRead is supported.
+     * @return true if NontransactionalRead is supported.
+     */
     public boolean isNontransactionalReadSupported(){
         return supportedOptions.contains(
             "javax.jdo.option.NontransactionalRead");
     }
     
-    /** Reports whether NontransactionalWrite is supported. */
+    /**
+     * Reports whether NontransactionalWrite is supported.
+     * @return true if NontransactionalWrite is supported.
+     */
     public boolean isNontransactionalWriteSupported() {
         return supportedOptions.contains(
             "javax.jdo.option.NontransactionalWrite");
     }
 
-    /** Reports whether RetainValues is supported. */
-    public boolean isRetainValuesSupported()
-    {
+    /**
+     * Reports whether RetainValues is supported.
+     * @return true if RetainValues is supported.
+     */
+    public boolean isRetainValuesSupported() {
         return supportedOptions.contains(
             "javax.jdo.option.RetainValues");
     }
 
-    /** Reports whether Optimistic is supported. */
+    /**
+     * Reports whether Optimistic is supported.
+     * @return true if Optimistic is supported.
+     */
     public boolean isOptimisticSupported() {
         return supportedOptions.contains(
             "javax.jdo.option.Optimistic");
     }
 
-    /** Reports whether Application Identity is supported. */
+    /**
+     * Reports whether Application Identity is supported.
+     * @return true if Application Identity is supported.
+     */
     public boolean isApplicationIdentitySupported() {
         return supportedOptions.contains(
             "javax.jdo.option.ApplicationIdentity");
     }
 
-    /** Reports whether Datastore Identity is supported. */
+    /**
+     * Reports whether Datastore Identity is supported.
+     * @return true if Datastore Identity is supported.
+     */
     public boolean isDatastoreIdentitySupported() {
         return supportedOptions.contains(
             "javax.jdo.option.DatastoreIdentity");
     }
 
-    /** Reports whether Non-Durable Identity is supported. */
+    /**
+     * Reports whether Non-Durable Identity is supported.
+     * @return true if Non-Durable Identity is supported.
+     */
     public boolean isNonDurableIdentitySupported() {
         return supportedOptions.contains(
             "javax.jdo.option.NonDurableIdentity");
     }
 
-    /** Reports whether an <code>ArrayList</code> collection is supported. */
-    public boolean isArrayListSupported() {        
+    /**
+     * Reports whether an <code>ArrayList</code> collection is supported.
+     * @return true if an <code>ArrayList</code> collection is supported.
+     */
+    public boolean isArrayListSupported() {
         return supportedOptions.contains(
             "javax.jdo.option.ArrayList");
     }
 
-    /** Reports whether a <code>HashMap</code> collection is supported. */
+    /**
+     * Reports whether a <code>HashMap</code> collection is supported.
+     * @return true if a <code>HashMap</code> collection is supported.
+     */
     public boolean isHashMapSupported() {
         return supportedOptions.contains(
             "javax.jdo.option.HashMap");
     }
 
-    /** Reports whether a <code>Hashtable</code> collection is supported. */
+    /**
+     * Reports whether a <code>Hashtable</code> collection is supported.
+     * @return true if a <code>Hashtable</code> collection is supported.
+     */
     public boolean isHashtableSupported() {
         return supportedOptions.contains(
             "javax.jdo.option.Hashtable");
     }
 
-    /** Reports whether a <code>LinkedList</code> collection is supported. */
+    /**
+     * Reports whether a <code>LinkedList</code> collection is supported.
+     * @return true if a <code>LinkedList</code> collection is supported.
+     */
     public boolean isLinkedListSupported() {
         return supportedOptions.contains(
             "javax.jdo.option.LinkedList");
     }
 
-    /** Reports whether a <code>TreeMap</code> collection is supported. */
+    /**
+     * Reports whether a <code>TreeMap</code> collection is supported.
+     * @return true if a <code>TreeMap</code> collection is supported.
+     */
     public boolean isTreeMapSupported() {
         return supportedOptions.contains(
             "javax.jdo.option.TreeMap");
     }
 
-    /** Reports whether a <code>TreeSet</code> collection is supported. */
+    /**
+     * Reports whether a <code>TreeSet</code> collection is supported.
+     * @return true if a <code>TreeSet</code> collection is supported.
+     */
     public boolean isTreeSetSupported() {
         return supportedOptions.contains(
             "javax.jdo.option.TreeSet");
     }
 
-    /** Reports whether a <code>Vector</code> collection is supported. */
+    /**
+     * Reports whether a <code>Vector</code> collection is supported.
+     * @return true if a <code>Vector</code> collection is supported.
+     */
     public boolean isVectorSupported() {
         return supportedOptions.contains(
             "javax.jdo.option.Vector");
     }
 
-    /** Reports whether a <code>Map</code> collection is supported. */
+    /**
+     * Reports whether a <code>Map</code> collection is supported.
+     * @return true if a <code>Map</code> collection is supported.
+     */
     public boolean isMapSupported() {
         return supportedOptions.contains(
             "javax.jdo.option.Map");
     }
 
-    /** Reports whether a <code>List</code> collection is supported. */
+    /**
+     * Reports whether a <code>List</code> collection is supported.
+     * @return true if a <code>List</code> collection is supported.
+     */
     public boolean isListSupported() {
         return supportedOptions.contains(
             "javax.jdo.option.List");
     }
 
-    /** Reports whether arrays are supported. */
+    /**
+     * Reports whether arrays are supported.
+     * @return true if arrays are supported.
+     */
     public boolean isArraySupported() {
         return supportedOptions.contains(
             "javax.jdo.option.Array");
     }
 
-    /** Reports whether a null collection is supported. */
+    /**
+     * Reports whether a null collection is supported.
+     * @return true if a null collection is supported.
+     */
     public boolean isNullCollectionSupported() {
         return supportedOptions.contains(
             "javax.jdo.option.NullCollection");
     }
 
-    /** Reports whether Changing Application Identity is supported. */
+    /**
+     * Reports whether Changing Application Identity is supported.
+     * @return true if Changing Application Identity is supported.
+     */
     public boolean isChangeApplicationIdentitySupported() {
         return supportedOptions.contains(
             "javax.jdo.option.ChangeApplicationIdentity");
     }
 
-    /** Reports whether Binary Compatibility is supported. */
+    /**
+     * Reports whether Binary Compatibility is supported.
+     * @return true if Binary Compatibility is supported.
+     */
     public boolean isBinaryCompatibilitySupported() {
         return supportedOptions.contains(
             "javax.jdo.option.BinaryCompatibility");
     }
 
-    /** Reports whether UnconstrainedVariables is supported. */
+    /**
+     * Reports whether UnconstrainedVariables is supported.
+     * @return true if UnconstrainedVariables is supported.
+     */
     public boolean isUnconstrainedVariablesSupported() {
         return supportedOptions.contains(
             "javax.jdo.query.JDOQL.UnconstraintedQueryVariables");
     }
 
-    /** Reports whether BitwiseOperations is supported. */
+    /**
+     * Reports whether BitwiseOperations is supported.
+     * @return true if BitwiseOperations is supported.
+     */
     public boolean isBitwiseOperationsSupported() {
         return supportedOptions.contains(
                 "javax.jdo.query.JDOQL.bitwiseOperations");
     }
     
-    /** Reports whether SQL queries are supported. */
+    /**
+     * Reports whether SQL queries are supported.
+     * @return true if SQL queries are supported.
+     */
     public boolean isSQLSupported() {
         return supportedOptions.contains(
             "javax.jdo.query.SQL");
     }
     
-    /** Reports whether getting the DataStoreConnection is supported. */
+    /**
+     * Reports whether getting the DataStoreConnection is supported.
+     * @return true if  getting the DataStoreConnection is supported.
+     */
     public boolean isDataStoreConnectionSupported() {
         return supportedOptions.contains(
             "javax.jdo.option.GetDataStoreConnection");
     }
 
-    /** Reports whether canceling a running query is supported. */
+    /**
+     * Reports whether canceling a running query is supported.
+     * @return true if canceling a running query is supported.
+     */
     public boolean isQueryCancelSupported() {
         return supportedOptions.contains(
             "javax.jdo.option.QueryCancel");
     }
 
-    /** Reports whether setting a Datastore timout is supported. */
+    /**
+     * Reports whether setting a Datastore timout is supported.
+     * @return true if setting a Datastore timout is supported.
+     */
     public boolean isDatastoreTimeoutSupported() {
         return supportedOptions.contains(
             Constants.OPTION_DATASTORE_TIMEOUT);
     }
 
-    /** Reports whether a feature is supported */
+    /**
+     * Reports whether a feature is supported
+     * @param option the option
+     * @return true if the specified option is supported
+     */
     public boolean isSupported(String option) {
         return supportedOptions.contains(option);
     }
 
     /**
      * Determine if a class is loadable in the current environment.
+     * @param className the name of the class
+     * @return true if the class is loadable in the current environment.
      */
     public static boolean isClassLoadable(String className) {
         try {
@@ -944,8 +1041,9 @@ public abstract class JDO_Test extends TestCase {
         }
     }
 
-    /** 
+    /**
      * Determine if the environment is 1.4 version of JRE or better.
+     * @return true if 1.4 version of JRE or better.
      */
     public static boolean isJRE14orBetter() {
         return isClassLoadable("java.util.Currency");
@@ -958,8 +1056,7 @@ public abstract class JDO_Test extends TestCase {
      * @return The current state of the instance, by using the
      * <code>JDOHelper</code> state interrogation methods.
      */
-    public static String getStateOfInstance(Object o)
-    {
+    public static String getStateOfInstance(Object o) {
         boolean existingEntries = false;
         StringBuffer buff = new StringBuffer("{");
         if( JDOHelper.isPersistent(o) ){
@@ -992,12 +1089,13 @@ public abstract class JDO_Test extends TestCase {
         buff.append("}");
         return buff.toString();
     }
-    
+
     /**
      * This method will return the current lifecycle state of an instance.
+     * @param o the object
+     * @return the current lifecycle state
      */
-    public static int currentState(Object o)
-    {
+    public static int currentState(Object o) {
         boolean[] status = new boolean[NUM_STATUSES];
         status[IS_PERSISTENT]       = JDOHelper.isPersistent(o);
         status[IS_TRANSACTIONAL]    = JDOHelper.isTransactional(o);
@@ -1019,9 +1117,11 @@ public abstract class JDO_Test extends TestCase {
 
     /**
      * Tests if a found state matches an expected state.
+     * @param found_state the  found state
+     * @param expected_state the expected state
+     * @return true if the found state matches the expected state
      */
-    public static boolean compareStates(int found_state, int expected_state)
-    {
+    public static boolean compareStates(int found_state, int expected_state) {
         // status interrogation gives same values for PERSISTENT_NONTRANSACTIONAL and HOLLOW
         return (expected_state < 0
                 || found_state == expected_state
@@ -1033,6 +1133,9 @@ public abstract class JDO_Test extends TestCase {
      *  non-final fields.
      *  It returns true if the object was mangled, and false if there
      *  are no fields to mangle.
+     * @param oid the oid of the object
+     * @return a mangled object
+     * @throws Exception exception
      */
     protected boolean mangleObject (Object oid) 
         throws Exception {
@@ -1067,8 +1170,9 @@ public abstract class JDO_Test extends TestCase {
         }
         return true;
     }
-    
-    /** Returns modifiable Fields of the class of the parameter. 
+
+    /**
+     Returns modifiable Fields of the class of the parameter.
      * Fields are considered modifiable if they are not static or final.
      * This method requires several permissions in order to run with
      * a SecurityManager, hence the doPrivileged block:
@@ -1076,6 +1180,8 @@ public abstract class JDO_Test extends TestCase {
      * <li>ReflectPermission("suppressAccessChecks")</li>
      * <li>RuntimePermission("accessDeclaredMembers")</li>
      * </ul>
+     * @param obj the object
+     * @return an array of fields
      */
     protected Field[] getModifiableFields(final Object obj) {
         return (Field[])AccessController.doPrivileged(
@@ -1173,8 +1279,10 @@ public abstract class JDO_Test extends TestCase {
     /** A buffer of of error messages.
      */
     protected static StringBuffer messages;
-    
-    /** Appends to error messages.
+
+    /**
+     * Appends to error messages.
+     * @param message the message
      */
     protected static synchronized void appendMessage(String message) {
         if (messages == null) {
@@ -1183,8 +1291,12 @@ public abstract class JDO_Test extends TestCase {
         messages.append(message);
         messages.append(NL);
     }
-    
-    /** Appends to error messages.
+
+    /**
+     * Appends to error messages.
+     * @param test test option
+     * @param context context
+     * @param message message
      */
     protected static synchronized void deferredAssertTrue(boolean test,
         String context, String message) {
@@ -1193,8 +1305,12 @@ public abstract class JDO_Test extends TestCase {
         }
     }
 
-    /** Appends an error if the actual value does not equal the expected value.
+    /**
+     * Appends an error if the actual value does not equal the expected value.
      * Primitive values are autoboxed. Null values are ok for both expected and actual.
+     * @param message the message
+     * @param expected the expected value
+     * @param actual the actual value
      */
     protected void errorIfNotEqual(String message, Object expected, Object actual) {
         if (expected == null) {
@@ -1208,8 +1324,12 @@ public abstract class JDO_Test extends TestCase {
         }
     }
 
-    /** Appends an error if the actual value equals the unexpected value.
+    /**
+     * Appends an error if the actual value equals the unexpected value.
      * Primitive values are autoboxed. Null values are ok for both unexpected and actual.
+     * @param message the message
+     * @param unexpected  the unexpected value
+     * @param actual the actual value
      */
     protected void errorIfEqual(String message, Object unexpected, Object actual) {
         if (unexpected == null) {
@@ -1226,6 +1346,7 @@ public abstract class JDO_Test extends TestCase {
     /**
      * Returns collected error messages, or <code>null</code> if there
      * are none, and clears the buffer.
+     * @return collected error messages
      */
     protected static synchronized String retrieveMessages() {
         if (messages == null) {
@@ -1246,7 +1367,12 @@ public abstract class JDO_Test extends TestCase {
         }
     }
 
-    /** Validate an actual isolation level against the requested level. */
+    /**
+     * Validate an actual isolation level against the requested level.
+     * @param requested requested level
+     * @param actual actual level
+     * @return true if the actual level is greater or equal the requsted level
+     */
     protected boolean validLevelSubstitution(String requested, String actual) {
         int requestedLevel = ((Integer)levelValues.get(requested)).intValue();
         int actualLevel = ((Integer)levelValues.get(actual)).intValue();
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 dd6f88f..4ce5ae1 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
@@ -63,8 +63,9 @@ public class SignatureTest extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
     }
     
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 c5ee432..d00ae2c 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
@@ -65,9 +65,6 @@ public class FetchGroupTest extends JDO_Test {
     /** All fetch groups in this PMF. */
     protected Set allPMFFetchGroups;
 
-    /** All fetch groups in this PMF. */
-
-
     /**
      * Employee.java:
     private Date             hiredate;
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 bdde2aa..148e6cb 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
@@ -165,6 +165,7 @@ public abstract class AbstractInstanceLifecycleListener extends JDO_Test {
     /** 
      * The listener to be used for the test. This method is implemented
      * by the subclasses to use the proper listener.
+     * @return listener
      */
     protected abstract InstanceLifecycleListenerImpl getListener();
 
@@ -174,6 +175,7 @@ public abstract class AbstractInstanceLifecycleListener extends JDO_Test {
      * by this method are used for two purposes: they are used to register
      * listeners; and they are used as the teardown classes whose instances
      * are removed from the datastore at the end of the test.
+     * @return classes
      */
     protected abstract Class[] getPersistentClasses();
 
@@ -273,7 +275,7 @@ public abstract class AbstractInstanceLifecycleListener extends JDO_Test {
         public static final int PRE_STORE_LISTENER;
         public static final int POST_STORE_LISTENER;
 
-        /**
+        /*
          * Initialize the list of names and the associated values. For each
          * listener event and callback, add the name and then assign the value.
          */
@@ -450,6 +452,8 @@ public abstract class AbstractInstanceLifecycleListener extends JDO_Test {
          * position is the order, starting with 1, of the callback.
          * If the callback or listener was never invoked, the value
          * is 0.
+         * @param where where
+         * @param expected expected
          */
         public void verifyCallbacks(String where, int[] expected) {
             int[] expectedSequence = newExpected(expected);
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 384bc95..08a283c 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
@@ -67,15 +67,14 @@ public class AccessOtherInstancesInPrestore extends TestParts {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
     protected void localSetUp() {
         addTearDownClass(InstanceCallbackClass.class);
     }
     
     /** */
-    public void test() throws Exception
-    {
+    public void test() {
         pm = getPM();
         Transaction t = pm.currentTransaction();
         
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 7ce20c4..3126066 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
@@ -73,14 +73,15 @@ public class AccessingFieldsInPredelete extends TestParts {
     }
     
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(InstanceCallbackClass.class);
     }
     
     /** */
-    public void test() throws Exception {
+    public void test() {
         pm = getPM();
         Transaction t = pm.currentTransaction();
         
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 7b52d31..0aa115f 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
@@ -70,15 +70,15 @@ public class CallingJdoPostload extends JDO_Test {
     }
     
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(InstanceCallbackNonPersistFdsClass.class);
     }
     
     /** */
-    public void test() throws Exception
-    {
+    public void test() {
         pm = getPM();
         Transaction t = pm.currentTransaction();
         t.setRetainValues(false);
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 9a1ea32..5bcffe7 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
@@ -68,14 +68,15 @@ public class CallingJdoPreclear extends TestParts {
     }
     
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(InstanceCallbackClass.class);
     }
     
     /** */
-    public void test() throws Exception {
+    public void test() {
         pm = getPM();
         Transaction t = pm.currentTransaction();
         t.setRetainValues(false);  // instances transit'n to hollow after commit
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 895ab85..4d933a0 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
@@ -71,15 +71,15 @@ public class CallingJdoPredelete extends JDO_Test {
     }
     
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(InstanceCallbackClass.class);
     }
     
     /** */
-    public void test() throws Exception
-    {
+    public void test() {
         pm = getPM();
         Transaction t = pm.currentTransaction();
         
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 5c82b43..c2dc260 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
@@ -75,15 +75,15 @@ public class CallingJdoPrestore extends JDO_Test {
     }
     
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(InstanceCallbackNonPersistFdsClass.class);
     }
     
     /** */
-    public void test() throws Exception
-    {
+    public void test() {
         pm = getPM();
         Transaction t = pm.currentTransaction(); 
 
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 4803d92..7aec74a 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
@@ -66,15 +66,15 @@ public class ModificationOfNontransactionalNonpersistentFields extends JDO_Test
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(InstanceCallbackNonPersistFdsClass.class);
     }
     
     /** */
-    public void test() throws Exception
-    {
+    public void test() {
         pm = getPM();
         Transaction t = pm.currentTransaction(); 
         t.setRetainValues(false);
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 ab038ee..9d095d8 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
@@ -64,15 +64,15 @@ public class NoAccessToFieldsAfterPredelete extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(InstanceCallbackClass.class);
     }
     
     /** */
-    public void test() throws Exception
-    {
+    public void test() {
         pm = getPM();
         Transaction t = pm.currentTransaction(); 
 
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 6513b9d..8ab4ead 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
@@ -59,8 +59,9 @@ public class GetObjectId extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
     }
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 6db11b6..f971fd6 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
@@ -103,8 +103,9 @@ public class GetObjectIds extends JDO_Test {
     PersistenceManager pm2;
     
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         objs = new Object[] {
@@ -150,8 +151,9 @@ public class GetObjectIds extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localTearDown()
+     * @see org.apache.jdo.tck.JDO_Test#localTearDown()
      */
+    @Override
     protected void localTearDown() {
         pm2.close();
     }
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 58edd92..6900624 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
@@ -61,8 +61,9 @@ public class GetPersistenceManager extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
     }
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 c3c6eab..55dc55f 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
@@ -57,10 +57,11 @@ public class GetTransactionalObjectId extends JDO_Test {
     public static void main(String[] args) {
         BatchTestRunner.run(GetTransactionalObjectId.class);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
     }
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 4000232..c9e9692 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
@@ -59,8 +59,9 @@ public class IsDeleted extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
     }
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 6160725..e3093bb 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
@@ -60,8 +60,9 @@ public class IsDeletedFalse extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
     }
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 b857640..699ba3d 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
@@ -58,8 +58,9 @@ public class IsDirty extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
     }
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 9ee30b6..9bc914a 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
@@ -58,8 +58,9 @@ public class IsDirtyFalse extends JDO_Test {
     }
  
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
     }
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 4b3c210..099c047 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
@@ -58,8 +58,9 @@ public class IsNew extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
     }
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 1863558..af84946 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
@@ -58,8 +58,9 @@ public class IsPersistent extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
     }
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 72c2e20..9492e2c 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
@@ -57,8 +57,9 @@ public class IsTransactional extends JDO_Test {
     }
  
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
     }
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 3fd24bc..1f1699d 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
@@ -57,9 +57,10 @@ public class IsTransactionalFalse extends JDO_Test {
     }
  
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
-    protected void localSetUp() {
+    @Override
+	protected void localSetUp() {
         addTearDownClass(PCPoint.class);
     }
     
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 60c71ad..de76da1 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
@@ -58,8 +58,9 @@ public class MakeDirty extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
     }
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ChangingObjectIdHasNoEffectOnInstance.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ChangingObjectIdHasNoEffectOnInstance.java
index 938683f..2ef71fc 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ChangingObjectIdHasNoEffectOnInstance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/ChangingObjectIdHasNoEffectOnInstance.java
@@ -49,7 +49,9 @@ public class ChangingObjectIdHasNoEffectOnInstance extends PersistenceManagerTes
         BatchTestRunner.run(ChangingObjectIdHasNoEffectOnInstance.class);
     }
 
-    /** */
+    /**
+     * @throws Exception exception
+     */
     public void testChangingObjectIdHasNoEffectOnInstance() throws Exception {
         pm = getPM();
         Object oid = createPCPointInstance(pm);
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 1c61897..f5b453f 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
@@ -67,8 +67,12 @@ public class DataStoreConnectionThrows extends PersistenceManagerTest {
     public static void main(String[] args) {
         BatchTestRunner.run(DataStoreConnectionThrows.class);
     }
-    
-    /** */
+
+    /**
+     *
+     * @param conn connection
+     * @param call call
+     */
     protected void checkThrow(Connection conn, Call call) {
         try {
             call.execute(conn);
@@ -109,6 +113,7 @@ public class DataStoreConnectionThrows extends PersistenceManagerTest {
 
    /** 
     * These methods are defined in Java 1.3 Connection.
+    * @param conn connection
     */
     protected void check13Methods(Connection conn) {
         checkThrow(conn,
@@ -152,6 +157,7 @@ public class DataStoreConnectionThrows extends PersistenceManagerTest {
 
     /**
      * These methods are defined in Java 1.4 Connection.
+     * @param conn connection
      */
     protected void check14Methods(Connection conn) {
         checkThrow(conn,
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 f81b9e7..d6593e1 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
@@ -86,7 +86,10 @@ public class DatastoreTimeout extends JDO_Test {
         BatchTestRunner.run(DatastoreTimeout.class);
     }
 
-    /** Method testing DatastoreReadTimeout. */
+    /**
+     * Method testing DatastoreReadTimeout.
+     * @throws Exception exception
+     */
     public void testDatastoreReadTimeout() throws Exception {
 
         if (debug) logger.debug("isDatastoreTimeoutSupported:" + isDatastoreTimeoutSupported());
@@ -118,7 +121,10 @@ public class DatastoreTimeout extends JDO_Test {
         }
     }
 
-    /** Method testing DatastoreWriteTimeout. */
+    /**
+     * Method testing DatastoreWriteTimeout.
+     * @throws Exception exception
+     */
     public void testDatastoreWriteTimeout() throws Exception {
 
         if (debug) logger.debug("isDatastoreTimeoutSupported:" + isDatastoreTimeoutSupported());
@@ -150,7 +156,10 @@ public class DatastoreTimeout extends JDO_Test {
         }
     }
 
-    /** Method testing zero DatastoreReadTimeout. */
+    /**
+     * Method testing zero DatastoreReadTimeout.
+     * @throws Exception exception
+     */
     public void testZeroDatastoreReadTimeout() throws Exception {
 
         // Parallel thread writing the instances and causing them to be locked
@@ -178,7 +187,10 @@ public class DatastoreTimeout extends JDO_Test {
         }
     }
 
-    /** Method testing zero DatastoreWriteTimeout. */
+    /**
+     * Method testing zero DatastoreWriteTimeout.
+     * @throws Exception exception
+     */
     public void testZeroDatastoreWriteTimeout() throws Exception {
 
         // Parallel thread reading the instances and causing them to be locked
@@ -207,8 +219,9 @@ public class DatastoreTimeout extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCRect.class);
         addTearDownClass(PCPoint.class);
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 0737134..9cd9b67 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
@@ -163,8 +163,6 @@ public class GetPutRemoveUserObject extends JDO_Test {
     }
     
     private class UserObject {
-        /** No implementation needed for this class. It is only used
-         * with == comparisons.
-         */
+        // No implementation needed for this class. It is only usedwith == comparisons.
     }
 }
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 f8bcba2..70cac0c 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
@@ -68,77 +68,55 @@ public class OneInstanceOfObjectPerPersistenceManager extends
 	 * therefore must be identical in the same PersistenceManager.
 	 */
     public void test() {
-        /** The getPM method is declared in a superclass. 
-         * This is the standard way to get a PersistenceManager.
-         * The method automatically gets a PersistenceManagerFactory,
-         * gets a PersistenceManager, and puts the PersistenceManager into
-         * the field pm.
-         */
+        // The getPM method is declared in a superclass.
+        // This is the standard way to get a PersistenceManager.
+        // The method automatically gets a PersistenceManagerFactory, gets a PersistenceManager,
+        // and puts the PersistenceManager into the field pm.
         getPM();
-        /** This is the standard way to get a Transaction.
-         */
+        // This is the standard way to get a Transaction.
         Transaction tx = pm.currentTransaction();
 
-        /** Any values for these flags should be set before 
-         * beginning a transaction.
-         */
+        // Any values for these flags should be set before beginning a transaction.
         tx.setRetainValues(false);
         tx.setRestoreValues(false);
 
-        /** This is the standard way to begin a transaction.
-         */
+        // This is the standard way to begin a transaction.
         tx.begin();
-        /** Create new objects to be persisted.
-         */
+        // Create new objects to be persisted.
         PCPoint p1 = new PCPoint(10, 20);
         PCPoint p2 = new PCPoint(20, 40);
         PCRect rect = new PCRect(0, p1, p2);
-        /** This test relies on persistence by reachability.
-         */
+        // This test relies on persistence by reachability.
         pm.makePersistent(rect);
-        /** This is the standard way to commit a transaction.
-         */
+        // This is the standard way to commit a transaction.
         tx.commit();
 
-        /** Begin a new transaction so that the navigation 
-         * uses the object id to load the target object into the cache.
-         * The RetainValues flag false guarantees that the object fields
-         * are no longer loaded.
-         */
+        // Begin a new transaction so that the navigation uses the object id to load the target object
+        // into the cache. The RetainValues flag false guarantees that the object fields are no longer loaded.
         tx.begin();
         Object p1Id = pm.getObjectId(p1);
-        /** Retrieves the field values from the datastore.
-         */
+        // Retrieves the field values from the datastore.
         PCPoint p1a = (PCPoint)pm.getObjectById(p1Id, true);
-        /** Navigate to the point.
-         */
+        // Navigate to the point.
         PCPoint p1b = rect.getUpperLeft();
-        /** Query for the point by its values in the datastore.
-         */
+        // Query for the point by its values in the datastore.
         PCPoint p1c = findPoint(10, 20);
         tx.commit();
         tx = null;
 
-        /** Use a StringBuffer to collect results.
-         */
+        // Use a StringBuffer to collect results.
         StringBuffer results = new StringBuffer();
 
-        /** Compare the original object with the object obtained
-         * by getObjectById.
-         */
+        // Compare the original object with the object obtained by getObjectById.
         if (p1 != p1a) {
             results.append("getObjectById results differ. ");
         }
 
-        /** Compare the original object with the object obtained
-         * by navigating from another object.
-         */
+        // Compare the original object with the object obtained by navigating from another object.
         if (p1 != p1b) {
             results.append("navigation results differ. ");
         }
-        /** Compare the original object with the object obtained
-         * by query.
-         */
+        // Compare the original object with the object obtained by query.
         if (p1 != p1c) {
             results.append("query results differ. ");
         }
@@ -146,11 +124,8 @@ public class OneInstanceOfObjectPerPersistenceManager extends
             fail(ASSERTION_FAILED + results.toString());
         }
 
-    /** The standard way to end each test method is to simply return.
-     * Exceptions are caught by JUnit.
-     * The tearDown method ends the transaction and closes
-     * the PersistenceManager.
-     */
+        // The standard way to end each test method is to simply return. Exceptions are caught by JUnit.
+        // The tearDown method ends the transaction and closes the PersistenceManager.
     }
 
     /** */
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 3cfe253..e547faa 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
@@ -75,8 +75,9 @@ public class OptimisticFailure extends PersistenceManagerTest {
     private Object p5oid = null;
     
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(VersionedPCPoint.class);
     }
@@ -229,8 +230,12 @@ public class OptimisticFailure extends PersistenceManagerTest {
                 tx1.rollback();
         }
     }
-    
-    /** */
+
+    /**
+     *
+     * @param p PCPoint instance
+     * @param value value
+     */
     protected void verify(VersionedPCPoint p, int value) {
         if (p.getX() != value) {
             fail(ASSERTION_FAILED,
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 d39953e..52b7982 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
@@ -34,8 +34,9 @@ public abstract class PersistenceManagerTest extends JDO_Test {
     protected PersistenceManagerTest() { }
 
     /** 
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         // The order of addTearDownClass calls is significant
         // as it takes into account database FKs.
@@ -44,8 +45,12 @@ public abstract class PersistenceManagerTest extends JDO_Test {
         addTearDownClass(Department.class);
         addTearDownClass(Company.class);
     }
-    
-    /** */
+
+    /**
+     *
+     * @param pm the PersistenceManager
+     * @return PCPOint instance
+     */
     protected Object createPCPointInstance(PersistenceManager pm) {
         PCPoint p1 = new PCPoint(8,8);
         Transaction tx = pm.currentTransaction();
@@ -55,8 +60,12 @@ public abstract class PersistenceManagerTest extends JDO_Test {
         tx.commit();
         return oid;
     }
-  
-    /** */
+
+    /**
+     *
+     * @param pm the PersistenceManager
+     * @param oid the ID of the instance to be deleted
+     */
     public void deletePCPointInstance (PersistenceManager pm, Object oid) {
         Transaction tx = pm.currentTransaction();
         tx.begin();
@@ -65,7 +74,13 @@ public abstract class PersistenceManagerTest extends JDO_Test {
         tx.commit();
     }
 
-    /** */
+    /**
+     *
+     * @param obj PCPoint instance
+     * @param expectState expected state
+     * @param str state description
+     * @return true if test successful
+     */
     public boolean testState(PCPoint obj, int expectState, String str) {
         int actualState = currentState(obj);
         if (actualState != expectState) {
@@ -80,7 +95,13 @@ public abstract class PersistenceManagerTest extends JDO_Test {
         return true;
     }
 
-    /** */
+    /**
+     *
+     * @param obj PCPoint instance
+     * @param expectState expected state
+     * @param str state description
+     * @return true if test successful
+     */
     public boolean testState(PCPoint2 obj, int expectState, String str) {
         int actualState = currentState(obj);
         if (actualState != expectState) {
@@ -94,8 +115,14 @@ public abstract class PersistenceManagerTest extends JDO_Test {
         }
         return true;
     }
-    
-    /** */
+
+    /**
+     *
+     * @param p PCPoint instance
+     * @param value value
+     * @param assertion assertion
+     * @param label label
+     */
     public void assertGetX(PCPoint p, int value, String assertion, String label) {
         if (p.getX() !=  value) {
             fail(assertion, label);
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 4e23f0a..004fd4a 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
@@ -63,7 +63,10 @@ public class ThreadSafe extends PersistenceManagerTest {
     private int successCount = 0;
     private int exceptionCount = 0;
 
-    /** */
+    /**
+     *
+     * @throws Exception exception
+     */
     public void testThreadSafe() throws Exception  {
         if (debug) logger.debug("\nSTART testThreadSafe");
         
@@ -93,7 +96,12 @@ public class ThreadSafe extends PersistenceManagerTest {
                    + "shared transient PC)", 1);
     }
 
-    /** */
+    /**
+     *
+     * @param pc objects
+     * @param header header
+     * @param toSucceed to succeed
+     */
     public void runThreads(Object[] pc, String header, int toSucceed) {
         // start threads with their pc instance
         final Thread[] threads = new Thread[threadCount];
@@ -118,7 +126,11 @@ public class ThreadSafe extends PersistenceManagerTest {
         checkResults(header, toSucceed);
     }
 
-    /** */
+    /**
+     *
+     * @param header header
+     * @param toSucceed to succeed
+     */
     protected synchronized void checkResults(String header, int toSucceed) {
         // check unhandled exceptions
         final Set uncaught = group.getAllUncaughtExceptions();
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 2bd825a..7b09ca4 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
@@ -71,8 +71,10 @@ public class CallingEvictAllWithCollectionContainingNulls extends PersistenceMan
         pm.close();
         pm = null;
     }
-    
-    /** */
+
+    /**
+     * @param pm the PersistenceManager
+     */
     private void createObjects(PersistenceManager pm) {
         Transaction tx = pm.currentTransaction();
         try {
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 83429ff..7b6bbeb 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
@@ -72,7 +72,9 @@ public class CallingRefreshAllWithCollectionContainingNulls extends PersistenceM
         pm = null;
     }
 
-    /** */
+    /**
+     * @param pm the PersistenceManager
+     */
     private void createObjects(PersistenceManager pm) {
         Transaction tx = pm.currentTransaction();
         try {
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 f650f92..c9020ad 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
@@ -68,8 +68,10 @@ public class EvictAllWithNoParameters extends PersistenceManagerTest {
         pm.close();
         pm = null;
     }
-    
-    /** */
+
+    /**
+     * @param pm the PersistenceManager
+     */
     private void createObjects(PersistenceManager pm) {
         Transaction tx = pm.currentTransaction();
         try {
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 bd542d8..79c0414 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
@@ -66,8 +66,9 @@ public class EvictingCollectionOfInstancesSideEffects extends PersistenceManager
     private PCPoint2 p2 = null;
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint2.class);
         super.localSetUp();
@@ -82,8 +83,10 @@ public class EvictingCollectionOfInstancesSideEffects extends PersistenceManager
         pm.close();
         pm = null;
     }
-    
-    /** */
+
+    /**
+     * @param pm the PersistenceManager
+     */
     private void createObjects(PersistenceManager pm) {
         Transaction tx = pm.currentTransaction();
         try {
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 f5b53a4..d046de0 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
@@ -62,8 +62,9 @@ public class EvictingWithRestoreValuesFalse extends PersistenceManagerTest {
     }	
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint2.class);
         super.localSetUp();
@@ -100,7 +101,10 @@ public class EvictingWithRestoreValuesFalse extends PersistenceManagerTest {
 		return pt;
     }
 
-    /** */
+    /**
+     *
+     * @param pt PCPont2 instance
+     */
     private void makePersistentClean(PCPoint2 pt) {
 		pm.makeTransactional(pt);
         int curr = currentState(pt);
@@ -110,7 +114,10 @@ public class EvictingWithRestoreValuesFalse extends PersistenceManagerTest {
         }
     }
 
-	/** */
+    /**
+     *
+     * @param pt PCPoint2 instance
+     */
     private void verify(PCPoint2 pt) {
 		// When PersistenceManager evicts instances, it: calls the jdoPreClear method on each instance
         if ( !pt.wasClearCalled()) {
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 3f857d0..b221a42 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
@@ -59,11 +59,12 @@ public class EvictingWithRetainValuesFalse extends PersistenceManagerTest {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(EvictingWithRetainValuesFalse.class);
-    }	
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint2.class);
         super.localSetUp();
@@ -108,7 +109,10 @@ public class EvictingWithRetainValuesFalse extends PersistenceManagerTest {
 		return pt;
     }
 
-    /** */
+    /**
+     *
+     * @param pt PCPoint2 instance
+     */
     private void makePersistentClean(PCPoint2 pt) {
 		pm.makeTransactional(pt);
         int curr = currentState(pt);
@@ -118,7 +122,10 @@ public class EvictingWithRetainValuesFalse extends PersistenceManagerTest {
         }
     }
 
-	/** */
+    /**
+     *
+     * @param pt PCPoint2 instance
+     */
     private void verify(PCPoint2 pt) {
 		// When PersistenceManager evicts instances, it: calls the jdoPreClear method on each instance
         if ( !pt.wasClearCalled()) {
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 9350429..f599c39 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
@@ -64,7 +64,10 @@ public class PassingNullToEvictAllThrowsException extends PersistenceManagerTest
         pm = null;
     }
 
-    /* test evictAll (Collection pcs) */
+    /**
+     * test evictAll (Collection pcs)
+     * @param pm the PersistenceManager
+     */
     private void runTestEvictAll1(PersistenceManager pm) {
         Transaction tx = pm.currentTransaction();
         if (debug) logger.debug ("**  in runTestEvictAll1() ");
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 8a5f7e6..0e93a8a 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
@@ -62,7 +62,10 @@ public class PassingNullToEvictHasNoEffect extends PersistenceManagerTest {
         pm = null;
     }
     
-    /* test evict (object pc) */
+    /**
+     * test evict (object pc)
+     * @param pm the PersistenceManager
+     */
     public void runTestPassingNullToEvictHasNoEffect(PersistenceManager pm) {
         Transaction tx = pm.currentTransaction();
         try {
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 aa0b169..4356436 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
@@ -66,7 +66,10 @@ public class PassingNullToRefreshAllThrowsException
         pm = null;
     }
 
-    /* test refreshAll (Collection pcs) */
+    /**
+     * test refreshAll (Collection pcs)
+     * @param pm the PersistenceManager
+     */
     public void runTestRefreshAll1(PersistenceManager pm) {
         Transaction tx = pm.currentTransaction();
         if (debug) logger.debug("**  in runTestRefreshAll1() ");
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 69a19b4..577a59c 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
@@ -62,7 +62,10 @@ public class PassingNullToRefreshHasNoEffect extends PersistenceManagerTest {
         pm = null;
     }
 
-    /* test evict (object pc) */
+    /**
+     *  test evict (object pc)
+     * @param pm the PersistenceManager
+     */
     private void runTestPassingNullToRefreshHasNoEffect(PersistenceManager pm) {
         Transaction tx = pm.currentTransaction();
         try {
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 0efb978..6f5eb90 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
@@ -39,8 +39,6 @@ the occurrence of commit failures due to mismatch between the state of cached in
 data in the data store.)) This can be tested by using 2 PersistenceManagers, independently change an object,
 then refresh.
  */
-
-/** */
 public class RefreshAllNoParameterSideEffects extends PersistenceManagerTest {
     
     /** */
@@ -51,8 +49,6 @@ public class RefreshAllNoParameterSideEffects extends PersistenceManagerTest {
     PersistenceManager pm1;
     PersistenceManager pm2;
     PersistenceManager pmVerify;
-    
-    /** */
 
     /**
      * The <code>main</code> is called when the class
@@ -76,7 +72,7 @@ public class RefreshAllNoParameterSideEffects extends PersistenceManagerTest {
     }
 
     /** */
-    public void test() throws Exception {
+    public void test() {
         if (!isOptimisticSupported()) {
             printUnsupportedOptionalFeatureNotTested(
                 "RefreshAllNoParameterSideEffect",
@@ -104,10 +100,12 @@ public class RefreshAllNoParameterSideEffects extends PersistenceManagerTest {
         }
         failOnError();
     }
-    
-    /** */
-    private void runTestRefreshAllNoParameterSideEffects(boolean doRefresh)
-            throws Exception {
+
+    /**
+     *
+     * @param doRefresh doRefresh flag
+     */
+    private void runTestRefreshAllNoParameterSideEffects(boolean doRefresh) {
 
         if (debug) logger.debug ("\nSTART RefreshAllNoParameterSideEffects");
 
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 4048a43..a669efe 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
@@ -42,9 +42,6 @@ the occurrence of commit failures due to mismatch between the state of cached in
 data in the data store.)) This can be tested by using 2 PersistenceManagers, independently change an object,
 then refresh.
  */
-
-
-/** */
 public class RefreshAllSideEffects extends PersistenceManagerTest {
     
     /** */
@@ -58,8 +55,6 @@ public class RefreshAllSideEffects extends PersistenceManagerTest {
     PersistenceManager pmVerify;
     Collection coll = new ArrayList(); // Collection of persistent instances
     boolean useCollection = true;
-    
-    /** */
 
     /**
      * The <code>main</code> is called when the class
@@ -88,19 +83,19 @@ public class RefreshAllSideEffects extends PersistenceManagerTest {
     }
 
     /** */
-    public void testRefreshAllWithCollection() throws Exception {
+    public void testRefreshAllWithCollection() {
         useCollection = true;
         runtest();
     }
 
     /** */
-    public void testRefreshAllWithArray() throws Exception {
+    public void testRefreshAllWithArray() {
         useCollection = false;
         runtest();
     }
 
     /** */
-    private void runtest() throws Exception {
+    private void runtest() {
         if (!isOptimisticSupported()) {
             printUnsupportedOptionalFeatureNotTested(
                 "RefreshAllSideEffects",
@@ -130,8 +125,7 @@ public class RefreshAllSideEffects extends PersistenceManagerTest {
     }
     
     /** */
-    private void runTestRefreshAllSideEffects(boolean doRefresh)
-            throws Exception {
+    private void runTestRefreshAllSideEffects(boolean doRefresh) {
 
         if (debug) logger.debug ("\nSTART RefreshAllSideEffects");
 
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 becd951..724ff5d 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
@@ -73,7 +73,9 @@ public class RefreshAllWithNoParameters extends PersistenceManagerTest {
         pm = null;
     }
     
-    /** */
+    /**
+     * @param pm the PersistenceManager
+     */
     private void runTestRefreshAll(PersistenceManager pm) {
         Transaction tx = pm.currentTransaction();
         try {
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 3c1ef34..54a9c69 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
@@ -44,8 +44,6 @@ import org.apache.jdo.tck.util.ThreadExceptionHandler;
  data in the data store.)) This can be tested by using 2 PersistenceManagers, independently change an object,
  then refresh.
  */
-
-/** */
 public class RefreshSideEffects extends PersistenceManagerTest {
     
     /** */
@@ -64,7 +62,9 @@ public class RefreshSideEffects extends PersistenceManagerTest {
         BatchTestRunner.run(RefreshSideEffects.class);
     }
 
-    /** */
+    /**
+     * @throws Exception exception
+     */
     public void test () throws Exception {
         PersistenceManagerFactory pmf = getPMF();
         PersistenceManager pm1 = pmf.getPersistenceManager();
@@ -81,7 +81,12 @@ public class RefreshSideEffects extends PersistenceManagerTest {
         }
     }
 
-    /** */
+    /**
+     *
+     * @param pm1 the first PersistenceManager
+     * @param pm2 the second PersistenceManager
+     * @throws Exception
+     */
     private void runTestRefreshSideEffects(PersistenceManager pm1, 
                                            PersistenceManager pm2) throws Exception {
         if (debug) logger.debug ("\nSTART RefreshSideEffects");
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 7ec3c45..478c59f 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
@@ -74,8 +74,9 @@ public class Retrieve extends PersistenceManagerTest {
     private static final Integer three = new Integer(3);
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint2.class);
         addTearDownClass(PCRect.class);
@@ -98,7 +99,9 @@ public class Retrieve extends PersistenceManagerTest {
         pm = null;
     }
 
-    /** */
+    /**
+     * @param pm the PersistenceManager
+     */
     private void runTestRetrieve(PersistenceManager pm) {
         createObjects(pm);
         Transaction tx = pm.currentTransaction();
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 554af58..641a24a 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
@@ -51,8 +51,6 @@ public class CopyOnAttachFalse extends DetachTest {
         BatchTestRunner.run(CopyOnAttachFalse.class);
     }
 
-    /** */
-
     /** 
      */
     public void testAttachClean() {
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 8f8a465..8b5d24a 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
@@ -74,7 +74,10 @@ public class DetachSerialize extends DetachTest {
         failOnError();
     }
 
-    /** Detach the parameter instance.
+    /**
+     * Detach the parameter instance.
+     * @param pc pc instance
+     * @return detached instance
      */
     protected Object detachClosure(Object pc) {
         byte[] cartStream = serialize(pc);
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 34b5d91..35030f6 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
@@ -56,7 +56,10 @@ public abstract class DetachTest extends JDO_Test {
     public DetachTest() {
     }
 
-    /** */
+    /**
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
+     */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CartEntry.class);
         addTearDownClass(Cart.class);
@@ -88,7 +91,12 @@ public abstract class DetachTest extends JDO_Test {
         fp.setMaxFetchDepth(2);
     }
 
-    /** */
+    /**
+     *
+     * @param location location
+     * @param obj object
+     * @param persistent persistent option
+     */
     protected void checkState(String location, Object obj, 
             boolean persistent) {
         if(persistent) {
@@ -103,7 +111,12 @@ public abstract class DetachTest extends JDO_Test {
                 states[currentState(obj)] + " " + getStateOfInstance(obj));
     }
 
-    /** */
+    /**
+     *
+     * @param location location
+     * @param expected  expected value
+     * @param actual actual value
+     */
     protected void reportDifference(String location, 
             long expected, long actual) {
         appendMessage(location + NL +
@@ -111,20 +124,34 @@ public abstract class DetachTest extends JDO_Test {
                 "actual: " + actual);
     }
 
-    /** */
-    protected void reportDifference(String location, 
+    /**
+     *
+     * @param location location
+     * @param expected  expected value
+     * @param actual actual value
+     */
+    protected void reportDifference(String location,
             Object expected, Object actual) {
         appendMessage(location + NL +
                 "expected: " + expected + NL +
                 "  actual: " + actual);
     }
 
-    /** */
+    /**
+     *
+     * @param location location
+     * @param cart cart
+     */
     protected void checkCartValues(String location, Cart cart) {
         checkCartValues(location, cart, false);
     }
 
-    /** */
+    /**
+     *
+     * @param location location
+     * @param cart cart
+     * @param persistent persistent option
+     */
     protected void checkCartValues(String location, Cart cart,
             boolean persistent) {
         checkState(location + "Cart instance", cart, persistent);
@@ -165,7 +192,11 @@ public abstract class DetachTest extends JDO_Test {
         }
     }
 
-    /** */
+    /**
+     *
+     * @param ASSERTION_FAILED assertion
+     * @return cart
+     */
     protected Cart createDetachedInstance(String ASSERTION_FAILED) {
         getPM().currentTransaction().begin();
         setCartFetchGroups();
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 0afca03..a366865 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
@@ -58,7 +58,9 @@ public class SetDetachAllOnCommit extends DetachTest {
         pm = null;
     }
 
-    /** */
+    /**
+     * @param pm the PersistenceManager
+     */
     protected void runTestSetDetachAllOnCommit(PersistenceManager pm) {
         pm.setDetachAllOnCommit(false);
         if (pm.getDetachAllOnCommit()) {
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 b71e8a9..567dfe0 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
@@ -59,8 +59,9 @@ public class GetExtentWithSubclasses extends PersistenceManagerTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FullTimeEmployee.class);
         addTearDownClass(PartTimeEmployee.class);
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 f7ac04b..b900db9 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
@@ -26,17 +26,14 @@ 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;
-
 /**
  * This class is an abstract superclass for the fetch plan tests.
  * It contains methods useful for testing the behavior of the
  * fetch plan.
  */
-
 public class AbstractFetchPlanTest extends JDO_Test {
 
-    /**
+    /*
      * The <code>main</code> method is not defined in this abstract class.
      */
 
@@ -63,8 +60,9 @@ public class AbstractFetchPlanTest extends JDO_Test {
     protected String[] bothGroup = new String[]{
         "default", "PCRect.upperLeft", "PCRect.lowerRight"};
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCRect.class);
         addTearDownClass(PCPoint.class);
@@ -107,13 +105,21 @@ public class AbstractFetchPlanTest extends JDO_Test {
         fp.setGroups(bothGroup);
     }
 
-    /** */
+    /**
+     *
+     * @param location location
+     * @param pcrect PCREct instance
+     */
     protected void checkBothLoaded(String location, PCRect pcrect) {
         checkUpperLeftLoaded(location, pcrect);
         checkLowerRightLoaded(location, pcrect);
     }
 
-    /** */
+    /**
+     *
+     * @param location location
+     * @param pcrect PCREct instance
+     */
     protected void checkUpperLeftLoaded(String location, PCRect pcrect) {
         if (pcrect.upperLeft == null) {
             appendMessage(location + NL + "Upper Left was null." + NL +
@@ -122,7 +128,11 @@ public class AbstractFetchPlanTest extends JDO_Test {
         }
     }
 
-    /** */
+    /**
+     *
+     * @param location location
+     * @param pcrect pc instance
+     */
     protected void checkLowerRightLoaded(String location, PCRect pcrect) {
         if (pcrect.lowerRight == null) {
             appendMessage(location + NL + "Lower Right was null." + NL +
@@ -130,7 +140,14 @@ public class AbstractFetchPlanTest extends JDO_Test {
                 " should have been loaded.");
         }
     }
-    protected void checkGroups(String location, 
+
+    /**
+     *
+     * @param location location
+     * @param fetchPlan fetch plan
+     * @param groups groups
+     */
+    protected void checkGroups(String location,
             FetchPlan fetchPlan, String[] groups) {
         Collection expected = new HashSet();
         Collection actual = fetchPlan.getGroups();
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 13983b8..834d662 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
@@ -17,7 +17,6 @@
  
 package org.apache.jdo.tck.api.persistencemanager.fetchplan;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
@@ -99,14 +98,20 @@ public class FetchPlanInterface extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCRect.class);
         addTearDownClass(PCPoint.class);
     }
 
-    /** */
+    /**
+     *
+     * @param expected expected value
+     * @param actual actual value
+     * @return true if equal
+     */
     protected boolean setEquals
             (Collection expected, Collection actual) {
         if (expected == actual) 
@@ -118,15 +123,25 @@ public class FetchPlanInterface extends JDO_Test {
         return expectedSet.equals(actualSet);
     }
 
-    /** */
-    protected void failCompare(String message, 
+    /**
+     *
+     * @param message message
+     * @param expected expected value
+     * @param actual actual value
+     */
+    protected void failCompare(String message,
             Object expected, Object actual) {
         appendMessage(ASSERTION_FAILED + message);
         appendMessage("expected: " + expected);
         appendMessage("actual: " + actual);
     }
 
-    /** */
+    /**
+     *
+     * @param message message
+     * @param expected expected value
+     * @param actual actual value
+     */
     protected void failCompare(String message, 
             int expected, int actual) {
         appendMessage(ASSERTION_FAILED + message);
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 3ca558d..b267e04 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
@@ -56,14 +56,6 @@ public class FetchPlanIsCopy extends AbstractFetchPlanTest {
         BatchTestRunner.run(FetchPlanIsCopy.class);
     }
 
-    /**
-     * @see JDO_Test#localSetUp()
-    protected void localSetUp() {
-        addTearDownClass(PCRect.class);
-        addTearDownClass(PCPoint.class);
-    }
-     */
-
     /** */
     public void testRemoveGroup() {
         beginFPTest();
@@ -132,7 +124,10 @@ public class FetchPlanIsCopy extends AbstractFetchPlanTest {
         extent = pm.getExtent(PCRect.class);
     }
 
-    /** */
+    /**
+     *
+     * @param location location
+     */
     public void closeFPTest(String location) {
         // check that pm fetch plan is unchanged
         checkGroups(ASSERTION_FAILED + " " + location, 
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 636bcf8..f72f742 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
@@ -27,7 +27,7 @@ import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
 /**
  *<B>Title:</B> Set IgnoreCache To False
  *<BR>
- *<B>Keywords:cache
+ *<B>Keywords:cache</B>
  *<BR>
  *<B>Assertion ID:</B> A12.5.3-3.
  *<BR>
@@ -63,7 +63,9 @@ public class SetIgnoreCacheToFalse extends PersistenceManagerTest {
         pm = null;
     }
 
-    /** */
+    /**
+     * @param pm the PersistenceManager
+     */
     private void runTestSetIgnoreCacheToFalse(PersistenceManager pm) {
         Transaction tx = pm.currentTransaction();
         try {
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 d607ed0..cb44296 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
@@ -27,7 +27,7 @@ import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
 /**
  *<B>Title:</B> Set IgnoreCache To True
  *<BR>
- *<B>Keywords:cache
+ *<B>Keywords:cache</B>
  *<BR>
  *<B>Assertion ID:</B> A12.5.3-2.
  *<BR>
@@ -64,7 +64,9 @@ public class SetIgnoreCacheToTrue extends PersistenceManagerTest {
         pm = null;
     }
 
-    /** */
+    /**
+     * @param pm the PersistenceManager
+     */
     public void runTestSetIgnoreCacheToTrue(PersistenceManager pm) {
         Transaction tx = pm.currentTransaction();
         try {
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 f41e275..dd9aecc 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
@@ -61,8 +61,10 @@ public class SetMultithreadedFalse extends PersistenceManagerTest{
         pm.close();
         pm = null;
     }
-    
-    /** */
+
+    /**
+     * @param pm the PersistenceManager
+     */
     private void runTestSetMultithreadedFalse(PersistenceManager pm) {
         Transaction tx = pm.currentTransaction();
         try {
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 c2a35dc..f365e53 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
@@ -61,8 +61,10 @@ public class SetMultithreadedTrue extends PersistenceManagerTest {
         pm.close();
         pm = null;
     }
-    
-    /** */
+
+    /**
+     * @param pm the PersistenceManager
+     */
     public void runTestSetMultithreadedTrue(PersistenceManager pm) {
         Transaction tx = pm.currentTransaction();
         try {
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 36767e2..9df12d4 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
@@ -26,7 +26,7 @@ import org.apache.jdo.tck.api.persistencemanager.PersistenceManagerTest;
 /**
  *<B>Title:</B> Setting Flags With Transaction instance
  *<BR>
- *<B>Keywords:
+ *<B>Keywords:</B>
  *<BR>
  *<B>Assertion ID:</B> A12.5.2-3.
  *<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 34be995..c4332be 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
@@ -90,8 +90,9 @@ public class GetObjectsById extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         getPM().currentTransaction().begin();
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 6206454..fae4588 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
@@ -82,7 +82,10 @@ public class MakeTransactional extends PersistenceManagerTest{
         p4 = new PCPoint(4,6);
     }
 
-    /** */
+    /**
+     *
+     * @param pm the PersistenceManager
+     */
     public void testMakeTransactional(PersistenceManager pm) {
         Transaction tx = pm.currentTransaction();
         try {
@@ -103,7 +106,10 @@ public class MakeTransactional extends PersistenceManagerTest{
         }
     }
 
-    /** */
+    /**
+     *
+     * @param pm the PersistenceManager
+     */
     public void testMakeTransactionalAll1(PersistenceManager pm) {
         Transaction tx = pm.currentTransaction();
         try {
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 fe63c18..8d9472c 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
@@ -296,7 +296,11 @@ public class MakeTransactionalANontransactionalPersistentInstance extends Persis
         }
     }
 
-    /** */
+    /**
+     *
+     * @param obj the PCPoint instance
+     * @return true
+     */
     public boolean makePersistentNonTranInstance (PCPoint obj) {
         int val = obj.getX();
         int curr = currentState(obj);
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 3000679..ae898ec 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
@@ -170,7 +170,10 @@ public class MakeTransactionalPriorToTransactionRolledback extends PersistenceMa
         }
     }
 
-    /** */
+    /**
+     *
+     * @param pm the PersistenceManager
+     */
     public void runTestMakeTransactionalPriorToTransactionRolledbackAll2(
         PersistenceManager pm) {
         Transaction tx = pm.currentTransaction();
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 02a8c42..1961c9e 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
@@ -93,8 +93,11 @@ public class MakeTransactionalWithinTransactionRolledback extends PersistenceMan
         col2.add(p4);
         col2.add(p5);
     }
-    
-    /** */
+
+    /**
+     *
+     * @param pm the PersistenceManager
+     */
     public void runTestMakeTransactionalWithinTransactionRolledback(PersistenceManager pm) {
         Transaction tx = pm.currentTransaction();
         try {
@@ -119,7 +122,10 @@ public class MakeTransactionalWithinTransactionRolledback extends PersistenceMan
         }
     }
 
-    /** */
+    /**
+     *
+     * @param pm the PersistenceManager
+     */
     private void runTestMakeTransactionalWithinTransactionRolledbackAll1(PersistenceManager pm) {
         Transaction tx = pm.currentTransaction();
         try {
@@ -151,7 +157,10 @@ public class MakeTransactionalWithinTransactionRolledback extends PersistenceMan
         }
     }
 
-    /** */
+    /**
+     *
+     * @param pm the PersistenceManager
+     */
     private void runTestMakeTransactionalWithinTransactionRolledbackAll2(PersistenceManager pm) {
         Transaction tx = pm.currentTransaction();
         try {
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 843d978..7e7fc74 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
@@ -44,17 +44,6 @@ import org.apache.jdo.tck.pc.mylib.PCPoint;
 public class PersistenceManagerNullsTest extends JDO_Test {
 
     /**
-    public static interface MethodUnderTest {
-        public void pmApi(PersistenceManager pm, Object obj);
-        public void pmApi(PersistenceManager pm, Collection coll);
-        public void pmApi(PersistenceManager pm, Object[] objs);
-        public Object pmApiReturn(PersistenceManager pm, Object obj);
-        public Collection pmApiReturn(PersistenceManager pm,  Collection coll);
-        public Object[] pmApiReturn(PersistenceManager pm, Object [ ] objs);
-    }
-     */
-
-    /**
      */
     public static class MethodUnderTest {
         public void pmApi(PersistenceManager pm, Object obj) {
@@ -98,8 +87,9 @@ public class PersistenceManagerNullsTest extends JDO_Test {
     protected PersistenceManagerNullsTest() { }
 
     /** 
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         // The order of addTearDownClass calls is significant
         // as it takes into account database FKs.
@@ -194,8 +184,10 @@ public class PersistenceManagerNullsTest extends JDO_Test {
         return true;
     }
 
-    /** 
+    /**
      * Test that method under test with null valued argument does nothing.
+     * @param mut method under test
+     * @param method method name
      */
     public void executeNullObjectParameter(MethodUnderTest mut, String method) {
 
@@ -226,6 +218,8 @@ public class PersistenceManagerNullsTest extends JDO_Test {
     /** 
      * Test that the method under test with null valued Collection argument
      * throws NullPointerException.
+     * @param mut method under test
+     * @param method method name
      */
     public void executeNullCollectionParameter(MethodUnderTest mut,
             String method) {
@@ -262,6 +256,8 @@ public class PersistenceManagerNullsTest extends JDO_Test {
     /** 
      * Test that the method under test with null valued array argument
      * throws NullPointerException.
+     * @param mut method under test
+     * @param method method name
      */
     public void executeNullArrayParameter(MethodUnderTest mut,
                 String method) {
@@ -296,6 +292,9 @@ public class PersistenceManagerNullsTest extends JDO_Test {
     /** 
      * Test that the method under test with a null element of a 
      * Collection argument ignores the null element.
+     * @param coll collection argument
+     * @param mut method under test
+     * @param method method name
      */
     public void executeCollectionNullElement(Collection coll,
             MethodUnderTest mut, String method) {
@@ -325,6 +324,9 @@ public class PersistenceManagerNullsTest extends JDO_Test {
     /** 
      * Test that the method under test with a null element of a 
      * array argument ignores the null element.
+     * @param array argument
+     * @param mut method under test
+     * @param method method name
      */
     public void executeArrayNullElement(Object[] array, MethodUnderTest mut,
                 String method) {
@@ -354,6 +356,8 @@ public class PersistenceManagerNullsTest extends JDO_Test {
 
     /** 
      * Test that method under test with null valued argument does nothing.
+     * @param mut method under test
+     * @param method method name
      */
     public void executeNullObjectParameterReturn(MethodUnderTest mut, 
             String method) {
@@ -392,6 +396,8 @@ public class PersistenceManagerNullsTest extends JDO_Test {
     /** 
      * Test that the method under test with null valued Collection argument
      * throws NullPointerException.
+     * @param mut method under test
+     * @param method method name
      */
     public void executeNullCollectionParameterReturn( MethodUnderTest mut, 
             String method) {
@@ -433,6 +439,8 @@ public class PersistenceManagerNullsTest extends JDO_Test {
     /** 
      * Test that the method under test with null valued array argument
      * throws NullPointerException.
+     * @param mut method under test
+     * @param method method name
      */
     public void executeNullArrayParameterReturn(MethodUnderTest mut, 
             String method) {
@@ -472,6 +480,9 @@ public class PersistenceManagerNullsTest extends JDO_Test {
     /** 
      * Test that the method under test with a null element of a 
      * Collection argument ignores the null element.
+     * @param coll argument
+     * @param mut method under test
+     * @param method method name
      */
     public void executeCollectionNullElementReturn(Collection coll,
             MethodUnderTest mut, String method) {
@@ -507,6 +518,9 @@ public class PersistenceManagerNullsTest extends JDO_Test {
     /** 
      * Test that the method under test with a null element of a 
      * array argument ignores the null element.
+     * @param obj argument
+     * @param mut method under test
+     * @param method method name
      */
     public void executeArrayNullElementReturn(Object[] obj,
             MethodUnderTest mut, String method) {
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 e70d7c7..8d47d43 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
@@ -75,6 +75,7 @@ abstract class AbstractGetPMF extends JDO_Test {
     
     /**
      * Removing the path prefix from argument <code>name</code>.
+     * @param name the name
      * @return argument <code>name</code> removed by the path prefix.
      */
     protected String removePathPrefix(String name) {
@@ -133,9 +134,11 @@ abstract class AbstractGetPMF extends JDO_Test {
         verifyProperties(pmf, loadProperties(validPropertiesFile));
         makePersistent();
     }
-    
-    /** 
+
+    /**
      * Verify that the Properties are correctly set in the PMF.
+     * @param pmf the PersistenceManagerFactory
+     * @param props the Properties
      */
     protected void verifyProperties(PersistenceManagerFactory pmf,
             Properties props) {
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 2839d5f..ee42c18 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
@@ -127,7 +127,10 @@ public class AfterGetPersistenceManagerNoSetMethodsSucceed extends JDO_Test {
         runTest(true);
     }
 
-    /** */
+    /**
+     *
+     * @param bUserAndPasswd flag whether to use user nad password
+     */
     public void runTest(boolean bUserAndPasswd) {       
         pmf = getPMF();
         if (!bUserAndPasswd)
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 d876c26..5d1d2fc 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
@@ -149,8 +149,11 @@ public class CloseFailsIfTransactionActive extends JDO_Test {
             }
         }
     }
-    
-    /** */
+
+    /**
+     *
+     * @param pmf the PersistenceManagerFactory
+     */
     protected void cleanupPMF(PersistenceManagerFactory pmf) {
         try {
             closePMF(pmf); // don't use closePMF() because that sets pmf to null
@@ -183,13 +186,20 @@ public class CloseFailsIfTransactionActive extends JDO_Test {
     protected void setAborted() {
         aborted = true;
     }
-    
-    /** */
+
+    /**
+     *
+     * @return true if aborted
+     */
     protected boolean isAborted() {
         return aborted;
     }
 
-    /** */
+    /**
+     *
+     * @param ex JDOException
+     * @return arry of failed PersistenceManager
+     */
     protected PersistenceManager[] getFailedPersistenceManagers(JDOException ex) {
         Throwable[] nesteds = ex.getNestedExceptions();
         int numberOfExceptions = nesteds==null ? 0 : nesteds.length;
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 bfa527d..5b6ecd2 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
@@ -65,8 +65,9 @@ public class FlushThrowsIfReadOnly extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(Company.class);
         Properties properties = loadProperties(PMFProperties);
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 e1cd519..89d252f 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
@@ -58,8 +58,9 @@ public class GetPersistenceManagerFactoryByPropertiesInstance extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(Company.class);
         PMFPropertiesObject = loadProperties(PMFProperties);
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/config/JDOConfigListener.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/config/JDOConfigListener.java
index 1005a14..b3930c6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/config/JDOConfigListener.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/config/JDOConfigListener.java
@@ -27,11 +27,11 @@ import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**
  *<B>Title:</B>JDOConfigListener
- *<BR/>
+ *<BR>
  *<B>Keywords:</B> persistencemanagerfactory, jdoconfig.xml
- *<BR/>
+ *<BR>
  *<B>Assertion IDs:</B> A11.1-40
- *<BR/>
+ *<BR>
  *<B>Assertion Description: </B>
  Properties whose key begins with the prefix
  * "javax.jdo.listener.InstanceLifecycleListener." have special treatment.
@@ -69,8 +69,9 @@ public class JDOConfigListener extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         /* Instance can be persisted ONLY if javax.jdo.mapping.Schema
          *   is overriden with 
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/config/Jdoconfig.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/config/Jdoconfig.java
index 12ae23e..bb8dd75 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/config/Jdoconfig.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/config/Jdoconfig.java
@@ -27,11 +27,11 @@ import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**
  *<B>Title:</B>Close of PersistenceManagerFactory  
- *<BR/>
+ *<BR>
  *<B>Keywords:</B> persistencemanagerfactory, jdoconfig.xml
- *<BR/>
+ *<BR>
  *<B>Assertion IDs:</B> A11.1.2-1
- *<BR/>
+ *<BR>
  *<B>Assertion Description: </B>
  * Users can access a PersistenceManagerFactory by creating a jdoconfig.xml file
  * and making it available on the class path as META-INF/jdoconfig.xml.
@@ -60,8 +60,9 @@ public class Jdoconfig extends JDO_Test {
     }
     
         /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         /* Instance can be persisted ONLY if javax.jdo.mapping.Schema
          *   is overriden with 
@@ -149,7 +150,10 @@ public class Jdoconfig extends JDO_Test {
         checkPersistent(name);
     }
 
-    /** */
+    /**
+     *
+     * @param name the name
+     */
     public void checkIsOpen(String name) {
         assertEquals("Incorrect PMF name", name, privatePmf.getName());
         if (privatePmf.isClosed()) {
@@ -165,6 +169,7 @@ public class Jdoconfig extends JDO_Test {
      * Checks if instance can be persisted. Can be used if
      *    javax.jdo.mapping.Schema is overriden with the correct value
      *    with JDOHelper.getPersistenceManagerFactory(Map overrides, ...).
+     * @param name the name
      */
     public void checkPersistent(String name) {
         assertEquals("Incorrect PMF name", name, privatePmf.getName());
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/config/Persistence.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/config/Persistence.java
index 724239f..8ad6d2c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/config/Persistence.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/config/Persistence.java
@@ -30,11 +30,11 @@ import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**
  *<B>Title:</B>Close of PersistenceManagerFactory  
- *<BR/>
+ *<BR>
  *<B>Keywords:</B> persistencemanagerfactory, jdoconfig.xml
- *<BR/>
+ *<BR>
  *<B>Assertion IDs:</B> A8.7-1
- *<BR/>
+ *<BR>
  *<B>Assertion Description: </B>
  * The application provides a resource named META-INF/persistence.xml and
  * optionally META-INF/services/javax.persistence.EntityManagerFactory which 
@@ -109,7 +109,9 @@ public class Persistence extends JDO_Test {
         runTest(name);
     }
 
-    /** */
+    /**
+     * @param name the name
+     */
     public void runTest(String name) {
         String actualPUName = pmf.getPersistenceUnitName();
         assertEquals("Incorrect PersistenceUnitName", name, actualPUName);
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 b27b333..c5cbc53 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
@@ -43,7 +43,11 @@ public abstract class EnhancerTest extends JDO_Test {
     public EnhancerTest() {
     }
 
-    /** */
+    /**
+     *
+     * @param resourceName name of teh resource
+     * @return Properties object
+     */
     protected Properties getProperties(String resourceName) {
         Properties props = null;
         try {
@@ -58,25 +62,32 @@ public abstract class EnhancerTest extends JDO_Test {
         return props;
     }
     
-    /** */
+    /**
+     *
+     * @param packageName package name
+     * @param fullyQualifiedClassNameList list of class names
+     */
     protected abstract void runTestOnePackage (String packageName, List fullyQualifiedClassNameList);
     
-    /** */
+    /**
+     *
+     * @param packageName package name
+     * @param className class name
+     * @return converted class name
+     */
     protected String convertClassName (String packageName, String className) {
         return packageName + "." + className;
     }
 
     /** */
     void runTestAllPackages() {
-        /** First, get classes to test from properties file.
-         */
+        // First, get classes to test from properties file.
         Properties classesToTest = getProperties("enhancement-test.properties"); //NOI18N
         
         Enumeration enumeration = classesToTest.propertyNames();
         int numberOfPackages = 0;
         
-        /** Each key is a package name; the value is a list of class names to test.
-         */
+        // Each key is a package name; the value is a list of class names to test.
         while (enumeration.hasMoreElements()) {
             ++numberOfPackages;
             String packageName = (String) enumeration.nextElement();
@@ -85,8 +96,7 @@ public abstract class EnhancerTest extends JDO_Test {
             if (debug) logger.debug("EnhancerTest Classes: " + classNames);
             StringTokenizer st = new StringTokenizer(classNames, " ,");
             ArrayList classNameList = new ArrayList();
-            /** Each entry is a list of class names separated by comma or space
-             */
+            // Each entry is a list of class names separated by comma or space
             while (st.hasMoreTokens()) {
                 String className = st.nextToken();
                 String listEntry = convertClassName(packageName, className);
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 2aa7e62..95c7f80 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
@@ -17,7 +17,6 @@
 
 package org.apache.jdo.tck.extents;
 
-
 import java.lang.reflect.Constructor;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -54,8 +53,9 @@ abstract class ExtentTest extends JDO_Test {
     protected Object companyOID;
     
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(DentalInsurance.class);
         addTearDownClass(MedicalInsurance.class);
@@ -80,8 +80,7 @@ abstract class ExtentTest extends JDO_Test {
     /** */
     protected void checkPM() {
         try {
-            /** Don't use beginTransaction() because this calls getPM()
-             * which calls checkPM()! */
+            // Don't use beginTransaction() because this calls getPM() which calls checkPM()!
             pm.currentTransaction().begin();
             Extent ex = getPM().getExtent(Company.class, false);
             int count = countIterator(ex.iterator());
@@ -185,8 +184,11 @@ abstract class ExtentTest extends JDO_Test {
         pm.currentTransaction().commit();
         // System.out.println ("Company OID: " + pm.getObjectId(company));
     }
-    
-    /** */
+
+    /**
+     *
+     * @return new employee
+     */
     protected Employee addEmployee() {
         Address addr1 = new Address (7004L, "456 Chelsey Lane", 
                                      "Mountain View", "CA", "94040", "USA");
@@ -195,20 +197,30 @@ abstract class ExtentTest extends JDO_Test {
         getPM().makePersistent (emp1);
         return emp1;
     }
-    
-    /** */
+
+    /**
+     *
+     * @param e employee
+     */
     protected void deleteEmployee(Employee e) {
         getPM().deletePersistent (e);
     }
 
-    /** */
+    /**
+     *
+     * @param it iterator
+     * @return count
+     */
     protected int countIterator(Iterator it) {
         int count = 0;
         for (;it.hasNext();count++, it.next());
         return count;
     }
     
-    /** */
+    /**
+     * @param it iterator
+     * @return count
+     */
     protected int printIterator(Iterator it) {
         int count = 0;
         for (;it.hasNext();count++) {
@@ -216,13 +228,19 @@ abstract class ExtentTest extends JDO_Test {
         }
         return count;
     }
-    
-    /** */
+
+    /**
+     *
+     * @return extent
+     */
     protected Extent getExtent() {
         return getPM().getExtent(extentClass, true);
     }
-    
-    /** */
+
+    /**
+     *
+     * @return OID
+     */
     protected Object getCompanyOID () {
         String companyOIDString = (String)
             PMFPropertiesObject.get("org.apache.jdo.tck.extents.CompanyOID");
@@ -244,8 +262,11 @@ abstract class ExtentTest extends JDO_Test {
                 "\torg.apache.jdo.tck.extents.CompanyOIDClass = <name of companyOID class>\n", ex);
         }
     }
-    
-    /** */
+
+    /**
+     *
+     * @return PersistenceManager
+     */
     protected PersistenceManager getPM() {
         if (pm == null) {
             pm = getPMF().getPersistenceManager();
@@ -253,8 +274,11 @@ abstract class ExtentTest extends JDO_Test {
         }
         return pm;
     }
-    
-    /** */
+
+    /**
+     *
+     * @return PersistenceManagerFactory
+     */
     public PersistenceManagerFactory getPMF() {
         if (pmf == null) {
             pmf = super.getPMF();
diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/HollowInstanceMaintainsPK.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/HollowInstanceMaintainsPK.java
index d287b3d..2bcf485 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/HollowInstanceMaintainsPK.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/HollowInstanceMaintainsPK.java
@@ -49,8 +49,9 @@ public class HollowInstanceMaintainsPK extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCRect.class);
         addTearDownClass(PCPoint.class);
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 3cca1ed..5f9caf4 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
@@ -62,9 +62,10 @@ public class MultiplePMsReturnInstancesRepresentingSamePC extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
-    protected void localSetUp() {
+    @Override
+	protected void localSetUp() {
         pm = getPM();
         addTearDownClass(StateTransitionObj.class);
         obj = generatePersistentInstances();
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 8267dab..04028df 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,7 +18,6 @@
 package org.apache.jdo.tck.lifecycle;
 
 import javax.jdo.JDOOptimisticVerificationException;
-import javax.jdo.JDOUnsupportedOptionException;
 
 import javax.jdo.PersistenceManager;
 
@@ -26,8 +25,6 @@ import org.apache.jdo.tck.JDO_Test;
 
 import org.apache.jdo.tck.pc.mylib.VersionedPCPoint;
 
-import org.apache.jdo.tck.util.BatchTestRunner;
-
 /**
  *<B>Title:</B> Test NontransactionalWrite abstract base class
  *<BR>
@@ -62,6 +59,7 @@ abstract public class NontransactionalWriteTest extends JDO_Test {
      * This method is only executed if the
      * JDO implementation supports the required features, otherwise
      * this method would be localSetUp.
+     * @return PCPoint instance
      */
     protected VersionedPCPoint createAndModifyVersionedPCPoint() {
         addTearDownClass(VersionedPCPoint.class);
@@ -103,6 +101,7 @@ abstract public class NontransactionalWriteTest extends JDO_Test {
      * Begin and commit a transaction using the persistence manager
      * that manages the nontransactional dirty instance. This 
      * transaction must fail due to a conflicting update.
+     * @param location location for error message
      * @param optimistic use optimistic transaction
      */
     protected void beginAndCommitTransactionFails(String location, 
@@ -125,6 +124,8 @@ abstract public class NontransactionalWriteTest extends JDO_Test {
      * value in a new transaction so there is no interference 
      * with the persistence manager that managed the nontransactional
      * dirty instance.
+     * @param location location for error message
+     * @param expectedXValue expected value
      */
     protected void checkXValue(String location, int expectedXValue) {
         PersistenceManager pmCheck = pmf.getPersistenceManager();
@@ -167,6 +168,7 @@ abstract public class NontransactionalWriteTest extends JDO_Test {
     /** 
      * Check that all Nontransactional features are supported.
      * @param optimistic check for whether Optimistic is supported as well.
+     * @return true if nontransactional supported
      */
     protected boolean checkNontransactionalFeaturesSupported
             (boolean optimistic) {
@@ -185,6 +187,7 @@ abstract public class NontransactionalWriteTest extends JDO_Test {
     /**
      * Check if NontransactionalWrite is supported, and log a debug
      * message if it is not.
+     * @return true if NontransactionalWriteSupported
      */
     protected boolean checkNontransactionalWriteSupported() {
         if (!isNontransactionalWriteSupported()) {
@@ -199,6 +202,7 @@ abstract public class NontransactionalWriteTest extends JDO_Test {
     /**
      * Check if NontransactionalRead is supported, and log a debug
      * message if it is not.
+     * @return true NontransactionalReadSupported
      */
     protected boolean checkNontransactionalReadSupported() {
         if (!isNontransactionalReadSupported()) {
@@ -213,6 +217,7 @@ abstract public class NontransactionalWriteTest extends JDO_Test {
     /**
      * Check if Optimistic is supported, and log a debug
      * message if it is not.
+     * @return true if optimistic is supported
      */
     protected boolean checkOptimisticSupported() {
         if (!isOptimisticSupported()) {
@@ -227,6 +232,7 @@ abstract public class NontransactionalWriteTest extends JDO_Test {
     /**
      * Check if RetainValues is supported, and log a debug
      * message if it is not.
+     * @return true if retain values is supported
      */
     protected boolean checkRetainValuesSupported() {
         if (!isRetainValuesSupported()) {
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 fe3774e..adce0ec 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
@@ -61,8 +61,9 @@ public class ObjectIdNotModifiedWhenObjectIdInstanceModified extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         pm = getPM();
         addTearDownClass(StateTransitionObj.class);
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 ece624f..7d1f54e 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
@@ -59,9 +59,10 @@ public class PMReturnsIdenticalInstancesForEqualObjIds extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
-    protected void localSetUp() {
+    @Override
+	protected void localSetUp() {
         pm = getPM();
         addTearDownClass(StateTransitionObj.class);
         obj = generatePersistentInstances();
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 a282402..5d97448 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
@@ -80,8 +80,9 @@ public class PMsCanSharePCClassesButNotPCInstances extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(StateTransitionObj.class);
     }
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 dd0d1a9..c73ce4e 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
@@ -392,8 +392,9 @@ public class StateTransitions extends JDO_Test {
     };
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         pm = getPM();
         addTearDownClass(StateTransitionObj.class);
@@ -445,7 +446,10 @@ public class StateTransitions extends JDO_Test {
         return ret;
     }
 
-    /** */
+    /**
+     *
+      * @param transaction the transaction
+     */
     public void prepareTransactionAndJDOSettings(Transaction transaction) {
             transaction.setNontransactionalRead(false);
             transaction.setNontransactionalWrite(false);
@@ -788,6 +792,8 @@ public class StateTransitions extends JDO_Test {
 
     /**
      * Get an instance in the specified state.
+     * @param state the state
+     * @return instance in the specified state.
      */
     public StateTransitionObj getInstanceInState(int state)
     {
@@ -823,7 +829,10 @@ public class StateTransitions extends JDO_Test {
         }
     }
 
-    /** */
+    /**
+     *
+     * @return transient instance
+     */
     public StateTransitionObj getTransientInstance()
     {
         StateTransitionObj obj = new StateTransitionObj(23);
@@ -838,7 +847,10 @@ public class StateTransitions extends JDO_Test {
         return obj;
     }
 
-    /** */
+    /**
+     *
+     * @return persistent new instance
+     */
     public StateTransitionObj getPersistentNewInstance()
     {
         StateTransitionObj obj = getTransientInstance();
@@ -855,8 +867,11 @@ public class StateTransitions extends JDO_Test {
         }
         return obj;
     }
-    
-    /** */
+
+    /**
+     *
+     * @return persistent clean instance
+     */
     public StateTransitionObj getPersistentCleanInstance()
     {
         StateTransitionObj obj = getHollowInstance();
@@ -874,8 +889,11 @@ public class StateTransitions extends JDO_Test {
         }
         return obj;
     }
-    
-    /** */
+
+    /**
+     *
+     * @return persistent dirty instance
+     */
     public StateTransitionObj getPersistentDirtyInstance()
     {
         StateTransitionObj obj = getHollowInstance();
@@ -894,7 +912,10 @@ public class StateTransitions extends JDO_Test {
         return obj;
     }
 
-    /** */
+    /**
+     *
+     * @return hollow instance
+     */
     public StateTransitionObj getHollowInstance()
     {
         if ( !transaction.isActive() )
@@ -928,8 +949,11 @@ public class StateTransitions extends JDO_Test {
         }
         return obj;
     }
-    
-    /** */
+
+    /**
+     *
+     * @return transient clean instance
+     */
     public StateTransitionObj getTransientCleanInstance()
     {
         StateTransitionObj obj = getTransientInstance();
@@ -947,7 +971,10 @@ public class StateTransitions extends JDO_Test {
         return obj;
     }
 
-    /** */
+    /**
+     *
+     * @return transient dirty instance
+     */
     public StateTransitionObj getTransientDirtyInstance()
     {
         StateTransitionObj obj = getTransientCleanInstance();
@@ -966,7 +993,10 @@ public class StateTransitions extends JDO_Test {
         return obj;
     }
 
-    /** */
+    /**
+     *
+     * @return persitent new deleted instance
+     */
     public StateTransitionObj getPersistentNewDeletedInstance()
     {
         StateTransitionObj obj = getPersistentNewInstance();
@@ -983,8 +1013,11 @@ public class StateTransitions extends JDO_Test {
         }
         return obj;
     }
-    
-    /** */
+
+    /**
+     *
+     * @return persitent deleted instance
+     */
     public StateTransitionObj getPersistentDeletedInstance()
     {
         StateTransitionObj obj = getHollowInstance();
@@ -1002,7 +1035,10 @@ public class StateTransitions extends JDO_Test {
         return obj;
     }
 
-    /** */
+    /**
+     *
+     * @return persient nontransactional instance
+     */
     public StateTransitionObj getPersistentNontransactionalInstance()
     {
         StateTransitionObj obj = getHollowInstance();
@@ -1025,7 +1061,10 @@ public class StateTransitions extends JDO_Test {
         return obj;
     }
 
-    /** */
+    /**
+     *
+     * @return persient nontransactional dirty instance
+     */
     public StateTransitionObj getPersistentNontransactionalDirtyInstance()
     {
         StateTransitionObj obj = getPersistentNontransactionalInstance();
@@ -1043,7 +1082,10 @@ public class StateTransitions extends JDO_Test {
         return obj;
     }
 
-    /** */
+    /**
+     *
+     * @return detached clean instance
+     */
     public StateTransitionObj getDetachedCleanInstance()
     {
         StateTransitionObj obj = getHollowInstance();
@@ -1061,7 +1103,10 @@ public class StateTransitions extends JDO_Test {
         return obj;
     }
 
-    /** */
+    /**
+     *
+     * @return detached dirty instance
+     */
     public StateTransitionObj getDetachedDirtyInstance()
     {
         StateTransitionObj obj = getHollowInstance();
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 5c7d7f6..ac3f22a 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
@@ -188,8 +188,9 @@ public class StateTransitionsReturnedObjects extends JDO_Test {
     };
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         pm = getPM();
         addTearDownClass(StateTransitionObj.class);
@@ -241,7 +242,10 @@ public class StateTransitionsReturnedObjects extends JDO_Test {
         return ret;
     }
 
-    /** */
+    /**
+     *
+     * @param transaction the transaction
+     */
     public void prepareTransactionAndJDOSettings(Transaction transaction) {
         if( scenario != NO_TX ) {
             transaction.setNontransactionalRead(false);
@@ -446,6 +450,8 @@ public class StateTransitionsReturnedObjects extends JDO_Test {
 
     /**
      * Get an instance in the specified state.
+     * @param state the state
+     * @return instance in the specified state.
      */
     public StateTransitionObj getInstanceInState(int state)
     {
@@ -481,7 +487,10 @@ public class StateTransitionsReturnedObjects extends JDO_Test {
         }
     }
 
-    /** */
+    /**
+     *
+     * @return transient instance
+     */
     public StateTransitionObj getTransientInstance()
     {
         StateTransitionObj obj = new StateTransitionObj(23);
@@ -496,7 +505,10 @@ public class StateTransitionsReturnedObjects extends JDO_Test {
         return obj;
     }
 
-    /** */
+    /**
+     *
+     * @return persistent new instance
+     */
     public StateTransitionObj getPersistentNewInstance()
     {
         StateTransitionObj obj = getTransientInstance();
@@ -513,8 +525,11 @@ public class StateTransitionsReturnedObjects extends JDO_Test {
         }
         return obj;
     }
-    
-    /** */
+
+    /**
+     *
+     * @return persistent clean instance
+     */
     public StateTransitionObj getPersistentCleanInstance()
     {
         StateTransitionObj obj = getHollowInstance();
@@ -532,8 +547,11 @@ public class StateTransitionsReturnedObjects extends JDO_Test {
         }
         return obj;
     }
-    
-    /** */
+
+    /**
+     *
+     * @return persistent dirty instance
+     */
     public StateTransitionObj getPersistentDirtyInstance()
     {
         StateTransitionObj obj = getHollowInstance();
@@ -552,7 +570,10 @@ public class StateTransitionsReturnedObjects extends JDO_Test {
         return obj;
     }
 
-    /** */
+    /**
+     *
+     * @return hollow instance
+     */
     public StateTransitionObj getHollowInstance()
     {
         if ( !transaction.isActive() )
@@ -586,8 +607,11 @@ public class StateTransitionsReturnedObjects extends JDO_Test {
         }
         return obj;
     }
-    
-    /** */
+
+    /**
+     *
+     * @return transient clean instance
+     */
     public StateTransitionObj getTransientCleanInstance()
     {
         StateTransitionObj obj = getTransientInstance();
@@ -605,7 +629,10 @@ public class StateTransitionsReturnedObjects extends JDO_Test {
         return obj;
     }
 
-    /** */
+    /**
+     *
+     * @return transient dirty instance
+     */
     public StateTransitionObj getTransientDirtyInstance()
     {
         StateTransitionObj obj = getTransientCleanInstance();
@@ -624,7 +651,10 @@ public class StateTransitionsReturnedObjects extends JDO_Test {
         return obj;
     }
 
-    /** */
+    /**
+     *
+     * @return persistent new deleted instance
+     */
     public StateTransitionObj getPersistentNewDeletedInstance()
     {
         StateTransitionObj obj = getPersistentNewInstance();
@@ -641,8 +671,11 @@ public class StateTransitionsReturnedObjects extends JDO_Test {
         }
         return obj;
     }
-    
-    /** */
+
+    /**
+     *
+     * @return persistent deleted instance
+     */
     public StateTransitionObj getPersistentDeletedInstance()
     {
         StateTransitionObj obj = getHollowInstance();
@@ -660,7 +693,10 @@ public class StateTransitionsReturnedObjects extends JDO_Test {
         return obj;
     }
 
-    /** */
+    /**
+     *
+     * @return persistent nontransactional instance
+     */
     public StateTransitionObj getPersistentNontransactionalInstance()
     {
         StateTransitionObj obj = getHollowInstance();
@@ -683,7 +719,10 @@ public class StateTransitionsReturnedObjects extends JDO_Test {
         return obj;
     }
 
-    /** */
+    /**
+     *
+     * @return persistent nontransactional dirty instance
+     */
     public StateTransitionObj getPersistentNontransactionalDirtyInstance()
     {
         StateTransitionObj obj = getPersistentNontransactionalInstance();
@@ -701,7 +740,10 @@ public class StateTransitionsReturnedObjects extends JDO_Test {
         return obj;
     }
 
-    /** */
+    /**
+     *
+     * @return detached clean instance
+     */
     public StateTransitionObj getDetachedCleanInstance()
     {
         StateTransitionObj obj = getHollowInstance();
@@ -719,7 +761,10 @@ public class StateTransitionsReturnedObjects extends JDO_Test {
         return obj;
     }
 
-    /** */
+    /**
+     *
+     * @return detached dirty instance
+     */
     public StateTransitionObj getDetachedDirtyInstance()
     {
         StateTransitionObj obj = getHollowInstance();
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 5c38190..b3cc729 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
@@ -39,8 +39,9 @@ public class AbstractRelationshipTest extends AbstractReaderTest {
     protected final boolean isTestToBePerformed = isTestToBePerformed();
     
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         if (isTestToBePerformed()) {
             getPM();
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 7597d66..197fc2a 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
@@ -56,8 +56,9 @@ public class CompletenessTest extends AbstractReaderTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         if (isTestToBePerformed()) {
             getPM();
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 4ff6b19..0919236 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
@@ -59,8 +59,9 @@ public class CompletenessTestJPA extends AbstractReaderTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         if (runsWithApplicationIdentity()) {
             getPM();
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 2874349..5c4a857 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
@@ -59,8 +59,9 @@ public class CompletenessTestList extends AbstractReaderTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         if (isTestToBePerformed) {
             getPM();
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 5f2ab22..e2cfe7c 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
@@ -59,8 +59,9 @@ public class CompletenessTestMap extends AbstractReaderTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         if (isTestToBePerformed) {
             getPM();
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 b62016f..5283010 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
@@ -54,8 +54,9 @@ public class CompletenessTestOrder extends AbstractReaderTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         if (runsWithApplicationIdentity()) {
             getPM();
diff --git a/tck/src/main/java/org/apache/jdo/tck/mapping/Relationship1To1AllRelationships.java b/tck/src/main/java/org/apache/jdo/tck/mapping/Relationship1To1AllRelationships.java
index 91ff2aa..6109dd1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/mapping/Relationship1To1AllRelationships.java
+++ b/tck/src/main/java/org/apache/jdo/tck/mapping/Relationship1To1AllRelationships.java
@@ -65,6 +65,7 @@ public class Relationship1To1AllRelationships extends AbstractRelationshipTest {
     /**
      * @see AbstractRelationshipTest#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         super.localSetUp();
         if (isTestToBePerformed) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/mapping/Relationship1To1NoRelationships.java b/tck/src/main/java/org/apache/jdo/tck/mapping/Relationship1To1NoRelationships.java
index 59ff787..f3a86f2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/mapping/Relationship1To1NoRelationships.java
+++ b/tck/src/main/java/org/apache/jdo/tck/mapping/Relationship1To1NoRelationships.java
@@ -64,6 +64,7 @@ public class Relationship1To1NoRelationships extends AbstractRelationshipTest {
     /**
      * @see AbstractRelationshipTest#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         super.localSetUp();
         if (isTestToBePerformed) {
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 e82b197..d8fa5e7 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
@@ -70,6 +70,7 @@ public class Relationship1ToManyAllRelationships extends AbstractRelationshipTes
     /**
      * @see AbstractRelationshipTest#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         super.localSetUp();
         if (isTestToBePerformed) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/mapping/Relationship1ToManyNoRelationships.java b/tck/src/main/java/org/apache/jdo/tck/mapping/Relationship1ToManyNoRelationships.java
index 0a60f57..72a0228 100644
--- a/tck/src/main/java/org/apache/jdo/tck/mapping/Relationship1ToManyNoRelationships.java
+++ b/tck/src/main/java/org/apache/jdo/tck/mapping/Relationship1ToManyNoRelationships.java
@@ -64,6 +64,7 @@ public class Relationship1ToManyNoRelationships extends AbstractRelationshipTest
     /**
      * @see AbstractRelationshipTest#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         super.localSetUp();
         if (isTestToBePerformed) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/mapping/RelationshipManyToManyAllRelationships.java b/tck/src/main/java/org/apache/jdo/tck/mapping/RelationshipManyToManyAllRelationships.java
index 9a1f02d..83bf559 100644
--- a/tck/src/main/java/org/apache/jdo/tck/mapping/RelationshipManyToManyAllRelationships.java
+++ b/tck/src/main/java/org/apache/jdo/tck/mapping/RelationshipManyToManyAllRelationships.java
@@ -66,6 +66,7 @@ public class RelationshipManyToManyAllRelationships
     /**
      * @see AbstractRelationshipTest#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         super.localSetUp();
         if (isTestToBePerformed) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/mapping/RelationshipManyToManyNoRelationships.java b/tck/src/main/java/org/apache/jdo/tck/mapping/RelationshipManyToManyNoRelationships.java
index d943b3a..7a5a0eb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/mapping/RelationshipManyToManyNoRelationships.java
+++ b/tck/src/main/java/org/apache/jdo/tck/mapping/RelationshipManyToManyNoRelationships.java
@@ -63,6 +63,7 @@ public class RelationshipManyToManyNoRelationships extends AbstractRelationshipT
     /**
      * @see AbstractRelationshipTest#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         super.localSetUp();
         if (isTestToBePerformed) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/mapping/RelationshipNegative1To1Test.java b/tck/src/main/java/org/apache/jdo/tck/mapping/RelationshipNegative1To1Test.java
index 562dad1..b0e07a6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/mapping/RelationshipNegative1To1Test.java
+++ b/tck/src/main/java/org/apache/jdo/tck/mapping/RelationshipNegative1To1Test.java
@@ -66,6 +66,7 @@ public class RelationshipNegative1To1Test extends AbstractRelationshipTest {
     /**
      * @see AbstractRelationshipTest#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         super.localSetUp();
         if (isTestToBePerformed) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/mapping/RelationshipNegative1ToManyTest.java b/tck/src/main/java/org/apache/jdo/tck/mapping/RelationshipNegative1ToManyTest.java
index 7a5d57f..0ffc5c3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/mapping/RelationshipNegative1ToManyTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/mapping/RelationshipNegative1ToManyTest.java
@@ -63,6 +63,7 @@ public class RelationshipNegative1ToManyTest extends AbstractRelationshipTest {
     /**
      * @see AbstractRelationshipTest#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         super.localSetUp();
         if (isTestToBePerformed) {
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 fb0b829..9f5e10f 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
@@ -54,8 +54,9 @@ public class SecondClassObjectsTrackTheirChanges extends JDO_Test {
     }
     
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(Company.class);
     }
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 5f47e17..9774987 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
@@ -60,8 +60,9 @@ public class TestArrayCollections extends JDO_Test {
     }   
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(ArrayCollections.class);
         addTearDownClass(SimpleClass.class);
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 8949dff..0293d59 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
@@ -60,8 +60,9 @@ public class TestArrayListCollections extends JDO_Test {
     }   
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(ArrayListCollections.class);
         addTearDownClass(SimpleClass.class);
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 4b4af8b..06059c9 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
@@ -60,8 +60,9 @@ public class TestCollectionCollections extends JDO_Test {
     }   
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CollectionCollections.class);
         addTearDownClass(SimpleClass.class);
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 9ce36c9..6ae6500 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
@@ -52,11 +52,12 @@ public class TestFieldsOfBigDecimal extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfBigDecimal.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfBigDecimal.class);
     }
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 73a2ee4..5014f56 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
@@ -52,11 +52,12 @@ public class TestFieldsOfBigInteger extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfBigInteger.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfBigInteger.class);
     }
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 301afca..dadfbff 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
@@ -50,11 +50,12 @@ public class TestFieldsOfBoolean extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfBoolean.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfBoolean.class);
     }
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 f34f1fe..eadff87 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
@@ -51,11 +51,12 @@ public class TestFieldsOfByte extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfByte.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfByte.class);
     }
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 caee957..9d2da09 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
@@ -51,11 +51,12 @@ public class TestFieldsOfCharacter extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfCharacter.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfCharacter.class);
     }
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 34e1cb1..8abb446 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
@@ -52,11 +52,12 @@ public class TestFieldsOfDate extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfDate.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfDate.class);
     }
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 107e595..3ebe6a2 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
@@ -51,11 +51,12 @@ public class TestFieldsOfDouble extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfDouble.class);
-    }  
-    
+    }
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfDouble.class);
     }
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 ceceefa..9a38c8a 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
@@ -52,11 +52,12 @@ public class TestFieldsOfFloat extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfFloat.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfFloat.class);
     }
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 a682a45..1f604c2 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
@@ -50,11 +50,12 @@ public class TestFieldsOfInteger extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfInteger.class);
-    } 
-    
+    }
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfInteger.class);
     }
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 06de880..de3a72c 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
@@ -52,11 +52,12 @@ public class TestFieldsOfLocale extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfLocale.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfLocale.class);
     }
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 1fddfe7..c16e3ef 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
@@ -51,11 +51,12 @@ public class TestFieldsOfLong extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfLong.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfLong.class);
     }
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 b53c074..9415c4d 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
@@ -54,11 +54,12 @@ public class TestFieldsOfObject extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfObject.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfObject.class);
     }
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 2e7fe1f..0b06ec8 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
@@ -48,11 +48,12 @@ public class TestFieldsOfPrimitiveboolean extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfPrimitiveboolean.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfPrimitiveboolean.class);
     }
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 8458bc0..550cae3 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
@@ -49,11 +49,12 @@ public class TestFieldsOfPrimitivebyte extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfPrimitivebyte.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfPrimitivebyte.class);
     }
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 dfb18e9..78c14c6 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
@@ -49,11 +49,12 @@ public class TestFieldsOfPrimitivechar extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfPrimitivechar.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfPrimitivechar.class);
     }
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 85e369c..02f434e 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
@@ -49,11 +49,12 @@ public class TestFieldsOfPrimitivedouble extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfPrimitivedouble.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfPrimitivedouble.class);
     }
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 52e4839..e7ed741 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
@@ -49,11 +49,12 @@ public class TestFieldsOfPrimitivefloat extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfPrimitivefloat.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfPrimitivefloat.class);
     }
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 cb0ec92..57ed942 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
@@ -49,11 +49,12 @@ public class TestFieldsOfPrimitiveint extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfPrimitiveint.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfPrimitiveint.class);
     }
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 411ecdf..5b6d63d 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
@@ -49,11 +49,12 @@ public class TestFieldsOfPrimitivelong extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfPrimitivelong.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfPrimitivelong.class);
     }
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 536d24a..e2b1037 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
@@ -48,11 +48,12 @@ public class TestFieldsOfPrimitiveshort extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfPrimitiveshort.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfPrimitiveshort.class);
     }
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 c836bcd..9bf6a0f 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
@@ -51,11 +51,12 @@ public class TestFieldsOfShort extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfShort.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfShort.class);
     }
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 b0f1377..f86096d 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
@@ -50,11 +50,12 @@ public class TestFieldsOfSimpleClass extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfSimpleClass.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfSimpleClass.class);
     }
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 5454a6c..f64557f 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
@@ -50,10 +50,11 @@ public class TestFieldsOfSimpleEnum extends JDO_Test {
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfSimpleEnum.class);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfSimpleEnum.class);
     }
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 53cab80..64d0bf6 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
@@ -52,11 +52,12 @@ public class TestFieldsOfSimpleInterface extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfSimpleInterface.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfSimpleInterface.class);
     }
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 458c34b..3ac0607 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
@@ -51,11 +51,12 @@ public class TestFieldsOfString extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestFieldsOfString.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfString.class);
     }
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 7a61bc6..2b69511 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
@@ -60,11 +60,12 @@ public class TestHashMapStringKeyCollections extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestHashMapStringKeyCollections.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(HashMapStringKeyCollections.class);
         addTearDownClass(SimpleClass.class);
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 811d229..eb1a56e 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
@@ -58,11 +58,12 @@ public class TestHashMapStringValueCollections extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestHashMapStringValueCollections.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(HashMapStringValueCollections.class);
         addTearDownClass(SimpleClass.class);
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 36be815..979e87a 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
@@ -59,11 +59,12 @@ public class TestHashSetCollections extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestHashSetCollections.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(HashSetCollections.class);
         addTearDownClass(SimpleClass.class);
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 5c0ae5e..d4993ed 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
@@ -60,11 +60,12 @@ public class TestHashtableStringKeyCollections extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestHashtableStringKeyCollections.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(HashtableStringKeyCollections.class);
         addTearDownClass(SimpleClass.class);
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 8fb7462..cd8ce02 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
@@ -59,11 +59,12 @@ public class TestHashtableStringValueCollections extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestHashtableStringValueCollections.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(HashtableStringValueCollections.class);
         addTearDownClass(SimpleClass.class);
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 2758b15..22517ce 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
@@ -58,11 +58,12 @@ public class TestLinkedListCollections extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestLinkedListCollections.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(LinkedListCollections.class);
         addTearDownClass(SimpleClass.class);
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 e600009..2ff6c4c 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
@@ -60,11 +60,12 @@ public class TestListCollections extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(Commit.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(ListCollections.class);
         addTearDownClass(SimpleClass.class);
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 23f80ab..8c9e349 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
@@ -59,11 +59,12 @@ public class TestMapStringKeyCollections extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestMapStringKeyCollections.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(MapStringKeyCollections.class);
         addTearDownClass(SimpleClass.class);
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 e89a90e..ee7f101 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
@@ -60,11 +60,12 @@ public class TestMapStringValueCollections extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestMapStringValueCollections.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(MapStringValueCollections.class);
         addTearDownClass(SimpleClass.class);
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 38f3c1b..c0f1d82 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
@@ -59,11 +59,12 @@ public class TestSetCollections extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestSetCollections.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(SetCollections.class);
         addTearDownClass(SimpleClass.class);
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 5887866..aa15adf 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
@@ -60,11 +60,12 @@ public class TestTreeMapStringKeyCollections extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestTreeMapStringKeyCollections.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(TreeMapStringKeyCollections.class);
         addTearDownClass(SimpleClass.class);
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 df0be54..8ffdae8 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
@@ -58,11 +58,12 @@ public class TestTreeMapStringValueCollections extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestTreeMapStringValueCollections.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(TreeMapStringValueCollections.class);
         addTearDownClass(SimpleClass.class);
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 3490696..5bc15af 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
@@ -60,11 +60,12 @@ public class TestTreeSetCollections extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestTreeSetCollections.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(TreeSetCollections.class);
         addTearDownClass(SimpleClass.class);
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 d654ede..15b21b5 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
@@ -57,11 +57,12 @@ public class TestVectorCollections extends JDO_Test {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(TestVectorCollections.class);
-    }   
+    }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(VectorCollections.class);
         addTearDownClass(SimpleClass.class);
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 fd8e497..9b3d515 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
@@ -60,10 +60,11 @@ public class FieldWithSameNameInSuperclass extends TestParts {
     public static void main(String[] args) {
         BatchTestRunner.run(FieldWithSameNameInSuperclass.class);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldSameName4.class);
     }
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 a88fa61..c81a6bb 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
@@ -58,8 +58,9 @@ public class NonPersistentFieldsAreNonPersistentInSubclasses extends TestParts {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(AllPersist4.class);
     }
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 0805aa9..6bd5641 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
@@ -58,8 +58,9 @@ public class NonpersistentSuperClass extends TestParts {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(TopNonPersistH.class);
     }
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 af80bd5..2652ac0 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
@@ -61,8 +61,9 @@ public class PersistenceCapableFlexibilityInInheritanceHierarchy extends TestPar
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(TopPersistH.class);
     }
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 478fde6..e2ea9aa 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
@@ -59,8 +59,9 @@ public class PersistentFieldsArePersistentInSubClasses extends TestParts {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(AllPersist4.class);
     }
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 b2178fa..5e4f344 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
@@ -58,8 +58,9 @@ public class TransactionalFieldsAreTransactionalInSubclasses extends TestParts {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(AllPersist4.class);
     }
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 7c0d1b8..b766f1e 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
@@ -183,7 +183,12 @@ public class Company
             (departments != null) ? new HashSet(departments) : null;
     }
     
-    /** Serialization support: initialize transient fields. */
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 38b9f65..498a5d2 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
@@ -39,7 +39,10 @@ public abstract class CompanyFactoryAbstractImpl implements CompanyFactory {
     /** true if debug logging is enabled. */
     protected boolean debug = logger.isDebugEnabled();
     
-    /** Creates a new instance of CompanyFactoryAbstractImpl */
+    /**
+     * Creates a new instance of CompanyFactoryAbstractImpl
+     * @param pm the PersistenceManager
+     */
     public CompanyFactoryAbstractImpl(PersistenceManager pm) {
         this.pm = pm;
     }
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryAnnotatedAbstractDelegator.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryAnnotatedAbstractDelegator.java
index d1de9eb..6952f98 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryAnnotatedAbstractDelegator.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryAnnotatedAbstractDelegator.java
@@ -33,9 +33,10 @@ public abstract class CompanyFactoryAnnotatedAbstractDelegator
     public final String identitytype =
             System.getProperty("jdo.tck.identitytype");
     public boolean isAppIdentity = "applicationidentity".equals(identitytype);
-    
+
     /**
      * Creates a new instance of CompanyFactory
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryAnnotatedAbstractDelegator(PersistenceManager pm) {
         super(pm);
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 3db7646..18f36da 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
@@ -36,6 +36,10 @@ public  class CompanyFactoryConcreteClass implements CompanyFactory {
         Project.class, Department.class, Company.class, MeetingRoom.class
     };
 
+    /**
+     * Creates a new instance of CompanyFactory
+     * @param pm the PersistenceManager
+     */
     public CompanyFactoryConcreteClass(PersistenceManager pm) {
     }
 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java
index eb31187..521f2d6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMClass.java
@@ -36,7 +36,8 @@ public class CompanyFactoryPMClass
     };
 
     /**
-     * Creates a new instance of CompanyFactoryPMInterface 
+     * Creates a new instance of CompanyFactory
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryPMClass(PersistenceManager pm) {
         super(pm);
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMInterface.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMInterface.java
index 8d60754..f3cd9f1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMInterface.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/CompanyFactoryPMInterface.java
@@ -36,7 +36,8 @@ public class CompanyFactoryPMInterface
     };
 
     /**
-     * Creates a new instance of CompanyFactoryPMInterface 
+     * Creates a new instance of CompanyFactory
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryPMInterface(PersistenceManager pm) {
         super(pm);
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 564c323..b2d489a 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
@@ -63,6 +63,7 @@ public class CompanyModelReader extends XmlBeanFactory {
     /** 
      * Create a CompanyModelReader for the specified resourceName. 
      * @param resourceName the name of the resource
+     * @param classLoader the ClassLoader for the lookup
      */
     public CompanyModelReader(String resourceName, ClassLoader classLoader) {
         super(new ClassPathResource(resourceName, classLoader));
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 f153a75..5cf96f0 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
@@ -264,7 +264,12 @@ public class Department
         this.meetingRooms = (rooms != null) ? new ArrayList(rooms) : null;
     }
 
-    /** Serialization support: initialize transient fields. */
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 4a9a37c..5fbc571 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
@@ -402,7 +402,12 @@ public abstract class Employee extends Person implements IEmployee {
         this.hradvisees = (hradvisees != null) ? new HashSet(hradvisees) : null;
     }
 
-    /** Serialization support: initialize transient fields. */
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 a9cf0fb..75f3354 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
@@ -182,7 +182,12 @@ public class Project
         this.members = (employees != null) ? new HashSet(employees) : null;
     }
 
-    /** Serialization support: initialize transient fields. */
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 e87d99c..b52ffa5 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
@@ -30,9 +30,10 @@ public class CompanyFactoryAnnotatedFCAppConcrete
         implements CompanyFactoryNewInstance {
     
     PersistenceManager pm = null;
-    
+
     /**
-     * Creates a new instance of CompanyFactoryAnnotatedPMFieldClass
+     * Creates a new instance of CompanyFactoryAnnotatedFCAppConcrete
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryAnnotatedFCAppConcrete(PersistenceManager pm) {
         this.pm = pm;        
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 319b916..c80ed06 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
@@ -30,9 +30,10 @@ public class CompanyFactoryAnnotatedFCAppPM
         implements CompanyFactoryNewInstance {
     
     PersistenceManager pm = null;
-    
+
     /**
-     * Creates a new instance of CompanyFactoryAnnotatedPMFieldClass
+     * Creates a new instance of CompanyFactoryAnnotatedFCAppPM
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryAnnotatedFCAppPM(PersistenceManager pm) {
         this.pm = pm;        
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCConcreteDelegator.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCConcreteDelegator.java
index 9620c58..10385ed 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCConcreteDelegator.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCConcreteDelegator.java
@@ -28,9 +28,10 @@ import org.apache.jdo.tck.pc.company.CompanyFactoryAnnotatedAbstractDelegator;
  */
 public class CompanyFactoryAnnotatedFCConcreteDelegator
         extends CompanyFactoryAnnotatedAbstractDelegator {
-    
+
     /**
-     * Creates a new instance of CompanyFactory
+     * Creates a new instance of CompanyFactoryAnnotatedFCConcreteDelegator
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryAnnotatedFCConcreteDelegator(PersistenceManager pm) {
         super(pm);
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 34e7588..1661dfb 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
@@ -30,9 +30,10 @@ public class CompanyFactoryAnnotatedFCDSConcrete
         implements CompanyFactoryNewInstance {
     
     PersistenceManager pm = null;
-    
+
     /**
-     * Creates a new instance of CompanyFactoryAnnotatedPMFieldClass
+     * Creates a new instance of CompanyFactoryAnnotatedFCDSConcrete
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryAnnotatedFCDSConcrete(PersistenceManager pm) {
         this.pm = pm;        
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 0e55eed..946fc88 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
@@ -30,9 +30,10 @@ public class CompanyFactoryAnnotatedFCDSPM
         implements CompanyFactoryNewInstance {
     
     PersistenceManager pm = null;
-    
+
     /**
-     * Creates a new instance of CompanyFactoryAnnotatedPMFieldClass
+     * Creates a new instance of CompanyFactoryAnnotatedFCDSPM
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryAnnotatedFCDSPM(PersistenceManager pm) {
         this.pm = pm;        
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCPMDelegator.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCPMDelegator.java
index 247f733..f407134 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCPMDelegator.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/CompanyFactoryAnnotatedFCPMDelegator.java
@@ -28,9 +28,10 @@ import org.apache.jdo.tck.pc.company.CompanyFactoryAnnotatedAbstractDelegator;
  */
 public class CompanyFactoryAnnotatedFCPMDelegator
         extends CompanyFactoryAnnotatedAbstractDelegator {
-    
+
     /**
-     * Creates a new instance of CompanyFactory
+     * Creates a new instance of CompanyFactoryAnnotatedFCPMDelegator
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryAnnotatedFCPMDelegator(PersistenceManager pm) {
         super(pm);
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 6e49d71..6aa2d35 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
@@ -38,9 +38,10 @@ public class CompanyFactoryAnnotatedPMFieldClass
     Class departmentClass = null;
     Class meetingRoomClass = null;
     Class companyClass = null;
-    
+
     /**
      * Creates a new instance of CompanyFactoryAnnotatedPMFieldClass
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryAnnotatedPMFieldClass(PersistenceManager pm) {
         super(pm);
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 03d26f2..5e5e0d9 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
@@ -211,7 +211,12 @@ import org.apache.jdo.tck.util.EqualityHelper;
             (departments != null) ? new HashSet(departments) : null;
     }
     
-    /** Serialization support: initialize transient fields. */
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 2711627..eb4a20d 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
@@ -259,7 +259,12 @@ public class FCAppDepartment
 		
 	}
 
-	/** Serialization support: initialize transient fields. */
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 a167e93..82932b5 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
@@ -440,7 +440,12 @@ public abstract class FCAppEmployee extends FCAppPerson implements IEmployee {
         this.hradvisees = (hradvisees != null) ? new HashSet(hradvisees) : null;
     }
 
-    /** Serialization support: initialize transient fields. */
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 b90c8f6..72e2438 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
@@ -199,7 +199,12 @@ public class FCAppProject
         this.members = (employees != null) ? new HashSet(employees) : null;
     }
 
-    /** Serialization support: initialize transient fields. */
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 d3a2b5e..d42a838 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
@@ -207,8 +207,13 @@ public class FCDSCompany
         this.departments = 
             (departments != null) ? new HashSet(departments) : null;
     }
-    
-    /** Serialization support: initialize transient fields. */
+
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 36773bf..7eb0054 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
@@ -254,7 +254,12 @@ public class FCDSDepartment
 		
 	}
 
-	/** Serialization support: initialize transient fields. */
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 88a8144..cf7fb1d 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
@@ -435,7 +435,12 @@ public abstract class FCDSEmployee extends FCDSPerson implements IEmployee {
         this.hradvisees = (hradvisees != null) ? new HashSet(hradvisees) : null;
     }
 
-    /** Serialization support: initialize transient fields. */
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 c5cba66..4867933 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
@@ -196,7 +196,12 @@ public class FCDSProject
         this.members = (members != null) ? new HashSet(employees) : null;
     }
 
-    /** Serialization support: initialize transient fields. */
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 efcaa5e..1469023 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
@@ -30,9 +30,10 @@ public class CompanyFactoryAnnotatedJPAAppConcrete
         extends CompanyFactoryAbstractImpl {
     
     PersistenceManager pm = null;
-    
+
     /**
-     * Creates a new instance of CompanyFactoryAnnotatedPMFieldClass
+     * Creates a new instance of CompanyFactoryAnnotatedJPAAppConcrete
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryAnnotatedJPAAppConcrete(PersistenceManager pm) {
         super(pm);
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 e7180f0..d9a604c 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
@@ -29,9 +29,10 @@ import org.apache.jdo.tck.pc.company.*;
 public class CompanyFactoryAnnotatedJPAAppPM
         extends CompanyFactoryAbstractImpl
         implements CompanyFactoryNewInstance {
-    
+
     /**
-     * Creates a new instance of CompanyFactoryAnnotatedPMFieldClass
+     * Creates a new instance of CompanyFactoryAnnotatedJPAAppPM
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryAnnotatedJPAAppPM(PersistenceManager pm) {
         super(pm);
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 08e1099..2783b0d 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
@@ -37,9 +37,10 @@ public class CompanyFactoryAnnotatedPMFieldClassJPA
     Class projectClass = null;
     Class departmentClass = null;
     Class companyClass = null;
-    
+
     /**
      * Creates a new instance of CompanyFactoryAnnotatedPMFieldClassJPA
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryAnnotatedPMFieldClassJPA(PersistenceManager pm) {
         super(pm);
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 bc8deff..28caa6c 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
@@ -219,8 +219,13 @@ import org.apache.jdo.tck.util.EqualityHelper;
         this.departments = 
             (departments != null) ? new HashSet(departments) : null;
     }
-    
-    /** Serialization support: initialize transient fields. */
+
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 9d3a9c1..9eb43fa 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
@@ -258,7 +258,12 @@ public class JPAAppDepartment
 		
 	}
 
-	/** Serialization support: initialize transient fields. */
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 14a9331..e199cf5 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
@@ -448,7 +448,12 @@ public abstract class JPAAppEmployee extends JPAAppPerson implements IEmployee {
         this.hradvisees = (hradvisees != null) ? new HashSet(hradvisees) : null;
     }
 
-    /** Serialization support: initialize transient fields. */
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 8d39975..27aacda 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
@@ -221,7 +221,7 @@ public class JPAAppPerson
 
     /**
      * Get the map of phone numbers as an unmodifiable map.
-     * @return A Map<String, String> of phone numbers.
+     * @return A Map of phone numbers.
      */
     public Map getPhoneNumbers() {
         return (convertPhone2String(phoneNumbers));
@@ -274,7 +274,7 @@ public class JPAAppPerson
 
     /**
      * Set the phoneNumber map to be in this person.
-     * @param phoneNumbers A Map<String, String> of phoneNumbers for this person.
+     * @param phoneNumbers A Map of phoneNumbers for this person.
      */
     public void setPhoneNumbers(Map phoneNumbers) {
         this.phoneNumbers = (phoneNumbers != null) ? 
@@ -282,7 +282,9 @@ public class JPAAppPerson
     }
     
     /**
-     * Converts HashMap<String, String> to HashMap<String, JPAAppPhoneNmber>
+     * Converts HashMap of String, String to HashMap of String, JPAAppPhoneNmber
+     * @param pnums Map of phoneNumbers
+     * @return Map of phoneNumbers
      */
     protected HashMap convertString2Phone(Map pnums) {
         HashMap retval = new HashMap();
@@ -299,7 +301,9 @@ public class JPAAppPerson
     }
     
     /**
-     * Converts HashMap<String, JPAAppPhoneNmber> to HashMap<String, String>
+     * Converts HashMap of String, JPAAppPhoneNmber to HashMap of String, String
+     * @param pnums Map of phoneNumbers
+     * @return Map of phoneNumbers
      */
     protected HashMap convertPhone2String(Map pnums) {
         HashMap retval = new HashMap();
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 c115e42..8c3b609 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
@@ -155,6 +155,7 @@ public class JPAAppPhoneNumber implements Serializable {
         /**
          * Initialize the identifier.
          * @param person The person identifier.
+         * @param type The phone number type.
          */
         public Oid(JPAAppPerson.Oid person, String type) {
             this.person = person;
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 c0fd0d7..740fff5 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
@@ -200,7 +200,12 @@ import org.apache.jdo.tck.util.EqualityHelper;
         this.members = (employees != null) ? new HashSet(employees) : null;
     }
 
-    /** Serialization support: initialize transient fields. */
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 a7febcd..248c868 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
@@ -30,9 +30,10 @@ public class CompanyFactoryAnnotatedPCAppConcrete
         implements CompanyFactoryNewInstance {
     
     PersistenceManager pm = null;
-    
+
     /**
-     * Creates a new instance of CompanyFactoryAnnotatedPMFieldClass
+     * Creates a new instance of CompanyFactoryAnnotatedPCAppConcrete
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryAnnotatedPCAppConcrete(PersistenceManager pm) {
         this.pm = pm;        
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 4d511b9..0398a9d 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
@@ -30,9 +30,10 @@ public class CompanyFactoryAnnotatedPCAppPM
         implements CompanyFactoryNewInstance {
     
     PersistenceManager pm = null;
-    
+
     /**
-     * Creates a new instance of CompanyFactoryAnnotatedPMFieldClass
+     * Creates a new instance of CompanyFactoryAnnotatedPCAppPM
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryAnnotatedPCAppPM(PersistenceManager pm) {
         this.pm = pm;        
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCConcreteDelegator.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCConcreteDelegator.java
index ad6d919..c38eacd 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCConcreteDelegator.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCConcreteDelegator.java
@@ -28,9 +28,10 @@ import org.apache.jdo.tck.pc.company.CompanyFactoryAnnotatedAbstractDelegator;
  */
 public class CompanyFactoryAnnotatedPCConcreteDelegator
         extends CompanyFactoryAnnotatedAbstractDelegator {
-    
+
     /**
-     * Creates a new instance of CompanyFactory
+     * Creates a new instance of CompanyFactoryAnnotatedPCConcreteDelegator
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryAnnotatedPCConcreteDelegator(PersistenceManager pm) {
         super(pm);
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 ed3fe6e..5e4f4de 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
@@ -30,9 +30,10 @@ public class CompanyFactoryAnnotatedPCDSConcrete
         implements CompanyFactoryNewInstance {
     
     PersistenceManager pm = null;
-    
+
     /**
-     * Creates a new instance of CompanyFactoryAnnotatedPMFieldClass
+     * Creates a new instance of CompanyFactoryAnnotatedPCDSConcrete
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryAnnotatedPCDSConcrete(PersistenceManager pm) {
         this.pm = pm;        
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 46aa81d..9e69a7a 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
@@ -30,9 +30,10 @@ public class CompanyFactoryAnnotatedPCDSPM
         implements CompanyFactoryNewInstance {
     
     PersistenceManager pm = null;
-    
+
     /**
-     * Creates a new instance of CompanyFactoryAnnotatedPMFieldClass
+     * Creates a new instance of CompanyFactoryAnnotatedPCDSPM
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryAnnotatedPCDSPM(PersistenceManager pm) {
         this.pm = pm;        
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCPMDelegator.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCPMDelegator.java
index 1b60110..eb868ac 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCPMDelegator.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/CompanyFactoryAnnotatedPCPMDelegator.java
@@ -28,9 +28,10 @@ import org.apache.jdo.tck.pc.company.CompanyFactoryAnnotatedAbstractDelegator;
  */
 public class CompanyFactoryAnnotatedPCPMDelegator
         extends CompanyFactoryAnnotatedAbstractDelegator {
-    
+
     /**
-     * Creates a new instance of CompanyFactory
+     * Creates a new instance of CompanyFactoryAnnotatedPCPMDelegator
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryAnnotatedPCPMDelegator(PersistenceManager pm) {
         super(pm);
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 d8237e3..a1d3d6f 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
@@ -219,8 +219,13 @@ import org.apache.jdo.tck.util.EqualityHelper;
         this._departments = 
             (departments != null) ? new HashSet(departments) : null;
     }
-    
-    /** Serialization support: initialize transient fields. */
+
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 591f1c2..81a33c3 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
@@ -264,7 +264,12 @@ public class PCAppDepartment
 		
 	}
 
-	/** Serialization support: initialize transient fields. */
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 7cbc11a..39e99f4 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
@@ -468,7 +468,12 @@ public abstract class PCAppEmployee extends PCAppPerson implements IEmployee {
         this._hradvisees = (hradvisees != null) ? new HashSet(hradvisees) : null;
     }
 
-    /** Serialization support: initialize transient fields. */
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 f8781cd..dbe1c89 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
@@ -207,7 +207,12 @@ public class PCAppProject
         this._members = (employees != null) ? new HashSet(employees) : null;
     }
 
-    /** Serialization support: initialize transient fields. */
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 c249683..a8e5b67 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
@@ -224,8 +224,13 @@ public class PCDSCompany
         this._departments = 
             (departments != null) ? new HashSet(departments) : null;
     }
-    
-    /** Serialization support: initialize transient fields. */
+
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 b88fdd5..881326e 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
@@ -266,7 +266,12 @@ public class PCDSDepartment
 		
 	}
 
-	/** Serialization support: initialize transient fields. */
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 ada8fb8..a0e2286 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
@@ -479,7 +479,12 @@ public abstract class PCDSEmployee extends PCDSPerson implements IEmployee {
         this._hradvisees = (hradvisees != null) ? new HashSet(hradvisees) : null;
     }
 
-    /** Serialization support: initialize transient fields. */
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 c81272c..dfd113a 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
@@ -208,7 +208,12 @@ public class PCDSProject
         this._members = (employees != null) ? new HashSet(employees) : null;
     }
 
-    /** Serialization support: initialize transient fields. */
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 109ce72..8cace61 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
@@ -30,9 +30,10 @@ public class CompanyFactoryAnnotatedPIAppPM
         implements CompanyFactoryNewInstance {
     
     PersistenceManager pm = null;
-    
+
     /**
      * Creates a new instance of CompanyFactoryAnnotatedPMFieldClass
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryAnnotatedPIAppPM(PersistenceManager pm) {
         this.pm = pm;        
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 cf4adbe..cac560b 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
@@ -30,9 +30,10 @@ public class CompanyFactoryAnnotatedPIDSPM
         implements CompanyFactoryNewInstance {
     
     PersistenceManager pm = null;
-    
+
     /**
-     * Creates a new instance of CompanyFactoryAnnotatedPMFieldClass
+     * Creates a new instance of CompanyFactoryAnnotatedPIDSPM
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryAnnotatedPIDSPM(PersistenceManager pm) {
         this.pm = pm;        
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIPMDelegator.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIPMDelegator.java
index 75d2567..3966ab9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIPMDelegator.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/CompanyFactoryAnnotatedPIPMDelegator.java
@@ -28,9 +28,10 @@ import org.apache.jdo.tck.pc.company.CompanyFactoryAnnotatedAbstractDelegator;
  */
 public class CompanyFactoryAnnotatedPIPMDelegator
         extends CompanyFactoryAnnotatedAbstractDelegator {
-    
+
     /**
-     * Creates a new instance of CompanyFactory
+     * Creates a new instance of CompanyFactoryAnnotatedPIPMDelegator
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryAnnotatedPIPMDelegator(PersistenceManager pm) {
         super(pm);
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 ea4ccdf..21efc78 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
@@ -48,7 +48,8 @@ public class CompanyFactoryAnnotatedPMInterface
     };
 
     /**
-     * Creates a new instance of CompanyFactoryAnnotatedPMInterface 
+     * Creates a new instance of CompanyFactoryAnnotatedPMInterface
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryAnnotatedPMInterface(PersistenceManager pm) {
         super(pm);
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 434b3e6..9cc4a7b 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
@@ -150,8 +150,13 @@ public class Company
         this.departments = 
             (departments != null) ? new HashSet(departments) : null;
     }
-    
-    /** Serialization support: initialize transient fields. */
+
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 e848b03..4bf0065 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
@@ -38,8 +38,11 @@ public abstract class CompanyFactoryAbstractImpl implements CompanyFactory {
 
     /** true if debug logging is enabled. */
     protected boolean debug = logger.isDebugEnabled();
-    
-    /** Creates a new instance of CompanyFactoryAbstractImpl */
+
+    /**
+     * Creates a new instance of CompanyFactoryAbstractImpl
+     * @param pm the PersistenceManager
+     */
     public CompanyFactoryAbstractImpl(PersistenceManager pm) {
         this.pm = pm;
     }
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 2b30a89..6567c79 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
@@ -35,6 +35,10 @@ public  class CompanyFactoryConcreteClass implements CompanyFactory {
         Department.class, Company.class
     };
 
+    /**
+     * Creates a new instance of CompanyFactoryConcreteClass
+     * @param pm the PersistenceManager
+     */
     public CompanyFactoryConcreteClass(PersistenceManager pm) {
     }
 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryPMClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryPMClass.java
index fad11ac..d2ea09d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryPMClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryPMClass.java
@@ -35,7 +35,8 @@ public class CompanyFactoryPMClass
     };
 
     /**
-     * Creates a new instance of CompanyFactoryPMClass 
+     * Creates a new instance of CompanyFactoryPMClass
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryPMClass(PersistenceManager pm) {
         super(pm);
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryPMInterface.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryPMInterface.java
index 91ba5d3..425655c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryPMInterface.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyFactoryPMInterface.java
@@ -35,7 +35,8 @@ public class CompanyFactoryPMInterface
     };
 
     /**
-     * Creates a new instance of CompanyFactoryPMInterface 
+     * Creates a new instance of CompanyFactoryPMInterface
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryPMInterface(PersistenceManager pm) {
         super(pm);
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 094f5ea..a82546b 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
@@ -63,6 +63,7 @@ public class CompanyModelReader extends XmlBeanFactory {
     /** 
      * Create a CompanyModelReader for the specified resourceName. 
      * @param resourceName the name of the resource
+     * @param classLoader the ClassLoader for the lookup
      */
     public CompanyModelReader(String resourceName, ClassLoader classLoader) {
         super(new ClassPathResource(resourceName, classLoader));
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 f6dc5e5..367f88d 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
@@ -276,7 +276,12 @@ public abstract class Employee extends Person implements IEmployee {
         this.hradvisees = (hradvisees != null) ? new HashSet(hradvisees) : null;
     }
 
-    /** Serialization support: initialize transient fields. */
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 8b2b379..4436b3c 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
@@ -150,8 +150,13 @@ public class Company
         this.departments = 
             (departments != null) ? new HashSet(departments) : null;
     }
-    
-    /** Serialization support: initialize transient fields. */
+
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
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 f61b493..1215f8b 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
@@ -39,7 +39,10 @@ public abstract class CompanyFactoryAbstractImpl implements CompanyFactory {
     /** true if debug logging is enabled. */
     protected boolean debug = logger.isDebugEnabled();
     
-    /** Creates a new instance of CompanyFactoryAbstractImpl */
+    /**
+     * Creates a new instance of CompanyFactoryAbstractImpl
+     * @param pm the PersistenceManager
+     */
     public CompanyFactoryAbstractImpl(PersistenceManager pm) {
         this.pm = pm;
     }
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 d195943..da9ed07 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
@@ -35,6 +35,10 @@ public  class CompanyFactoryConcreteClass implements CompanyFactory {
         Department.class, Company.class
     };
 
+    /**
+     * Creates a new instance of CompanyFactoryConcreteClass
+     * @param pm the PersistenceManager
+     */
     public CompanyFactoryConcreteClass(PersistenceManager pm) {
     }
 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryPMClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryPMClass.java
index 08b1d3a..0e9edb9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryPMClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryPMClass.java
@@ -35,7 +35,8 @@ public class CompanyFactoryPMClass
     };
 
     /**
-     * Creates a new instance of CompanyFactoryPMClass 
+     * Creates a new instance of CompanyFactoryPMClass
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryPMClass(PersistenceManager pm) {
         super(pm);
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryPMInterface.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryPMInterface.java
index 6304f42..c0d27fc 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryPMInterface.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyFactoryPMInterface.java
@@ -35,7 +35,8 @@ public class CompanyFactoryPMInterface
     };
 
     /**
-     * Creates a new instance of CompanyFactoryPMInterface 
+     * Creates a new instance of CompanyFactoryPMInterface
+     * @param pm the PersistenceManager
      */
     public CompanyFactoryPMInterface(PersistenceManager pm) {
         super(pm);
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 e98e131..22f01c7 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
@@ -63,6 +63,7 @@ public class CompanyModelReader extends XmlBeanFactory {
     /** 
      * Create a CompanyModelReader for the specified resourceName. 
      * @param resourceName the name of the resource
+     * @param classLoader the ClassLoader for the lookup
      */
     public CompanyModelReader(String resourceName, ClassLoader classLoader) {
         super(new ClassPathResource(resourceName, classLoader));
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Employee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Employee.java
index 6d19e95..85ef21a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Employee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/Employee.java
@@ -296,7 +296,12 @@ public abstract class Employee extends Person implements IEmployee {
         this.hradvisees = (hradvisees != null) ? new HashSet(hradvisees) : null;
     }
 
-    /** Serialization support: initialize transient fields. */
+    /**
+     * Serialization support: initialize transient fields.
+     * @param in stream
+     * @throws IOException error during reading
+     * @throws ClassNotFoundException class could not be found
+     */
     private void readObject(ObjectInputStream in)
         throws IOException, ClassNotFoundException {
         in.defaultReadObject();
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/FullTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/FullTimeEmployee.java
index a25ade0..5a9d889 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/FullTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/FullTimeEmployee.java
@@ -42,6 +42,7 @@ public class FullTimeEmployee extends Employee implements IFullTimeEmployee {
      * @param middle The person's middle name.
      * @param born The person's birthdate.
      * @param hired The date that the person was hired.
+     * @param role The person's role
      * @param sal The salary of the full-time employee.
      */
     public FullTimeEmployee(long personid, String first, String last,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/PartTimeEmployee.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/PartTimeEmployee.java
index 10b4561..1e12980 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/PartTimeEmployee.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/PartTimeEmployee.java
@@ -41,6 +41,7 @@ public class PartTimeEmployee extends Employee implements IPartTimeEmployee {
      * @param middle The person's middle name.
      * @param born The person's birthdate.
      * @param hired The date the person was hired.
+     * @param role The person's role
      * @param wage The person's wage.
      */
     public PartTimeEmployee(long personid, String first, String last,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/MylibReader.java b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/MylibReader.java
index b36a809..e345082 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/MylibReader.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/MylibReader.java
@@ -59,6 +59,7 @@ public class MylibReader extends XmlBeanFactory {
     /** 
      * Create a MylibReader for the specified resourceName. 
      * @param resourceName the name of the resource
+     * @param classLoader the ClassLoader for the lookup
      */
     public MylibReader(String resourceName, ClassLoader classLoader) {
         super(new ClassPathResource(resourceName, classLoader));
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderFactoryAbstractImpl.java b/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderFactoryAbstractImpl.java
index d3571c0..99a362d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderFactoryAbstractImpl.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderFactoryAbstractImpl.java
@@ -41,7 +41,10 @@ public abstract class OrderFactoryAbstractImpl implements OrderFactory {
     /** true if debug logging is enabled. */
     protected boolean debug = logger.isDebugEnabled();
     
-    /** Creates a new instance of OrderFactoryAbstractImpl */
+    /**
+     * Creates a new instance of OrderFactoryAbstractImpl
+     * @param pm the PersistnceManager
+     */
     public OrderFactoryAbstractImpl(PersistenceManager pm) {
         this.pm = pm;
     }
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderFactoryConcreteClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderFactoryConcreteClass.java
index b70c6dd..174200f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderFactoryConcreteClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderFactoryConcreteClass.java
@@ -32,6 +32,10 @@ public  class OrderFactoryConcreteClass implements OrderFactory {
         Order.class, OrderItem.class
     };
 
+    /**
+     * Creates a new instance of OrderFactoryConcreteClass
+     * @param pm the PersistnceManager
+     */
     public OrderFactoryConcreteClass(PersistenceManager pm) {
     }
 
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderFactoryPMClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderFactoryPMClass.java
index 1793be3..ce1cb0b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderFactoryPMClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderFactoryPMClass.java
@@ -34,7 +34,8 @@ public class OrderFactoryPMClass
     };
 
     /**
-     * Creates a new instance of OrderFactoryPMClass 
+     * Creates a new instance of OrderFactoryPMClass
+     * @param pm the PersistnceManager
      */
     public OrderFactoryPMClass(PersistenceManager pm) {
         super(pm);
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderFactoryPMInterface.java b/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderFactoryPMInterface.java
index 7152b39..1c65fcb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderFactoryPMInterface.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderFactoryPMInterface.java
@@ -32,7 +32,8 @@ public class OrderFactoryPMInterface
     };
 
     /**
-     * Creates a new instance of OrderFactoryPMInterface 
+     * Creates a new instance of OrderFactoryPMInterface
+     * @param pm the PersistnceManager
      */
     public OrderFactoryPMInterface(PersistenceManager pm) {
         super(pm);
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderModelReader.java b/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderModelReader.java
index 1f1234d..4f655fd 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderModelReader.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/order/OrderModelReader.java
@@ -62,6 +62,7 @@ public class OrderModelReader extends XmlBeanFactory {
     /** 
      * Create a OrderModelReader for the specified resourceName. 
      * @param resourceName the name of the resource
+     * @param classLoader the ClassLOader for the lookup
      */
     public OrderModelReader(String resourceName, ClassLoader classLoader) {
         super(new ClassPathResource(resourceName, classLoader));
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/shoppingcart/Product.java b/tck/src/main/java/org/apache/jdo/tck/pc/shoppingcart/Product.java
index 8a25257..b1f2bfa 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/shoppingcart/Product.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/shoppingcart/Product.java
@@ -30,12 +30,18 @@ public class Product implements Serializable {
     /** No-arg constructor required by JDO; not for public consumption */
     protected Product() {}
 
-    /** Domain model constructor */
+    /**
+     * Domain model constructor
+     * @param sku identity field
+     */
     public Product(String sku) {
         setSku(sku);
     }
 
-    /** Constructor with sku and description
+    /**
+     * Constructor with sku and description
+     * @param sku identity field
+     * @param description description
      */
     public Product(String sku, String description) {
         this(sku);
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldByte.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldByte.java
index f7606ae..979e057 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldByte.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldByte.java
@@ -59,8 +59,8 @@ public class PCPointSingleFieldByte extends AbstractPCPointSingleField {
      * This constructor is used by test cases checking assertion A7.12-39:<br>
      * The instance returned is initialized with the value of the primary key 
      * field of the instance on which the method is called.
-     * @param x
-     * @param y
+     * @param x the x coordinate
+     * @param y the y coordinate
      */
     public PCPointSingleFieldByte(int x, int y) {
         this.x = x;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldCharacter.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldCharacter.java
index a173301..7aae619 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldCharacter.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldCharacter.java
@@ -59,8 +59,8 @@ public class PCPointSingleFieldCharacter extends AbstractPCPointSingleField {
      * This constructor is used by test cases checking assertion A7.12-39:<br>
      * The instance returned is initialized with the value of the primary key 
      * field of the instance on which the method is called.
-     * @param x
-     * @param y
+     * @param x the x coordinate
+     * @param y the y coordinate
      */
     public PCPointSingleFieldCharacter(int x, int y) {
         this.x = x;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldDate.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldDate.java
index e6b4085..a343b53 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldDate.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldDate.java
@@ -61,8 +61,8 @@ public class PCPointSingleFieldDate extends AbstractPCPointSingleField {
      * This constructor is used by test cases checking assertion A7.12-39:<br>
      * The instance returned is initialized with the value of the primary key 
      * field of the instance on which the method is called.
-     * @param x
-     * @param y
+     * @param x the x coordinate
+     * @param y the y coordinate
      */
     public PCPointSingleFieldDate(int x, int y) {
         this.x = x;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldInteger.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldInteger.java
index 68a4442..5c88c20 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldInteger.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldInteger.java
@@ -59,8 +59,8 @@ public class PCPointSingleFieldInteger extends AbstractPCPointSingleField {
      * This constructor is used by test cases checking assertion A7.12-39:<br>
      * The instance returned is initialized with the value of the primary key 
      * field of the instance on which the method is called.
-     * @param x
-     * @param y
+     * @param x the x coordinate
+     * @param y the y coordinate
      */
     public PCPointSingleFieldInteger(int x, int y) {
         this.x = x;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldLong.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldLong.java
index e841973..543aaa4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldLong.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldLong.java
@@ -59,8 +59,8 @@ public class PCPointSingleFieldLong extends AbstractPCPointSingleField {
      * This constructor is used by test cases checking assertion A7.12-39:<br>
      * The instance returned is initialized with the value of the primary key 
      * field of the instance on which the method is called.
-     * @param x
-     * @param y
+     * @param x the x coordinate
+     * @param y the y coordinate
      */
     public PCPointSingleFieldLong(int x, int y) {
         this.x = x;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivebyte.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivebyte.java
index 0d6449f..8d0189e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivebyte.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivebyte.java
@@ -48,8 +48,8 @@ public class PCPointSingleFieldPrimitivebyte extends AbstractPCPointSingleField
      * This constructor is used by test cases checking assertion A7.12-39:<br>
      * The instance returned is initialized with the value of the primary key 
      * field of the instance on which the method is called.
-     * @param x
-     * @param y
+     * @param x the x coordinate
+     * @param y the y coordinate
      */
     public PCPointSingleFieldPrimitivebyte(int x, int y) {
         this.x = x;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivechar.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivechar.java
index c69540c..1a08306 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivechar.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivechar.java
@@ -48,8 +48,8 @@ public class PCPointSingleFieldPrimitivechar extends AbstractPCPointSingleField
      * This constructor is used by test cases checking assertion A7.12-39:<br>
      * The instance returned is initialized with the value of the primary key 
      * field of the instance on which the method is called.
-     * @param x
-     * @param y
+     * @param x the x coordinate
+     * @param y the y coordinate
      */
     public PCPointSingleFieldPrimitivechar(int x, int y) {
         this.x = x;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitiveint.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitiveint.java
index dfd9fec..a4e4444 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitiveint.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitiveint.java
@@ -48,8 +48,8 @@ public class PCPointSingleFieldPrimitiveint extends AbstractPCPointSingleField {
      * This constructor is used by test cases checking assertion A7.12-39:<br>
      * The instance returned is initialized with the value of the primary key 
      * field of the instance on which the method is called.
-     * @param x
-     * @param y
+     * @param x the x coordinate
+     * @param y the y coordinate
      */
     public PCPointSingleFieldPrimitiveint(int x, int y) {
         this.x = x;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivelong.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivelong.java
index 0a05ca0..7dc8703 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivelong.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitivelong.java
@@ -48,8 +48,8 @@ public class PCPointSingleFieldPrimitivelong extends AbstractPCPointSingleField
      * This constructor is used by test cases checking assertion A7.12-39:<br>
      * The instance returned is initialized with the value of the primary key 
      * field of the instance on which the method is called.
-     * @param x
-     * @param y
+     * @param x the x coordinate
+     * @param y the y coordinate
      */
     public PCPointSingleFieldPrimitivelong(int x, int y) {
         this.x = x;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitiveshort.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitiveshort.java
index 6a5f8a2..3b8f75f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitiveshort.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldPrimitiveshort.java
@@ -48,8 +48,8 @@ public class PCPointSingleFieldPrimitiveshort extends AbstractPCPointSingleField
      * This constructor is used by test cases checking assertion A7.12-39:<br>
      * The instance returned is initialized with the value of the primary key 
      * field of the instance on which the method is called.
-     * @param x
-     * @param y
+     * @param x the x coordinate
+     * @param y the y coordinate
      */
     public PCPointSingleFieldPrimitiveshort(int x, int y) {
         this.x = x;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldShort.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldShort.java
index 9a0b1d1..bdb49dc 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldShort.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldShort.java
@@ -59,8 +59,8 @@ public class PCPointSingleFieldShort extends AbstractPCPointSingleField {
      * This constructor is used by test cases checking assertion A7.12-39:<br>
      * The instance returned is initialized with the value of the primary key 
      * field of the instance on which the method is called.
-     * @param x
-     * @param y
+     * @param x the x coordinate
+     * @param y the y coordinate
      */
     public PCPointSingleFieldShort(int x, int y) {
         this.x = x;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldString.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldString.java
index 184567a..3fc3b5a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldString.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/PCPointSingleFieldString.java
@@ -59,8 +59,8 @@ public class PCPointSingleFieldString extends AbstractPCPointSingleField {
      * This constructor is used by test cases checking assertion A7.12-39:<br>
      * The instance returned is initialized with the value of the primary key 
      * field of the instance on which the method is called.
-     * @param x
-     * @param y
+     * @param x the x coordinate
+     * @param y the y coordinate
      */
     public PCPointSingleFieldString(int x, int y) {
         this.x = x;
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/Person.java b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/Person.java
index 439aa9f..86e9e0f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/Person.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/singlefieldidentity/Person.java
@@ -44,7 +44,7 @@ public class Person
 
     /**
      * Construct a <code>Person</code> instance.
-     * @param id The person identifier.
+     * @param personid The person identifier.
      * @param firstname The person's first name.
      * @param lastname The person's last name.
      * @param middlename The person's middle name.
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/QueryElementHolder.java b/tck/src/main/java/org/apache/jdo/tck/query/QueryElementHolder.java
index fda9447..b46a04f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/QueryElementHolder.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/QueryElementHolder.java
@@ -129,6 +129,8 @@ public class QueryElementHolder {
      * @param ordering the JDOQL ordering query element
      * @param from the JDOQL range from query element
      * @param to the JDOQL range to query element
+     * @param jdoqlTypedQuery the query instance
+     * @param paramValues the parameter values
      */
     public QueryElementHolder(Boolean unique, String result,
                               Class resultClass, Class candidateClass,
@@ -180,6 +182,8 @@ public class QueryElementHolder {
      * @param ordering the JDOQL ordering query element
      * @param from the JDOQL from query element
      * @param to the JDOQL to query element
+     * @param jdoqlTypedQuery the query instance
+     * @param paramValues the parameter values
      */
     public QueryElementHolder(Boolean unique, String result,
                               Class resultClass, Class candidateClass,
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java b/tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java
index f6edfaa..89f7280 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java
@@ -92,13 +92,20 @@ public abstract class QueryTest extends AbstractReaderTest {
     private MylibReader mylibReaderForTransientInstances;
 
     // Helper methods to create persistent PCPoint instances
-    
-    /** */
+
+    /**
+     *
+     * @param pm the PersistenceManager
+     */
     public void loadAndPersistPCPoints(PersistenceManager pm) {
         insertPCPoints(pm, 5);
     }
 
-    /** */
+    /**
+     *
+     * @param pm the PersistenceManager
+     * @param numInsert number of instances to be inserted
+     */
     protected void insertPCPoints(PersistenceManager pm, int numInsert) {
         Transaction tx = pm.currentTransaction();
         try {
@@ -118,7 +125,10 @@ public abstract class QueryTest extends AbstractReaderTest {
         }
     }
        
-    /** */
+    /**
+     * @param list list
+     * @return list
+     */
     public List getFromInserted(List list) {
         if (list == null)
             return null;
@@ -152,8 +162,7 @@ public abstract class QueryTest extends AbstractReaderTest {
      * for persistent instances.
      * @return the company model reader for persistent instances.
      */
-    private CompanyModelReader 
-    getCompanyModelReaderForPersistentInstances() {
+    private CompanyModelReader getCompanyModelReaderForPersistentInstances() {
         if (companyModelReaderForPersistentInstances == null) {
             companyModelReaderForPersistentInstances = 
                 new CompanyModelReader(getCompanyTestDataResource());
@@ -166,8 +175,7 @@ public abstract class QueryTest extends AbstractReaderTest {
      * for transient instances.
      * @return the company model reader for transient instances.
      */
-    private CompanyModelReader 
-    getCompanyModelReaderForTransientInstances() {
+    private CompanyModelReader getCompanyModelReaderForTransientInstances() {
         if (companyModelReaderForTransientInstances == null) {
             companyModelReaderForTransientInstances = 
                 new CompanyModelReader(getCompanyTestDataResource());
@@ -206,6 +214,8 @@ public abstract class QueryTest extends AbstractReaderTest {
      * methods explictly calls makePersistent for all named instances using the
      * specified PersistenceManager. The method returns the CompanyModelReader 
      * instance allowing to access a compay model instance by name.
+     * @param pm the PersistenceManager
+     * @return the company model reader
      */
     public CompanyModelReader loadAndPersistCompanyModel(PersistenceManager pm) {
         makePersistentAll(
@@ -218,6 +228,8 @@ public abstract class QueryTest extends AbstractReaderTest {
      * methods explictly calls makePersistent for all named instances using the
      * specified PersistenceManager. The method returns the CompanyModelReader 
      * instance allowing to access a compay model instance by name.
+     * @param pm the PersistenceManager
+     * @return mylib reader
      */
     public MylibReader loadAndPersistMylib(PersistenceManager pm) {
         makePersistentAll(
@@ -386,12 +398,18 @@ public abstract class QueryTest extends AbstractReaderTest {
     
     // PrimitiveTypes helper methods (creation and query)
 
-    /** */
+    /**
+     *
+     * @param pm the PersistenceManager
+     */
     public void loadAndPersistPrimitiveTypes(PersistenceManager pm) {
         insertPrimitiveTypes(pm);
     }
 
-    /** */
+    /**
+     *
+     * @param pm the PersistenceManager
+     */
     protected void insertPrimitiveTypes(PersistenceManager pm) {
         boolean bFlag = false;
         String strValue = "";
@@ -432,12 +450,16 @@ public abstract class QueryTest extends AbstractReaderTest {
                 tx.rollback();
         }
     }
-    
+
     /**
-     * Creates and executes a PrimitiveTypes query with the specified filter. 
+     * Creates and executes a PrimitiveTypes query with the specified filter.
      * The method checks whether the query returns the expected result.
+     * @param filter the filter
+     * @param pm the PersistenceManager
+     * @param expected expected
+     * @param assertion assertion
      */
-    protected void runSimplePrimitiveTypesQuery(String filter, 
+    protected void runSimplePrimitiveTypesQuery(String filter,
                                                 PersistenceManager pm,
                                                 Collection expected,
                                                 String assertion) {
@@ -453,8 +475,14 @@ public abstract class QueryTest extends AbstractReaderTest {
 
     /**
      * Creates and executes a PrimitiveTypes query with the specified filter,
-     * parameter declarations and parameter values. The method checks whether 
+     * parameter declarations and parameter values. The method checks whether
      * the query returns the expected result.
+     * @param filter the filter
+     * @param paramDecl the parameter declaration
+     * @param paramValue the parameter values
+     * @param pm the PersistenceManager
+     * @param expected expected
+     * @param assertion assertion
      */
     protected void runParameterPrimitiveTypesQuery(String filter,
                                                    String paramDecl,
@@ -474,13 +502,17 @@ public abstract class QueryTest extends AbstractReaderTest {
     }
 
     // Helper methods to check query result
-    
-    /** Verify that expected equals result, including the order of the elements.
+
+    /**
+     * Verify that expected equals result, including the order of the elements.
      * If not equal, fail the test.
      * If there is a filter != null, do not use this method. Use the method
      * of the same name that takes a String as the second argument.
+     * @param assertion assertion
+     * @param result the result
+     * @param expected the expected
      */
-    protected void checkQueryResultWithOrder(String assertion, 
+    protected void checkQueryResultWithOrder(String assertion,
                                              Object result, 
                                              Object expected) {
         if (!equals(result, expected)) {
@@ -488,10 +520,14 @@ public abstract class QueryTest extends AbstractReaderTest {
         }
     }
     
-    /** Verify that expected equals result, ignoring the order of the elements.
+    /**
+     * Verify that expected equals result, ignoring the order of the elements.
      * If not equal, fail the test.
      * If there is a filter != null, do not use this method. Use the method
      * of the same name that takes a String as the second argument.
+     * @param assertion assertion
+     * @param result the result
+     * @param expected the expected
      */
     protected void checkQueryResultWithoutOrder(String assertion, 
                                                 Object result, 
@@ -526,8 +562,14 @@ public abstract class QueryTest extends AbstractReaderTest {
                 " of size " + size(result) + lf + result);
     }
 
-    /** */
-    protected void checkQueryResultWithOrder(String assertion, 
+    /**
+     *
+     * @param assertion assertion
+     * @param query the query
+     * @param result the result
+     * @param expected expected
+     */
+    protected void checkQueryResultWithOrder(String assertion,
                                              String query,
                                              Object result, 
                                              Object expected) {
@@ -535,9 +577,15 @@ public abstract class QueryTest extends AbstractReaderTest {
             queryFailed(assertion, query, result, expected);
         }
     }
-    
-    /** */
-    protected void checkQueryResultWithoutOrder(String assertion, 
+
+    /**
+     *
+     * @param assertion assertion
+     * @param query the query
+     * @param result the result
+     * @param expected expected
+     */
+    protected void checkQueryResultWithoutOrder(String assertion,
                                                 String query,
                                                 Object result, 
                                                 Object expected) {
@@ -563,7 +611,7 @@ public abstract class QueryTest extends AbstractReaderTest {
      * collections of object arrays, maps of object arrays.
      * This method implements a narrowing in case of floating point values.
      * In case of big decimals it calls 
-     * {@link BigDecimal#compareTo(java.lang.Object)}.
+     * {@link BigDecimal#compareTo(java.math.BigDecimal)}.
      * It allows <code>o1</code> and/or <code>o2</code>
      * to be <code>null</code>. 
      * @param o1 the first object
@@ -828,6 +876,8 @@ public abstract class QueryTest extends AbstractReaderTest {
      * Returns the size of the object. If it is a multivalued object
      * (Collection, Map, or array) return the number of elements. If not, 
      * return 1.
+     * @param o the object
+     * @return size
      */
     protected int size(Object o) {
         if (o instanceof Collection) {
@@ -843,8 +893,12 @@ public abstract class QueryTest extends AbstractReaderTest {
     }
 
     // Debugging helper methods
-     
-    /** */
+
+    /**
+     *
+     * @param results the results
+     * @param expected expected values
+     */
     protected void printOutput(Object results, Collection expected) {
         if (!debug)
             return;
@@ -1004,10 +1058,10 @@ public abstract class QueryTest extends AbstractReaderTest {
      * then the test case fails prompting argument <code>assertion</code>
      * and <code>queryText</code>. 
      * Otherwise the test case succeeds. 
-     * @param assertion
-     * @param query
-     * @param queryText
-     * @param positive
+     * @param assertion asserting text
+     * @param query the query instance
+     * @param queryText the text representation of the query
+     * @param positive positive test
      */
     protected void compile(String assertion, 
             Query query, String queryText, boolean positive) {
@@ -1075,9 +1129,9 @@ public abstract class QueryTest extends AbstractReaderTest {
 
     /**
      * 
-     * @param assertion
-     * @param queryElementHolder
-     * @param expectedResult
+     * @param assertion assertion text
+     * @param queryElementHolder query elements
+     * @param expectedResult expected query result
      */
     protected void executeJDOQLTypedQuery(String assertion, QueryElementHolder queryElementHolder,
                                           Object expectedResult) {
@@ -1086,11 +1140,11 @@ public abstract class QueryTest extends AbstractReaderTest {
 
     /**
      *
-     * @param assertion
-     * @param queryElementHolder
-     * @param resultClass
-     * @param resultClauseSpecified
-     * @param expectedResult
+     * @param assertion assertion text
+     * @param queryElementHolder query elements
+     * @param resultClass result class object
+     * @param resultClauseSpecified flag whether result clause is specified
+     * @param expectedResult the expected query result
      */
     protected void executeJDOQLTypedQuery(String assertion, QueryElementHolder queryElementHolder,
                                           Class<?> resultClass, boolean resultClauseSpecified,
@@ -1165,7 +1219,7 @@ public abstract class QueryTest extends AbstractReaderTest {
      * to a JDO query instance,
      * based on argument <code>asSingleString</code>.
      * Afterwards, delegates to method 
-     * {@link QueryTest#execute(String, Query, String, boolean, Object[], Object, boolean)}.
+     * {@link QueryTest#execute(String, Query, String, boolean, Object, Object, boolean)}.
      * @param assertion the assertion to prompt if the test case fails.
      * @param queryElementHolder the query to execute.
      * @param asSingleString determines if the query is executed as
@@ -1226,6 +1280,7 @@ public abstract class QueryTest extends AbstractReaderTest {
      * @param sql the SQL string.
      * @param candidateClass the candidate class.
      * @param resultClass the result class.
+     * @param positive positive option
      * @param parameters the parameters of the query.
      * @param expectedResult the expected query result.
      * @param unique indicates, if the query is supposed 
@@ -1269,7 +1324,7 @@ public abstract class QueryTest extends AbstractReaderTest {
      * 
      * The result of query execution is compared against the argument 
      * <code>expectedResult</code>. If the two values differ, 
-     * then this method throws an {@link AssertionFailedError} and 
+     * then this method throws an {@link junit.framework.AssertionFailedError} and
      * the calling test case fails prompting argument 
      * <code>assertion</code>.<p>
      * 
@@ -1278,7 +1333,7 @@ public abstract class QueryTest extends AbstractReaderTest {
      * a negative test case. 
      * Then, query execution is expected to throw a {@link JDOUserException}.
      * If query execution succeeds in this case, then this method throws
-     * an {@link AssertionFailedError} and the calling test case fails
+     * an {@link junit.framework.AssertionFailedError} and the calling test case fails
      * prompting argument <code>assertion</code>.<p>
      * 
      * @param assertion the assertion to prompt if the test case fails.
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/AutoCloseable.java b/tck/src/main/java/org/apache/jdo/tck/query/api/AutoCloseable.java
index 0922932..44bdf59 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/AutoCloseable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/AutoCloseable.java
@@ -237,8 +237,9 @@ public class AutoCloseable extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/ChangeQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/api/ChangeQuery.java
index 1a0500e..877a1cd 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/ChangeQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/ChangeQuery.java
@@ -97,8 +97,9 @@ public class ChangeQuery extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/Close.java b/tck/src/main/java/org/apache/jdo/tck/query/api/Close.java
index c979dfe..1b1ea71 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/Close.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/Close.java
@@ -126,8 +126,9 @@ public class Close extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/CloseAll.java b/tck/src/main/java/org/apache/jdo/tck/query/api/CloseAll.java
index d8ed0c0..b4f1bad 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/CloseAll.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/CloseAll.java
@@ -96,8 +96,9 @@ public class CloseAll extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/CompileQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/api/CompileQuery.java
index 278dbad..803d515 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/CompileQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/CompileQuery.java
@@ -91,8 +91,9 @@ public class CompileQuery extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/DeclareImports.java b/tck/src/main/java/org/apache/jdo/tck/query/api/DeclareImports.java
index 79e2a14..77d8800 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/DeclareImports.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/DeclareImports.java
@@ -151,10 +151,10 @@ public class DeclareImports extends QueryTest {
         }
     }
 
-
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/DeclareParameters.java b/tck/src/main/java/org/apache/jdo/tck/query/api/DeclareParameters.java
index 6ba3514..8cfaff8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/DeclareParameters.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/DeclareParameters.java
@@ -157,8 +157,9 @@ public class DeclareParameters extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQuery.java
index 6f4b16f..8a13426 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQuery.java
@@ -162,8 +162,9 @@ public class ExecuteQuery extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java b/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java
index 5504e74..20540d3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQueryWithArray.java
@@ -137,8 +137,9 @@ public class ExecuteQueryWithArray extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java b/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java
index 3ffd3d1..c55d1c2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/ExecuteQueryWithMap.java
@@ -140,8 +140,9 @@ public class ExecuteQueryWithMap extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/GetIgnoreCache.java b/tck/src/main/java/org/apache/jdo/tck/query/api/GetIgnoreCache.java
index 870d198..0cee24b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/GetIgnoreCache.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/GetIgnoreCache.java
@@ -51,7 +51,7 @@ public class GetIgnoreCache extends QueryTest {
     }
 
     /** */
-    public void test() throws Exception {
+    public void test() {
         pmf = getPMF();
         pm = getPM();
 
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/GetPersistenceManagerFromRestoredSerializedQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/api/GetPersistenceManagerFromRestoredSerializedQuery.java
index 03c33f1..67558d9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/GetPersistenceManagerFromRestoredSerializedQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/GetPersistenceManagerFromRestoredSerializedQuery.java
@@ -57,7 +57,10 @@ public class GetPersistenceManagerFromRestoredSerializedQuery
     }
 
 
-    /** */
+    /**
+     *
+     * @throws Exception exception
+     */
     public void test() throws Exception {
         pm = getPM();
 
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/MetadataSearchOrder.java b/tck/src/main/java/org/apache/jdo/tck/query/api/MetadataSearchOrder.java
index 144720f..92bd646 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/MetadataSearchOrder.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/MetadataSearchOrder.java
@@ -113,10 +113,11 @@ public class MetadataSearchOrder extends QueryTest {
         executeJDOQuery(ASSERTION_FAILED, query, "Named query " + namedQuery,
                 false, null, expectedResult, true);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         addTearDownClass(MylibReader.getTearDownClasses());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/NewNamedQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/api/NewNamedQuery.java
index 6365ea2..1d5a9dd 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/NewNamedQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/NewNamedQuery.java
@@ -89,10 +89,11 @@ public class NewNamedQuery extends QueryTest {
         executeJDOQuery(ASSERTION_FAILED, query, "Named query " + namedQuery,
                 false, null, expectedResult, positive);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryFromExistingQueryBoundToPMFromSameVendor.java b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryFromExistingQueryBoundToPMFromSameVendor.java
index 82b2b7f..6d84ff4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryFromExistingQueryBoundToPMFromSameVendor.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryFromExistingQueryBoundToPMFromSameVendor.java
@@ -154,8 +154,9 @@ public class NewQueryFromExistingQueryBoundToPMFromSameVendor extends QueryTest
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java
index 8a9477a..a95ea73 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryFromRestoredSerializedQuery.java
@@ -59,7 +59,10 @@ public class NewQueryFromRestoredSerializedQuery extends QueryTest {
         BatchTestRunner.run(NewQueryFromRestoredSerializedQuery.class);
     }
 
-    /** */
+    /**
+     *
+     * @throws Exception exception
+     */
     public void testPositive() throws Exception {
         PersistenceManager pm = getPM();
         if (debug)
@@ -120,8 +123,9 @@ public class NewQueryFromRestoredSerializedQuery extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQuerySingleString.java b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQuerySingleString.java
index 31dd1d1..d23de8c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQuerySingleString.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQuerySingleString.java
@@ -88,8 +88,9 @@ public class NewQuerySingleString extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClass.java b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClass.java
index 470c0c5..0d0eec4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClass.java
@@ -77,8 +77,9 @@ public class NewQueryWithCandidateClass extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndCollection.java b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndCollection.java
index 46ea44c..806362d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndCollection.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndCollection.java
@@ -76,8 +76,9 @@ public class NewQueryWithCandidateClassAndCollection extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndExtent.java b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndExtent.java
index 0d5e1e3..898d209 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndExtent.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndExtent.java
@@ -85,8 +85,9 @@ public class NewQueryWithCandidateClassAndExtent extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndFilter.java b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndFilter.java
index 337b1a7..4c2ec8e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndFilter.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassAndFilter.java
@@ -86,8 +86,9 @@ public class NewQueryWithCandidateClassAndFilter extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassCollectionFilter.java b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassCollectionFilter.java
index 75f93f2..be0398a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassCollectionFilter.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithCandidateClassCollectionFilter.java
@@ -84,8 +84,9 @@ public class NewQueryWithCandidateClassCollectionFilter extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithExtent.java b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithExtent.java
index 3c77a02..6d4f1df 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithExtent.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithExtent.java
@@ -79,8 +79,9 @@ public class NewQueryWithExtent extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithExtentAndFilter.java b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithExtentAndFilter.java
index d305b7b..38b3dd4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithExtentAndFilter.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithExtentAndFilter.java
@@ -85,8 +85,9 @@ public class NewQueryWithExtentAndFilter extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithSpecifiedLanguageAndQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithSpecifiedLanguageAndQuery.java
index 482aa0c..b313810 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithSpecifiedLanguageAndQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/NewQueryWithSpecifiedLanguageAndQuery.java
@@ -102,8 +102,9 @@ public class NewQueryWithSpecifiedLanguageAndQuery extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/QueryCancel.java b/tck/src/main/java/org/apache/jdo/tck/query/api/QueryCancel.java
index 8161dff..9e34f8c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/QueryCancel.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/QueryCancel.java
@@ -86,7 +86,10 @@ public class QueryCancel extends QueryTest {
         BatchTestRunner.run(QueryCancel.class);
     }
 
-    /** */
+    /**
+     *
+     * @throws Exception exception
+     */
     public void testCancel() throws Exception {
         PersistenceManager pm = getPM();
         // Test query 
@@ -134,7 +137,10 @@ public class QueryCancel extends QueryTest {
         }
     }
 
-    /** */
+    /**
+     *
+     * @throws Exception exception
+     */
     public void testCancelAll() throws Exception {
         PersistenceManager pm = getPM();
         // Test query
@@ -230,8 +236,9 @@ public class QueryCancel extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         addTearDownClass(PCPoint2.class);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/QueryExtentions.java b/tck/src/main/java/org/apache/jdo/tck/query/api/QueryExtentions.java
index cda430a..20be68e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/QueryExtentions.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/QueryExtentions.java
@@ -76,10 +76,11 @@ public class QueryExtentions extends QueryTest {
         executeJDOQuery(ASSERTION_FAILED, query, singleStringQuery, 
                 false, null, expectedResult[index], true);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/SampleQueries.java b/tck/src/main/java/org/apache/jdo/tck/query/api/SampleQueries.java
index 35ae3f6..9153649 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/SampleQueries.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/SampleQueries.java
@@ -3019,10 +3019,11 @@ public class SampleQueries extends QueryTest {
             return builder.toString();
         }
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/SaveAsNamedQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/api/SaveAsNamedQuery.java
index 6374567..44cd936 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/SaveAsNamedQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/SaveAsNamedQuery.java
@@ -89,8 +89,9 @@ public class SaveAsNamedQuery extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/SetCandidateCollection.java b/tck/src/main/java/org/apache/jdo/tck/query/api/SetCandidateCollection.java
index 2134c5b..156f3bb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/SetCandidateCollection.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/SetCandidateCollection.java
@@ -98,8 +98,9 @@ public class SetCandidateCollection extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/SetCandidateExtent.java b/tck/src/main/java/org/apache/jdo/tck/query/api/SetCandidateExtent.java
index 8ecda28..6d56bf1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/SetCandidateExtent.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/SetCandidateExtent.java
@@ -97,8 +97,9 @@ public class SetCandidateExtent extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/SetFilter.java b/tck/src/main/java/org/apache/jdo/tck/query/api/SetFilter.java
index 3f5aaa6..71c69a2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/SetFilter.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/SetFilter.java
@@ -91,8 +91,9 @@ public class SetFilter extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/SetGrouping.java b/tck/src/main/java/org/apache/jdo/tck/query/api/SetGrouping.java
index bb9bda2..993f218 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/SetGrouping.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/SetGrouping.java
@@ -71,10 +71,11 @@ public class SetGrouping extends QueryTest {
         executeJDOQuery(ASSERTION_FAILED, query, singleStringQuery, 
                 false, null, expectedResult[index], true);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/SetOrdering.java b/tck/src/main/java/org/apache/jdo/tck/query/api/SetOrdering.java
index 93ab43f..c5ca421 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/SetOrdering.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/SetOrdering.java
@@ -130,8 +130,9 @@ public class SetOrdering extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/SetRange.java b/tck/src/main/java/org/apache/jdo/tck/query/api/SetRange.java
index b8e2694..a47b45a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/SetRange.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/SetRange.java
@@ -70,10 +70,11 @@ public class SetRange extends QueryTest {
         executeJDOQuery(ASSERTION_FAILED, query, singleStringQuery, 
                 false, null, expectedResult[index], true);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/SetResult.java b/tck/src/main/java/org/apache/jdo/tck/query/api/SetResult.java
index a3d3930..bcd83ad 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/SetResult.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/SetResult.java
@@ -84,10 +84,11 @@ public class SetResult extends QueryTest {
         } catch (JDOUserException e) {
         }
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/SetResultClass.java b/tck/src/main/java/org/apache/jdo/tck/query/api/SetResultClass.java
index 1a6cca5..1279c5e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/SetResultClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/SetResultClass.java
@@ -77,10 +77,11 @@ public class SetResultClass extends QueryTest {
         executeJDOQuery(ASSERTION_FAILED, query, singleStringQuery, 
                 false, null, expectedResult[index], true);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/SetUnique.java b/tck/src/main/java/org/apache/jdo/tck/query/api/SetUnique.java
index 81a8939..6bb3260 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/SetUnique.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/SetUnique.java
@@ -78,10 +78,11 @@ public class SetUnique extends QueryTest {
         executeJDOQuery(ASSERTION_FAILED, query, singleStringQuery, 
                 false, null, expectedResult[index], true);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/SetterReplacePreviousValues.java b/tck/src/main/java/org/apache/jdo/tck/query/api/SetterReplacePreviousValues.java
index afbe8a7..4316404 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/SetterReplacePreviousValues.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/SetterReplacePreviousValues.java
@@ -154,10 +154,11 @@ public class SetterReplacePreviousValues extends QueryTest {
         executeJDOQuery(ASSERTION_FAILED, query, VALID_QUERIES[index].toString(), false, 
                 null, expectedResult[index], true);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/SingleStringQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/api/SingleStringQuery.java
index 59ecc1d..77cca23 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/SingleStringQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/SingleStringQuery.java
@@ -112,10 +112,11 @@ public class SingleStringQuery extends QueryTest {
         executeJDOQuery(ASSERTION_FAILED, query, singleStringQuery, false, null, 
                 expectedResult[index], true);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/api/UnmodifiableQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/api/UnmodifiableQuery.java
index 10386d5..5c9f72c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/api/UnmodifiableQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/api/UnmodifiableQuery.java
@@ -181,10 +181,11 @@ public class UnmodifiableQuery extends QueryTest {
         fail(ASSERTION_FAILED + method + 
                 " on an unmodifiable query must throw JDOUserException." );
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/delete/DeleteCallback.java b/tck/src/main/java/org/apache/jdo/tck/query/delete/DeleteCallback.java
index 7cf027f..bd0383c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/delete/DeleteCallback.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/delete/DeleteCallback.java
@@ -149,10 +149,11 @@ public class DeleteCallback extends QueryTest {
     public void testNoRelationshipsSingleString() {
         queryUpdateDeleteVerify(1, true, "stringNull");
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         addTearDownClass(MylibReader.getTearDownClasses());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/delete/DeletePersistentAll.java b/tck/src/main/java/org/apache/jdo/tck/query/delete/DeletePersistentAll.java
index db32cfb..68749b5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/delete/DeletePersistentAll.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/delete/DeletePersistentAll.java
@@ -234,10 +234,11 @@ public class DeletePersistentAll extends QueryTest {
             }
         }
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/delete/DeleteQueryElements.java b/tck/src/main/java/org/apache/jdo/tck/query/delete/DeleteQueryElements.java
index 3937c2d..e394cc0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/delete/DeleteQueryElements.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/delete/DeleteQueryElements.java
@@ -256,10 +256,11 @@ public class DeleteQueryElements extends QueryTest {
             deletePersistentAllBySingleStringQuery(ASSERTION_FAILED, INVALID_QUERIES[i], -1);
         }
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Cast.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Cast.java
index 5ac1ee8..982fb43 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Cast.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Cast.java
@@ -125,10 +125,11 @@ public class Cast extends QueryTest {
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, expected);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/CharacterAndStringLiterals.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/CharacterAndStringLiterals.java
index f573fb1..578e9c9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/CharacterAndStringLiterals.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/CharacterAndStringLiterals.java
@@ -168,8 +168,9 @@ public class CharacterAndStringLiterals extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(MylibReader.getTearDownClasses());
         loadAndPersistMylib(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ComparingCollectionFieldToNull.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ComparingCollectionFieldToNull.java
index 3859e6c..20ffc94 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ComparingCollectionFieldToNull.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ComparingCollectionFieldToNull.java
@@ -91,10 +91,11 @@ public class ComparingCollectionFieldToNull extends QueryTest {
         executeSingleStringQuery(ASSERTION_FAILED, holder, expectedResult);
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, expectedResult);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ComparingPersistentAndNonPersistentInstance.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ComparingPersistentAndNonPersistentInstance.java
index e8f24f1..653c1a2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ComparingPersistentAndNonPersistentInstance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ComparingPersistentAndNonPersistentInstance.java
@@ -126,10 +126,11 @@ public class ComparingPersistentAndNonPersistentInstance
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, expected);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java
index f93aabc..d4f8cae 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/DenoteUniquenessInFilter.java
@@ -176,10 +176,11 @@ public class DenoteUniquenessInFilter extends QueryTest {
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, expected);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java
index a8c1374..04040fb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ExecutingMultipleQueriesSimultaneouslyIsThreadSafe.java
@@ -179,8 +179,9 @@ public class ExecutingMultipleQueriesSimultaneouslyIsThreadSafe
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Having.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Having.java
index 85561bf..d0e77c3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Having.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/Having.java
@@ -175,10 +175,11 @@ public class Having extends QueryTest {
                     false);
         }
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IdentifiersEqualFieldNames.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IdentifiersEqualFieldNames.java
index 5f9c464..804cace 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IdentifiersEqualFieldNames.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IdentifiersEqualFieldNames.java
@@ -209,7 +209,7 @@ public class IdentifiersEqualFieldNames extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
     @Override
     protected void localSetUp() {
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IfElseInFilter.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IfElseInFilter.java
index ac3a169..3ae2ad4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IfElseInFilter.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IfElseInFilter.java
@@ -259,10 +259,11 @@ public class IfElseInFilter extends QueryTest {
                     false);
         }
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IgnoreCacheFalse.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IgnoreCacheFalse.java
index 1c0206a..5dc2bb1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IgnoreCacheFalse.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/IgnoreCacheFalse.java
@@ -62,10 +62,11 @@ public class IgnoreCacheFalse extends QueryTest {
     public static void main(String[] args) {
         BatchTestRunner.run(IgnoreCacheFalse.class);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PrimitiveTypes.class);
         super.localSetUp();
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java
index 83139d5..bbbb9c1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/MultipleActiveQueryInstanceInSamePersistenceManager.java
@@ -109,8 +109,9 @@ public class MultipleActiveQueryInstanceInSamePersistenceManager extends QueryTe
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java
index 7994728..f52416d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/MultipleIdenticalImports.java
@@ -171,10 +171,11 @@ public class MultipleIdenticalImports extends QueryTest {
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, expected);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NamespaceOfIdentifiers.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NamespaceOfIdentifiers.java
index 2bf24ca..8f0c0b1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NamespaceOfIdentifiers.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NamespaceOfIdentifiers.java
@@ -86,8 +86,9 @@ public class NamespaceOfIdentifiers extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationComparisonWithNull.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationComparisonWithNull.java
index 6a7028e..bde01e6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationComparisonWithNull.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationComparisonWithNull.java
@@ -67,7 +67,7 @@ public class NavigationComparisonWithNull extends QueryTest {
         return NAVIGATION_TEST_COMPANY_TESTDATA;
     }
 
-    /**
+    /*
      * Manager relationship:
      * emp0
      *   emp1
@@ -226,7 +226,7 @@ public class NavigationComparisonWithNull extends QueryTest {
     }
     
     /**
-     * this.manager != null && this.manager.manager == null
+     * this.manager != null AND this.manager.manager == null
      */
     public void testPositive4() {
        // 4: manager's manager check with extra check on first level manager
@@ -363,7 +363,7 @@ public class NavigationComparisonWithNull extends QueryTest {
     }
 
     /**
-     * this.employee != null && this.employee.manager != null && this.employee.manager.manager == null
+     * this.employee != null AND this.employee.manager != null AND this.employee.manager.manager == null
      */
     public void testPositive8() {
         // 8 : multiple relationships 
@@ -464,10 +464,11 @@ public class NavigationComparisonWithNull extends QueryTest {
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, expected);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java
index cc48a81..224c788 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughACollectionField.java
@@ -98,10 +98,11 @@ public class NavigationThroughACollectionField extends QueryTest {
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, expected);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java
index 3a92c2a..efd2ffb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughANullValuedField.java
@@ -195,10 +195,11 @@ public class NavigationThroughANullValuedField extends QueryTest {
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, expected);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughReferencesUsesDotOperator.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughReferencesUsesDotOperator.java
index 3649a4d..503a6f9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughReferencesUsesDotOperator.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NavigationThroughReferencesUsesDotOperator.java
@@ -192,8 +192,9 @@ public class NavigationThroughReferencesUsesDotOperator extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NegativeRange.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NegativeRange.java
index dfe14f3..e14acae 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NegativeRange.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NegativeRange.java
@@ -36,7 +36,7 @@ import javax.jdo.JDOQLTypedQuery;
  *<B>Assertion ID:</B> A14.6.8-2.
  *<BR>
  *<B>Assertion Description: </B>
- * If ((toExcl - fromIncl) <= 0) evaluates to true, if the result of the query 
+ * If ((toExcl - fromIncl) LESS THAN EQUAL 0) evaluates to true, if the result of the query
  * execution is a List, the returned List contains no instances, 
  * and an Iterator obtained from the List returns false to hasNext(). 
  * If the result of the query execution is a single instance (setUnique(true)), 
@@ -166,7 +166,7 @@ public class NegativeRange extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
     @Override
     protected void localSetUp() {
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java
index 5564ca9..1555b7c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndContainsMethod.java
@@ -132,10 +132,11 @@ public class NullCollectionsAndContainsMethod extends QueryTest {
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, expected);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndIsEmpty.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndIsEmpty.java
index 1dbb520..5050db5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndIsEmpty.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/NullCollectionsAndIsEmpty.java
@@ -84,10 +84,11 @@ public class NullCollectionsAndIsEmpty extends QueryTest {
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, expected);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java
index 2377f1a..6099e08 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/OrderingSpecification.java
@@ -258,8 +258,9 @@ public class OrderingSpecification extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java
index 6fde58a..3864ad6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/ParenthesesMarkOperatorPrecedence.java
@@ -387,8 +387,9 @@ public class ParenthesesMarkOperatorPrecedence extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/PositiveRange.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/PositiveRange.java
index 7cb22ca..0b086de 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/PositiveRange.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/PositiveRange.java
@@ -173,7 +173,7 @@ public class PositiveRange extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
     @Override
     protected void localSetUp() {
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java
index 3d68a64..e573b59 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryIsSerializable.java
@@ -17,7 +17,6 @@
  
 package org.apache.jdo.tck.query.jdoql;
 
-
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.ObjectInputStream;
@@ -63,7 +62,10 @@ public class QueryIsSerializable extends QueryTest {
         BatchTestRunner.run(QueryIsSerializable.class);
     }
 
-    /** */
+    /**
+     *
+     * @throws Exception exception
+     */
     public void testPositive() throws Exception {
         PersistenceManager pm = getPM();
 
@@ -183,8 +185,9 @@ public class QueryIsSerializable extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java
index cf3da66..d27c5ef 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryResultPassedToAnotherQuery.java
@@ -197,8 +197,9 @@ public class QueryResultPassedToAnotherQuery extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryWithNoFilter.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryWithNoFilter.java
index f396555..66a6d73 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryWithNoFilter.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/QueryWithNoFilter.java
@@ -97,8 +97,9 @@ public class QueryWithNoFilter extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/RangeAsString.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/RangeAsString.java
index 9adae62..f056ec8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/RangeAsString.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/RangeAsString.java
@@ -174,8 +174,9 @@ public class RangeAsString extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/RestoredSerializedQueryInstanceLosesAssociationWithPM.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/RestoredSerializedQueryInstanceLosesAssociationWithPM.java
index b16f704..ee98445 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/RestoredSerializedQueryInstanceLosesAssociationWithPM.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/RestoredSerializedQueryInstanceLosesAssociationWithPM.java
@@ -59,7 +59,10 @@ public class RestoredSerializedQueryInstanceLosesAssociationWithPM
         BatchTestRunner.run(RestoredSerializedQueryInstanceLosesAssociationWithPM.class);
     }
 
-    /** */
+    /**
+     *
+     * @throws Exception exception
+     */
     public void test() throws Exception {
         pm = getPM();
 
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java
index d9e4323..9b18e1d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/SeparateNamespaceForTypeNames.java
@@ -130,10 +130,11 @@ public class SeparateNamespaceForTypeNames extends QueryTest {
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, expected);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java
index b8e83d5..016c317 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/WhiteSpaceIsACharacterAndIgnored.java
@@ -140,8 +140,9 @@ public class WhiteSpaceIsACharacterAndIgnored extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/SingleString.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/SingleString.java
index 73b476a..ed1737a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/SingleString.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/SingleString.java
@@ -88,8 +88,9 @@ public class SingleString extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/ThisIsReservedWordForElementOfCollection.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/ThisIsReservedWordForElementOfCollection.java
index c5673e8..d6c3d14 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/ThisIsReservedWordForElementOfCollection.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/ThisIsReservedWordForElementOfCollection.java
@@ -75,8 +75,9 @@ public class ThisIsReservedWordForElementOfCollection extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java
index 6adb84a..bf5742f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/keywords/UseOfThisToAcessHiddenField.java
@@ -136,8 +136,9 @@ public class UseOfThisToAcessHiddenField extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodOrdinal.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodOrdinal.java
index 827cbfa..8bbbe49 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodOrdinal.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodOrdinal.java
@@ -86,9 +86,10 @@ public class EnumMethodOrdinal extends QueryTest {
         }
     }
 
-   /**
-     * @see JDO_Test#localSetUp()
+    /**
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfSimpleEnum.class);
         insertFieldsOfSimpleEnums(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodToString.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodToString.java
index af9ef77..b7530a7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodToString.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/EnumMethodToString.java
@@ -87,8 +87,9 @@ public class EnumMethodToString extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(FieldsOfSimpleEnum.class);
         insertFieldsOfSimpleEnums(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/StartsWithAndEndsWith.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/StartsWithAndEndsWith.java
index e263f30..a3b6016 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/StartsWithAndEndsWith.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/StartsWithAndEndsWith.java
@@ -118,10 +118,11 @@ public class StartsWithAndEndsWith extends QueryTest {
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, expected);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java
index b5307fd..51d4c76 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedCollectionMethods.java
@@ -223,8 +223,9 @@ public class SupportedCollectionMethods extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedDateMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedDateMethods.java
index 09a03f0..4a6d79d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedDateMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedDateMethods.java
@@ -148,8 +148,9 @@ public class SupportedDateMethods extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java
index f67b78c..6165f30 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedJDOHelperMethods.java
@@ -214,10 +214,11 @@ public class SupportedJDOHelperMethods extends QueryTest {
             pm.currentTransaction().commit();
         }
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java
index ff1a416..b965972 100755
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedListMethods.java
@@ -134,8 +134,9 @@ public class SupportedListMethods extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedLocalDateMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedLocalDateMethods.java
index 0cbaaef..4a2bcf7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedLocalDateMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedLocalDateMethods.java
@@ -130,8 +130,9 @@ public class SupportedLocalDateMethods extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(LocalDateSample.class);
         insertLocalDateSampleData(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedLocalDateTimeMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedLocalDateTimeMethods.java
index b3713bd..6a2ea49 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedLocalDateTimeMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedLocalDateTimeMethods.java
@@ -197,8 +197,9 @@ public class SupportedLocalDateTimeMethods extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(LocalDateTimeSample.class);
         insertLocalDateTimeSampleData(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedLocalTimeMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedLocalTimeMethods.java
index 890d1b8..cefe93e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedLocalTimeMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedLocalTimeMethods.java
@@ -131,8 +131,9 @@ public class SupportedLocalTimeMethods extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(LocalTimeSample.class);
         insertLocalTimeSampleData(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMapMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMapMethods.java
index 4b3d203..2a69a23 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMapMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMapMethods.java
@@ -214,8 +214,9 @@ public class SupportedMapMethods extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMathMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMathMethods.java
index 100ef97..3f8667b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMathMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedMathMethods.java
@@ -879,8 +879,9 @@ public class SupportedMathMethods extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(MylibReader.getTearDownClasses());
         addTearDownClass(MathSample.class);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedOptionalMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedOptionalMethods.java
index b77e3a1..913d16f 100755
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedOptionalMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedOptionalMethods.java
@@ -511,9 +511,8 @@ public class SupportedOptionalMethods extends QueryTest {
         }
     }
 
-
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
     @Override
     protected void localSetUp() {
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedStringMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedStringMethods.java
index bdd8608..4364311 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedStringMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedStringMethods.java
@@ -527,8 +527,9 @@ public class SupportedStringMethods extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedTimeMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedTimeMethods.java
index 518021b..17ca63a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedTimeMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/methods/SupportedTimeMethods.java
@@ -141,9 +141,10 @@ public class SupportedTimeMethods extends QueryTest {
         }
     }
 
-   /**
-     * @see JDO_Test#localSetUp()
+    /**
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(TimeSample.class);
         insertTimeSampleData(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BinaryAddition.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BinaryAddition.java
index e23327c..e407ef5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BinaryAddition.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BinaryAddition.java
@@ -111,8 +111,9 @@ public class BinaryAddition extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BinarySubtraction.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BinarySubtraction.java
index ae02abf..75861d0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BinarySubtraction.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BinarySubtraction.java
@@ -117,8 +117,9 @@ public class BinarySubtraction extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BitwiseBinaryOperators.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BitwiseBinaryOperators.java
index ce8c12f..e4cc835 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BitwiseBinaryOperators.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BitwiseBinaryOperators.java
@@ -38,7 +38,7 @@ import java.util.List;
  *<B>Assertion Description: </B>
  A JDO implementation including javax.jdo.query.JDOQL.bitwiseOperations in the result of
  PMF.supportedOptions() supports JDOQL queries that contain bitwise operations.
- Then the integral binary bitwise operators (<code>& and | and ^</code>) are supported
+ Then the integral binary bitwise operators (<code>ampersand and | and ^</code>) are supported
  for the following types:
  <UL>
  <LI><code>byte, short, int, long, Byte, Short Integer, Long</code></LI>
@@ -267,8 +267,9 @@ public class BitwiseBinaryOperators extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BitwiseComplement.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BitwiseComplement.java
index ec0c157..98af4d8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BitwiseComplement.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BitwiseComplement.java
@@ -98,8 +98,9 @@ public class BitwiseComplement extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalAND.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalAND.java
index d06e2b5..656edcc 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalAND.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalAND.java
@@ -127,8 +127,9 @@ public class BooleanLogicalAND extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalOR.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalOR.java
index ddf1df6..539314e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalOR.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/BooleanLogicalOR.java
@@ -153,8 +153,9 @@ public class BooleanLogicalOR extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/ComparisonTests.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/ComparisonTests.java
index b330cf7..e8dd35d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/ComparisonTests.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/ComparisonTests.java
@@ -55,8 +55,14 @@ public abstract class ComparisonTests extends JDO_Test {
     protected static    String      BigIntegerParameter = "java.math.BigInteger value";
     protected static    String      DateParameter = "java.util.Date value";
     protected static    String      AllTypesParameter = "org.apache.jdo.tck.pc.fieldtypes.AllTypes value";
-    
-    /** */
+
+    /**
+     *
+     * @param assertion assertion
+     * @param message the message
+     * @param filter the filter
+     * @param parameter the parameter
+     */
     protected void fail(String assertion, String message, String filter, String parameter)
     {
         StringBuffer buf = new StringBuffer();
@@ -70,9 +76,16 @@ public abstract class ComparisonTests extends JDO_Test {
         
         fail(assertion, buf.toString());
     }
-    
-    /** */
-    protected void runQuery(PersistenceManager pm, 
+
+    /**
+     *
+     * @param pm the PersistenceManager
+     * @param filter the filter
+     * @param parameter the parameter declaration
+     * @param parameterValue the parameter value
+     * @param assertion assertion
+     */
+    protected void runQuery(PersistenceManager pm,
                             String filter, String parameter, Object parameterValue, 
                             String assertion)
     {
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalAND.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalAND.java
index 7e21879..9311d50 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalAND.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalAND.java
@@ -126,8 +126,9 @@ public class ConditionalAND extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalOR.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalOR.java
index 360fee9..25d8a69 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalOR.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/ConditionalOR.java
@@ -127,8 +127,9 @@ public class ConditionalOR extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Division.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Division.java
index 5a2cac8..bf1aac2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Division.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Division.java
@@ -118,8 +118,9 @@ public class Division extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java
index aefc250..589be33 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java
@@ -194,10 +194,11 @@ public class EqualityAndComparisonsBetweenDateFieldsAndParameters
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, expected);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.java
index 5ee06a9..25cb28a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances.java
@@ -98,8 +98,9 @@ public class EqualityAndComparisonsBetweenPrimitivesAndWrapperInstances
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java
index fdc0e8b..ed54e13 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenStringFieldsAndParameters.java
@@ -159,10 +159,11 @@ public class EqualityAndComparisonsBetweenStringFieldsAndParameters
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, expected);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Instanceof.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Instanceof.java
index 1bef44f..b31d8e0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Instanceof.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Instanceof.java
@@ -112,9 +112,11 @@ public class Instanceof extends QueryTest {
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, expected);
     }
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThan.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThan.java
index ec280fb..e9e6ebe 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThan.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThan.java
@@ -47,7 +47,7 @@ are defined in the Java language. This includes the following types:
 </UL>
 The operation on object-valued fields of wrapper types (<code>Boolean, Byte,
 Short, Integer, Long, Float</code>, and <code>Double</code>), and numeric types
-<code>(<code>BigDecimal</code> and <code>BigInteger</code>)
+(<code>BigDecimal</code> and <code>BigInteger</code>)
 use the wrapped values as operands.
 
  */
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LogicalComplement.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LogicalComplement.java
index 5dc7d10..c4fc825 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LogicalComplement.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LogicalComplement.java
@@ -221,8 +221,9 @@ public class LogicalComplement extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Modulo.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Modulo.java
index 7326275..d053227 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Modulo.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Modulo.java
@@ -122,8 +122,9 @@ public class Modulo extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         addTearDownClass(PrimitiveTypes.class);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Multiplication.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Multiplication.java
index f6e0cd0..88d2417 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Multiplication.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Multiplication.java
@@ -109,8 +109,9 @@ public class Multiplication extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/PromotionOfNumericOperands.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/PromotionOfNumericOperands.java
index 85d2af3..09acf6c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/PromotionOfNumericOperands.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/PromotionOfNumericOperands.java
@@ -93,8 +93,9 @@ public class PromotionOfNumericOperands extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/SignInversion.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/SignInversion.java
index 481f0d7..29c0c83 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/SignInversion.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/SignInversion.java
@@ -114,8 +114,9 @@ public class SignInversion extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/StringConcatenation.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/StringConcatenation.java
index 3e4ed54..0cfad87 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/StringConcatenation.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/StringConcatenation.java
@@ -123,10 +123,11 @@ public class StringConcatenation extends QueryTest {
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, expected);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/UnaryPlus.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/UnaryPlus.java
index 786a2d4..f03c4f3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/UnaryPlus.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/UnaryPlus.java
@@ -80,8 +80,9 @@ public class UnaryPlus extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/DomainObjectsAsParameters.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/DomainObjectsAsParameters.java
index 7af069b..fa49758 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/DomainObjectsAsParameters.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/DomainObjectsAsParameters.java
@@ -322,10 +322,11 @@ public class DomainObjectsAsParameters extends QueryTest {
                 tx.rollback();
         }
     }
-     
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         PersistenceManager pm  = getPM();
         addTearDownClass(CompanyModelReader.getTearDownClasses());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/ImplicitParameters.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/ImplicitParameters.java
index 539f4e6..ce3f09c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/ImplicitParameters.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/ImplicitParameters.java
@@ -181,10 +181,11 @@ public class ImplicitParameters extends QueryTest {
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         //TBD executeJDOQLTypedQuery(ASSERTION_FAILED, holder, expected);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/OrderOfParameters.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/OrderOfParameters.java
index e97d32d..b6f1f11 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/OrderOfParameters.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/OrderOfParameters.java
@@ -103,10 +103,11 @@ public class OrderOfParameters extends QueryTest {
             }
         }
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterBoundToDifferentPM.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterBoundToDifferentPM.java
index 2551698..a429942 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterBoundToDifferentPM.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterBoundToDifferentPM.java
@@ -90,10 +90,11 @@ public class ParameterBoundToDifferentPM extends QueryTest {
             }
         }
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java
index 8f1cd9d..3d9f49a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/ParameterDeclaredWithSameNameAsFieldOfCandidateClass.java
@@ -150,8 +150,9 @@ public class ParameterDeclaredWithSameNameAsFieldOfCandidateClass extends QueryT
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
         loadAndPersistPCPoints(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/PrimitiveParameterPassedAsNull.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/PrimitiveParameterPassedAsNull.java
index 7795fd4..bd550b7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/PrimitiveParameterPassedAsNull.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/parameters/PrimitiveParameterPassedAsNull.java
@@ -77,8 +77,9 @@ public class PrimitiveParameterPassedAsNull extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/AggregateOnSize.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/AggregateOnSize.java
index 8c0e9cd..65231c8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/AggregateOnSize.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/AggregateOnSize.java
@@ -17,7 +17,6 @@
  
 package org.apache.jdo.tck.query.jdoql.subqueries;
 
-import java.util.Arrays;
 import java.util.List;
 
 import javax.jdo.PersistenceManager;
@@ -52,7 +51,7 @@ public class AggregateOnSize extends SubqueriesTest {
     }
 
     /** */
-    public void testMaxAndSizeInSubquery() throws Exception {
+    public void testMaxAndSizeInSubquery() {
         PersistenceManager pm = getPM();
 
         List expectedResult = getTransientCompanyModelInstancesAsList(
@@ -85,8 +84,9 @@ public class AggregateOnSize extends SubqueriesTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueries.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueries.java
index b33adc4..4a81128 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueries.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueries.java
@@ -234,8 +234,9 @@ public class CorrelatedSubqueries extends SubqueriesTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java
index 7c9762d..2680858 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java
@@ -21,12 +21,10 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
-import java.util.TimeZone;
 
 import javax.jdo.PersistenceManager;
 import javax.jdo.Query;
 
-import org.apache.jdo.tck.JDO_Test;
 import org.apache.jdo.tck.pc.company.CompanyModelReader;
 import org.apache.jdo.tck.pc.company.Employee;
 import org.apache.jdo.tck.util.BatchTestRunner;
@@ -59,7 +57,7 @@ public class CorrelatedSubqueriesWithParameters extends SubqueriesTest {
     }
 
     /** */
-    public void testPositive() throws Exception {
+    public void testPositive() {
         PersistenceManager pm = getPM();
         runTestSubqueries01(pm);
         runTestSubqueries02(pm);
@@ -178,8 +176,9 @@ public class CorrelatedSubqueriesWithParameters extends SubqueriesTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/MultipleCallsReplaceSubquery.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/MultipleCallsReplaceSubquery.java
index 3a46f57..00ca8b3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/MultipleCallsReplaceSubquery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/MultipleCallsReplaceSubquery.java
@@ -21,12 +21,9 @@ import java.util.List;
 
 import javax.jdo.PersistenceManager;
 import javax.jdo.Query;
-import javax.jdo.Transaction;
 
-import org.apache.jdo.tck.JDO_Test;
 import org.apache.jdo.tck.pc.company.CompanyModelReader;
 import org.apache.jdo.tck.pc.company.Employee;
-import org.apache.jdo.tck.query.QueryTest;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**
@@ -56,7 +53,7 @@ public class MultipleCallsReplaceSubquery extends SubqueriesTest {
     }
 
     /** */
-    public void testPositive() throws Exception {
+    public void testPositive() {
         PersistenceManager pm = getPM();
         List expectedResult = getTransientCompanyModelInstancesAsList(
             new String[]{"emp1","emp2","emp4","emp5","emp6","emp7","emp10"});
@@ -86,8 +83,9 @@ public class MultipleCallsReplaceSubquery extends SubqueriesTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java
index 051c2c0..6fb1119 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java
@@ -60,7 +60,7 @@ public class NonCorrelatedSubqueries extends SubqueriesTest {
     }
 
     /** */
-    public void testPositive() throws Exception {
+    public void testPositive() {
         PersistenceManager pm = getPM();
         runTestSubqueries01(pm);
         runTestSubqueries02(pm);
@@ -137,8 +137,9 @@ public class NonCorrelatedSubqueries extends SubqueriesTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NullCandidateCollectionExpression.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NullCandidateCollectionExpression.java
index 55dc78b..e026925 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NullCandidateCollectionExpression.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NullCandidateCollectionExpression.java
@@ -58,7 +58,7 @@ public class NullCandidateCollectionExpression extends SubqueriesTest {
     }
 
     /** */
-    public void testPositive() throws Exception {
+    public void testPositive() {
         PersistenceManager pm = getPM();
 
         List expectedResult = getTransientCompanyModelInstancesAsList(
@@ -89,8 +89,9 @@ public class NullCandidateCollectionExpression extends SubqueriesTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NullSubqueryParameter.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NullSubqueryParameter.java
index 973638d..77cdc46 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NullSubqueryParameter.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NullSubqueryParameter.java
@@ -56,7 +56,7 @@ public class NullSubqueryParameter extends SubqueriesTest {
     }
 
     /** */
-    public void testPositive() throws Exception {
+    public void testPositive() {
         PersistenceManager pm = getPM();
 
         List expectedResult = getTransientCompanyModelInstancesAsList(
@@ -82,8 +82,9 @@ public class NullSubqueryParameter extends SubqueriesTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NullVariableDeclaration.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NullVariableDeclaration.java
index 3b1b055..b7de072 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NullVariableDeclaration.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/NullVariableDeclaration.java
@@ -57,7 +57,7 @@ public class NullVariableDeclaration extends SubqueriesTest {
     }
 
     /** */
-    public void testNegative() throws Exception {
+    public void testNegative() {
         PersistenceManager pm = getPM();
         runTestNullVariable(pm);
         runTestEmptyVariable(pm);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/UnmodifiedSubqueryInstance.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/UnmodifiedSubqueryInstance.java
index f015c7b..5096c18 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/UnmodifiedSubqueryInstance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/subqueries/UnmodifiedSubqueryInstance.java
@@ -61,7 +61,7 @@ public class UnmodifiedSubqueryInstance extends SubqueriesTest {
     }
 
     /** */
-    public void testPositive() throws Exception {
+    public void testPositive() {
         PersistenceManager pm = getPM();
         runTestUnmodifiedSubquery(pm);
         runTestDifferentPM(pm);
@@ -123,8 +123,9 @@ public class UnmodifiedSubqueryInstance extends SubqueriesTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/MixedVariables.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/MixedVariables.java
index 21336a5..eb829bb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/MixedVariables.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/MixedVariables.java
@@ -136,8 +136,9 @@ public class MixedVariables extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/UnconstrainedVariable.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/UnconstrainedVariable.java
index 65f5731..ec9eab1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/UnconstrainedVariable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/UnconstrainedVariable.java
@@ -93,10 +93,11 @@ public class UnconstrainedVariable extends QueryTest {
             executeJDOQLTypedQuery(ASSERTION_FAILED, holder, expected);
         }
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java
index 3f671d9..0fc681d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariablesAndFields.java
@@ -251,8 +251,9 @@ public class VariablesAndFields extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariablesWithoutExtent.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariablesWithoutExtent.java
index ecd29ef..4620c22 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariablesWithoutExtent.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/variables/VariablesWithoutExtent.java
@@ -84,10 +84,11 @@ public class VariablesWithoutExtent extends QueryTest {
             executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         }
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/AggregateResult.java b/tck/src/main/java/org/apache/jdo/tck/query/result/AggregateResult.java
index 2bea411..8c0b6db 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/AggregateResult.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/AggregateResult.java
@@ -953,10 +953,11 @@ public class AggregateResult extends QueryTest {
                     false);
         }
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/DefaultResult.java b/tck/src/main/java/org/apache/jdo/tck/query/result/DefaultResult.java
index 7b16949..40b2575 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/DefaultResult.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/DefaultResult.java
@@ -82,8 +82,9 @@ public class DefaultResult extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/DefaultUnique.java b/tck/src/main/java/org/apache/jdo/tck/query/result/DefaultUnique.java
index df38b55..3ff4ecf 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/DefaultUnique.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/DefaultUnique.java
@@ -373,7 +373,7 @@ public class DefaultUnique extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
     @Override
     protected void localSetUp() {
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/DistinctCandidateInstances.java b/tck/src/main/java/org/apache/jdo/tck/query/result/DistinctCandidateInstances.java
index 859d6d0..c772c8b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/DistinctCandidateInstances.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/DistinctCandidateInstances.java
@@ -149,8 +149,9 @@ public class DistinctCandidateInstances extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/DistinctQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/result/DistinctQuery.java
index 1f29293..4a53256 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/DistinctQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/DistinctQuery.java
@@ -185,9 +185,11 @@ public class DistinctQuery extends QueryTest {
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/Grouping.java b/tck/src/main/java/org/apache/jdo/tck/query/result/Grouping.java
index 131c81b..0aa0d5f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/Grouping.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/Grouping.java
@@ -121,10 +121,11 @@ public class Grouping extends QueryTest {
                     false);
         }
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/IfElseResult.java b/tck/src/main/java/org/apache/jdo/tck/query/result/IfElseResult.java
index 3572f5f..17e3458 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/IfElseResult.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/IfElseResult.java
@@ -220,8 +220,9 @@ public class IfElseResult extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/ImmutableQueryResult.java b/tck/src/main/java/org/apache/jdo/tck/query/result/ImmutableQueryResult.java
index 959139b..b8a39be 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/ImmutableQueryResult.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/ImmutableQueryResult.java
@@ -171,8 +171,9 @@ public class ImmutableQueryResult extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PrimitiveTypes.class);
         loadAndPersistPrimitiveTypes(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/MethodsInResult.java b/tck/src/main/java/org/apache/jdo/tck/query/result/MethodsInResult.java
index 4b3f163..aa9ad2e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/MethodsInResult.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/MethodsInResult.java
@@ -246,8 +246,9 @@ public class MethodsInResult extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java b/tck/src/main/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java
index 47e6fc8..b9a3c4c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/NPEInResultExpr.java
@@ -122,8 +122,9 @@ public class NPEInResultExpr extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/NullResults.java b/tck/src/main/java/org/apache/jdo/tck/query/result/NullResults.java
index b9d2b98..415b861 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/NullResults.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/NullResults.java
@@ -148,8 +148,9 @@ public class NullResults extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/ProjectedSCODoesNotTrackChanges.java b/tck/src/main/java/org/apache/jdo/tck/query/result/ProjectedSCODoesNotTrackChanges.java
index 3921132..e434e4e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/ProjectedSCODoesNotTrackChanges.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/ProjectedSCODoesNotTrackChanges.java
@@ -67,10 +67,11 @@ public class ProjectedSCODoesNotTrackChanges extends JDO_Test {
     public static void main(String[] args) {
         BatchTestRunner.run(ProjectedSCODoesNotTrackChanges.class);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(Company.class);
     }
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java b/tck/src/main/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java
index 368c2e1..2724763 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/ResultClassRequirements.java
@@ -522,7 +522,7 @@ public class ResultClassRequirements extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
     @Override
     protected void localSetUp() {
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/ResultExpressions.java b/tck/src/main/java/org/apache/jdo/tck/query/result/ResultExpressions.java
index 19d76e8..4030166 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/ResultExpressions.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/ResultExpressions.java
@@ -694,8 +694,9 @@ public class ResultExpressions extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/ShapeOfResult.java b/tck/src/main/java/org/apache/jdo/tck/query/result/ShapeOfResult.java
index 370b543..dee38e3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/ShapeOfResult.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/ShapeOfResult.java
@@ -378,10 +378,11 @@ public class ShapeOfResult extends QueryTest {
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, FullName.class, true, expected);
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/Unique.java b/tck/src/main/java/org/apache/jdo/tck/query/result/Unique.java
index 44b50d5..8b14bf8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/Unique.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/Unique.java
@@ -163,8 +163,9 @@ public class Unique extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResult.java b/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResult.java
index 234ed77..bca6708 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResult.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResult.java
@@ -235,8 +235,9 @@ public class VariableInResult extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultMultipleNavigation.java b/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultMultipleNavigation.java
index 9eac55c..6cdd478 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultMultipleNavigation.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultMultipleNavigation.java
@@ -219,8 +219,9 @@ public class VariableInResultMultipleNavigation extends QueryTest {
     }
 
     /**
-     * @see QueryTest#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultNavigation.java b/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultNavigation.java
index f300bfd..3fda155 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultNavigation.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/VariableInResultNavigation.java
@@ -280,9 +280,11 @@ public class VariableInResultNavigation extends QueryTest {
         executeSingleStringQuery(ASSERTION_FAILED, holder, expected);
         executeJDOQLTypedQuery(ASSERTION_FAILED, holder, null, true, expected);
     }
+
     /**
-     * @see QueryTest#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/sql/AllowedAPIMethods.java b/tck/src/main/java/org/apache/jdo/tck/query/sql/AllowedAPIMethods.java
index f7bccda..c340de8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/sql/AllowedAPIMethods.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/sql/AllowedAPIMethods.java
@@ -214,10 +214,11 @@ public class AllowedAPIMethods extends QueryTest {
         fail(ASSERTION_FAILED + method + 
                 " on a SQL query must throw JDOUserException." );
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         addTearDownClass(MylibReader.getTearDownClasses());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/sql/ExecuteWithMap.java b/tck/src/main/java/org/apache/jdo/tck/query/sql/ExecuteWithMap.java
index d385a3e..a5de1d7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/sql/ExecuteWithMap.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/sql/ExecuteWithMap.java
@@ -164,10 +164,11 @@ public class ExecuteWithMap extends QueryTest {
                     false, illegalMapStringKeys, null, false); 
         }
     }
-    
+
     /**
-     * @see QueryTest#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         addTearDownClass(MylibReader.getTearDownClasses());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/sql/NewQuery.java b/tck/src/main/java/org/apache/jdo/tck/query/sql/NewQuery.java
index b22da7c..b043d29 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/sql/NewQuery.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/sql/NewQuery.java
@@ -82,8 +82,9 @@ public class NewQuery extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/sql/NoCandidateClass.java b/tck/src/main/java/org/apache/jdo/tck/query/sql/NoCandidateClass.java
index a907803..1f0bbb3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/sql/NoCandidateClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/sql/NoCandidateClass.java
@@ -91,8 +91,9 @@ public class NoCandidateClass extends QueryTest {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         loadAndPersistCompanyModel(getPM());
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/sql/ShapeOfResult.java b/tck/src/main/java/org/apache/jdo/tck/query/sql/ShapeOfResult.java
index 2c92fb0..f6ef6a7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/sql/ShapeOfResult.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/sql/ShapeOfResult.java
@@ -172,10 +172,11 @@ public class ShapeOfResult extends QueryTest {
             compile(ASSERTION_FAILED, query, sql, false);
         }
     }
-    
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(CompanyModelReader.getTearDownClasses());
         addTearDownClass(MylibReader.getTearDownClasses());
diff --git a/tck/src/main/java/org/apache/jdo/tck/transactions/AfterCompletionMethodCalledWhenCommitted.java b/tck/src/main/java/org/apache/jdo/tck/transactions/AfterCompletionMethodCalledWhenCommitted.java
index 74f5260..bb7c2bf 100644
--- a/tck/src/main/java/org/apache/jdo/tck/transactions/AfterCompletionMethodCalledWhenCommitted.java
+++ b/tck/src/main/java/org/apache/jdo/tck/transactions/AfterCompletionMethodCalledWhenCommitted.java
@@ -65,11 +65,12 @@ public class AfterCompletionMethodCalledWhenCommitted
      */
     public static void main(String[] args) {
         BatchTestRunner.run(AfterCompletionMethodCalledWhenCommitted.class);
-    }   
-    
+    }
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
     }
@@ -97,7 +98,10 @@ public class AfterCompletionMethodCalledWhenCommitted
         }        
     }
 
-    /** */
+    /**
+     * This method is called by the transaction manager after the transaction is committed or rolled back.
+     * @param status The status of the transaction completion.
+     */
     public void afterCompletion(int status) {
         if (status == javax.transaction.Status.STATUS_COMMITTED) {
             afterCompletionCalled = true;
diff --git a/tck/src/main/java/org/apache/jdo/tck/transactions/AfterCompletionMethodCalledWhenRolledback.java b/tck/src/main/java/org/apache/jdo/tck/transactions/AfterCompletionMethodCalledWhenRolledback.java
index 3627cfb..9b3575a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/transactions/AfterCompletionMethodCalledWhenRolledback.java
+++ b/tck/src/main/java/org/apache/jdo/tck/transactions/AfterCompletionMethodCalledWhenRolledback.java
@@ -66,11 +66,12 @@ public class AfterCompletionMethodCalledWhenRolledback
      */
     public static void main(String[] args) {
         BatchTestRunner.run(AfterCompletionMethodCalledWhenRolledback.class);
-    }   
-    
+    }
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
     }
@@ -98,7 +99,10 @@ public class AfterCompletionMethodCalledWhenRolledback
         }        
     }
 
-    /** */
+    /**
+     * This method is called by the transaction manager after the transaction is committed or rolled back.
+     * @param status The status of the transaction completion.
+     */
     public void afterCompletion(int status) {
         if (status == javax.transaction.Status.STATUS_ROLLEDBACK) {
             afterCompletionCalled = true;
diff --git a/tck/src/main/java/org/apache/jdo/tck/transactions/BeforeCompletionMethodCalled.java b/tck/src/main/java/org/apache/jdo/tck/transactions/BeforeCompletionMethodCalled.java
index 5d123c4..2e23b23 100644
--- a/tck/src/main/java/org/apache/jdo/tck/transactions/BeforeCompletionMethodCalled.java
+++ b/tck/src/main/java/org/apache/jdo/tck/transactions/BeforeCompletionMethodCalled.java
@@ -67,11 +67,12 @@ public class BeforeCompletionMethodCalled
      */
     public static void main(String[] args) {
         BatchTestRunner.run(BeforeCompletionMethodCalled.class);
-    }   
-    
+    }
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
     }
@@ -91,8 +92,11 @@ public class BeforeCompletionMethodCalled
         beforeCompletionCalled = true;
         if (debug) logger.debug ("beforeCompletion called ");
     }
-      
-    /** */
+
+    /**
+     * This method is called by the transaction manager after the transaction is committed or rolled back.
+     * @param status The status of the transaction completion.
+     */
     public void afterCompletion(int status) {
         if (status != javax.transaction.Status.STATUS_COMMITTED) {
             fail(ASSERTION_FAILED,
diff --git a/tck/src/main/java/org/apache/jdo/tck/transactions/BeforeCompletionMethodNotCalledBeforeRollback.java b/tck/src/main/java/org/apache/jdo/tck/transactions/BeforeCompletionMethodNotCalledBeforeRollback.java
index 0f3cf4a..602d1bb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/transactions/BeforeCompletionMethodNotCalledBeforeRollback.java
+++ b/tck/src/main/java/org/apache/jdo/tck/transactions/BeforeCompletionMethodNotCalledBeforeRollback.java
@@ -63,11 +63,12 @@ public class BeforeCompletionMethodNotCalledBeforeRollback
      */
     public static void main(String[] args) {
         BatchTestRunner.run(BeforeCompletionMethodNotCalledBeforeRollback.class);
-    }   
-    
+    }
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
     }
@@ -87,7 +88,10 @@ public class BeforeCompletionMethodNotCalledBeforeRollback
         beforeCompletionCalled = true ;
     }
 
-    /** */
+    /**
+     * This method is called by the transaction manager after the transaction is committed or rolled back.
+     * @param status The status of the transaction completion.
+     */
     public void afterCompletion(int status) {
         if (status != javax.transaction.Status.STATUS_ROLLEDBACK) {
             fail(ASSERTION_FAILED,
diff --git a/tck/src/main/java/org/apache/jdo/tck/transactions/Commit.java b/tck/src/main/java/org/apache/jdo/tck/transactions/Commit.java
index 4f803ab..bb66ca6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/transactions/Commit.java
+++ b/tck/src/main/java/org/apache/jdo/tck/transactions/Commit.java
@@ -74,11 +74,12 @@ public class Commit extends JDO_Test implements Synchronization {
      */
     public static void main(String[] args) {
         BatchTestRunner.run(Commit.class);
-    }   
-    
+    }
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
     }
@@ -98,8 +99,11 @@ public class Commit extends JDO_Test implements Synchronization {
         beforeCompletionCalled = true;
         if (debug) logger.debug("beforeCompletion called ");
     }
-    
-    /** */
+
+    /**
+     * This method is called by the transaction manager after the transaction is committed or rolled back.
+     * @param status The status of the transaction completion.
+     */
     public void afterCompletion(int status) {
         if (status == Status.STATUS_COMMITTED) {
             afterCompletionCalled = true;
diff --git a/tck/src/main/java/org/apache/jdo/tck/transactions/GetPersistenceManager.java b/tck/src/main/java/org/apache/jdo/tck/transactions/GetPersistenceManager.java
index f03ac16..8ad46d7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/transactions/GetPersistenceManager.java
+++ b/tck/src/main/java/org/apache/jdo/tck/transactions/GetPersistenceManager.java
@@ -61,8 +61,9 @@ public class GetPersistenceManager extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
     }
diff --git a/tck/src/main/java/org/apache/jdo/tck/transactions/GetRetainValues.java b/tck/src/main/java/org/apache/jdo/tck/transactions/GetRetainValues.java
index 179fb5b..7bae115 100644
--- a/tck/src/main/java/org/apache/jdo/tck/transactions/GetRetainValues.java
+++ b/tck/src/main/java/org/apache/jdo/tck/transactions/GetRetainValues.java
@@ -68,7 +68,9 @@ public class GetRetainValues extends JDO_Test {
         pm = null;
     }
 
-    /** test transaction.getRetainValues()*/
+    /** test transaction.getRetainValues()
+     * @param pm the PersistenceManager
+     */
     public void runTestGetRetainValues(PersistenceManager pm) {
         Transaction tx = pm.currentTransaction();
         try {
diff --git a/tck/src/main/java/org/apache/jdo/tck/transactions/GetSynchronization.java b/tck/src/main/java/org/apache/jdo/tck/transactions/GetSynchronization.java
index a95d383..10a228f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/transactions/GetSynchronization.java
+++ b/tck/src/main/java/org/apache/jdo/tck/transactions/GetSynchronization.java
@@ -66,8 +66,9 @@ public class GetSynchronization
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
     }
@@ -85,7 +86,10 @@ public class GetSynchronization
         }
     }
 
-    /** */
+    /**
+     * This method is called by the transaction manager after the transaction is committed or rolled back.
+     * @param status The status of the transaction completion.
+     */
     public void afterCompletion(int status) {
         try {
             if (debug) 
diff --git a/tck/src/main/java/org/apache/jdo/tck/transactions/IsActive.java b/tck/src/main/java/org/apache/jdo/tck/transactions/IsActive.java
index afaae98..1adb60f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/transactions/IsActive.java
+++ b/tck/src/main/java/org/apache/jdo/tck/transactions/IsActive.java
@@ -69,7 +69,10 @@ public class IsActive extends JDO_Test {
         pm = null;
     }
 
-    /** test transactions.isActive() */
+    /**
+     * test transactions.isActive()
+     * @param pm the PersistenceManager
+     */
     void runTestIsActive(PersistenceManager pm) {
         Transaction tx = pm.currentTransaction();
         try {
diff --git a/tck/src/main/java/org/apache/jdo/tck/transactions/IsActiveUntilAfterCompletionMethodCalled.java b/tck/src/main/java/org/apache/jdo/tck/transactions/IsActiveUntilAfterCompletionMethodCalled.java
index d562ab1..7b3d9c3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/transactions/IsActiveUntilAfterCompletionMethodCalled.java
+++ b/tck/src/main/java/org/apache/jdo/tck/transactions/IsActiveUntilAfterCompletionMethodCalled.java
@@ -65,8 +65,9 @@ public class IsActiveUntilAfterCompletionMethodCalled
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
     }
@@ -85,7 +86,10 @@ public class IsActiveUntilAfterCompletionMethodCalled
         }
     }
 
-    /** */
+    /**
+     * This method is called by the transaction manager after the transaction is committed or rolled back.
+     * @param status The status of the transaction completion.
+     */
     public void afterCompletion(int status) {
         try {
             if (tx.isActive()) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/transactions/Rollback.java b/tck/src/main/java/org/apache/jdo/tck/transactions/Rollback.java
index e77ad6a..6d1af2b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/transactions/Rollback.java
+++ b/tck/src/main/java/org/apache/jdo/tck/transactions/Rollback.java
@@ -74,10 +74,11 @@ public class Rollback
     public static void main(String[] args) {
         BatchTestRunner.run(Rollback.class);
     }
-   
+
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(PCPoint.class);
     }
@@ -87,8 +88,11 @@ public class Rollback
         beforeCompletionCalled = true;
         if (debug) logger.debug ("beforeCompletion called ");
     }
-     
-    /** */
+
+    /**
+     * This method is called by the transaction manager after the transaction is committed or rolled back.
+     * @param status The status of the transaction completion.
+     */
     public void afterCompletion(int status) {
         if (status == javax.transaction.Status.STATUS_ROLLEDBACK) {
             afterCompletionCalled = true;
diff --git a/tck/src/main/java/org/apache/jdo/tck/transactions/SetNontransactionalRead.java b/tck/src/main/java/org/apache/jdo/tck/transactions/SetNontransactionalRead.java
index e1d297f..22ef898 100644
--- a/tck/src/main/java/org/apache/jdo/tck/transactions/SetNontransactionalRead.java
+++ b/tck/src/main/java/org/apache/jdo/tck/transactions/SetNontransactionalRead.java
@@ -69,8 +69,9 @@ public class SetNontransactionalRead extends JDO_Test {
     }
 
     /**
-     * @see JDO_Test#localSetUp()
+     * @see org.apache.jdo.tck.JDO_Test#localSetUp()
      */
+    @Override
     protected void localSetUp() {
         addTearDownClass(Department.class);
         addTearDownClass(Company.class);
@@ -86,7 +87,10 @@ public class SetNontransactionalRead extends JDO_Test {
         pm = null;
     }
 
-    /** test transactions.setNonteansactionalRead() */
+    /**
+     * test transactions.setNonteansactionalRead()
+     * @param pm the PersistenceManager
+     */
     public void runTestSetNontransactionalRead(PersistenceManager pm) {
         if (!isNontransactionalReadSupported()) {
             if (debug)
diff --git a/tck/src/main/java/org/apache/jdo/tck/transactions/SetNontransactionalReadCalledDuringTxCompletion.java b/tck/src/main/java/org/apache/jdo/tck/transactions/SetNontransactionalReadCalledDuringTxCompletion.java
index 5549a76..844350a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/transactions/SetNontransactionalReadCalledDuringTxCompletion.java
+++ b/tck/src/main/java/org/apache/jdo/tck/transactions/SetNontransactionalReadCalledDuringTxCompletion.java
@@ -85,8 +85,11 @@ public class SetNontransactionalReadCalledDuringTxCompletion
                  "tx.setNontransactionalRead called in beforeCompletion throws unexpected exception: " + ex);
         }
     }
-    
-    /** */
+
+    /**
+     * This method is called by the transaction manager after the transaction is committed or rolled back.
+     * @param status The status of the transaction completion.
+     */
     public void afterCompletion(int status) {
         if (debug) logger.debug("afterCompletion.");
         try {
@@ -113,14 +116,11 @@ public class SetNontransactionalReadCalledDuringTxCompletion
         pm = null;
     }
     
-    /** test transactions.setNonteansactionalRead() */
+    /**
+     * Test transactions.setNonteansactionalRead()
+     * @param pm the PersistenceManager
+     */
     public void runTestSetNontransactionalReadCalledDuringTxCompletion(PersistenceManager pm) {
-        /**
-        if (!isNontransactionalReadSupported()) {
-            if (verbose) println("Implementation does not support non transactional read");
-            return;
... 1294 lines suppressed ...


Mime
View raw message