You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2013/03/14 23:29:20 UTC
[8/8] git commit: ISIS-362: upgrading to JMock 2.6.0
Updated Branches:
refs/heads/master 2782ee865 -> 77aa56878
ISIS-362: upgrading to JMock 2.6.0
* and adding in support for @Never, @Ignoring, @Allowing annotations etc.
(from github.com/danhaywood/java-testsupport).
* the size of the commit is because of an "organize import" throughout,
done with respect to our standard isis.importorder
(see http://isis.apache.org/contributors/development-environment.html)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/77aa5687
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/77aa5687
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/77aa5687
Branch: refs/heads/master
Commit: 77aa56878f60bda6b21daa4300e5eb6dd914cce1
Parents: 2782ee8
Author: Dan Haywood <da...@apache.org>
Authored: Thu Mar 14 22:19:24 2013 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Thu Mar 14 22:19:24 2013 +0000
----------------------------------------------------------------------
.../jdo/applib/AuditServiceLogging.java | 3 +-
.../persistence/FrameworkSynchronizer.java | 4 -
...sistenceQueryFindUsingApplibQueryProcessor.java | 1 -
.../queries/PersistenceQueryProcessorAbstract.java | 3 +-
.../persistence/spi/JdoObjectIdSerializer.java | 3 +-
.../datanucleus/valuetypes/IsisBlobConverter.java | 3 +-
.../datanucleus/valuetypes/IsisBlobMapping.java | 3 +-
.../datanucleus/valuetypes/IsisClobConverter.java | 3 +-
.../datanucleus/valuetypes/IsisClobMapping.java | 3 +-
.../datanucleus/valuetypes/IsisDateConverter.java | 3 +-
.../valuetypes/IsisDateTimeConverter.java | 3 +-
...sPersistenceMechanismInstallerTest_getName.java | 2 -
.../isis/objectstore/jdo/datanucleus/Utils.java | 2 -
.../persistence/spi/JdoObjectIdSerializerTest.java | 8 +-
.../adaptermanager/Persistence_lazyLoading.java | 7 +-
.../adaptermanager/Persistence_loadObject.java | 5 +-
.../Persistence_persistentAdapterFor.java | 5 +-
.../Persistence_persist_bidirWithSetParent.java | 3 -
.../refs/Persistence_persist_polyinter.java | 3 -
...sistence_persist_polyinterIdentityStrategy.java | 6 -
.../refs/Persistence_persist_referencing.java | 9 +-
.../scenarios/refs/Persistence_persist_unidir.java | 6 -
.../refs/Persistence_persist_unidirJoin.java | 9 -
.../Persistence_update_using_domMethodCalls.java | 11 +-
...ersistence_persistAndUpdate_objectAdapters.java | 1 -
...tence_persistAndUpdate_wrapperValuedEntity.java | 4 -
.../valuetypes/IsisDateConverterTest.java | 7 +-
.../valuetypes/IsisDateMappingTest.java | 6 +-
.../JdoDatastoreIdentityFacetImpl.java | 1 -
.../JdoDiscriminatorAnnotationFacetFactory.java | 1 -
.../GivenAuditableAnnotationFacetFactoryTest.java | 6 -
...enAuditableMarkerInterfaceFacetFactoryTest.java | 1 -
...atastoreIdentityAnnotationFacetFactoryTest.java | 6 -
...JdoDiscriminatorAnnotationFacetFactoryTest.java | 2 -
...nJdoEmbeddedOnlyAnnotationFacetFactoryTest.java | 4 -
...rsistenceCapableAnnotationFacetFactoryTest.java | 3 -
...venJdoPrimaryKeyAnnotationFacetFactoryTest.java | 4 -
.../isis/objectstore/nosql/ObjectReader.java | 3 +-
.../nosql/db/file/ClientConnection.java | 1 -
.../objectstore/nosql/db/file/FileServerDb.java | 3 +-
.../FileServerPersistorMechanismInstaller.java | 3 -
.../objectstore/nosql/db/file/JsonStateWriter.java | 9 +-
.../nosql/db/mongo/MongoClientCommandContext.java | 11 +-
.../isis/objectstore/nosql/db/mongo/MongoDb.java | 19 +-
.../nosql/db/mongo/MongoStateReader.java | 11 +-
.../nosql/db/mongo/MongoStateWriter.java | 13 +-
.../DestroyObjectCommandImplementationTest.java | 13 +-
.../nosql/NoSqlIdentifierGeneratorTest.java | 3 +-
.../objectstore/nosql/NoSqlKeyCreatorTest.java | 2 +-
.../nosql/NoSqlKeyCreatorTest_reference.java | 2 +-
.../nosql/NoSqlObjectStoreTest_constructor.java | 4 +-
.../NoSqlObjectStoreTest_interactWith_db.java | 4 +-
.../objectstore/nosql/WriteObjectCommandTest.java | 4 +-
.../nosql/db/file/ClientConnectionTest.java | 3 -
.../nosql/db/file/JsonStateReaderTest.java | 1 -
.../nosql/db/file/JsonStateWriterTest.java | 8 +-
.../nosql/db/file/server/DataReaderTest.java | 4 -
.../nosql/db/file/server/DataWriterTest.java | 4 -
.../nosql/db/file/server/FileServerTest.java | 3 -
.../nosql/db/file/server/LockManagerTest.java | 2 -
.../nosql/db/file/server/LogWriterTest.java | 5 -
.../nosql/db/mongo/MongoIntegrationTest.java | 2 -
.../db/mongo/MongoStateReaderIntegrationTest.java | 1 -
.../db/mongo/MongoStateWriterIntegrationTest.java | 1 -
.../db/mongo/ObjectReaderMongoIntegrationTest.java | 5 +-
...lymorphicForeignKeyInChildCollectionMapper.java | 4 +-
.../apache/isis/objectstore/sql/DefaultsTest.java | 1 -
.../helpers/SimplePasswordEncoderDecoderTest.java | 1 -
.../sql/common/SqlIntegrationTestCommonBase.java | 4 -
.../sql/common/SqlIntegrationTestData.java | 2 -
.../isis/objectstore/sql/MySqlIntegrationTest.java | 1 -
.../objectstore/sql/PostgreSqlIntegrationTest.java | 1 -
.../isis/objectstore/xml/XmlObjectStore.java | 1 -
.../commands/AbstractXmlPersistenceCommand.java | 1 -
.../xml/internal/data/CollectionData.java | 1 -
.../isis/objectstore/xml/internal/data/Data.java | 1 -
.../objectstore/xml/internal/data/ObjectData.java | 1 -
.../XmlObjectStoreTest_isFixturesInstalled.java | 3 +-
.../objectstore/xml/XmlObjectStoreTest_name.java | 3 +-
.../xml/XmlObjectStoreTest_persist.java | 1 -
.../xml/XmlObjectStoreTest_toRefactor.java | 4 +-
.../xml/XmlPersistenceMechanismInstallerTest.java | 3 +-
.../xml/internal/clock/DefaultClockTest.java | 1 -
.../objectstore/xml/internal/clock/TestClock.java | 1 -
.../xml/internal/data/ObjectDataTest.java | 1 -
.../xml/internal/data/ObjectDataVectorTest.java | 2 -
.../xml/internal/data/ReferenceVectorTest.java | 1 -
.../xml/internal/data/xml/XmlDataManagerTest.java | 2 -
.../data/xml/XmlDataManagerTest_instances.java | 2 -
.../xml/internal/UserProfileContentWriter.java | 3 -
.../xml/internal/UserProfileContentWriterTest.java | 1 -
.../xml/internal/UserProfileDataHandlerTest.java | 20 +-
...FactoryDefaultTest_wrappedObject_transient.java | 2 +-
.../shiro/ShiroAuthenticatorOrAuthorizorTest.java | 2 +-
.../isis/security/shiro/util/UtilTest_parse.java | 7 +-
.../apache/isis/viewer/bdd/common/Scenario.java | 1 -
.../bdd/common/fixtures/AbstractFixturePeer.java | 1 -
.../dnd/combined/TwoPartViewSpecification.java | 1 -
.../isis/viewer/dnd/tree/TreeNodeBorder.java | 1 -
.../isis/viewer/dnd/view/base/ObjectView.java | 4 -
.../dnd/view/base/ViewUpdateNotifierImpl.java | 1 -
.../isis/viewer/dnd/view/undo/SetValueCommand.java | 1 -
.../dnd/viewer/basic/ApplicationWorkspace.java | 1 -
.../viewer/dnd/configurable/PanelViewDropTest.java | 2 +-
.../viewer/dnd/configurable/PanelViewTest.java | 2 +-
.../view/text/MultilineTextFieldContentTest.java | 15 +-
.../viewer/dnd/view/text/TextFieldContentTest.java | 8 +-
.../viewer/dnd/viewer/ViewUpdateNotifierTest.java | 12 -
.../dnd/viewer/basic/ActionFieldBuilderTest.java | 2 +-
.../viewer/basic/PlacementStrategyImplTest.java | 2 +-
.../viewer/dnd/viewer/basic/ScrollBorderTest.java | 1 -
.../content/TextParseableField_ParseTextEntry.java | 2 +-
.../dnd/viewer/table/TableRowLayoutTest.java | 2 +-
.../viewer/view/configurable/GridLayoutTest.java | 2 +-
.../isis/viewer/html/action/edit/EditObject.java | 1 -
.../viewer/html/context/CollectionMapping.java | 1 -
.../apache/isis/viewer/html/context/Context.java | 1 -
.../html/context/PersistentRootAdapterMapping.java | 1 -
.../html/servlet/internal/WebController.java | 1 -
.../viewer/html/context/ContextTest_mapAction.java | 1 -
.../html/context/ContextTest_mapCollection.java | 1 -
.../viewer/html/context/ContextTest_mapObject.java | 1 -
.../html/context/ContextTest_serialization.java | 2 +-
.../applib/LinkRepresentationTest_equals.java | 2 -
.../applib/RestfulHttpMethodTest_setUp.java | 2 +-
.../applib/client/RestfulClientTest_follow.java | 4 +-
.../RestfulRequestDomainModelTest_parser.java | 1 -
...RestfulRequestRequestParameterTest_valueOf.java | 1 -
.../DomainObjectRepresentationTest.java | 1 -
.../restfulobjects/applib/util/ParserTest.java | 1 -
.../RestfulObjectsApplicationExceptionMapper.java | 5 +-
.../server/RuntimeExceptionMapper.java | 5 +-
.../AuthenticationSessionStrategyBasicAuth.java | 1 -
.../AuthenticationSessionStrategyHeader.java | 8 +-
.../embedded/EmbeddedWebViewerRestfulObjects.java | 5 +-
.../resources/DomainObjectResourceServerside.java | 3 +-
.../server/resources/DomainResourceHelper.java | 3 +-
.../server/ResourceContextTest_getArg.java | 9 +-
.../isis/viewer/scimpi/dispatcher/Dispatcher.java | 14 +-
.../viewer/scimpi/dispatcher/ErrorCollator.java | 3 +-
.../dispatcher/context/IndirectObjectMapping.java | 1 -
.../scimpi/dispatcher/util/MethodsUtils.java | 1 -
.../viewer/scimpi/dispatcher/view/debug/Log.java | 3 +-
.../dispatcher/view/debug/Specification.java | 1 +
.../viewer/scimpi/servlet/DispatcherServlet.java | 3 +-
.../wicket/viewer/IsisWicketApplication.java | 35 ++--
.../imagecache/ImageResourceCacheClassPath.java | 11 +-
.../integration/wicket/WebRequestCycleForIsis.java | 27 +--
.../settings/WicketViewerSettingsDefault.java | 4 +-
.../viewer/IsisWicketApplication_Defaults.java | 4 -
.../wicket/viewer/IsisWicketApplication_Pages.java | 2 +-
...uthenticatedWebSessionForIsis_Authenticate.java | 2 +-
...thenticatedWebSessionForIsis_Instantiation.java | 2 +-
.../AuthenticatedWebSessionForIsis_SignIn.java | 2 +-
...nticatedWebSessionForIsis_ThreadManagement.java | 2 +-
.../viewer/wicket/model/links/LinksProvider.java | 3 +-
.../wicket/model/mementos/PageParameterNames.java | 9 +-
.../viewer/wicket/model/models/ActionModel.java | 8 +-
.../wicket/model/models/EntityCollectionModel.java | 9 +-
.../viewer/wicket/model/models/ScalarModel.java | 1 -
.../isis/viewer/wicket/ui/ComponentType.java | 1 -
.../ui/app/registry/ComponentFactoryRegistrar.java | 6 +-
.../wicket/ui/components/about/AboutPanel.java | 6 +-
.../ui/components/about/AboutPanelFactory.java | 5 +-
.../ui/components/about/JarManifestModel.java | 6 +-
.../ui/components/about/JarManifestPanel.java | 3 +-
.../ui/components/actionlink/ActionLinkPanel.java | 13 -
.../actionlink/ActionLinkPanelFactory.java | 1 -
.../wicket/ui/components/actions/ActionPanel.java | 15 +-
.../ui/components/collection/CollectionPanel.java | 14 +-
.../ajaxtable/BulkActionsLinkFactory.java | 10 +-
.../CollectionContentsAsAjaxTablePanel.java | 21 +-
.../CollectionContentsLinksSelectorPanel.java | 3 +-
.../entity/collections/EntityCollectionsPanel.java | 21 --
.../entity/icontitle/EntityIconAndTitlePanel.java | 19 +-
.../entity/properties/EntityPropertiesForm.java | 38 ++--
.../selector/links/EntityLinksSelectorPanel.java | 3 +-
.../ui/components/scalars/ScalarPanelAbstract.java | 1 +
.../scalars/image/JavaAwtImagePanel.java | 1 -
.../isisapplib/IsisBlobOrClobPanelAbstract.java | 11 +-
.../scalars/isisapplib/IsisBlobPanel.java | 5 +-
.../scalars/isisapplib/IsisBlobPanelFactory.java | 3 +-
.../scalars/isisapplib/IsisClobPanel.java | 7 +-
.../scalars/isisapplib/IsisClobPanelFactory.java | 3 +-
.../scalars/jodatime/JodaDateTimePanel.java | 5 +-
.../scalars/jodatime/JodaDateTimePanelFactory.java | 5 +-
.../ui/components/value/StandaloneValuePanel.java | 3 +-
.../value/StandaloneValuePanelFactory.java | 5 +-
.../ui/components/voidreturn/VoidReturnPanel.java | 4 -
.../voidreturn/VoidReturnPanelFactory.java | 1 -
.../components/widgets/cssmenu/CssMenuBuilder.java | 4 +-
.../ui/components/widgets/cssmenu/CssMenuItem.java | 23 +-
.../widgets/cssmenu/CssMenuLinkFactory.java | 1 -
.../widgets/entitylink/EntityLinkSelect2Panel.java | 27 +-
.../viewer/wicket/ui/errors/ExceptionModel.java | 4 +-
.../wicket/ui/errors/ExceptionStackTracePanel.java | 3 +-
.../viewer/wicket/ui/errors/JGrowlBehaviour.java | 9 +-
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 47 ++--
.../viewer/wicket/ui/pages/action/ActionPage.java | 7 +-
.../viewer/wicket/ui/pages/error/ErrorPage.java | 5 +-
.../wicket/ui/pages/login/WicketSignInPage.java | 8 -
.../isis/viewer/wicket/ui/panels/FormAbstract.java | 1 -
.../isis/viewer/wicket/ui/panels/PanelUtil.java | 5 +-
.../dropdown/DropDownSelectorPanelAbstract.java | 21 +-
.../selector/links/LinksSelectorPanelAbstract.java | 23 +-
.../EntityIconAndTitlePanelTest_abbreviated.java | 2 +-
core/applib/pom.xml | 8 +
.../java/org/apache/isis/applib/filter/Filter.java | 1 -
.../isis/applib/fixtures/AbstractFixture.java | 2 -
.../isis/applib/fixtures/AbstractFixtureSusa.java | 4 -
.../exceprecog/ExceptionRecognizerAbstract.java | 1 -
.../exceprecog/ExceptionRecognizerComposite.java | 4 +-
.../exceprecog/ExceptionRecognizerForType.java | 4 +-
.../exceprecog/ExceptionRecognizerGeneral.java | 4 +-
.../applib/services/publish/EventSerializer.java | 3 +-
.../isis/applib/FactoryAndRepositoryTest.java | 27 ++-
.../fixtures/FixtureClockInstantiationTest.java | 2 +-
.../exceprecog/ExceptionRecognizerForTypeTest.java | 4 +-
.../exceprecog/ExceptionRecognizerGeneralTest.java | 4 +-
.../org/apache/isis/applib/util/EnumsTest.java | 1 -
.../core/bytecode/cglib/ClassEnhancerTest.java | 1 -
.../core/integtestsupport/IsisSystemDefault.java | 6 +-
.../core/integtestsupport/IsisSystemForTest.java | 6 +-
.../integtestsupport/IsisSystemWithFixtures.java | 21 +-
.../IsisSystemWithFixturesTest_basicTest.java | 1 -
.../objectstore/InMemoryObjectStoreTest_debug.java | 6 +-
.../objectstore/InMemoryObjectStoreTest_init.java | 1 -
.../objectstore/InMemoryObjectStoreTest_name.java | 1 -
.../InMemoryObjectStoreTest_openAndClose.java | 4 +-
.../InMemoryObjectStoreTest_persist.java | 1 -
.../InMemoryObjectStoreTest_persistAggregated.java | 3 -
.../objectstore/InMemoryObjectStoreTest_reset.java | 2 -
.../InMemoryObjectStoreTest_retrieve.java | 1 -
.../InMemoryObjectStoreTest_serviceRegistry.java | 1 -
.../ObjectFixtureFilePersistorTest.java | 5 +-
.../ObjectFixtureServiceTest_loadFile.java | 2 -
...tFixtureServiceTest_loadFile_nothingExists.java | 1 -
.../ObjectFixtureServiceTest_save.java | 1 -
.../isis/core/runtime/memento/MementoTest.java | 7 -
.../core/runtime/memento/MementoTest_data.java | 3 -
.../runtime/memento/MementoTest_encodedData.java | 3 +-
.../IsisConfigurationBuilderResourceStreams.java | 9 +-
.../commons/config/IsisConfigurationDefault.java | 7 +-
.../isis/core/commons/matchers/IsisMatchers.java | 3 +-
.../core/metamodel/adapter/oid/RootOidDefault.java | 7 +-
.../facetapi/ClassSubstitutorFactory.java | 3 -
.../core/metamodel/facetapi/MetaModelRefiner.java | 1 -
.../actions/invoke/ActionInvocationFacet.java | 2 -
.../autocomplete/AutoCompleteFacetAbstract.java | 3 +-
.../object/publish/PublishedObjectFacet.java | 3 -
.../metamodel/interactions/InteractionContext.java | 1 -
.../core/metamodel/progmodel/ProgrammingModel.java | 1 -
.../progmodel/ProgrammingModelAbstract.java | 5 +-
.../runtimecontext/RuntimeContextAbstract.java | 1 -
.../services/ServicesInjectorDefault.java | 17 +-
.../metamodel/services/ServicesInjectorSpi.java | 2 -
.../container/DomainObjectContainerDefault.java | 1 -
.../core/metamodel/spec/ObjectAdapterUtils.java | 4 +-
.../core/metamodel/spec/ObjectSpecification.java | 3 -
.../spec/feature/ObjectActionFilters.java | 3 -
.../core/metamodel/spec/feature/ObjectActions.java | 4 +-
.../specloader/ObjectReflectorDefault.java | 1 +
.../metamodel/specloader/ReflectorConstants.java | 2 -
.../specimpl/dflt/ObjectSpecificationDefault.java | 2 -
.../specloader/validator/MetaModelValidator.java | 1 -
.../invoke/ActionInvocationFacetViaMethod.java | 2 -
.../annotation/PrototypeFacetAnnotation.java | 2 -
.../members/resolve/RenderFacetAnnotation.java | 1 -
.../annotation/AutoCompleteFacetAnnotation.java | 2 -
.../publish/PublishedObjectFacetAnnotation.java | 3 -
.../annotation/TitleAnnotationFacetFactory.java | 3 -
.../value/blobs/BlobValueSemanticsProvider.java | 1 +
.../JodaDateTimeValueSemanticsProvider.java | 3 +-
.../JodaLocalDateTimeValueSemanticsProvider.java | 3 +-
.../dflt/JavaReflectorInstallerNoDecorators.java | 11 -
.../IsisConfigurationDefaultTest_createSubset.java | 11 +-
.../core/commons/lang/TypesTest_filteredList.java | 3 +-
.../metamodel/adapter/version/VersionTest.java | 2 +-
.../ObjectAssociationFiltersTest_visibleWhere.java | 8 +-
.../services/ServicesInjectorAbstractTest.java | 2 +-
...omainObjectContainerDefaultTest_recognizes.java | 7 +-
.../feature/ObjectAssociationFiltersTests.java | 5 +-
.../specloader/SpecificationCacheDefaultTest.java | 2 +-
...ionParameterAbstractTest_getId_and_getName.java | 2 +-
.../specimpl/ObjectAssociationAbstractTest.java | 4 +-
...ObjectAssociationAbstractTest_alwaysHidden.java | 5 +-
.../IsisMetaModelBaseTest_constructDefaults.java | 2 +-
.../IsisMetaModelTest_constructWithServices.java | 2 +-
...IsisMetaModelTest_getDomainObjectContainer.java | 2 +-
.../core/progmodel/app/IsisMetaModelTest_init.java | 2 +-
.../progmodel/app/IsisMetaModelTest_shutdown.java | 2 +-
.../facets/AbstractFacetFactoryJUnit4TestCase.java | 2 +-
.../progmodel/facets/ObjectAdapterUtilsTest.java | 2 +-
.../ActionSemanticsAnnotationFacetFactoryTest.java | 3 -
.../ActionSemanticsFallbackFacetFactoryTest.java | 6 +-
.../IdempotentAnnotationFacetFactoryTest.java | 6 -
.../QueryOnlyAnnotationFacetFactoryTest.java | 5 -
.../collections/JavaCollectionFacetTest.java | 2 +-
...ationFacetFactoryTest_withRenderAnnotation.java | 4 +-
.../TitleFacetViaTitleAnnotationTest.java | 2 +-
...ctTypeDerivedFromClassNameFacetFactoryTest.java | 2 +-
.../parseable/ParseableFacetUsingParserTest.java | 2 +-
.../PagedAnnotationOnTypeFacetFactoryTest.java | 3 -
.../value/BlobValueSemanticsProviderTest.java | 5 +-
.../value/ClobValueSemanticsProviderTest.java | 5 +-
.../ImageValueSemanticsProviderAbstractTest.java | 2 +-
.../ValueSemanticsProviderAbstractTestCase.java | 9 +-
.../dflt/ObjectReflectorDefaultTestAbstract.java | 2 +-
.../InMemoryPersistenceMechanismInstaller.java | 1 -
.../ObjectStorePersistedObjectsDefault.java | 4 +-
.../ObjectStoreInstances_findInstancesAndAdd.java | 3 +-
.../internal/ObjectStoreInstances_init.java | 1 -
.../internal/ObjectStoreInstances_save.java | 1 -
...jectStorePersistedObjectsDefault_instances.java | 2 -
...dObjectsDefault_savesOidGeneratorAsMemento.java | 1 -
...bjectStorePersistedObjectsDefault_services.java | 7 +-
core/pom.xml | 12 +-
.../ObjectFixtureFilePersistor.java | 1 -
.../fixturedomainservice/ObjectFixtureService.java | 1 -
.../PersistenceMechanismInstallerAbstract.java | 17 +--
.../apache/isis/core/runtime/memento/Memento.java | 2 -
.../runtime/persistence/adapter/PojoAdapter.java | 3 +-
.../adaptermanager/AdapterManagerDefault.java | 3 +-
.../DomainObjectContainerObjectChanged.java | 1 -
.../isis/core/runtime/runner/IsisRunner.java | 13 +-
.../core/runtime/runner/opts/OptionValidator.java | 4 +-
.../runner/opts/OptionValidatorForPersistor.java | 4 +-
.../runner/opts/OptionValidatorForViewers.java | 4 +-
.../opts/OptionValidatorUserAndPasswordCombo.java | 4 +-
.../ServicesInstallerFromConfiguration.java | 7 +-
.../core/runtime/snapshot/XmlSnapshotBuilder.java | 2 -
.../core/runtime/system/context/IsisContext.java | 5 -
.../system/persistence/PersistenceSession.java | 1 -
.../core/runtime/system/persistence/Persistor.java | 1 +
.../system/session/IsisSessionFactoryAbstract.java | 12 +-
.../system/transaction/IsisTransaction.java | 15 +-
.../system/transaction/IsisTransactionManager.java | 3 +-
.../system/transaction/MessageBrokerDefault.java | 4 +-
.../systemusinginstallers/IsisSystemAbstract.java | 20 --
.../ActionInvocationFacetWrapTransaction.java | 1 -
.../userprofile/UserProfileLoaderDefault.java | 3 -
.../userprofile/UserProfileStoreInstaller.java | 1 -
.../runtime/userprofile/UserProfilesDebugUtil.java | 2 -
.../isis/core/webapp/IsisWebAppBootstrapper.java | 1 -
.../standard/MultiUserExplorationSessionTest.java | 3 +-
.../SimpleSessionEncodabilityNoRolesTest.java | 1 -
.../SimpleSessionEncodabilityTestAbstract.java | 1 -
.../SimpleSessionEncodabilityWithRolesTest.java | 1 -
...rdAuthenticationManager_AuthenticationTest.java | 3 -
...rdAuthenticationManager_AuthenticatorsTest.java | 3 -
.../isis/core/runtime/context/IsisContextTest.java | 2 +-
.../adapterfactory/pojo/PojoAdapterTest.java | 2 +-
.../AdapterManagerDefault_aggregateAdapters.java | 4 +-
.../PersistenceSessionObjectStoreTest.java | 10 +-
.../DefaultPersistAlgorithmContractTest.java | 2 -
.../algorithm/PersistAlgorithmContractTest.java | 4 +-
...StoreTransactionManager_EndTransactionTest.java | 17 +-
...tStoreTransactionManager_InstantiationTest.java | 7 +-
...oreTransactionManager_StartTransactionTest.java | 11 +-
.../transaction/PojoAdapterBuilder.java | 1 -
.../isis/core/runtime/profiler/ProfilerTest.java | 2 -
.../core/runtime/profiler/ProfilerTestSystem.java | 1 -
.../core/runtime/system/ObjectActionImplTest.java | 11 +-
.../system/OneToManyAssociationImplTest.java | 2 +-
...ssionFactoryAbstractTest_init_and_shutdown.java | 20 +-
.../system/transaction/IsisTransactionTest.java | 22 +-
.../isis/core/runtime/userprofile/OptionsTest.java | 1 -
.../BypassAuthenticationManagerInstaller.java | 4 +-
.../apache/isis/core/tck/dom/refs/ChildEntity.java | 2 -
.../isis/core/tck/dom/refs/ReferencingEntity.java | 1 -
.../core/tck/dom/refs/UnidirJoinParentEntity.java | 1 -
core/unittestsupport/pom.xml | 5 +
.../isis/core/unittestsupport/jmock/auto/Auto.java | 57 -----
.../isis/core/unittestsupport/jmock/auto/Mock.java | 57 -----
.../jmock/auto/internal/AllDeclaredFields.java | 62 -----
.../jmock/auto/internal/Mockomatic.java | 110 ---------
.../jmock/integration/junit4/JUnitRuleMockery.java | 128 ----------
.../core/unittestsupport/jmocking/IsisActions.java | 4 +-
.../unittestsupport/jmocking/JMockActions.java | 80 ++++++
.../jmocking/JUnitRuleMockery2.java | 191 ++++++++++++++-
.../unittestsupport/jmocking/MyMockomatic.java | 126 ++++++++++
.../jmocking/ReturnArgumentJMockAction.java | 50 ----
.../unittestsupport/jmocking/ReturnEachAction.java | 58 -----
.../value/ValueTypeContractTestAbstract.java | 1 -
.../files/FilesTest_deleteFiles.java | 4 +-
.../unittestsupport/jmocking/Collaborating.java | 18 ++
.../unittestsupport/jmocking/Collaborator.java | 5 +
.../jmocking/JMockActionsTest_returnArgument.java | 49 ++++
.../jmocking/JMockActionsTest_returnEach.java | 51 ++++
.../jmocking/JUnit4RuleMockery2Test.java | 63 -----
.../jmocking/JUnitRuleMockery2Test.java | 27 ++
...JUnitRuleMockery2Test_autoWiring_happyCase.java | 38 +++
...y2Test_autoWiring_sadCase_noClassUnderTest.java | 26 ++
...est_autoWiring_sadCase_twoClassesUnderTest.java | 31 +++
...RuleMockery2Test_mockAnnotatedWithAllowing.java | 40 +++
...RuleMockery2Test_mockAnnotatedWithChecking.java | 42 ++++
...RuleMockery2Test_mockAnnotatedWithIgnoring.java | 39 +++
...kery2Test_mockAnnotatedWithNever_happyCase.java | 34 +++
...ockery2Test_mockAnnotatedWithNever_sadCase.java | 40 +++
...ockery2Test_mockAnnotatedWithOne_happyCase.java | 35 +++
...eMockery2Test_mockAnnotatedWithOne_sadCase.java | 36 +++
...lueTypeContractTestAbstract_BigIntegerTest.java | 2 -
.../ValueTypeContractTestAbstract_StringTest.java | 2 -
.../isis/core/webserver/WebServerBootstrapper.java | 2 +-
.../internal/OptionHandlerStartupMode.java | 2 +-
.../isis/example/claims/junit/AbstractTest.java | 7 +-
.../dom/src/main/java/dom/todo/ToDoItem.java | 3 +-
.../example/domainservice/email/EmailService.java | 1 +
.../example/domainservice/email/EmailTemplate.java | 1 +
.../facets/NameFileFacetFacetHolderTest.java | 1 -
.../NameFileFacetFactoryFeatureTypesTest.java | 1 -
.../NameFileFacetFactoryInstantiationTest.java | 1 -
.../facets/NameFileFacetFactoryProcessTest.java | 2 -
.../facets/NameFileFacetInstantiationTest.java | 1 -
.../namefile/facets/NameFileFacetValueTest.java | 1 -
.../facets/NameFileParserInstantiationTest.java | 1 -
.../namefile/facets/NameFileParserParsingTest.java | 1 -
.../apache/isis/tool/mavenplugin/ValidateMojo.java | 25 +-
.../isis/tool/mavenplugin/util/ClassRealms.java | 3 -
.../isis/tool/mavenplugin/util/ClassWorlds.java | 10 -
.../isis/tool/mavenplugin/util/IsisMetaModels.java | 12 -
.../isis/tool/mavenplugin/util/Xpp3Doms.java | 4 +-
422 files changed, 1601 insertions(+), 1755 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/AuditServiceLogging.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/AuditServiceLogging.java b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/AuditServiceLogging.java
index 3e394da..4208305 100644
--- a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/AuditServiceLogging.java
+++ b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/AuditServiceLogging.java
@@ -18,9 +18,10 @@
*/
package org.apache.isis.objectstore.jdo.applib;
-import org.apache.isis.applib.annotation.Hidden;
import org.apache.log4j.Logger;
+import org.apache.isis.applib.annotation.Hidden;
+
@SuppressWarnings("deprecation")
public class AuditServiceLogging implements AuditService {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/FrameworkSynchronizer.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/FrameworkSynchronizer.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/FrameworkSynchronizer.java
index 48c5004..4703c05 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/FrameworkSynchronizer.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/FrameworkSynchronizer.java
@@ -28,15 +28,12 @@ import javax.jdo.PersistenceManager;
import javax.jdo.spi.PersistenceCapable;
import org.apache.log4j.Logger;
-import org.datanucleus.api.jdo.JDOPersistenceManager;
import org.datanucleus.api.jdo.NucleusJDOHelper;
-import org.datanucleus.util.PersistenceUtils;
import org.apache.isis.applib.filter.Filter;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
@@ -53,7 +50,6 @@ import org.apache.isis.core.runtime.system.persistence.OidGenerator;
import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
import org.apache.isis.core.runtime.system.transaction.IsisTransaction;
import org.apache.isis.objectstore.jdo.datanucleus.DataNucleusObjectStore;
-import org.apache.isis.objectstore.jdo.datanucleus.persistence.spi.JdoObjectIdSerializer;
public class FrameworkSynchronizer {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
index bf39cfe..f858675 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java
@@ -33,7 +33,6 @@ import org.apache.isis.core.metamodel.spec.ObjectAdapterUtils;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.runtime.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
-import org.apache.isis.objectstore.jdo.datanucleus.DataNucleusObjectStore;
import org.apache.isis.objectstore.jdo.datanucleus.metamodel.JdoPropertyUtils;
import org.apache.isis.objectstore.jdo.datanucleus.persistence.FrameworkSynchronizer;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
index 35a5691..1e30ca0 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java
@@ -33,13 +33,12 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.core.runtime.system.persistence.AdapterManagerSpi;
import org.apache.isis.core.runtime.system.persistence.PersistenceQuery;
import org.apache.isis.core.runtime.system.persistence.Persistor;
import org.apache.isis.objectstore.jdo.datanucleus.DataNucleusObjectStore;
import org.apache.isis.objectstore.jdo.datanucleus.persistence.FrameworkSynchronizer;
-import org.apache.isis.objectstore.jdo.datanucleus.persistence.IsisLifecycleListener;
import org.apache.isis.objectstore.jdo.datanucleus.persistence.FrameworkSynchronizer.CalledFrom;
+import org.apache.isis.objectstore.jdo.datanucleus.persistence.IsisLifecycleListener;
public abstract class PersistenceQueryProcessorAbstract<T extends PersistenceQuery>
implements PersistenceQueryProcessor<T> {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
index ccd0654..994aa87 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializer.java
@@ -28,12 +28,13 @@ import javax.jdo.identity.IntIdentity;
import javax.jdo.identity.LongIdentity;
import javax.jdo.identity.StringIdentity;
+import org.datanucleus.identity.OID;
+
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.datanucleus.identity.OID;
public final class JdoObjectIdSerializer {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobConverter.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobConverter.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobConverter.java
index 8ac273e..a5c1f4f 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobConverter.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobConverter.java
@@ -18,10 +18,11 @@
*/
package org.apache.isis.objectstore.jdo.datanucleus.valuetypes;
+import org.datanucleus.store.types.converters.TypeConverter;
+
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.core.progmodel.facets.value.blobs.BlobValueSemanticsProvider;
-import org.datanucleus.store.types.converters.TypeConverter;
public class IsisBlobConverter implements TypeConverter<Blob, String>{
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobMapping.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobMapping.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobMapping.java
index 854c785..b684518 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobMapping.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisBlobMapping.java
@@ -18,7 +18,6 @@
*/
package org.apache.isis.objectstore.jdo.datanucleus.valuetypes;
-import org.apache.isis.applib.value.Blob;
import org.datanucleus.ClassLoaderResolver;
import org.datanucleus.ClassNameConstants;
import org.datanucleus.NucleusContext;
@@ -28,6 +27,8 @@ import org.datanucleus.store.mapped.DatastoreContainerObject;
import org.datanucleus.store.mapped.MappedStoreManager;
import org.datanucleus.store.mapped.mapping.SingleFieldMultiMapping;
+import org.apache.isis.applib.value.Blob;
+
public class IsisBlobMapping extends SingleFieldMultiMapping {
public IsisBlobMapping() {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisClobConverter.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisClobConverter.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisClobConverter.java
index 907f64a..55544f8 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisClobConverter.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisClobConverter.java
@@ -18,10 +18,11 @@
*/
package org.apache.isis.objectstore.jdo.datanucleus.valuetypes;
+import org.datanucleus.store.types.converters.TypeConverter;
+
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.core.progmodel.facets.value.clobs.ClobValueSemanticsProvider;
-import org.datanucleus.store.types.converters.TypeConverter;
public class IsisClobConverter implements TypeConverter<Clob, String>{
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisClobMapping.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisClobMapping.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisClobMapping.java
index 92f808a..476eea9 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisClobMapping.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisClobMapping.java
@@ -18,7 +18,6 @@
*/
package org.apache.isis.objectstore.jdo.datanucleus.valuetypes;
-import org.apache.isis.applib.value.Clob;
import org.datanucleus.ClassLoaderResolver;
import org.datanucleus.ClassNameConstants;
import org.datanucleus.NucleusContext;
@@ -28,6 +27,8 @@ import org.datanucleus.store.mapped.DatastoreContainerObject;
import org.datanucleus.store.mapped.MappedStoreManager;
import org.datanucleus.store.mapped.mapping.SingleFieldMultiMapping;
+import org.apache.isis.applib.value.Clob;
+
public class IsisClobMapping extends SingleFieldMultiMapping {
public IsisClobMapping() {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateConverter.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateConverter.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateConverter.java
index b0576d1..f658fc9 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateConverter.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateConverter.java
@@ -18,9 +18,10 @@
*/
package org.apache.isis.objectstore.jdo.datanucleus.valuetypes;
-import org.apache.isis.applib.value.Date;
import org.datanucleus.store.types.converters.TypeConverter;
+import org.apache.isis.applib.value.Date;
+
public class IsisDateConverter implements TypeConverter<Date, Long>{
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateTimeConverter.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateTimeConverter.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateTimeConverter.java
index e4d0741..553e0a3 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateTimeConverter.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateTimeConverter.java
@@ -18,9 +18,10 @@
*/
package org.apache.isis.objectstore.jdo.datanucleus.valuetypes;
-import org.apache.isis.applib.value.DateTime;
import org.datanucleus.store.types.converters.TypeConverter;
+import org.apache.isis.applib.value.DateTime;
+
public class IsisDateTimeConverter implements TypeConverter<DateTime, Long>{
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstallerTest_getName.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstallerTest_getName.java b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstallerTest_getName.java
index fe7a089..ebba602 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstallerTest_getName.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstallerTest_getName.java
@@ -25,8 +25,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller;
-
public class DataNucleusPersistenceMechanismInstallerTest_getName {
private DataNucleusPersistenceMechanismInstaller installer;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/Utils.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/Utils.java b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/Utils.java
index b941c5e..5b0bb73 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/Utils.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/Utils.java
@@ -29,8 +29,6 @@ import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
import org.apache.isis.core.runtime.system.context.IsisContext;
-import org.apache.isis.objectstore.jdo.datanucleus.DataNucleusObjectStore;
-import org.apache.isis.objectstore.jdo.datanucleus.DataNucleusPersistenceMechanismInstaller;
public class Utils {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializerTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializerTest.java b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializerTest.java
index d1b175f..012f9a6 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializerTest.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/JdoObjectIdSerializerTest.java
@@ -24,15 +24,15 @@ import static org.junit.Assert.assertThat;
import java.math.BigInteger;
import java.util.Date;
+import org.datanucleus.identity.OIDImpl;
+import org.junit.Rule;
+import org.junit.Test;
+
import org.apache.isis.applib.annotation.ObjectType;
import org.apache.isis.core.commons.matchers.IsisMatchers;
import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
import org.apache.isis.core.metamodel.adapter.oid.RootOidDefault;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.objectstore.jdo.datanucleus.persistence.spi.JdoObjectIdSerializer;
-import org.datanucleus.identity.OIDImpl;
-import org.junit.Rule;
-import org.junit.Test;
public class JdoObjectIdSerializerTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_lazyLoading.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_lazyLoading.java b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_lazyLoading.java
index 1110ec7..94087d7 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_lazyLoading.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_lazyLoading.java
@@ -25,18 +25,17 @@ import static org.junit.Assert.assertThat;
import java.util.List;
+import org.junit.Rule;
+import org.junit.Test;
+
import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ResolveState;
-import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
import org.apache.isis.core.tck.dom.refs.UnidirReferencedEntity;
import org.apache.isis.core.tck.dom.refs.UnidirReferencedEntityRepository;
import org.apache.isis.core.tck.dom.refs.UnidirReferencingEntity;
import org.apache.isis.core.tck.dom.refs.UnidirReferencingEntityRepository;
import org.apache.isis.objectstore.jdo.datanucleus.Utils;
-import org.junit.Rule;
-import org.junit.Test;
public class Persistence_lazyLoading {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_loadObject.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_loadObject.java b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_loadObject.java
index 2d86e48..32487be 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_loadObject.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_loadObject.java
@@ -21,6 +21,9 @@ package org.apache.isis.objectstore.jdo.datanucleus.scenarios.adaptermanager;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.junit.Rule;
+import org.junit.Test;
+
import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
@@ -29,8 +32,6 @@ import org.apache.isis.core.tck.dom.refs.UnidirReferencedEntityRepository;
import org.apache.isis.core.tck.dom.refs.UnidirReferencingEntity;
import org.apache.isis.core.tck.dom.refs.UnidirReferencingEntityRepository;
import org.apache.isis.objectstore.jdo.datanucleus.Utils;
-import org.junit.Rule;
-import org.junit.Test;
public class Persistence_loadObject {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_persistentAdapterFor.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_persistentAdapterFor.java b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_persistentAdapterFor.java
index d16d827..39d9833 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_persistentAdapterFor.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/adaptermanager/Persistence_persistentAdapterFor.java
@@ -21,6 +21,9 @@ package org.apache.isis.objectstore.jdo.datanucleus.scenarios.adaptermanager;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
+import org.junit.Rule;
+import org.junit.Test;
+
import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
@@ -29,8 +32,6 @@ import org.apache.isis.core.tck.dom.refs.UnidirReferencedEntityRepository;
import org.apache.isis.core.tck.dom.refs.UnidirReferencingEntity;
import org.apache.isis.core.tck.dom.refs.UnidirReferencingEntityRepository;
import org.apache.isis.objectstore.jdo.datanucleus.Utils;
-import org.junit.Rule;
-import org.junit.Test;
public class Persistence_persistentAdapterFor {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_bidirWithSetParent.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_bidirWithSetParent.java b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_bidirWithSetParent.java
index 6002b58..21447b7 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_bidirWithSetParent.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_bidirWithSetParent.java
@@ -21,7 +21,6 @@ package org.apache.isis.objectstore.jdo.datanucleus.scenarios.refs;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -33,8 +32,6 @@ import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
import org.apache.isis.core.tck.dom.refs.BidirWithSetChildEntity;
import org.apache.isis.core.tck.dom.refs.BidirWithSetParentEntity;
import org.apache.isis.core.tck.dom.refs.BidirWithSetParentEntityRepository;
-import org.apache.isis.core.tck.dom.refs.ParentEntity;
-import org.apache.isis.core.tck.dom.refs.ParentEntityRepository;
import org.apache.isis.objectstore.jdo.datanucleus.Utils;
public class Persistence_persist_bidirWithSetParent {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_polyinter.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_polyinter.java b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_polyinter.java
index 40f65e9..60a8ee7 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_polyinter.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_polyinter.java
@@ -29,9 +29,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
-import org.apache.isis.core.tck.dom.refs.PolyClassChildEntity;
-import org.apache.isis.core.tck.dom.refs.PolyClassParentEntity;
-import org.apache.isis.core.tck.dom.refs.PolyClassParentEntityRepository;
import org.apache.isis.core.tck.dom.refs.PolyInterface;
import org.apache.isis.core.tck.dom.refs.PolyInterfaceParentEntity;
import org.apache.isis.core.tck.dom.refs.PolyInterfaceParentEntityRepository;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_polyinterIdentityStrategy.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_polyinterIdentityStrategy.java b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_polyinterIdentityStrategy.java
index 33c55db..9484c1d 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_polyinterIdentityStrategy.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_polyinterIdentityStrategy.java
@@ -29,15 +29,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
-import org.apache.isis.core.tck.dom.refs.PolyClassChildEntity;
-import org.apache.isis.core.tck.dom.refs.PolyClassParentEntity;
-import org.apache.isis.core.tck.dom.refs.PolyClassParentEntityRepository;
-import org.apache.isis.core.tck.dom.refs.PolyInterface;
import org.apache.isis.core.tck.dom.refs.PolyInterfaceIdentityStrategy;
import org.apache.isis.core.tck.dom.refs.PolyInterfaceIdentityStrategyParentEntity;
import org.apache.isis.core.tck.dom.refs.PolyInterfaceIdentityStrategyParentEntityRepository;
-import org.apache.isis.core.tck.dom.refs.PolyInterfaceParentEntity;
-import org.apache.isis.core.tck.dom.refs.PolyInterfaceParentEntityRepository;
import org.apache.isis.objectstore.jdo.datanucleus.Utils;
public class Persistence_persist_polyinterIdentityStrategy {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_referencing.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_referencing.java b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_referencing.java
index d2ef5d8..d29c674 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_referencing.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_referencing.java
@@ -25,18 +25,15 @@ import static org.junit.Assert.assertThat;
import java.util.List;
+import org.junit.Rule;
+import org.junit.Test;
+
import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.ResolveState;
-import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
import org.apache.isis.core.tck.dom.refs.UnidirReferencedEntity;
import org.apache.isis.core.tck.dom.refs.UnidirReferencedEntityRepository;
import org.apache.isis.core.tck.dom.refs.UnidirReferencingEntity;
import org.apache.isis.core.tck.dom.refs.UnidirReferencingEntityRepository;
import org.apache.isis.objectstore.jdo.datanucleus.Utils;
-import org.junit.Rule;
-import org.junit.Test;
public class Persistence_persist_referencing {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_unidir.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_unidir.java b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_unidir.java
index 4dd3912..387f561 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_unidir.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_unidir.java
@@ -21,7 +21,6 @@ package org.apache.isis.objectstore.jdo.datanucleus.scenarios.refs;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -30,11 +29,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
-import org.apache.isis.core.tck.dom.refs.BidirWithSetChildEntity;
-import org.apache.isis.core.tck.dom.refs.BidirWithSetParentEntity;
-import org.apache.isis.core.tck.dom.refs.BidirWithSetParentEntityRepository;
-import org.apache.isis.core.tck.dom.refs.ParentEntity;
-import org.apache.isis.core.tck.dom.refs.ParentEntityRepository;
import org.apache.isis.core.tck.dom.refs.UnidirFkChildEntity;
import org.apache.isis.core.tck.dom.refs.UnidirFkParentEntity;
import org.apache.isis.core.tck.dom.refs.UnidirFkParentEntityRepository;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_unidirJoin.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_unidirJoin.java b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_unidirJoin.java
index 51e9099..3f56f4e 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_unidirJoin.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_persist_unidirJoin.java
@@ -21,7 +21,6 @@ package org.apache.isis.objectstore.jdo.datanucleus.scenarios.refs;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -30,14 +29,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
-import org.apache.isis.core.tck.dom.refs.BidirWithSetChildEntity;
-import org.apache.isis.core.tck.dom.refs.BidirWithSetParentEntity;
-import org.apache.isis.core.tck.dom.refs.BidirWithSetParentEntityRepository;
-import org.apache.isis.core.tck.dom.refs.ParentEntity;
-import org.apache.isis.core.tck.dom.refs.ParentEntityRepository;
-import org.apache.isis.core.tck.dom.refs.UnidirFkChildEntity;
-import org.apache.isis.core.tck.dom.refs.UnidirFkParentEntity;
-import org.apache.isis.core.tck.dom.refs.UnidirFkParentEntityRepository;
import org.apache.isis.core.tck.dom.refs.UnidirJoinChildEntity;
import org.apache.isis.core.tck.dom.refs.UnidirJoinParentEntity;
import org.apache.isis.core.tck.dom.refs.UnidirJoinParentEntityRepository;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_update_using_domMethodCalls.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_update_using_domMethodCalls.java b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_update_using_domMethodCalls.java
index ff469a3..b7d8026 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_update_using_domMethodCalls.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/refs/Persistence_update_using_domMethodCalls.java
@@ -19,24 +19,19 @@
package org.apache.isis.objectstore.jdo.datanucleus.scenarios.refs;
import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import java.util.List;
+import org.junit.Rule;
+import org.junit.Test;
+
import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.ResolveState;
-import org.apache.isis.core.metamodel.adapter.oid.Oid;
-import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
import org.apache.isis.core.tck.dom.refs.UnidirReferencedEntity;
import org.apache.isis.core.tck.dom.refs.UnidirReferencedEntityRepository;
import org.apache.isis.core.tck.dom.refs.UnidirReferencingEntity;
import org.apache.isis.core.tck.dom.refs.UnidirReferencingEntityRepository;
import org.apache.isis.objectstore.jdo.datanucleus.Utils;
-import org.junit.Rule;
-import org.junit.Test;
public class Persistence_update_using_domMethodCalls {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/scalar/Persistence_persistAndUpdate_objectAdapters.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/scalar/Persistence_persistAndUpdate_objectAdapters.java b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/scalar/Persistence_persistAndUpdate_objectAdapters.java
index 84292d8..d1567cb 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/scalar/Persistence_persistAndUpdate_objectAdapters.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/scalar/Persistence_persistAndUpdate_objectAdapters.java
@@ -18,7 +18,6 @@
*/
package org.apache.isis.objectstore.jdo.datanucleus.scenarios.scalar;
-import static org.hamcrest.CoreMatchers.*;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/scalar/Persistence_persistAndUpdate_wrapperValuedEntity.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/scalar/Persistence_persistAndUpdate_wrapperValuedEntity.java b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/scalar/Persistence_persistAndUpdate_wrapperValuedEntity.java
index fc0841f..94e3c62 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/scalar/Persistence_persistAndUpdate_wrapperValuedEntity.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/scenarios/scalar/Persistence_persistAndUpdate_wrapperValuedEntity.java
@@ -27,10 +27,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.core.integtestsupport.IsisSystemWithFixtures;
-import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.ResolveState;
-import org.apache.isis.core.tck.dom.scalars.PrimitiveValuedEntity;
-import org.apache.isis.core.tck.dom.scalars.PrimitiveValuedEntityRepository;
import org.apache.isis.core.tck.dom.scalars.WrapperValuedEntity;
import org.apache.isis.core.tck.dom.scalars.WrapperValuedEntityRepository;
import org.apache.isis.objectstore.jdo.datanucleus.Utils;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateConverterTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateConverterTest.java b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateConverterTest.java
index 48773ca..95f9321 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateConverterTest.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateConverterTest.java
@@ -18,14 +18,15 @@
*/
package org.apache.isis.objectstore.jdo.datanucleus.valuetypes;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
import org.junit.Before;
import org.junit.Test;
import org.apache.isis.applib.value.Date;
-import org.apache.isis.objectstore.jdo.datanucleus.valuetypes.IsisDateConverter;
public class IsisDateConverterTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateMappingTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateMappingTest.java b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateMappingTest.java
index 718ddad..2523f04 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateMappingTest.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/test/java/org/apache/isis/objectstore/jdo/datanucleus/valuetypes/IsisDateMappingTest.java
@@ -18,14 +18,14 @@
*/
package org.apache.isis.objectstore.jdo.datanucleus.valuetypes;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
import org.junit.Before;
import org.junit.Test;
import org.apache.isis.applib.value.Date;
-import org.apache.isis.objectstore.jdo.datanucleus.valuetypes.IsisDateMapping;
public class IsisDateMappingTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetImpl.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetImpl.java b/component/objectstore/jdo/jdo-metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetImpl.java
index 14711b8..3094993 100644
--- a/component/objectstore/jdo/jdo-metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetImpl.java
+++ b/component/objectstore/jdo/jdo-metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetImpl.java
@@ -19,7 +19,6 @@
package org.apache.isis.objectstore.jdo.metamodel.facets.object.datastoreidentity;
import javax.jdo.annotations.IdGeneratorStrategy;
-import javax.jdo.annotations.IdentityType;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java b/component/objectstore/jdo/jdo-metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
index 1ffb553..86e3546 100644
--- a/component/objectstore/jdo/jdo-metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
+++ b/component/objectstore/jdo/jdo-metamodel/src/main/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java
@@ -28,7 +28,6 @@ import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
-import org.apache.isis.core.metamodel.facets.object.objecttype.ObjectSpecIdFacet;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutor;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.ClassSubstitutorAware;
import org.apache.isis.core.progmodel.facets.object.objecttype.ObjectSpecIdFacetDerivedFromClassName;
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/GivenAuditableAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/GivenAuditableAnnotationFacetFactoryTest.java b/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/GivenAuditableAnnotationFacetFactoryTest.java
index 5a9ae86..edc22ab 100644
--- a/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/GivenAuditableAnnotationFacetFactoryTest.java
+++ b/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/GivenAuditableAnnotationFacetFactoryTest.java
@@ -20,8 +20,6 @@ package org.apache.isis.objectstore.jdo.metamodel.facets.object.auditable;
import java.util.List;
-import javax.jdo.annotations.DatastoreIdentity;
-import javax.jdo.annotations.IdGeneratorStrategy;
import javax.jdo.annotations.PersistenceCapable;
import junit.framework.Assert;
@@ -33,10 +31,6 @@ import org.apache.isis.core.metamodel.facets.object.audit.AuditableFacet;
import org.apache.isis.core.metamodel.facets.object.audit.annotation.AuditableFacetAnnotation;
import org.apache.isis.core.objectstore.jdo.applib.annotations.Auditable;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.objectstore.jdo.metamodel.facets.object.auditable.AuditableAnnotationInJdoApplibFacetFactory;
-import org.apache.isis.objectstore.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableAnnotationFacetFactory;
-import org.apache.isis.objectstore.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
-import org.apache.isis.objectstore.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacetAnnotation;
public class GivenAuditableAnnotationFacetFactoryTest extends
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/GivenAuditableMarkerInterfaceFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/GivenAuditableMarkerInterfaceFacetFactoryTest.java b/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/GivenAuditableMarkerInterfaceFacetFactoryTest.java
index d543bf2..9be65a0 100644
--- a/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/GivenAuditableMarkerInterfaceFacetFactoryTest.java
+++ b/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/auditable/GivenAuditableMarkerInterfaceFacetFactoryTest.java
@@ -31,7 +31,6 @@ import org.apache.isis.core.metamodel.facets.object.audit.AuditableFacet;
import org.apache.isis.core.metamodel.facets.object.audit.markerifc.AuditableFacetMarkerInterface;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.objectstore.jdo.applib.Auditable;
-import org.apache.isis.objectstore.jdo.metamodel.facets.object.auditable.AuditableMarkerInterfaceInJdoApplibFacetFactory;
public class GivenAuditableMarkerInterfaceFacetFactoryTest extends
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java b/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
index 194322f..19cba30 100644
--- a/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
+++ b/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java
@@ -30,12 +30,6 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactory;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.objectstore.jdo.metamodel.facets.object.datastoreidentity.JdoDatastoreIdentityAnnotationFacetFactory;
-import org.apache.isis.objectstore.jdo.metamodel.facets.object.datastoreidentity.JdoDatastoreIdentityFacet;
-import org.apache.isis.objectstore.jdo.metamodel.facets.object.datastoreidentity.JdoDatastoreIdentityFacetAnnotation;
-import org.apache.isis.objectstore.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableAnnotationFacetFactory;
-import org.apache.isis.objectstore.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
-import org.apache.isis.objectstore.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacetAnnotation;
public class GivenJdoDatastoreIdentityAnnotationFacetFactoryTest extends
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java b/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java
index a3528a7..b5553eb 100644
--- a/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java
+++ b/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java
@@ -31,8 +31,6 @@ import org.apache.isis.core.metamodel.facets.FacetFactory;
import org.apache.isis.core.metamodel.facets.object.objecttype.ObjectSpecIdFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.objectstore.jdo.metamodel.facets.object.discriminator.JdoDiscriminatorAnnotationFacetFactory;
-import org.apache.isis.objectstore.jdo.metamodel.facets.object.discriminator.ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation;
public class GivenJdoDiscriminatorAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/embeddedonly/GivenJdoEmbeddedOnlyAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/embeddedonly/GivenJdoEmbeddedOnlyAnnotationFacetFactoryTest.java b/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/embeddedonly/GivenJdoEmbeddedOnlyAnnotationFacetFactoryTest.java
index 7909195..e31e60f 100644
--- a/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/embeddedonly/GivenJdoEmbeddedOnlyAnnotationFacetFactoryTest.java
+++ b/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/embeddedonly/GivenJdoEmbeddedOnlyAnnotationFacetFactoryTest.java
@@ -27,10 +27,6 @@ import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactory;
import org.apache.isis.core.metamodel.facets.object.aggregated.ParentedFacet;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.objectstore.jdo.metamodel.facets.object.embeddedonly.JdoEmbeddedOnlyAnnotationFacetFactory;
-import org.apache.isis.objectstore.jdo.metamodel.facets.object.embeddedonly.JdoEmbeddedOnlyFacet;
-import org.apache.isis.objectstore.jdo.metamodel.facets.object.embeddedonly.JdoEmbeddedOnlyFacetAnnotation;
-import org.apache.isis.objectstore.jdo.metamodel.facets.object.embeddedonly.ParentedFacetDerivedFromJdoEmbeddedOnlyAnnotation;
public class GivenJdoEmbeddedOnlyAnnotationFacetFactoryTest extends
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java b/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java
index ae56d33..eda4f34 100644
--- a/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java
+++ b/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java
@@ -29,9 +29,6 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facets.FacetFactory;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
-import org.apache.isis.objectstore.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableAnnotationFacetFactory;
-import org.apache.isis.objectstore.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacet;
-import org.apache.isis.objectstore.jdo.metamodel.facets.object.persistencecapable.JdoPersistenceCapableFacetAnnotation;
public class GivenJdoPersistenceCapableAnnotationFacetFactoryTest extends
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java b/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
index 0d02691..b07cef5 100644
--- a/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
+++ b/component/objectstore/jdo/jdo-metamodel/src/test/java/org/apache/isis/objectstore/jdo/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java
@@ -31,10 +31,6 @@ import org.apache.isis.core.metamodel.facets.FacetFactory;
import org.apache.isis.core.metamodel.facets.mandatory.MandatoryFacet;
import org.apache.isis.core.progmodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.progmodel.facets.members.disabled.DisabledFacet;
-import org.apache.isis.objectstore.jdo.metamodel.facets.prop.primarykey.DisabledFacetDerivedFromJdoPrimaryKeyAnnotation;
-import org.apache.isis.objectstore.jdo.metamodel.facets.prop.primarykey.JdoPrimaryKeyAnnotationFacetFactory;
-import org.apache.isis.objectstore.jdo.metamodel.facets.prop.primarykey.JdoPrimaryKeyFacet;
-import org.apache.isis.objectstore.jdo.metamodel.facets.prop.primarykey.OptionalFacetDerivedFromJdoPrimaryKeyAnnotation;
public class GivenJdoPrimaryKeyAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
http://git-wip-us.apache.org/repos/asf/isis/blob/77aa5687/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/ObjectReader.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/ObjectReader.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/ObjectReader.java
index 4ed0ba8..6c51a54 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/ObjectReader.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/ObjectReader.java
@@ -22,6 +22,8 @@ package org.apache.isis.objectstore.nosql;
import java.util.List;
import java.util.Map;
+import org.apache.log4j.Logger;
+
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ResolveState;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
@@ -43,7 +45,6 @@ import org.apache.isis.objectstore.nosql.db.StateReader;
import org.apache.isis.objectstore.nosql.encryption.DataEncryption;
import org.apache.isis.objectstore.nosql.keys.KeyCreatorDefault;
import org.apache.isis.objectstore.nosql.versions.VersionCreator;
-import org.apache.log4j.Logger;
public class ObjectReader {