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 2019/12/04 20:41:19 UTC

[isis] branch master updated (6111dff -> 1114748)

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.


    from 6111dff  ISIS-2213: moves most of jdo common to jdo-datanucleus-5, and renames jdo-common to jdo-applib
     add 00970c4  ISIS-2213: moves jdo-datanucleus-5 classes under o.a.i.persistence.jdo
     add 1114748  ISIS-2213: moves jdo classes to o.a.i.persistence.jdo.datanucleus5

No new revisions were added by this update.

Summary of changes:
 .../config/presets/DebugPersistence.properties     |  6 +++---
 core/persistence/jdo/datanucleus-5/pom.xml         |  2 +-
 .../jdo/datanucleus5}/IsisBootDataNucleus.java     | 18 ++++++++--------
 .../CreateSchemaObjectFromClassMetadata.java       |  2 +-
 .../datanucleus/DataNucleusException.java          |  2 +-
 .../datanucleus/DataNucleusLifeCycleHelper.java    |  2 +-
 .../datanucleus/DataNucleusPropertiesAware.java    |  2 +-
 .../datanucleus/DataNucleusSettings.java           |  2 +-
 .../datanucleus/JDOStateManagerForIsis.java        |  5 +++--
 .../datanucleus/JdoRuntimeException.java           |  2 +-
 .../datanucleus/metamodel/JdoPropertyUtils.java    |  6 +++---
 .../commands/AbstractDataNucleusObjectCommand.java |  2 +-
 .../commands/DataNucleusCreateObjectCommand.java   |  2 +-
 .../commands/DataNucleusDeleteObjectCommand.java   |  2 +-
 .../PersistenceQueryFindAllInstancesProcessor.java |  4 ++--
 ...sistenceQueryFindUsingApplibQueryProcessor.java |  6 +++---
 .../queries/PersistenceQueryProcessor.java         |  2 +-
 .../queries/PersistenceQueryProcessorAbstract.java |  6 +++---
 .../datanucleus/persistence/queries/QueryUtil.java |  2 +-
 .../persistence/spi/JdoObjectIdSerializer.java     |  4 ++--
 .../service/JdoPersistenceLifecycleService.java    |  2 +-
 .../service/eventbus/EventBusServiceJdo.java       |  6 +++---
 .../typeconverters/IsisMarkupConverter.java        |  2 +-
 .../typeconverters/IsisPasswordConverter.java      |  2 +-
 .../valuemappings/ByteArrayBlobRdbmsMapping.java   |  2 +-
 .../datanucleus/valuetypes/IsisBlobMapping.java    |  2 +-
 .../datanucleus/valuetypes/IsisClobMapping.java    |  2 +-
 .../datanucleus/valuetypes/IsisMoneyMapping.java   |  2 +-
 .../entities/JdoEntityTypeRegistry.java            |  4 ++--
 ...eptionRecognizerCompositeForJdoObjectStore.java |  2 +-
 ...xceptionRecognizerForJDODataStoreException.java |  2 +-
 ...traintViolationForeignKeyNoActionException.java |  2 +-
 ...ionRecognizerForJDOObjectNotFoundException.java |  2 +-
 ...yConstraintViolationUniqueOrIndexException.java |  2 +-
 .../exceprecog/JdoNestedExceptionResolver.java     |  2 +-
 .../jdosupport/IsisJdoMetamodelPlugin5.java        |  4 ++--
 .../jdosupport/IsisJdoSupportDN5.java              |  4 ++--
 .../mixins/Persistable_datanucleusIdLong.java      |  2 +-
 .../mixins/Persistable_datanucleusVersionLong.java |  2 +-
 .../Persistable_datanucleusVersionTimestamp.java   |  2 +-
 .../mixins/Persistable_downloadJdoMetadata.java    |  2 +-
 .../JdoStoreLifecycleListenerForIsis.java          |  4 ++--
 .../metamodel/IsisJdoMetamodelPlugin.java          |  2 +-
 .../datanucleus5}/metamodel/JdoMetamodelUtil.java  |  2 +-
 .../metamodel/JdoProgrammingModelPlugin.java       | 24 +++++++++++-----------
 ...JdoDatastoreIdentityAnnotationFacetFactory.java |  4 ++--
 .../JdoDatastoreIdentityFacet.java                 |  2 +-
 .../JdoDatastoreIdentityFacetAbstract.java         |  2 +-
 .../JdoDatastoreIdentityFacetAnnotation.java       |  2 +-
 .../JdoDatastoreIdentityFacetImpl.java             |  2 +-
 .../object/datastoreidentity}/package-info.java    |  2 +-
 .../JdoDiscriminatorAnnotationFacetFactory.java    |  4 ++--
 .../discriminator/JdoDiscriminatorFacet.java       |  2 +-
 .../JdoDiscriminatorFacetDefault.java              |  2 +-
 ...nferredFromJdoDiscriminatorValueAnnotation.java |  2 +-
 .../facets/object/discriminator/package-info.java  |  2 +-
 ...cIdFacetForJdoPersistenceCapableAnnotation.java |  4 ++--
 ...doPersistenceCapableAnnotationFacetFactory.java |  6 +++---
 .../JdoPersistenceCapableFacet.java                |  2 +-
 .../JdoPersistenceCapableFacetAbstract.java        |  4 ++--
 .../JdoPersistenceCapableFacetAnnotation.java      |  2 +-
 .../JdoPersistenceCapableFacetImpl.java            |  4 ++--
 .../object/persistencecapable/package-info.java    |  2 +-
 .../facets/object/query/JdoNamedQuery.java         |  2 +-
 .../object/query/JdoQueriesFacetAnnotation.java    |  2 +-
 .../query/JdoQueryAnnotationFacetFactory.java      |  4 ++--
 .../facets/object/query/JdoQueryFacet.java         |  2 +-
 .../facets/object/query/JdoQueryFacetAbstract.java |  2 +-
 .../object/query/JdoQueryFacetAnnotation.java      |  2 +-
 .../object/query/VisitorForClauseAbstract.java     |  2 +-
 .../facets/object/query/VisitorForFromClause.java  |  2 +-
 .../object/query/VisitorForVariablesClause.java    |  4 ++--
 .../version/JdoVersionAnnotationFacetFactory.java  |  4 ++--
 .../facets/object/version/JdoVersionFacet.java     |  2 +-
 .../version/JdoVersionFacetFromAnnotation.java     |  2 +-
 .../facets/object/version}/package-info.java       |  2 +-
 ...DerivedFromJdoColumnAnnotationFacetFactory.java |  6 +++---
 .../BigDecimalFacetDerivedFromJdoColumn.java       |  2 +-
 .../prop/column/BigDecimalFacetFallback.java       |  2 +-
 .../column/MandatoryFacetDerivedFromJdoColumn.java |  2 +-
 ...ndatoryFacetInferredFromAbsenceOfJdoColumn.java |  2 +-
 ...ndatoryFromJdoColumnAnnotationFacetFactory.java | 10 ++++-----
 ...DerivedFromJdoColumnAnnotationFacetFactory.java |  8 ++++----
 .../column/MaxLengthFacetDerivedFromJdoColumn.java |  2 +-
 .../JdoNotPersistentAnnotationFacetFactory.java    |  4 ++--
 .../prop/notpersistent/JdoNotPersistentFacet.java  |  2 +-
 .../JdoNotPersistentFacetAbstract.java             |  2 +-
 .../JdoNotPersistentFacetAnnotation.java           |  2 +-
 .../notpersistent/JdoNotPersistentFacetImpl.java   |  2 +-
 ...FacetDerivedFromJdoNotPersistentAnnotation.java |  2 +-
 ...ledFacetDerivedFromJdoPrimaryKeyAnnotation.java |  2 +-
 .../JdoPrimaryKeyAnnotationFacetFactory.java       |  4 ++--
 .../facets/prop/primarykey/JdoPrimaryKeyFacet.java |  2 +-
 .../primarykey/JdoPrimaryKeyFacetAbstract.java     |  2 +-
 .../primarykey/JdoPrimaryKeyFacetAnnotation.java   |  2 +-
 .../prop/primarykey/JdoPrimaryKeyFacetImpl.java    |  2 +-
 ...nalFacetDerivedFromJdoPrimaryKeyAnnotation.java |  2 +-
 .../facets/prop/primarykey/package-info.java       |  2 +-
 .../util/JdoPrimaryKeyPropertyPredicate.java       |  4 ++--
 .../metrics/MetricsServiceDefault.java             |  2 +-
 .../objectadapter/ObjectAdapterContext.java        |  4 ++--
 .../ObjectAdapterContext_DependencyInjection.java  |  2 +-
 .../ObjectAdapterContext_Factories.java            |  4 ++--
 ...ObjectAdapterContext_LifecycleEventSupport.java |  2 +-
 .../ObjectAdapterContext_NewIdentifier.java        |  2 +-
 ...ctAdapterContext_ObjectAdapterByIdProvider.java |  2 +-
 ...ObjectAdapterContext_ObjectAdapterProvider.java |  2 +-
 .../ObjectAdapterContext_ObjectCreation.java       |  2 +-
 .../objectadapter/ObjectAdapterLegacy.java         |  2 +-
 .../persistence/DNStoreManagerType.java            |  2 +-
 .../DataNucleusApplicationComponents5.java         | 10 ++++-----
 .../persistence/IsisLifecycleListener.java         |  2 +-
 .../persistence/IsisPersistenceSessionJdo.java     |  2 +-
 .../persistence/IsisPersistenceSessionJdoBase.java |  4 ++--
 .../IsisPlatformTransactionManagerForJdo.java      |  2 +-
 .../persistence/IsisTransactionJdo.java            |  2 +-
 .../persistence/IsisTransactionManagerJdo.java     |  2 +-
 .../persistence/PersistenceSession5.java           | 16 +++++++--------
 .../persistence/PersistenceSessionFactory5.java    | 10 ++++-----
 .../jdo/datanucleus5}/persistence/Utils.java       |  2 +-
 ...pache.isis.jdo.metamodel.IsisJdoMetamodelPlugin |  1 -
 ...o.datanucleus5.metamodel.IsisJdoMetamodelPlugin |  1 +
 .../datanucleus-5/src/main/resources/plugin.xml    | 18 ++++++++--------
 ...onRecognizerCompositeForJdoObjectStoreTest.java |  3 ++-
 ...LIntegrityConstraintViolationExceptionTest.java |  3 ++-
 ...atastoreIdentityAnnotationFacetFactoryTest.java |  5 ++++-
 ...JdoDiscriminatorAnnotationFacetFactoryTest.java |  6 +++++-
 ...rsistenceCapableAnnotationFacetFactoryTest.java |  5 ++++-
 .../query/JdoQueryAnnotationFacetFactoryTest.java  |  2 +-
 .../JdoVersionAnnotationFacetFactoryTest.java      |  5 ++++-
 ...AnnotationFacetFactoryTest_refineMetaModel.java |  3 ++-
 ...vedFromJdoColumnAnnotationFacetFactoryTest.java |  2 +-
 ...vedFromJdoColumnAnnotationFacetFactoryTest.java |  2 +-
 ...impleObjectWithBigDecimalColumnAnnotations.java |  2 +-
 ...impleObjectWithColumnAllowsNullAnnotations.java |  2 +-
 ...JdoNotPersistentAnnotationFacetFactoryTest.java |  2 +-
 .../SimpleObjectWithNotPersistentColumn.java       |  2 +-
 ...venJdoPrimaryKeyAnnotationFacetFactoryTest.java |  2 +-
 .../primarykey/SimpleObjectWithPrimaryKey.java     |  2 +-
 .../adapterfactory/pojo/PojoAdapterTest.java       |  2 +-
 .../transaction/PojoAdapterBuilder.java            |  2 +-
 .../java/demoapp/application/DemoAppManifest.java  |  2 +-
 .../testdomain/conf/Configuration_usingJdo.java    |  2 +-
 .../conf/Configuration_usingJdoAndShiro.java       |  2 +-
 .../testdomain/bootstrapping/builtin-IsisBoot.list |  6 +++---
 .../bootstrapping/builtin-domain-services.list     |  2 +-
 .../bootstrapping/builtin-singleton.list           | 10 ++++-----
 147 files changed, 253 insertions(+), 236 deletions(-)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/IsisBootDataNucleus.java (70%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/CreateSchemaObjectFromClassMetadata.java (99%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/DataNucleusException.java (95%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/DataNucleusLifeCycleHelper.java (96%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/DataNucleusPropertiesAware.java (93%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/DataNucleusSettings.java (94%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/JDOStateManagerForIsis.java (96%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/JdoRuntimeException.java (94%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/metamodel/JdoPropertyUtils.java (90%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/persistence/commands/AbstractDataNucleusObjectCommand.java (94%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java (96%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java (95%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java (92%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/persistence/queries/PersistenceQueryFindUsingApplibQueryProcessor.java (96%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/persistence/queries/PersistenceQueryProcessor.java (92%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/persistence/queries/PersistenceQueryProcessorAbstract.java (91%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/persistence/queries/QueryUtil.java (97%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/persistence/spi/JdoObjectIdSerializer.java (97%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/service/JdoPersistenceLifecycleService.java (98%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/service/eventbus/EventBusServiceJdo.java (89%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/typeconverters/IsisMarkupConverter.java (94%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/typeconverters/IsisPasswordConverter.java (94%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/valuemappings/ByteArrayBlobRdbmsMapping.java (95%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/valuetypes/IsisBlobMapping.java (98%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/valuetypes/IsisClobMapping.java (98%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/datanucleus/valuetypes/IsisMoneyMapping.java (98%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/entities/JdoEntityTypeRegistry.java (96%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/exceprecog/ExceptionRecognizerCompositeForJdoObjectStore.java (97%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/exceprecog/ExceptionRecognizerForJDODataStoreException.java (95%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/exceprecog/ExceptionRecognizerForJDODataStoreExceptionIntegrityConstraintViolationForeignKeyNoActionException.java (95%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/exceprecog/ExceptionRecognizerForJDOObjectNotFoundException.java (95%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationUniqueOrIndexException.java (95%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/exceprecog/JdoNestedExceptionResolver.java (95%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/jdosupport/IsisJdoMetamodelPlugin5.java (93%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/jdosupport/IsisJdoSupportDN5.java (97%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/jdosupport/mixins/Persistable_datanucleusIdLong.java (97%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/jdosupport/mixins/Persistable_datanucleusVersionLong.java (97%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/jdosupport/mixins/Persistable_datanucleusVersionTimestamp.java (97%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/jdosupport/mixins/Persistable_downloadJdoMetadata.java (97%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/lifecycles/JdoStoreLifecycleListenerForIsis.java (94%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/IsisJdoMetamodelPlugin.java (96%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/JdoMetamodelUtil.java (94%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/JdoProgrammingModelPlugin.java (89%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityAnnotationFacetFactory.java (92%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacet.java (92%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetAbstract.java (95%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetAnnotation.java (92%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/datastoreidentity/JdoDatastoreIdentityFacetImpl.java (92%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo/metamodel/facets/object/version => persistence/jdo/datanucleus5/metamodel/facets/object/datastoreidentity}/package-info.java (89%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/discriminator/JdoDiscriminatorAnnotationFacetFactory.java (95%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/discriminator/JdoDiscriminatorFacet.java (91%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/discriminator/JdoDiscriminatorFacetDefault.java (92%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/discriminator/ObjectSpecIdFacetInferredFromJdoDiscriminatorValueAnnotation.java (93%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/discriminator/package-info.java (89%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/domainobject/objectspecid/ObjectSpecIdFacetForJdoPersistenceCapableAnnotation.java (89%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/persistencecapable/JdoPersistenceCapableAnnotationFacetFactory.java (90%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacet.java (94%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java (93%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAnnotation.java (93%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetImpl.java (95%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/persistencecapable/package-info.java (89%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/query/JdoNamedQuery.java (97%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/query/JdoQueriesFacetAnnotation.java (93%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/query/JdoQueryAnnotationFacetFactory.java (95%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/query/JdoQueryFacet.java (95%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/query/JdoQueryFacetAbstract.java (96%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/query/JdoQueryFacetAnnotation.java (93%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/query/VisitorForClauseAbstract.java (97%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/query/VisitorForFromClause.java (96%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/query/VisitorForVariablesClause.java (92%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/version/JdoVersionAnnotationFacetFactory.java (96%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/version/JdoVersionFacet.java (91%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/version/JdoVersionFacetFromAnnotation.java (93%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo/metamodel/facets/object/datastoreidentity => persistence/jdo/datanucleus5/metamodel/facets/object/version}/package-info.java (90%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactory.java (96%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/column/BigDecimalFacetDerivedFromJdoColumn.java (96%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/column/BigDecimalFacetFallback.java (95%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/column/MandatoryFacetDerivedFromJdoColumn.java (93%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/column/MandatoryFacetInferredFromAbsenceOfJdoColumn.java (93%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/column/MandatoryFromJdoColumnAnnotationFacetFactory.java (94%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/column/MaxLengthDerivedFromJdoColumnAnnotationFacetFactory.java (94%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/column/MaxLengthFacetDerivedFromJdoColumn.java (93%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/notpersistent/JdoNotPersistentAnnotationFacetFactory.java (92%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/notpersistent/JdoNotPersistentFacet.java (93%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetAbstract.java (93%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetAnnotation.java (92%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/notpersistent/JdoNotPersistentFacetImpl.java (92%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/notpersistent/NotPersistedFacetDerivedFromJdoNotPersistentAnnotation.java (93%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/primarykey/DisabledFacetDerivedFromJdoPrimaryKeyAnnotation.java (93%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/primarykey/JdoPrimaryKeyAnnotationFacetFactory.java (93%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacet.java (93%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetAbstract.java (93%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetAnnotation.java (92%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/primarykey/JdoPrimaryKeyFacetImpl.java (92%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/primarykey/OptionalFacetDerivedFromJdoPrimaryKeyAnnotation.java (94%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/primarykey/package-info.java (90%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/util/JdoPrimaryKeyPropertyPredicate.java (91%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metrics/MetricsServiceDefault.java (97%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/objectadapter/ObjectAdapterContext.java (98%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/objectadapter/ObjectAdapterContext_DependencyInjection.java (97%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/objectadapter/ObjectAdapterContext_Factories.java (94%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/objectadapter/ObjectAdapterContext_LifecycleEventSupport.java (97%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/objectadapter/ObjectAdapterContext_NewIdentifier.java (97%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/objectadapter/ObjectAdapterContext_ObjectAdapterByIdProvider.java (99%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java (97%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/objectadapter/ObjectAdapterContext_ObjectCreation.java (98%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/objectadapter/ObjectAdapterLegacy.java (98%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/persistence/DNStoreManagerType.java (98%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/persistence/DataNucleusApplicationComponents5.java (95%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/persistence/IsisLifecycleListener.java (99%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/persistence/IsisPersistenceSessionJdo.java (96%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/persistence/IsisPersistenceSessionJdoBase.java (98%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/persistence/IsisPlatformTransactionManagerForJdo.java (98%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/persistence/IsisTransactionJdo.java (99%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/persistence/IsisTransactionManagerJdo.java (99%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/persistence/PersistenceSession5.java (97%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/persistence/PersistenceSessionFactory5.java (95%)
 rename core/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/persistence/Utils.java (95%)
 delete mode 100644 core/persistence/jdo/datanucleus-5/src/main/resources/META-INF/services/org.apache.isis.jdo.metamodel.IsisJdoMetamodelPlugin
 create mode 100644 core/persistence/jdo/datanucleus-5/src/main/resources/META-INF/services/org.apache.isis.persistence.jdo.datanucleus5.metamodel.IsisJdoMetamodelPlugin
 rename core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java (93%)
 rename core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/exceprecog/ExceptionRecognizerForSQLIntegrityConstraintViolationExceptionTest.java (91%)
 rename core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/datastoreidentity/GivenJdoDatastoreIdentityAnnotationFacetFactoryTest.java (90%)
 rename core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/discriminator/GivenJdoDiscriminatorAnnotationFacetFactoryTest.java (87%)
 rename core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/persistencecapable/GivenJdoPersistenceCapableAnnotationFacetFactoryTest.java (92%)
 rename core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/query/JdoQueryAnnotationFacetFactoryTest.java (97%)
 rename core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest.java (88%)
 rename core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java (97%)
 rename core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/column/BigDecimalDerivedFromJdoColumnAnnotationFacetFactoryTest.java (98%)
 rename core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/column/MandatoryDerivedFromJdoColumnAnnotationFacetFactoryTest.java (98%)
 rename core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/column/SimpleObjectWithBigDecimalColumnAnnotations.java (97%)
 rename core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/column/SimpleObjectWithColumnAllowsNullAnnotations.java (97%)
 rename core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/notpersistent/GivenJdoNotPersistentAnnotationFacetFactoryTest.java (98%)
 rename core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/notpersistent/SimpleObjectWithNotPersistentColumn.java (93%)
 rename core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/primarykey/GivenJdoPrimaryKeyAnnotationFacetFactoryTest.java (98%)
 rename core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/{jdo => persistence/jdo/datanucleus5}/metamodel/facets/prop/primarykey/SimpleObjectWithPrimaryKey.java (92%)