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 2020/01/10 18:35:25 UTC
[isis] branch master updated (b0b446f -> ba0793a)
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 b0b446f ISIS-2158: further simplify WebModules
add 26afedd ISIS-2062: combines the secman docs together.
add f27a282 ISIS-2062: renames secman:ROOT to security:secman
add 8c56359 ISIS-2062: moves secman and shiro-realm-ldap from extensions to security module.
add 6837ce1 ISIS-2062: moves other modules from extensions to pjdo, vw and vro
add e5214ca ISIS-2259: adds in parent module for shiro-realm-ldap
add 8858558 ISIS-2259: adds in parent module for cors extension module
add 984b7e8 ISIS-2259: scaffolding for jaxrsclient mapping
add 3c45d34 ISIS-2259: adds in parent module for restclient and jaxrsclient (in mappings)
add decedce ISIS-2062; moves location of docs for mappings modules.
add 4081233 ISIS-2259: renames base subdomain dom to applib.
add ba1179e ISIS-2259: renames package for base subdomain
add bd378c1 ISIS-2259: adds parent for base subdomain
add 805156b ISIS-2062: moves base subdomains doc
add 7083dd4 ISIS-2259: adds parent for docx subdomain.
add 4295ffb ISIS-2259: reorganises excel subdomain, factors out excel.applib vs excel.testing
add 7e2b011 ISIS-2259: freemarker subdomain structure
add e0f1458 ISIS-2259: reorg pdfbox module
add 7ff9bb9 ISIS-2259: reorg spring subdomains module
add f788b25 ISIS-2259: reorg xdocreport module
add e570062 ISIS-2259: reorg fakedata module
add c1c20d9 ISIS-2259: reorg fixtures testing module.
add 86f80a7 ISIS-2259: removes some deprecated classes from base subdomain module's tests.
add 191f3f2 ISIS-2259: reorg specsupport module
add 5206d9c ISIS-2259: reorg unittestsupport module
add 270cb13 ISIS-2259; reorg asciidoctor modules
add 4ea1289 ISIS-2259: reorg markdown module
add aeef432 ISIS-2259: reorg sse module
add b89cf95 Merge remote-tracking branch 'origin/master' into ide
add 97092b9 ISIS-2259: fixes some compile issues
add b894414 ISIS-2259: renames isis-applib back to isis-core-applib
add 5c221e2 ISIS-2259: renames isis-codegen-bytebuddy to isis-core-codegen-bytebuddy
add 44b52d6 ISIS-2259: renames isis-commons to isis-core-commons
add bd70a9c ISIS-2259: renames isis-config to isis-core-config
add 861faaf ISIS-2259: renames isis-detached-tests to isis-core-detachedtests
add d192d56 ISIS-2259: renames isis-metamodel to isis-core-metamodel
add 87b6b5c ISIS-2259: renames isis-runtime to isis-core-runtime
add 16d6b5c ISIS-2259: moves runtime.services package to runtimeservices (to align packages with artifactId, avoid split packages).
add 44e526e ISIS-2259: renames isis-runtime-services to isis-core-runtimeservices
add 35ba537 ISIS-2259: renames isis-schema to isis-core-schema
add 2f4bbcc ISIS-2259: renames isis-webapp to isis-core-webapp
add f7ce11d ISIS-2259: renames isis-webboot-springboot to isis-core-webboot-springboot
add 2735499 ISIS-2259: renames core/runtime-services directory to core/runtimeservices
add f0f62d5 Merge remote-tracking branch 'origin/master' into ide
add d3fdb9d ISIS-2259: revert, renames isis-core-applib back to isis-applib
add bfd3bf4 ISIS-2259: revert, renames isis-core-schema back to isis-schema
add fde0cf3 ISIS-2259: moves isis-applib and isis-schema to ../api directory
add 8b21f46 ISIS-2259: introduce parent for viewers/restfulobjects
add f659d9b ISIS-2259: introduce parent for viewers/wicket and persistence/jdo
add c2e1e8d ISIS-2259: moves security modules up a level, renames isis-security-api to isis-core-security
add 2dbdf0c ISIS-2259: moves core/persistence up a level.
add 033d444 ISIS-2259: moves core/integtestsupport to testing/integtestsupport
add aa0d039 ISIS-2259: renames isis-integtestsupport to isis-testing-integtestsupport-applib
add bdef229 ISIS-2259: adds parent module for integtestsupport
add ad03851 ISIS-2259: renames isis-unittestsupport to isis-core-unittestsupport
add 98a59cc ISIS-2259: moves core/testsupport/unittestsupport up one level
add 2074ec1 ISIS-2259: moves core/viewers up a level.
add 3ac9f0f ISIS-2259: fixes package for isis-core-codegen-bytebuddy
add c4b62b7 ISIS-2259: fixes package for isis-core-commons
add 41d6458 ISIS-2259: fixes module class names for core-codegen-bytebuddy and core-commons
add b6d4fa1 ISIS-2259: fixes package names for isis-core-config
add 88b8e18 ISIS-2259: moves constants defined in ConfigurationConstants class elsewhere
add 57d16ae ISIS-2259: minor partial tidy up of detached-tests
add 31b8b21 ISIS-2259: fixes up package name of isis-core-metamodel
add 868a69c Merge remote-tracking branch 'origin/master' into ide
new c1cd28d ISIS-2259: fixes up packages for sse module
new 7c42bbc ISIS-2259: fixes up package name for isis-core-runtime
new 1769a66 ISIS-2259: fixes up some module names
new 3a21a48 ISIS-2259: updates packages for isis-core-runtimeservices.
new 57763d6 ISIS-2259: updates packages for isis-core-unittestsupport
new 0283607 ISIS-2259: updates packages for isis-core-webapp
new 95b84ba ISIS-2259: updates packages for core-webspringboot
new 4613ed6 ISIS-2259: search-n-replace text references to isis.apache.isis where missing "core" as the next bit.
new 59dc863 ISIS-2259: fixes unit tests (incorrect class literals)
new e2cb0f9 ISIS-2259: more fixes to unit tests (string literals)
new 976e961 ISIS-2259: search-n-replace for org.apache.isis.runtime -> core, integtestsupport -> testing.integtestsupport.applib
new f3e2749 ISIS-2259: fixing further unit tests
new f6ec8f9 ISIS-2259: some further unit tests being fixed.
new ba0793a Merge remote-tracking branch 'origin/master' into ide
The 14 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.adoc | 8 +-
.../isis-configurations-and-modules.pptx | Bin 49792 -> 49903 bytes
antora/components/extensions/{ => adoc}/antora.yml | 0
.../extensions/{ => adoc}/modules/ROOT/nav.adoc | 0
.../{ => adoc}/modules/ROOT/pages/about.adoc | 0
.../adoc/modules/ROOT/partials/component-nav.adoc | 18 +
.../modules/ROOT/partials/module-nav.adoc | 0
.../modules/ROOT/partials/component-nav.adoc | 13 -
.../security/modules/ROOT/pages/about.adoc | 2 +-
.../modules/ROOT/partials/component-nav.adoc | 5 +-
.../modules/ROOT/partials/component-nav.adoc | 4 +-
...15-HealthAssessmentReport_DRCP594591_138322.pdf | Bin 0 -> 932790 bytes
...9-HealthAssessmentReport_DRCJ1712475_138322.pdf | Bin 0 -> 1387664 bytes
.../components/toc/modules/ROOT/pages/about.adoc | 2 +-
.../modules/ROOT/pages/landing-page/guides.adoc | 2 +-
.../what-is-apache-isis/isis-in-pictures.adoc | 10 +-
.../pages/what-is-apache-isis/screencasts.adoc | 2 +-
.../toc/modules/ROOT/partials/module-nav.adoc | 2 +-
.../mn-1.16.0-to-2.0.0-M1_other-changes.adoc | 2 +-
.../toc/modules/relnotes/pages/rn-1.12.0.adoc | 2 +-
.../btb/pages/hints-and-tips/multi-tenancy.adoc | 4 +-
.../apache-isis-vs/mvc-server-side.adoc | 2 +-
.../fun/pages/core-concepts/philosophy/aop.adoc | 2 +-
antora/playbooks/site-core.yml | 2 +-
antora/playbooks/site-mappings.yml | 8 +-
antora/playbooks/site-refguide.yml | 10 +-
antora/playbooks/site-security.yml | 25 +-
antora/playbooks/site-subdomains.yml | 18 +-
antora/playbooks/site-testing.yml | 10 +-
antora/playbooks/site.yml | 89 +-
.../jaxrs-resteasy-4 => api/applib}/.gitignore | 0
api/applib/pom.xml | 103 ++
.../schema => api/applib}/src/main/doc/antora.yml | 0
.../src/main/doc/modules/applib-ant/examples.sh | 0
.../applib-ant/examples}/annotation/Action.java | 0
.../examples}/annotation/ActionLayout.java | 0
.../applib-ant/examples}/annotation/Auditing.java | 0
.../examples}/annotation/BookmarkPolicy.java | 0
.../applib-ant/examples}/annotation/Bounding.java | 0
.../examples}/annotation/Collection.java | 0
.../examples}/annotation/CollectionLayout.java | 0
.../examples}/annotation/CommandExecuteIn.java | 0
.../examples}/annotation/CommandPersistence.java | 0
.../examples}/annotation/CommandReification.java | 0
.../applib-ant/examples}/annotation/Constants.java | 0
.../examples}/annotation/Contributed.java | 0
.../applib-ant/examples/annotation/Defaulted.java | 83 +
.../examples}/annotation/DomainObject.java | 0
.../examples}/annotation/DomainObjectLayout.java | 0
.../examples}/annotation/DomainService.java | 0
.../examples}/annotation/DomainServiceLayout.java | 0
.../applib-ant/examples}/annotation/Editing.java | 0
.../examples}/annotation/EqualByContent.java | 0
.../applib-ant/examples/annotation/Facets.java | 60 +
.../applib-ant/examples}/annotation/HomePage.java | 0
.../examples}/annotation/LabelPosition.java | 0
.../examples}/annotation/MemberOrder.java | 0
.../examples}/annotation/MementoSerialization.java | 0
.../applib-ant/examples}/annotation/MinLength.java | 0
.../applib-ant/examples}/annotation/Mixin.java | 0
.../applib-ant/examples}/annotation/Module.java | 0
.../applib-ant/examples}/annotation/Nature.java | 0
.../examples}/annotation/NatureOfService.java | 0
.../applib-ant/examples}/annotation/Navigable.java | 0
.../examples}/annotation/Optionality.java | 0
.../examples}/annotation/OrderPrecedence.java | 0
.../applib-ant/examples}/annotation/Parameter.java | 0
.../examples}/annotation/ParameterLayout.java | 0
.../examples}/annotation/Programmatic.java | 0
.../examples}/annotation/Projecting.java | 0
.../examples}/annotation/PromptStyle.java | 0
.../applib-ant/examples}/annotation/Property.java | 0
.../examples}/annotation/PropertyLayout.java | 0
.../examples}/annotation/Publishing.java | 0
.../examples}/annotation/PublishingChangeKind.java | 0
.../applib-ant/examples}/annotation/Redirect.java | 0
.../applib-ant/examples}/annotation/RenderDay.java | 0
.../examples}/annotation/Repainting.java | 0
.../examples}/annotation/RestrictTo.java | 0
.../examples}/annotation/SemanticsOf.java | 0
.../applib-ant/examples}/annotation/Title.java | 0
.../applib-ant/examples/annotation/Value.java | 103 ++
.../applib-ant/examples}/annotation/ViewModel.java | 0
.../examples}/annotation/ViewModelLayout.java | 0
.../applib-ant/examples}/annotation/Where.java | 0
.../examples}/annotation/package-info.java | 0
.../main/doc/modules/applib-ant}/images/.gitkeep | 0
.../ActionLayout}/bookmarking.png | Bin
.../ActionLayout/position-BELOW.png | Bin
.../ActionLayout/position-PANEL.png | Bin
.../ActionLayout/position-PANEL_DROPDOWN.png | Bin
.../ActionLayout/position-RIGHT.png | Bin
.../CollectionLayout/sortedby-dependencies.png | Bin
.../DomainObjectLayout/bookmarking-nested.png | Bin
.../DomainObjectLayout}/bookmarking.png | Bin
.../DomainServiceLayout/menuBar-primary.png | Bin
.../DomainServiceLayout/menuBar-secondary.png | Bin
.../DomainServiceLayout/menuBar-tertiary.png | Bin
.../DomainServiceLayout/menuOrder.png | Bin
.../reference-annotations/HomePage/HomePage.png | Bin
.../PropertyLayout/labelPosition-LEFT.png | Bin
.../PropertyLayout/labelPosition-NONE.png | Bin
.../PropertyLayout/labelPosition-TOP.png | Bin
.../PropertyLayout/labelPosition-boolean-LEFT.png | Bin
.../PropertyLayout/labelPosition-boolean-RIGHT.png | Bin
.../src/main/doc/modules/applib-ant}/nav.adoc | 0
.../main/doc/modules/applib-ant/pages/Action.adoc | 0
.../applib-ant/pages/Action/associateWith.adoc | 0
.../modules/applib-ant/pages/Action/command.adoc | 0
.../applib-ant/pages/Action/domainEvent.adoc | 0
.../modules/applib-ant/pages/Action/hidden.adoc | 0
.../modules/applib-ant/pages/Action/invokeOn.adoc | 0
.../applib-ant/pages/Action/publishing.adoc | 0
.../applib-ant/pages/Action/restrictTo.adoc | 0
.../modules/applib-ant/pages/Action/semantics.adoc | 0
.../modules/applib-ant/pages/Action/typeOf.adoc | 0
.../doc/modules/applib-ant/pages/ActionLayout.adoc | 0
.../applib-ant/pages/ActionLayout/bookmarking.adoc | 0
.../pages/ActionLayout/contributedAs.adoc | 0
.../applib-ant/pages/ActionLayout/cssClass.adoc | 0
.../applib-ant/pages/ActionLayout/cssClassFa.adoc | 0
.../applib-ant/pages/ActionLayout/describedAs.adoc | 0
.../applib-ant/pages/ActionLayout/hidden.adoc | 0
.../applib-ant/pages/ActionLayout/named.adoc | 0
.../applib-ant/pages/ActionLayout/position.adoc | 0
.../applib-ant/pages/ActionLayout/promptStyle.adoc | 0
.../applib-ant/pages/ActionLayout/redirect.adoc | 0
.../doc/modules/applib-ant/pages/Collection.adoc | 0
.../applib-ant/pages/Collection/domainEvent.adoc | 0
.../applib-ant/pages/Collection/editing.adoc | 0
.../applib-ant/pages/Collection/hidden.adoc | 0
.../applib-ant/pages/Collection/notPersisted.adoc | 0
.../applib-ant/pages/Collection/typeOf.adoc | 0
.../modules/applib-ant/pages/CollectionLayout.adoc | 0
.../pages/CollectionLayout/cssClass.adoc | 0
.../pages/CollectionLayout/defaultView.adoc | 0
.../pages/CollectionLayout/describedAs.adoc | 0
.../applib-ant/pages/CollectionLayout/hidden.adoc | 0
.../applib-ant/pages/CollectionLayout/named.adoc | 0
.../applib-ant/pages/CollectionLayout/paged.adoc | 0
.../pages/CollectionLayout/sortedBy.adoc | 0
.../main/doc/modules/applib-ant/pages/Column.adoc | 0
.../main/doc/modules/applib-ant/pages/Digits.adoc | 0
.../modules/applib-ant/pages/Discriminator.adoc | 0
.../doc/modules/applib-ant/pages/DomainObject.adoc | 0
.../pages/DomainObject/actionDomainEvent.adoc | 0
.../applib-ant/pages/DomainObject/auditing.adoc | 0
.../pages/DomainObject/autoCompleteRepository.adoc | 0
.../applib-ant/pages/DomainObject/bounding.adoc | 0
.../pages/DomainObject/collectionDomainEvent.adoc | 0
.../pages/DomainObject/createdLifecycleEvent.adoc | 0
.../applib-ant/pages/DomainObject/editing.adoc | 0
.../pages/DomainObject/loadedLifecycleEvent.adoc | 0
.../applib-ant/pages/DomainObject/mixinMethod.adoc | 0
.../applib-ant/pages/DomainObject/nature.adoc | 0
.../applib-ant/pages/DomainObject/objectType.adoc | 0
.../DomainObject/persistedLifecycleEvent.adoc | 0
.../DomainObject/persistingLifecycleEvent.adoc | 0
.../pages/DomainObject/propertyDomainEvent.adoc | 0
.../applib-ant/pages/DomainObject/publishing.adoc | 0
.../pages/DomainObject/removingLifecycleEvent.adoc | 0
.../pages/DomainObject/updatedLifecycleEvent.adoc | 0
.../pages/DomainObject/updatingLifecycleEvent.adoc | 0
.../applib-ant/pages/DomainObjectLayout.adoc | 0
.../pages/DomainObjectLayout/bookmarking.adoc | 0
.../pages/DomainObjectLayout/cssClass.adoc | 0
.../pages/DomainObjectLayout/cssClassFa.adoc | 0
.../pages/DomainObjectLayout/cssClassUiEvent.adoc | 0
.../pages/DomainObjectLayout/describedAs.adoc | 0
.../pages/DomainObjectLayout/iconUiEvent.adoc | 0
.../pages/DomainObjectLayout/layoutUiEvent.adoc | 0
.../applib-ant/pages/DomainObjectLayout/named.adoc | 0
.../applib-ant/pages/DomainObjectLayout/paged.adoc | 0
.../pages/DomainObjectLayout/plural.adoc | 0
.../pages/DomainObjectLayout/titleUiEvent.adoc | 0
.../modules/applib-ant/pages/DomainService.adoc | 0
.../applib-ant/pages/DomainService/nature.adoc | 0
.../applib-ant/pages/DomainService/objectType.adoc | 0
.../pages/DomainService/repositoryFor.adoc | 0
.../applib-ant/pages/DomainServiceLayout.adoc | 0
.../pages/DomainServiceLayout/menuBar.adoc | 0
.../pages/DomainServiceLayout/menuOrder.adoc | 0
.../pages/DomainServiceLayout/named.adoc | 0
.../main/doc/modules/applib-ant/pages/Facets.adoc | 0
.../doc/modules/applib-ant/pages/HomePage.adoc | 0
.../main/doc/modules/applib-ant/pages/Inject.adoc | 0
.../applib-ant/pages/MemberGroupLayout.adoc | 0
.../doc/modules/applib-ant/pages/MemberOrder.adoc | 0
.../modules/applib-ant/pages/MemberOrder/name.adoc | 0
.../applib-ant/pages/MemberOrder/sequence.adoc | 0
.../doc/modules/applib-ant/pages/MinLength.adoc | 0
.../main/doc/modules/applib-ant/pages/Mixin.adoc | 0
.../doc/modules/applib-ant/pages/Mixin/method.adoc | 0
.../modules/applib-ant/pages/NotPersistent.adoc | 0
.../doc/modules/applib-ant/pages/Nullable.adoc | 0
.../doc/modules/applib-ant/pages/Parameter.adoc | 0
.../applib-ant/pages/Parameter/fileAccept.adoc | 0
.../applib-ant/pages/Parameter/maxLength.adoc | 0
.../applib-ant/pages/Parameter/mustSatisfy.adoc | 0
.../applib-ant/pages/Parameter/optionality.adoc | 0
.../applib-ant/pages/Parameter/regexPattern.adoc | 0
.../modules/applib-ant/pages/ParameterLayout.adoc | 0
.../applib-ant/pages/ParameterLayout/cssClass.adoc | 0
.../pages/ParameterLayout/describedAs.adoc | 0
.../pages/ParameterLayout/labelPosition.adoc | 0
.../pages/ParameterLayout/multiLine.adoc | 0
.../applib-ant/pages/ParameterLayout/named.adoc | 0
.../pages/ParameterLayout/renderedAsDayBefore.adoc | 0
.../pages/ParameterLayout/typicalLength.adoc | 0
.../main/doc/modules/applib-ant/pages/Pattern.adoc | 0
.../applib-ant/pages/PersistenceCapable.adoc | 0
.../modules/applib-ant/pages/PostConstruct.adoc | 0
.../doc/modules/applib-ant/pages/PreDestroy.adoc | 0
.../doc/modules/applib-ant/pages/PrimaryKey.adoc | 0
.../doc/modules/applib-ant/pages/Programmatic.adoc | 0
.../doc/modules/applib-ant/pages/Property.adoc | 0
.../modules/applib-ant/pages/Property/command.adoc | 0
.../applib-ant/pages/Property/domainEvent.adoc | 0
.../modules/applib-ant/pages/Property/editing.adoc | 0
.../applib-ant/pages/Property/fileAccept.adoc | 0
.../modules/applib-ant/pages/Property/hidden.adoc | 0
.../applib-ant/pages/Property/maxLength.adoc | 0
.../applib-ant/pages/Property/mustSatisfy.adoc | 0
.../applib-ant/pages/Property/notPersisted.adoc | 0
.../applib-ant/pages/Property/optionality.adoc | 0
.../applib-ant/pages/Property/projecting.adoc | 0
.../applib-ant/pages/Property/publishing.adoc | 0
.../applib-ant/pages/Property/regexPattern.adoc | 0
.../modules/applib-ant/pages/PropertyLayout.adoc | 0
.../applib-ant/pages/PropertyLayout/cssClass.adoc | 0
.../pages/PropertyLayout/describedAs.adoc | 0
.../applib-ant/pages/PropertyLayout/hidden.adoc | 0
.../pages/PropertyLayout/labelPosition.adoc | 0
.../applib-ant/pages/PropertyLayout/multiLine.adoc | 0
.../applib-ant/pages/PropertyLayout/named.adoc | 0
.../applib-ant/pages/PropertyLayout/navigable.adoc | 0
.../pages/PropertyLayout/promptStyle.adoc | 0
.../pages/PropertyLayout/renderedAsDayBefore.adoc | 0
.../pages/PropertyLayout/typicalLength.adoc | 0
.../pages/PropertyLayout/unchanging.adoc | 0
.../modules/applib-ant/pages/RequestScoped.adoc | 0
.../main/doc/modules/applib-ant/pages/Title.adoc | 0
.../doc/modules/applib-ant/pages/ViewModel.adoc | 0
.../applib-ant/pages/ViewModel/objectType.adoc | 0
.../modules/applib-ant/pages/ViewModelLayout.adoc | 0
.../pages/ViewModelLayout/bookmarking.adoc | 0
.../applib-ant/pages/ViewModelLayout/cssClass.adoc | 0
.../pages/ViewModelLayout/cssClassFa.adoc | 0
.../pages/ViewModelLayout/cssClassUiEvent.adoc | 0
.../pages/ViewModelLayout/describedAs.adoc | 0
.../pages/ViewModelLayout/iconUiEvent.adoc | 0
.../pages/ViewModelLayout/layoutUiEvent.adoc | 0
.../applib-ant/pages/ViewModelLayout/named.adoc | 0
.../applib-ant/pages/ViewModelLayout/paged.adoc | 0
.../applib-ant/pages/ViewModelLayout/plural.adoc | 0
.../pages/ViewModelLayout/titleUiEvent.adoc | 0
.../applib-ant/pages/XmlJavaTypeAdapter.adoc | 0
.../modules/applib-ant/pages/XmlRootElement.adoc | 0
.../main/doc/modules/applib-ant/pages/about.adoc | 0
.../doc/modules/applib-ant/pages/about/jdo.adoc | 0
.../doc/modules/applib-ant/pages/about/jee.adoc | 0
.../doc/modules/applib-ant/pages/about/main.adoc | 0
.../doc/modules/applib-ant/pages/about/other.adoc | 0
.../modules/applib-ant/pages/about/partial.adoc | 0
.../modules/applib-ant/partials/module-nav.adoc | 0
.../src/main/doc/modules/applib-cm/examples.sh | 0
.../modules/applib-cm/examples}/clock/Clock.java | 0
.../applib-cm/examples}/clock/package-info.java | 0
.../examples/domain/DomainObjectList.java | 179 ++
.../events/ActionArgumentUsabilityEvent.java | 0
.../events/ActionArgumentVisibilityEvent.java | 0
.../events/domain/AbstractDomainEvent.java | 346 ++++
.../examples}/events/domain/ActionDomainEvent.java | 0
.../events/domain/CollectionDomainEvent.java | 0
.../examples/events/domain/EventObjectBase.java | 79 +
.../events/domain/PropertyDomainEvent.java | 0
.../events/lifecycle/AbstractLifecycleEvent.java | 0
.../events/lifecycle/ObjectCreatedEvent.java | 0
.../events/lifecycle/ObjectLoadedEvent.java | 0
.../events/lifecycle/ObjectPersistedEvent.java | 0
.../events/lifecycle/ObjectPersistingEvent.java | 0
.../events/lifecycle/ObjectRemovingEvent.java | 0
.../events/lifecycle/ObjectUpdatedEvent.java | 0
.../events/lifecycle/ObjectUpdatingEvent.java | 0
.../examples/events/ui/AbstractUiEvent.java | 60 +
.../examples}/events/ui/CssClassUiEvent.java | 0
.../applib-cm/examples}/events/ui/IconUiEvent.java | 0
.../examples}/events/ui/LayoutUiEvent.java | 0
.../examples}/events/ui/TitleUiEvent.java | 0
.../layout/component/ActionLayoutData.java | 0
.../layout/component/ActionLayoutDataOwner.java | 0
.../layout/component/CollectionLayoutData.java | 275 +++
.../component/CollectionLayoutDataOwner.java | 0
.../layout/component/DomainObjectLayoutData.java | 0
.../component/DomainObjectLayoutDataOwner.java | 0
.../examples/layout/component/FieldSet.java | 206 +++
.../examples}/layout/component/FieldSetOwner.java | 0
.../examples}/layout/component/HasBookmarking.java | 0
.../examples}/layout/component/HasCssClass.java | 0
.../examples}/layout/component/HasCssClassFa.java | 0
.../examples}/layout/component/HasDescribedAs.java | 0
.../examples}/layout/component/HasHidden.java | 0
.../examples}/layout/component/HasNamed.java | 0
.../examples}/layout/component/MemberRegion.java | 0
.../layout/component/MemberRegionOwner.java | 0
.../examples}/layout/component/Owned.java | 0
.../examples}/layout/component/Owner.java | 0
.../layout/component/PropertyLayoutData.java | 314 ++++
.../layout/component/ServiceActionLayoutData.java | 0
.../component/ServiceActionLayoutDataOwner.java | 0
.../examples}/layout/component/package-info.java | 0
.../applib-cm/examples}/layout/grid/Grid.java | 0
.../examples/layout/grid/GridAbstract.java | 208 +++
.../layout/grid/bootstrap3/BS3ClearFix.java | 0
.../layout/grid/bootstrap3/BS3ClearFixHidden.java | 0
.../layout/grid/bootstrap3/BS3ClearFixVisible.java | 0
.../examples/layout/grid/bootstrap3/BS3Col.java | 281 +++
.../layout/grid/bootstrap3/BS3Element.java | 0
.../layout/grid/bootstrap3/BS3ElementAbstract.java | 0
.../examples/layout/grid/bootstrap3/BS3Grid.java | 307 ++++
.../examples/layout/grid/bootstrap3/BS3Row.java | 140 ++
.../layout/grid/bootstrap3/BS3RowContent.java | 0
.../layout/grid/bootstrap3/BS3RowContentOwner.java | 0
.../layout/grid/bootstrap3/BS3RowOwner.java | 0
.../examples/layout/grid/bootstrap3/BS3Tab.java | 177 ++
.../layout/grid/bootstrap3/BS3TabGroup.java | 138 ++
.../layout/grid/bootstrap3/BS3TabGroupOwner.java | 0
.../layout/grid/bootstrap3/BS3TabOwner.java | 0
.../examples}/layout/grid/bootstrap3/HasCssId.java | 0
.../examples}/layout/grid/bootstrap3/Size.java | 0
.../examples}/layout/grid/bootstrap3/SizeSpan.java | 0
.../layout/grid/bootstrap3/WithinGrid.java | 0
.../layout/grid/bootstrap3/package-info.java | 0
.../applib-cm/examples}/layout/links/Link.java | 0
.../examples}/layout/links/package-info.java | 0
.../applib-cm/examples}/layout/menubars/Menu.java | 0
.../examples}/layout/menubars/MenuBar.java | 0
.../examples}/layout/menubars/MenuBars.java | 0
.../examples/layout/menubars/MenuBarsAbstract.java | 69 +
.../examples}/layout/menubars/MenuSection.java | 0
.../layout/menubars/bootstrap3/BS3Menu.java | 111 ++
.../layout/menubars/bootstrap3/BS3MenuBar.java | 61 +
.../layout/menubars/bootstrap3/BS3MenuBars.java | 227 +++
.../layout/menubars/bootstrap3/BS3MenuSection.java | 64 +
.../layout/menubars/bootstrap3/package-info.java | 0
.../applib-cm/examples}/layout/package-info.java | 0
.../applib-cm/examples}/mixins/MixinConstants.java | 0
.../applib-cm/examples}/mixins/dto/Dto.java | 0
.../examples/mixins/dto/DtoMappingHelper.java | 78 +
.../examples}/mixins/dto/Dto_downloadXml.java | 0
.../examples/mixins/dto/Dto_downloadXsd.java | 124 ++
.../examples}/mixins/dto/package-info.java | 0
.../mixins/layout/Object_downloadLayoutXml.java | 0
.../mixins/layout/Object_openRestApi.java | 0
.../mixins/layout/Object_rebuildMetamodel.java | 0
.../metamodel/Object_downloadMetaModelXml.java | 0
.../mixins/metamodel/Object_objectIdentifier.java | 0
.../mixins/metamodel/Object_objectType.java | 0
.../examples}/mixins/timestamp/HoldsUpdatedAt.java | 0
.../examples}/mixins/timestamp/HoldsUpdatedBy.java | 0
.../examples}/mixins/timestamp/Timestampable.java | 0
.../examples}/mixins/timestamp/package-info.java | 0
.../applib-cm/examples}/security/RoleMemento.java | 0
.../applib-cm/examples}/security/UserMemento.java | 0
.../applib-cm/examples}/security/package-info.java | 0
.../examples}/spec/AbstractSpecification.java | 0
.../examples/spec/AbstractSpecification2.java | 112 ++
.../applib-cm/examples}/spec/Specification.java | 0
.../applib-cm/examples}/spec/Specification2.java | 0
.../applib-cm/examples}/spec/SpecificationAnd.java | 0
.../applib-cm/examples}/spec/SpecificationNot.java | 0
.../applib-cm/examples}/spec/SpecificationOr.java | 0
.../applib-cm/examples}/spec/package-info.java | 0
.../applib-cm/examples/tree/LazyTreeNode.java | 142 ++
.../applib-cm/examples}/tree/TreeAdapter.java | 0
.../modules/applib-cm/examples/tree/TreeNode.java | 155 ++
.../tree/TreeNode_iteratorBreadthFirst.java | 0
.../tree/TreeNode_iteratorDepthFirst.java | 0
.../tree/TreeNode_iteratorHierarchyUp.java | 0
.../modules/applib-cm/examples}/tree/TreePath.java | 0
.../applib-cm/examples}/tree/TreePath_Default.java | 0
.../applib-cm/examples}/tree/TreeState.java | 0
.../examples}/tree/TreeState_Default.java | 0
.../doc/modules/applib-cm/examples/util/Enums.java | 87 +
.../modules/applib-cm/examples/util/Equality.java | 75 +
.../modules/applib-cm/examples/util/Hashing.java | 66 +
.../applib-cm/examples/util/JaxbAdapters.java | 201 +++
.../modules/applib-cm/examples/util/JaxbUtil.java | 109 ++
.../examples}/util/ObjectContract_Empty.java | 0
.../examples}/util/ObjectContract_Impl.java | 0
.../examples/util/ObjectContract_Parser.java | 179 ++
.../applib-cm/examples/util/ObjectContracts.java | 231 +++
.../applib-cm/examples}/util/ReasonBuffer.java | 0
.../applib-cm/examples/util/ReasonBuffer2.java | 227 +++
.../modules/applib-cm/examples}/util/Reasons.java | 0
.../applib-cm/examples/util/TitleBuffer.java | 467 +++++
.../examples}/util/TitleBufferException.java | 0
.../modules/applib-cm/examples/util/ToString.java | 123 ++
.../applib-cm/examples}/util/package-info.java | 0
.../examples/util/schema/ChangesDtoUtils.java | 101 ++
.../examples/util/schema/CommandDtoUtils.java | 149 ++
.../examples/util/schema/CommonDtoUtils.java | 494 ++++++
.../examples/util/schema/InteractionDtoUtils.java | 450 +++++
.../util/schema/MemberExecutionDtoUtils.java | 119 ++
.../modules/applib-cm/examples}/value/Blob.java | 0
.../applib-cm/examples/value/BlobClobFactory.java | 151 ++
.../modules/applib-cm/examples}/value/Clob.java | 0
.../modules/applib-cm/examples/value/Image.java | 59 +
.../examples/value/LocalResourcePath.java | 96 ++
.../modules/applib-cm/examples/value/Markup.java | 76 +
.../examples}/value/NamedWithMimeType.java | 0
.../modules/applib-cm/examples/value/Password.java | 78 +
.../applib-cm/examples}/value/package-info.java | 0
.../reference-classes/issue-in-more-detail.png | Bin
.../prefixes/choices/dependent.png | Bin
.../reserved/cssClass/strikethrough.png | Bin
.../reserved/iconName/differing.pdn | Bin
.../reserved/iconName/differing.png | Bin
.../reserved/iconName/png-files.png | Bin
.../applib-cm}/images/value-types/markup.png | Bin
.../src/main/doc/modules/applib-cm}/nav.adoc | 0
.../main/doc/modules/applib-cm/pages/about.adoc | 0
.../main/doc/modules/applib-cm/pages/classes.adoc | 0
.../pages/classes/AppManifest-bootstrapping.adoc | 320 ++++
.../pages/classes/AppManifest2-bootstrapping.adoc | 0
.../applib-cm/pages/classes/contributee.adoc | 0
.../classes/contributee/HasTransactionId.adoc | 0
.../pages/classes/contributee/HasUserName.adoc | 26 +
.../applib-cm/pages/classes/domainevent.adoc | 0
.../classes/domainevent/AbstractDomainEvent.adoc | 0
.../classes/domainevent/ActionDomainEvent.adoc | 0
.../classes/domainevent/CollectionDomainEvent.adoc | 0
.../classes/domainevent/PropertyDomainEvent.adoc | 0
.../doc/modules/applib-cm/pages/classes/i18n.adoc | 0
.../pages/classes/i18n/TranslatableString.adoc | 0
.../modules/applib-cm/pages/classes/layout.adoc | 0
.../applib-cm/pages/classes/lifecycleevent.adoc | 0
.../lifecycleevent/AbstractLifecycleEvent.adoc | 0
.../classes/lifecycleevent/ObjectCreatedEvent.adoc | 0
.../classes/lifecycleevent/ObjectLoadedEvent.adoc | 0
.../lifecycleevent/ObjectPersistedEvent.adoc | 0
.../lifecycleevent/ObjectPersistingEvent.adoc | 0
.../lifecycleevent/ObjectRemovingEvent.adoc | 0
.../classes/lifecycleevent/ObjectUpdatedEvent.adoc | 0
.../lifecycleevent/ObjectUpdatingEvent.adoc | 0
.../modules/applib-cm/pages/classes/menubars.adoc | 0
.../modules/applib-cm/pages/classes/mixins.adoc | 0
.../applib-cm/pages/classes/mixins/Dto.adoc | 0
.../applib-cm/pages/classes/mixins/Object.adoc | 0
.../pages/classes/mixins/Persistable.adoc | 0
.../doc/modules/applib-cm/pages/classes/roles.adoc | 0
.../pages/classes/roles/HoldsUpdatedAt.adoc | 0
.../pages/classes/roles/HoldsUpdatedBy.adoc | 0
.../pages/classes/roles/Timestampable.adoc | 0
.../doc/modules/applib-cm/pages/classes/spec.adoc | 0
.../doc/modules/applib-cm/pages/classes/super.adoc | 0
.../pages/classes/super/AbstractService.adoc | 0
.../pages/classes/super/AbstractSubscriber.adoc | 14 +
.../pages/classes/super/AbstractViewModel.adoc | 0
.../pages/classes/super/FixtureScript.adoc | 0
.../pages/classes/super/FixtureScripts.adoc | 0
.../modules/applib-cm/pages/classes/uievent.adoc | 0
.../pages/classes/uievent/CssClassUiEvent.adoc | 0
.../pages/classes/uievent/IconUiEvent.adoc | 0
.../pages/classes/uievent/TitleUiEvent.adoc | 0
.../modules/applib-cm/pages/classes/utility.adoc | 0
.../applib-cm/pages/classes/utility/Enums.adoc | 0
.../pages/classes/utility/ObjectContracts.adoc | 0
.../applib-cm/pages/classes/utility/Reasons.adoc | 0
.../pages/classes/utility/TitleBuffer.adoc | 0
.../applib-cm/pages/classes/value-types.adoc | 0
.../applib-cm/pages/classes/value-types/Blob.adoc | 0
.../applib-cm/pages/classes/value-types/Clob.adoc | 0
.../applib-cm/pages/classes/value-types/Color.adoc | 0
.../pages/classes/value-types/Markup.adoc | 0
.../applib-cm/pages/classes/value-types/Money.adoc | 0
.../pages/classes/value-types/Password.adoc | 0
.../main/doc/modules/applib-cm/pages/methods.adoc | 0
.../modules/applib-cm/pages/methods/lifecycle.adoc | 0
.../applib-cm/pages/methods/lifecycle/created.adoc | 0
.../applib-cm/pages/methods/lifecycle/jdo-api.adoc | 0
.../applib-cm/pages/methods/lifecycle/loaded.adoc | 0
.../pages/methods/lifecycle/persisted.adoc | 0
.../pages/methods/lifecycle/persisting.adoc | 0
.../applib-cm/pages/methods/lifecycle/removed.adoc | 0
.../pages/methods/lifecycle/removing.adoc | 0
.../applib-cm/pages/methods/lifecycle/updated.adoc | 0
.../pages/methods/lifecycle/updating.adoc | 0
.../modules/applib-cm/pages/methods/prefixes.adoc | 0
.../applib-cm/pages/methods/prefixes/addTo.adoc | 0
.../pages/methods/prefixes/autoComplete.adoc | 0
.../applib-cm/pages/methods/prefixes/choices.adoc | 0
.../applib-cm/pages/methods/prefixes/clear.adoc | 0
.../applib-cm/pages/methods/prefixes/default.adoc | 0
.../applib-cm/pages/methods/prefixes/disable.adoc | 0
.../applib-cm/pages/methods/prefixes/get.adoc | 0
.../applib-cm/pages/methods/prefixes/hide.adoc | 0
.../applib-cm/pages/methods/prefixes/modify.adoc | 0
.../pages/methods/prefixes/removeFrom.adoc | 0
.../applib-cm/pages/methods/prefixes/set.adoc | 0
.../applib-cm/pages/methods/prefixes/validate.adoc | 0
.../pages/methods/prefixes/validateAddTo.adoc | 0
.../pages/methods/prefixes/validateRemoveFrom.adoc | 0
.../modules/applib-cm/pages/methods/reserved.adoc | 0
.../applib-cm/pages/methods/reserved/cssClass.adoc | 0
.../applib-cm/pages/methods/reserved/disable.adoc | 0
.../applib-cm/pages/methods/reserved/getId.adoc | 0
.../applib-cm/pages/methods/reserved/hide.adoc | 0
.../applib-cm/pages/methods/reserved/iconName.adoc | 0
.../applib-cm/pages/methods/reserved/layout.adoc | 0
.../applib-cm/pages/methods/reserved/title.adoc | 0
.../applib-cm/pages/methods/reserved/validate.adoc | 0
.../main/doc/modules/applib-cm/pages/rgcms.adoc | 0
.../doc/modules/applib-cm/partials/module-nav.adoc | 0
.../src/main/doc/modules/applib-svc/examples.sh | 0
.../applib-svc/examples}/services/HasUniqueId.java | 0
.../applib-svc/examples}/services/HasUsername.java | 0
.../RepresentsInteractionMemberExecution.java | 0
.../examples}/services/WithTransactionScope.java | 0
.../services/acceptheader/AcceptHeaderService.java | 0
.../appfeat/ApplicationFeatureRepository.java | 0
.../services/appfeat/ApplicationMemberType.java | 33 +
.../examples}/services/appfeat/package-info.java | 0
.../services/audit/AuditEntryPropertyIdType.java | 0
.../audit/AuditEntryPropertyValueType.java | 0
.../examples}/services/audit/AuditerService.java | 0
.../services/audit/AuditerServiceLogging.java | 0
.../examples}/services/audit/package-info.java | 0
.../background/BackgroundCommandService.java | 0
.../services/background/package-info.java | 0
.../examples/services/bookmark/Bookmark.java | 187 ++
.../services/bookmark/BookmarkHolder.java | 0
.../services/bookmark/BookmarkHolder_lookup.java | 0
.../services/bookmark/BookmarkHolder_object.java | 0
.../services/bookmark/BookmarkService.java | 70 +
.../examples}/services/bookmark/package-info.java | 0
.../services/bookmarkui/BookmarkUiService.java | 0
.../examples}/services/clock/ClockService.java | 0
.../examples}/services/clock/package-info.java | 0
.../examples}/services/command/Command.java | 0
.../examples}/services/command/CommandContext.java | 0
.../examples}/services/command/CommandDefault.java | 0
.../services/command/CommandDtoProcessor.java | 0
.../CommandDtoProcessorForActionAbstract.java | 0
.../CommandDtoProcessorForPropertyAbstract.java | 0
.../services/command/CommandExecutorService.java | 0
.../examples}/services/command/CommandWithDto.java | 0
.../examples}/services/command/package-info.java | 0
.../services/command/spi/CommandService.java | 0
.../services/confview/ConfigurationMenu.java | 0
.../services/confview/ConfigurationProperty.java | 84 +
.../confview/ConfigurationProperty.layout.xml | 0
.../services/confview/ConfigurationProperty.png | Bin
.../confview/ConfigurationViewService.java | 0
.../examples}/services/confview/package-info.java | 0
.../services/conmap/ContentMappingService.java | 66 +
.../ContentMappingServiceForCommandDto.java | 0
.../ContentMappingServiceForCommandsDto.java | 0
.../command/spi/CommandDtoProcessorService.java | 0
.../examples}/services/conmap/package-info.java | 0
.../examples}/services/email/EmailService.java | 0
.../examples}/services/email/package-info.java | 0
.../examples}/services/error/ErrorDetails.java | 0
.../services/error/ErrorReportingService.java | 0
.../examples}/services/error/Ticket.java | 0
.../examples}/services/error/package-info.java | 0
.../services/eventbus/EventBusService.java | 0
.../examples}/services/eventbus/package-info.java | 0
.../services/exceprecog/ExceptionRecognizer.java | 0
.../exceprecog/ExceptionRecognizerAbstract.java | 171 ++
.../exceprecog/ExceptionRecognizerComposite.java | 178 ++
.../exceprecog/ExceptionRecognizerForType.java | 181 ++
.../services/exceprecog/TranslatableException.java | 0
.../services/exceprecog/package-info.java | 0
.../examples}/services/factory/FactoryService.java | 0
.../examples}/services/factory/package-info.java | 0
.../examples}/services/grid/GridLoaderService.java | 0
.../examples}/services/grid/GridService.java | 0
.../examples}/services/grid/GridSystemService.java | 0
.../examples}/services/grid/package-info.java | 0
.../examples}/services/health/Health.java | 0
.../services/health/HealthCheckService.java | 0
.../examples}/services/hint/HintStore.java | 0
.../examples}/services/hint/package-info.java | 0
.../examples}/services/i18n/LocaleProvider.java | 0
.../examples/services/i18n/TranslatableString.java | 274 +++
.../services/i18n/TranslationService.java | 0
.../services/i18n/TranslationsResolver.java | 0
.../examples}/services/i18n/package-info.java | 0
.../examples/services/iactn/Interaction.java | 722 ++++++++
.../services/iactn/InteractionContext.java | 0
.../examples}/services/iactn/package-info.java | 0
.../examples}/services/inject/ServiceInjector.java | 0
.../jaxb/CatalogingSchemaOutputResolver.java | 154 ++
.../examples/services/jaxb/JaxbService.java | 253 +++
.../services/jaxb/JaxbServiceDefault.java | 0
.../services/jaxb/StreamResultWithWriter.java | 0
.../examples}/services/jaxb/package-info.java | 0
.../examples}/services/layout/LayoutService.java | 0
.../services/layout/LayoutServiceMenu.java | 121 ++
.../examples}/services/layout/package-info.java | 0
.../services/linking/DeepLinkService.java | 0
.../examples}/services/linking/package-info.java | 0
.../services/menu/MenuBarsLoaderService.java | 0
.../examples}/services/menu/MenuBarsService.java | 0
.../examples}/services/message/MessageService.java | 0
.../examples}/services/message/package-info.java | 0
.../examples}/services/metamodel/DomainMember.java | 0
.../examples}/services/metamodel/DomainModel.java | 0
.../services/metamodel/MetaModelService.java | 183 ++
.../services/metamodel/MetaModelServicesMenu.java | 252 +++
.../examples}/services/metamodel/package-info.java | 0
.../examples}/services/metrics/MetricsService.java | 0
.../examples}/services/metrics/package-info.java | 0
.../examples}/services/package-info.java | 0
.../services/publish/PublishedObjects.java | 0
.../services/publish/PublisherService.java | 0
.../services/publish/PublisherServiceLogging.java | 0
.../examples}/services/publish/package-info.java | 0
.../queryresultscache/QueryResultCacheControl.java | 0
.../queryresultscache/QueryResultsCache.java | 0
.../QueryResultsCacheDefault.java | 163 ++
.../services/queryresultscache/package-info.java | 0
.../services/registry/ServiceRegistry.java | 173 ++
.../examples}/services/registry/package-info.java | 0
.../services/repository/RepositoryService.java | 0
.../services/repository/package-info.java | 0
.../examples}/services/routing/RoutingService.java | 0
.../examples}/services/routing/package-info.java | 0
.../examples/services/scratchpad/Scratchpad.java | 78 +
.../services/scratchpad/package-info.java | 0
.../services/session/SessionLoggingService.java | 0
.../examples}/services/session/package-info.java | 0
.../sessmgmt/SessionManagementService.java | 0
.../examples}/services/sessmgmt/package-info.java | 0
.../examples}/services/sudo/SudoService.java | 0
.../examples}/services/sudo/package-info.java | 0
.../examples}/services/swagger/SwaggerService.java | 0
.../examples}/services/swagger/package-info.java | 0
.../services/tablecol/TableColumnOrderService.java | 0
.../examples}/services/title/TitleService.java | 0
.../examples}/services/title/package-info.java | 0
.../services/urlencoding/UrlEncodingService.java | 47 +
...rlEncodingServiceUsingBaseEncodingAbstract.java | 44 +
.../UrlEncodingServiceWithCompression.java | 66 +
.../services/urlencoding/package-info.java | 0
.../examples}/services/user/UserService.java | 0
.../examples}/services/user/package-info.java | 0
.../services/userprof/UserProfileService.java | 0
.../examples}/services/userprof/package-info.java | 0
.../services/userreg/EmailNotificationService.java | 0
.../examples}/services/userreg/UserDetails.java | 0
.../services/userreg/UserRegistrationService.java | 0
.../userreg/events/EmailEventAbstract.java | 0
.../userreg/events/EmailRegistrationEvent.java | 0
.../userreg/events/PasswordResetEvent.java | 0
.../examples}/services/userreg/package-info.java | 0
.../examples}/services/wrapper/AsyncWrap.java | 0
.../services/wrapper/DisabledException.java | 0
.../services/wrapper/HiddenException.java | 0
.../services/wrapper/InteractionException.java | 0
.../services/wrapper/InvalidException.java | 0
.../examples}/services/wrapper/WrapperFactory.java | 0
.../examples}/services/wrapper/WrappingObject.java | 0
.../services/wrapper/events/AccessEvent.java | 0
.../wrapper/events/ActionArgumentEvent.java | 0
.../wrapper/events/ActionInvocationEvent.java | 0
.../wrapper/events/ActionUsabilityEvent.java | 0
.../wrapper/events/ActionVisibilityEvent.java | 0
.../wrapper/events/CollectionAccessEvent.java | 0
.../wrapper/events/CollectionAddToEvent.java | 0
.../wrapper/events/CollectionMethodEvent.java | 0
.../wrapper/events/CollectionRemoveFromEvent.java | 0
.../wrapper/events/CollectionUsabilityEvent.java | 0
.../wrapper/events/CollectionVisibilityEvent.java | 0
.../services/wrapper/events/InteractionEvent.java | 0
.../services/wrapper/events/ObjectTitleEvent.java | 0
.../wrapper/events/ObjectValidityEvent.java | 0
.../wrapper/events/ObjectVisibilityEvent.java | 0
.../services/wrapper/events/ParseValueEvent.java | 0
.../wrapper/events/PropertyAccessEvent.java | 0
.../wrapper/events/PropertyModifyEvent.java | 0
.../wrapper/events/PropertyUsabilityEvent.java | 0
.../wrapper/events/PropertyVisibilityEvent.java | 0
.../wrapper/events/ProposedHolderEvent.java | 0
.../services/wrapper/events/UsabilityEvent.java | 0
.../services/wrapper/events/ValidityEvent.java | 0
.../services/wrapper/events/VisibilityEvent.java | 0
.../services/wrapper/events/package-info.java | 0
.../wrapper/listeners/InteractionAdapter.java | 0
.../wrapper/listeners/InteractionListener.java | 0
.../examples}/services/wrapper/package-info.java | 0
.../examples}/services/xactn/Transaction.java | 0
.../examples}/services/xactn/TransactionId.java | 0
.../services/xactn/TransactionService.java | 0
.../examples}/services/xactn/TransactionState.java | 0
.../examples}/services/xactn/package-info.java | 0
.../services/xmlsnapshot/XmlSnapshotService.java | 0
.../xmlsnapshot/XmlSnapshotServiceAbstract.java | 0
.../services/xmlsnapshot/package-info.java | 0
.../reference-services-api/acceptheaderservice.png | Bin
.../acceptheaderservice.pptx | Bin
.../ErrorReportingService/kitchensink-example.png | Bin
.../action-invocation-published-to-stderr.png | Bin
.../changed-object-published-to-stderr.png | Bin
.../PublishingService/yuml.me-23db58a4.png | Bin
.../UserProfileService/todoapp.png | Bin
.../images/reference-services/categories.png | Bin
.../images/reference-services/categories.pptx | Bin
.../reference-services/commands-and-events.png | Bin
.../reference-services/commands-and-events.pptx | Bin
.../src/main/doc/modules/applib-svc}/nav.adoc | 0
.../main/doc/modules/applib-svc/pages/about.adoc | 0
.../applib-svc/pages/application-layer-api.adoc | 0
.../application-layer-api/BackgroundService.adoc | 0
.../BackgroundCommandExecution.adoc | 0
.../BackgroundService/Quartz.adoc | 0
.../application-layer-api/CommandContext.adoc | 0
.../CommandExecutorService.adoc | 0
.../application-layer-api/DtoMappingHelper.adoc | 0
.../application-layer-api/InteractionContext.adoc | 0
.../application-layer-api/MessageService.adoc | 0
.../SessionManagementService.adoc | 0
.../pages/application-layer-api/TitleService.adoc | 0
.../application-layer-api/TransactionService.adoc | 0
.../application-layer-api/WrapperFactory.adoc | 0
.../applib-svc/pages/application-layer-spi.adoc | 0
.../BackgroundCommandService.adoc | 0
.../application-layer-spi/CommandService.adoc | 0
.../application-layer-spi/HealthCheckService.adoc | 0
.../HomePageProviderService.adoc | 0
.../applib-svc/pages/bootstrapping-spi.adoc | 0
.../bootstrapping-spi/ClassDiscoveryService.adoc | 0
.../modules/applib-svc/pages/core-domain-api.adoc | 0
.../pages/core-domain-api/ClockService.adoc | 0
.../core-domain-api/ConfigurationService.adoc | 0
.../pages/core-domain-api/EventBusService.adoc | 412 +++++
.../pages/core-domain-api/FactoryService.adoc | 0
.../pages/core-domain-api/Scratchpad.adoc | 0
.../pages/core-domain-api/UserService.adoc | 0
.../modules/applib-svc/pages/integration-api.adoc | 0
.../pages/integration-api/BookmarkService.adoc | 0
.../pages/integration-api/EmailService.adoc | 0
.../pages/integration-api/JaxbService.adoc | 0
.../pages/integration-api/MementoService.adoc | 0
.../pages/integration-api/XmlSnapshotService.adoc | 0
.../doc/modules/applib-svc/pages/metadata-api.adoc | 0
.../metadata-api/ApplicationFeatureRepository.adoc | 0
.../pages/metadata-api/LayoutService.adoc | 0
.../pages/metadata-api/MetamodelService.adoc | 0
.../pages/metadata-api/ServiceRegistry.adoc | 0
.../pages/metadata-api/SwaggerService.adoc | 0
.../applib-svc/pages/persistence-layer-api.adoc | 0
.../pages/persistence-layer-api/H2ManagerMenu.adoc | 0
.../persistence-layer-api/HsqlDbManagerMenu.adoc | 0
.../persistence-layer-api/IsisJdoSupport.adoc | 0
.../persistence-layer-api/MetricsService.adoc | 0
.../persistence-layer-api/QueryResultsCache.adoc | 0
.../persistence-layer-api/RepositoryService.adoc | 0
.../applib-svc/pages/persistence-layer-spi.adoc | 0
.../persistence-layer-spi/AuditerService.adoc | 0
.../persistence-layer-spi/PublisherService.adoc | 0
.../UserRegistrationService.adoc | 93 +
.../applib-svc/pages/presentation-layer-api.adoc | 0
.../AcceptHeaderService.adoc | 0
.../presentation-layer-api/BookmarkUiService.adoc | 0
.../ConfigurationViewService.adoc | 0
.../presentation-layer-api/DeepLinkService.adoc | 0
.../presentation-layer-api/GuiceBeanProvider.adoc | 0
.../applib-svc/pages/presentation-layer-spi.adoc | 0
.../ContentMappingService.adoc | 0
.../EmailNotificationService.adoc | 0
.../ErrorReportingService.adoc | 0
.../ExceptionRecognizer.adoc | 0
.../presentation-layer-spi/GridLoaderService.adoc | 0
.../pages/presentation-layer-spi/GridService.adoc | 0
.../presentation-layer-spi/GridSystemService.adoc | 0
.../pages/presentation-layer-spi/HintStore.adoc | 0
.../presentation-layer-spi/LocaleProvider.adoc | 0
.../MenuBarsLoaderService.adoc | 0
.../presentation-layer-spi/MenuBarsService.adoc | 0
.../presentation-layer-spi/RoutingService.adoc | 0
.../SessionLoggingService.adoc | 0
.../TableColumnOrderService.adoc | 0
.../presentation-layer-spi/TranslationService.adoc | 0
.../TranslationsResolver.adoc | 0
.../presentation-layer-spi/UrlEncodingService.adoc | 0
.../presentation-layer-spi/UserProfileService.adoc | 0
.../main/doc/modules/applib-svc/pages/testing.adoc | 0
.../pages/testing/ExecutionParametersService.adoc | 0
.../applib-svc/pages/testing/FixtureScripts.adoc | 0
.../FixtureScriptsSpecificationProvider.adoc | 0
.../applib-svc/pages/testing/SudoService.adoc | 0
.../pages/testing/SwitchUserService.adoc | 0
.../modules/applib-svc/partials/module-nav.adoc | 0
.../org/apache/isis/applib/AbstractService.java | 0
.../org/apache/isis/applib/AbstractViewModel.java | 0
.../apache/isis/applib/ApplicationException.java | 0
.../org/apache/isis/applib/FatalException.java | 0
.../java/org/apache/isis/applib/Identifier.java | 444 +++++
.../org/apache/isis/applib/IsisModuleApplib.java | 0
.../isis/applib/NonRecoverableException.java | 142 ++
.../apache/isis/applib/PersistFailedException.java | 0
.../apache/isis/applib/RecoverableException.java | 136 ++
.../isis/applib/RecreatableDomainObject.java | 0
.../apache/isis/applib/RepositoryException.java | 0
.../java/org/apache/isis/applib/ViewModel.java | 0
.../adapters/AbstractValueSemanticsProvider.java | 0
.../isis/applib/adapters/DefaultsProvider.java | 0
.../isis/applib/adapters/EncoderDecoder.java | 0
.../isis/applib/adapters/EncodingException.java | 0
.../org/apache/isis/applib/adapters/Parser.java | 0
.../isis/applib/adapters/ParsingException.java | 0
.../applib/adapters/ValueSemanticsProvider.java | 0
.../apache/isis/applib/adapters/package-info.java | 0
.../org/apache/isis/applib}/annotation/Action.java | 0
.../isis/applib}/annotation/ActionLayout.java | 0
.../apache/isis/applib}/annotation/Auditing.java | 0
.../isis/applib}/annotation/BookmarkPolicy.java | 0
.../apache/isis/applib}/annotation/Bounding.java | 0
.../apache/isis/applib}/annotation/Collection.java | 0
.../isis/applib}/annotation/CollectionLayout.java | 0
.../isis/applib}/annotation/CommandExecuteIn.java | 0
.../applib}/annotation/CommandPersistence.java | 0
.../applib}/annotation/CommandReification.java | 0
.../apache/isis/applib}/annotation/Constants.java | 0
.../isis/applib}/annotation/Contributed.java | 0
.../apache/isis/applib/annotation/Defaulted.java | 82 +
.../isis/applib}/annotation/DomainObject.java | 0
.../applib}/annotation/DomainObjectLayout.java | 0
.../isis/applib}/annotation/DomainService.java | 0
.../applib}/annotation/DomainServiceLayout.java | 0
.../apache/isis/applib}/annotation/Editing.java | 0
.../isis/applib}/annotation/EqualByContent.java | 0
.../org/apache/isis/applib/annotation/Facets.java | 60 +
.../apache/isis/applib}/annotation/HomePage.java | 0
.../isis/applib}/annotation/LabelPosition.java | 0
.../isis/applib}/annotation/MemberOrder.java | 0
.../applib}/annotation/MementoSerialization.java | 0
.../apache/isis/applib}/annotation/MinLength.java | 0
.../org/apache/isis/applib}/annotation/Mixin.java | 0
.../org/apache/isis/applib}/annotation/Module.java | 0
.../org/apache/isis/applib}/annotation/Nature.java | 0
.../isis/applib}/annotation/NatureOfService.java | 0
.../apache/isis/applib}/annotation/Navigable.java | 0
.../isis/applib}/annotation/Optionality.java | 0
.../isis/applib}/annotation/OrderPrecedence.java | 0
.../apache/isis/applib}/annotation/Parameter.java | 0
.../isis/applib}/annotation/ParameterLayout.java | 0
.../isis/applib}/annotation/Programmatic.java | 0
.../apache/isis/applib}/annotation/Projecting.java | 0
.../isis/applib}/annotation/PromptStyle.java | 0
.../apache/isis/applib}/annotation/Property.java | 0
.../isis/applib}/annotation/PropertyLayout.java | 0
.../apache/isis/applib}/annotation/Publishing.java | 0
.../applib}/annotation/PublishingChangeKind.java | 0
.../apache/isis/applib}/annotation/Redirect.java | 0
.../apache/isis/applib}/annotation/RenderDay.java | 0
.../apache/isis/applib}/annotation/Repainting.java | 0
.../apache/isis/applib}/annotation/RestrictTo.java | 0
.../isis/applib}/annotation/SemanticsOf.java | 0
.../org/apache/isis/applib}/annotation/Title.java | 0
.../org/apache/isis/applib/annotation/Value.java | 97 ++
.../apache/isis/applib}/annotation/ViewModel.java | 0
.../isis/applib}/annotation/ViewModelLayout.java | 0
.../org/apache/isis/applib}/annotation/Where.java | 0
.../isis/applib}/annotation/package-info.java | 0
.../apache/isis/applib/client/SuppressionType.java | 91 +
.../java/org/apache/isis/applib}/clock/Clock.java | 0
.../apache/isis/applib}/clock/package-info.java | 0
.../isis/applib/domain/DomainObjectList.java | 179 ++
.../events/ActionArgumentUsabilityEvent.java | 0
.../events/ActionArgumentVisibilityEvent.java | 0
.../applib/events/domain/AbstractDomainEvent.java | 347 ++++
.../applib}/events/domain/ActionDomainEvent.java | 0
.../events/domain/CollectionDomainEvent.java | 0
.../isis/applib/events/domain/EventObjectBase.java | 79 +
.../applib}/events/domain/PropertyDomainEvent.java | 0
.../events/lifecycle/AbstractLifecycleEvent.java | 0
.../events/lifecycle/ObjectCreatedEvent.java | 0
.../events/lifecycle/ObjectLoadedEvent.java | 0
.../events/lifecycle/ObjectPersistedEvent.java | 0
.../events/lifecycle/ObjectPersistingEvent.java | 0
.../events/lifecycle/ObjectRemovingEvent.java | 0
.../events/lifecycle/ObjectUpdatedEvent.java | 0
.../events/lifecycle/ObjectUpdatingEvent.java | 0
.../isis/applib/events/ui/AbstractUiEvent.java | 60 +
.../isis/applib}/events/ui/CssClassUiEvent.java | 0
.../apache/isis/applib}/events/ui/IconUiEvent.java | 0
.../isis/applib}/events/ui/LayoutUiEvent.java | 0
.../isis/applib}/events/ui/TitleUiEvent.java | 0
.../jaxbadapters/PersistentEntitiesAdapter.java | 66 +
.../jaxbadapters/PersistentEntityAdapter.java | 0
.../applib}/layout/component/ActionLayoutData.java | 0
.../layout/component/ActionLayoutDataOwner.java | 0
.../layout/component/CollectionLayoutData.java | 275 +++
.../component/CollectionLayoutDataOwner.java | 0
.../layout/component/DomainObjectLayoutData.java | 0
.../component/DomainObjectLayoutDataOwner.java | 0
.../isis/applib/layout/component/FieldSet.java | 206 +++
.../applib}/layout/component/FieldSetOwner.java | 0
.../applib}/layout/component/HasBookmarking.java | 0
.../isis/applib}/layout/component/HasCssClass.java | 0
.../applib}/layout/component/HasCssClassFa.java | 0
.../applib}/layout/component/HasDescribedAs.java | 0
.../isis/applib}/layout/component/HasHidden.java | 0
.../isis/applib}/layout/component/HasNamed.java | 0
.../applib}/layout/component/MemberRegion.java | 0
.../layout/component/MemberRegionOwner.java | 0
.../isis/applib}/layout/component/Owned.java | 0
.../isis/applib}/layout/component/Owner.java | 0
.../layout/component/PropertyLayoutData.java | 314 ++++
.../layout/component/ServiceActionLayoutData.java | 0
.../component/ServiceActionLayoutDataOwner.java | 0
.../applib}/layout/component/package-info.java | 0
.../org/apache/isis/applib}/layout/grid/Grid.java | 0
.../isis/applib/layout/grid/GridAbstract.java | 207 +++
.../layout/grid/bootstrap3/BS3ClearFix.java | 0
.../layout/grid/bootstrap3/BS3ClearFixHidden.java | 0
.../layout/grid/bootstrap3/BS3ClearFixVisible.java | 0
.../isis/applib/layout/grid/bootstrap3/BS3Col.java | 281 +++
.../applib}/layout/grid/bootstrap3/BS3Element.java | 0
.../layout/grid/bootstrap3/BS3ElementAbstract.java | 0
.../applib/layout/grid/bootstrap3/BS3Grid.java | 306 ++++
.../isis/applib/layout/grid/bootstrap3/BS3Row.java | 140 ++
.../layout/grid/bootstrap3/BS3RowContent.java | 0
.../layout/grid/bootstrap3/BS3RowContentOwner.java | 0
.../layout/grid/bootstrap3/BS3RowOwner.java | 0
.../isis/applib/layout/grid/bootstrap3/BS3Tab.java | 177 ++
.../applib/layout/grid/bootstrap3/BS3TabGroup.java | 138 ++
.../layout/grid/bootstrap3/BS3TabGroupOwner.java | 0
.../layout/grid/bootstrap3/BS3TabOwner.java | 0
.../applib}/layout/grid/bootstrap3/HasCssId.java | 0
.../isis/applib}/layout/grid/bootstrap3/Size.java | 0
.../applib}/layout/grid/bootstrap3/SizeSpan.java | 0
.../applib}/layout/grid/bootstrap3/WithinGrid.java | 0
.../layout/grid/bootstrap3/package-info.java | 0
.../org/apache/isis/applib}/layout/links/Link.java | 0
.../isis/applib}/layout/links/package-info.java | 0
.../apache/isis/applib}/layout/menubars/Menu.java | 0
.../isis/applib}/layout/menubars/MenuBar.java | 0
.../isis/applib}/layout/menubars/MenuBars.java | 0
.../applib/layout/menubars/MenuBarsAbstract.java | 69 +
.../isis/applib}/layout/menubars/MenuSection.java | 0
.../applib/layout/menubars/bootstrap3/BS3Menu.java | 111 ++
.../layout/menubars/bootstrap3/BS3MenuBar.java | 62 +
.../layout/menubars/bootstrap3/BS3MenuBars.java | 227 +++
.../layout/menubars/bootstrap3/BS3MenuSection.java | 65 +
.../layout/menubars/bootstrap3/package-info.java | 0
.../apache/isis/applib}/layout/package-info.java | 0
.../apache/isis/applib}/mixins/MixinConstants.java | 0
.../org/apache/isis/applib}/mixins/dto/Dto.java | 0
.../isis/applib/mixins/dto/DtoMappingHelper.java | 78 +
.../isis/applib}/mixins/dto/Dto_downloadXml.java | 0
.../isis/applib/mixins/dto/Dto_downloadXsd.java | 124 ++
.../isis/applib}/mixins/dto/package-info.java | 0
.../mixins/layout/Object_downloadLayoutXml.java | 0
.../applib}/mixins/layout/Object_openRestApi.java | 0
.../mixins/layout/Object_rebuildMetamodel.java | 0
.../metamodel/Object_downloadMetaModelXml.java | 0
.../mixins/metamodel/Object_objectIdentifier.java | 0
.../mixins/metamodel/Object_objectType.java | 0
.../applib}/mixins/timestamp/HoldsUpdatedAt.java | 0
.../applib}/mixins/timestamp/HoldsUpdatedBy.java | 0
.../applib}/mixins/timestamp/Timestampable.java | 0
.../applib}/mixins/timestamp/package-info.java | 0
.../java/org/apache/isis/applib/package-info.java | 0
.../java/org/apache/isis/applib/query/Query.java | 0
.../apache/isis/applib/query/QueryAbstract.java | 92 +
.../org/apache/isis/applib/query/QueryDefault.java | 0
.../isis/applib/query/QueryFindAllInstances.java | 0
.../org/apache/isis/applib/query/package-info.java | 0
.../apache/isis/applib}/security/RoleMemento.java | 0
.../apache/isis/applib}/security/UserMemento.java | 0
.../apache/isis/applib}/security/package-info.java | 0
.../apache/isis/applib}/services/HasUniqueId.java | 0
.../apache/isis/applib}/services/HasUsername.java | 0
.../RepresentsInteractionMemberExecution.java | 0
.../applib}/services/WithTransactionScope.java | 0
.../services/acceptheader/AcceptHeaderService.java | 0
.../appfeat/ApplicationFeatureRepository.java | 0
.../services/appfeat/ApplicationMemberType.java | 33 +
.../applib}/services/appfeat/package-info.java | 0
.../services/audit/AuditEntryPropertyIdType.java | 0
.../audit/AuditEntryPropertyValueType.java | 0
.../applib}/services/audit/AuditerService.java | 0
.../services/audit/AuditerServiceLogging.java | 0
.../isis/applib}/services/audit/package-info.java | 0
.../background/BackgroundCommandService.java | 0
.../applib}/services/background/package-info.java | 0
.../isis/applib/services/bookmark/Bookmark.java | 187 ++
.../applib}/services/bookmark/BookmarkHolder.java | 0
.../services/bookmark/BookmarkHolder_lookup.java | 0
.../services/bookmark/BookmarkHolder_object.java | 0
.../applib/services/bookmark/BookmarkService.java | 70 +
.../applib}/services/bookmark/package-info.java | 0
.../services/bookmarkui/BookmarkUiService.java | 0
.../isis/applib}/services/clock/ClockService.java | 0
.../isis/applib}/services/clock/package-info.java | 0
.../isis/applib}/services/command/Command.java | 0
.../applib}/services/command/CommandContext.java | 0
.../applib}/services/command/CommandDefault.java | 0
.../services/command/CommandDtoProcessor.java | 0
.../CommandDtoProcessorForActionAbstract.java | 0
.../CommandDtoProcessorForPropertyAbstract.java | 0
.../services/command/CommandExecutorService.java | 0
.../applib}/services/command/CommandWithDto.java | 0
.../applib}/services/command/package-info.java | 0
.../services/command/spi/CommandService.java | 0
.../services/confview/ConfigurationMenu.java | 0
.../services/confview/ConfigurationProperty.java | 84 +
.../confview/ConfigurationProperty.layout.xml | 0
.../services/confview/ConfigurationProperty.png | Bin
.../confview/ConfigurationViewService.java | 0
.../applib}/services/confview/package-info.java | 0
.../services/conmap/ContentMappingService.java | 66 +
.../ContentMappingServiceForCommandDto.java | 0
.../ContentMappingServiceForCommandsDto.java | 0
.../command/spi/CommandDtoProcessorService.java | 0
.../isis/applib}/services/conmap/package-info.java | 0
.../isis/applib}/services/email/EmailService.java | 0
.../isis/applib}/services/email/package-info.java | 0
.../isis/applib}/services/error/ErrorDetails.java | 0
.../services/error/ErrorReportingService.java | 0
.../apache/isis/applib}/services/error/Ticket.java | 0
.../isis/applib}/services/error/package-info.java | 0
.../applib}/services/eventbus/EventBusService.java | 0
.../applib}/services/eventbus/package-info.java | 0
.../services/exceprecog/ExceptionRecognizer.java | 0
.../exceprecog/ExceptionRecognizerAbstract.java | 171 ++
.../exceprecog/ExceptionRecognizerComposite.java | 178 ++
.../exceprecog/ExceptionRecognizerForType.java | 181 ++
.../services/exceprecog/TranslatableException.java | 0
.../applib}/services/exceprecog/package-info.java | 0
.../applib}/services/factory/FactoryService.java | 0
.../applib}/services/factory/package-info.java | 0
.../applib}/services/grid/GridLoaderService.java | 0
.../isis/applib}/services/grid/GridService.java | 0
.../applib}/services/grid/GridSystemService.java | 0
.../isis/applib}/services/grid/package-info.java | 0
.../isis/applib}/services/health/Health.java | 0
.../services/health/HealthCheckService.java | 0
.../isis/applib}/services/hint/HintStore.java | 0
.../isis/applib}/services/hint/package-info.java | 0
.../isis/applib}/services/i18n/LocaleProvider.java | 0
.../applib/services/i18n/TranslatableString.java | 274 +++
.../applib}/services/i18n/TranslationService.java | 0
.../services/i18n/TranslationsResolver.java | 0
.../isis/applib}/services/i18n/package-info.java | 0
.../isis/applib/services/iactn/Interaction.java | 722 ++++++++
.../applib}/services/iactn/InteractionContext.java | 0
.../isis/applib}/services/iactn/package-info.java | 0
.../applib}/services/inject/ServiceInjector.java | 0
.../jaxb/CatalogingSchemaOutputResolver.java | 154 ++
.../isis/applib/services/jaxb/JaxbService.java | 253 +++
.../applib}/services/jaxb/JaxbServiceDefault.java | 0
.../services/jaxb/StreamResultWithWriter.java | 0
.../isis/applib}/services/jaxb/package-info.java | 0
.../applib}/services/layout/LayoutService.java | 0
.../applib/services/layout/LayoutServiceMenu.java | 121 ++
.../isis/applib}/services/layout/package-info.java | 0
.../applib}/services/linking/DeepLinkService.java | 0
.../applib}/services/linking/package-info.java | 0
.../services/menu/MenuBarsLoaderService.java | 0
.../applib}/services/menu/MenuBarsService.java | 0
.../applib}/services/message/MessageService.java | 0
.../applib}/services/message/package-info.java | 0
.../applib}/services/metamodel/DomainMember.java | 0
.../applib}/services/metamodel/DomainModel.java | 0
.../services/metamodel/MetaModelService.java | 183 ++
.../services/metamodel/MetaModelServicesMenu.java | 252 +++
.../applib}/services/metamodel/package-info.java | 0
.../applib}/services/metrics/MetricsService.java | 0
.../applib}/services/metrics/package-info.java | 0
.../apache/isis/applib}/services/package-info.java | 0
.../applib}/services/publish/PublishedObjects.java | 0
.../applib}/services/publish/PublisherService.java | 0
.../services/publish/PublisherServiceLogging.java | 0
.../applib}/services/publish/package-info.java | 0
.../queryresultscache/QueryResultCacheControl.java | 0
.../queryresultscache/QueryResultsCache.java | 0
.../QueryResultsCacheDefault.java | 163 ++
.../services/queryresultscache/package-info.java | 0
.../applib/services/registry/ServiceRegistry.java | 173 ++
.../applib}/services/registry/package-info.java | 0
.../services/repository/RepositoryService.java | 0
.../applib}/services/repository/package-info.java | 0
.../applib}/services/routing/RoutingService.java | 0
.../applib}/services/routing/package-info.java | 0
.../applib/services/scratchpad/Scratchpad.java | 78 +
.../applib}/services/scratchpad/package-info.java | 0
.../services/session/SessionLoggingService.java | 0
.../applib}/services/session/package-info.java | 0
.../sessmgmt/SessionManagementService.java | 0
.../applib}/services/sessmgmt/package-info.java | 0
.../isis/applib}/services/sudo/SudoService.java | 0
.../isis/applib}/services/sudo/package-info.java | 0
.../applib}/services/swagger/SwaggerService.java | 0
.../applib}/services/swagger/package-info.java | 0
.../services/tablecol/TableColumnOrderService.java | 0
.../isis/applib}/services/title/TitleService.java | 0
.../isis/applib}/services/title/package-info.java | 0
.../services/urlencoding/UrlEncodingService.java | 47 +
...rlEncodingServiceUsingBaseEncodingAbstract.java | 44 +
.../UrlEncodingServiceWithCompression.java | 66 +
.../applib}/services/urlencoding/package-info.java | 0
.../isis/applib}/services/user/UserService.java | 0
.../isis/applib}/services/user/package-info.java | 0
.../services/userprof/UserProfileService.java | 0
.../applib}/services/userprof/package-info.java | 0
.../services/userreg/EmailNotificationService.java | 0
.../isis/applib}/services/userreg/UserDetails.java | 0
.../services/userreg/UserRegistrationService.java | 0
.../userreg/events/EmailEventAbstract.java | 0
.../userreg/events/EmailRegistrationEvent.java | 0
.../userreg/events/PasswordResetEvent.java | 0
.../applib}/services/userreg/package-info.java | 0
.../isis/applib}/services/wrapper/AsyncWrap.java | 0
.../services/wrapper/DisabledException.java | 0
.../applib}/services/wrapper/HiddenException.java | 0
.../services/wrapper/InteractionException.java | 0
.../applib}/services/wrapper/InvalidException.java | 0
.../applib}/services/wrapper/WrapperFactory.java | 0
.../applib}/services/wrapper/WrappingObject.java | 0
.../services/wrapper/events/AccessEvent.java | 0
.../wrapper/events/ActionArgumentEvent.java | 0
.../wrapper/events/ActionInvocationEvent.java | 0
.../wrapper/events/ActionUsabilityEvent.java | 0
.../wrapper/events/ActionVisibilityEvent.java | 0
.../wrapper/events/CollectionAccessEvent.java | 0
.../wrapper/events/CollectionAddToEvent.java | 0
.../wrapper/events/CollectionMethodEvent.java | 0
.../wrapper/events/CollectionRemoveFromEvent.java | 0
.../wrapper/events/CollectionUsabilityEvent.java | 0
.../wrapper/events/CollectionVisibilityEvent.java | 0
.../services/wrapper/events/InteractionEvent.java | 0
.../services/wrapper/events/ObjectTitleEvent.java | 0
.../wrapper/events/ObjectValidityEvent.java | 0
.../wrapper/events/ObjectVisibilityEvent.java | 0
.../services/wrapper/events/ParseValueEvent.java | 0
.../wrapper/events/PropertyAccessEvent.java | 0
.../wrapper/events/PropertyModifyEvent.java | 0
.../wrapper/events/PropertyUsabilityEvent.java | 0
.../wrapper/events/PropertyVisibilityEvent.java | 0
.../wrapper/events/ProposedHolderEvent.java | 0
.../services/wrapper/events/UsabilityEvent.java | 0
.../services/wrapper/events/ValidityEvent.java | 0
.../services/wrapper/events/VisibilityEvent.java | 0
.../services/wrapper/events/package-info.java | 0
.../wrapper/listeners/InteractionAdapter.java | 0
.../wrapper/listeners/InteractionListener.java | 0
.../applib}/services/wrapper/package-info.java | 0
.../isis/applib}/services/xactn/Transaction.java | 0
.../isis/applib}/services/xactn/TransactionId.java | 0
.../applib}/services/xactn/TransactionService.java | 0
.../applib}/services/xactn/TransactionState.java | 0
.../isis/applib}/services/xactn/package-info.java | 0
.../services/xmlsnapshot/XmlSnapshotService.java | 0
.../xmlsnapshot/XmlSnapshotServiceAbstract.java | 0
.../applib}/services/xmlsnapshot/package-info.java | 0
.../snapshot/SnapshottableWithInclusions.java | 0
.../apache/isis/applib/snapshot/package-info.java | 0
.../isis/applib}/spec/AbstractSpecification.java | 0
.../isis/applib/spec/AbstractSpecification2.java | 112 ++
.../apache/isis/applib}/spec/Specification.java | 0
.../apache/isis/applib}/spec/Specification2.java | 0
.../apache/isis/applib}/spec/SpecificationAnd.java | 0
.../apache/isis/applib}/spec/SpecificationNot.java | 0
.../apache/isis/applib}/spec/SpecificationOr.java | 0
.../org/apache/isis/applib}/spec/package-info.java | 0
.../org/apache/isis/applib/tree/LazyTreeNode.java | 142 ++
.../org/apache/isis/applib}/tree/TreeAdapter.java | 0
.../java/org/apache/isis/applib/tree/TreeNode.java | 155 ++
.../tree/TreeNode_iteratorBreadthFirst.java | 0
.../applib}/tree/TreeNode_iteratorDepthFirst.java | 0
.../applib}/tree/TreeNode_iteratorHierarchyUp.java | 0
.../org/apache/isis/applib}/tree/TreePath.java | 0
.../apache/isis/applib}/tree/TreePath_Default.java | 0
.../org/apache/isis/applib}/tree/TreeState.java | 0
.../isis/applib}/tree/TreeState_Default.java | 0
.../apache/isis/applib/types/DescriptionType.java | 0
.../isis/applib/types/MemberIdentifierType.java | 0
.../apache/isis/applib/types/TargetActionType.java | 0
.../apache/isis/applib/types/TargetClassType.java | 0
.../org/apache/isis/applib/types/package-info.java | 0
.../java/org/apache/isis/applib/util/Enums.java | 87 +
.../java/org/apache/isis/applib/util/Equality.java | 75 +
.../java/org/apache/isis/applib/util/Hashing.java | 66 +
.../org/apache/isis/applib/util/JaxbAdapters.java | 201 +++
.../java/org/apache/isis/applib/util/JaxbUtil.java | 109 ++
.../isis/applib}/util/ObjectContract_Empty.java | 0
.../isis/applib}/util/ObjectContract_Impl.java | 0
.../isis/applib/util/ObjectContract_Parser.java | 179 ++
.../apache/isis/applib/util/ObjectContracts.java | 231 +++
.../org/apache/isis/applib}/util/ReasonBuffer.java | 0
.../org/apache/isis/applib/util/ReasonBuffer2.java | 227 +++
.../java/org/apache/isis/applib}/util/Reasons.java | 0
.../org/apache/isis/applib/util/TitleBuffer.java | 467 +++++
.../isis/applib}/util/TitleBufferException.java | 0
.../java/org/apache/isis/applib/util/ToString.java | 123 ++
.../org/apache/isis/applib/util/ZipWriter.java | 118 ++
.../org/apache/isis/applib}/util/package-info.java | 0
.../isis/applib/util/schema/ChangesDtoUtils.java | 101 ++
.../isis/applib/util/schema/CommandDtoUtils.java | 149 ++
.../isis/applib/util/schema/CommonDtoUtils.java | 494 ++++++
.../applib/util/schema/InteractionDtoUtils.java | 450 +++++
.../util/schema/MemberExecutionDtoUtils.java | 119 ++
.../java/org/apache/isis/applib}/value/Blob.java | 0
.../apache/isis/applib/value/BlobClobFactory.java | 151 ++
.../java/org/apache/isis/applib}/value/Clob.java | 0
.../java/org/apache/isis/applib/value/Image.java | 59 +
.../isis/applib/value/LocalResourcePath.java | 96 ++
.../java/org/apache/isis/applib/value/Markup.java | 76 +
.../isis/applib}/value/NamedWithMimeType.java | 0
.../org/apache/isis/applib/value/Password.java | 78 +
.../apache/isis/applib}/value/package-info.java | 0
.../org/apache/isis/applib/IdentifierTests.java | 0
.../org/apache/isis/applib/SomeDomainClass.java | 0
.../isis/applib/events/InteractionEventTest.java | 0
...ropertyLayoutData_renderedAsDayBefore_Test.java | 0
.../component/PropertyLayoutData_repaint_Test.java | 0
.../applib/layout/grid/bootstrap3/BS3ColTest.java | 0
.../layout/grid/bootstrap3/SizeSpanTest.java | 0
.../bootstrap3/BS3MenuBars_roundtrip_Test.java | 0
.../QueryDefaultTest_withStart_or_withCount.java | 0
.../appfeat/ApplicationMemberTypeTest.java | 0
.../eventbus/AbstractDomainEvent_veto_Test.java | 0
.../ExceptionRecognizerCompositeTest.java | 104 ++
.../exceprecog/ExceptionRecognizerForTypeTest.java | 0
.../exceprecog/ExceptionRecognizerGeneralTest.java | 0
.../services/i18n/TranslatableStringTest.java | 150 ++
.../interaction/InteractionDefaultTest_next.java | 0
.../metamodel/MetaModelService_Config_Test.java | 0
.../QueryResultsCache_KeyTest.java | 0
.../applib/services/urlencoding/MementosTest.java | 134 ++
.../urlencoding/UrlEncodingServiceTest.java | 0
.../XmlSnapshotServiceAbstractTest.java | 115 ++
.../xmlsnapshot/XmlSnapshotServiceAbstractTest.xml | 0
.../applib/spec/AbstractSpecification2Test.java | 0
.../applib/spec/AbstractSpecificationTest.java | 0
.../org/apache/isis/applib/tree/TreePathTest.java | 0
.../org/apache/isis/applib/util/EnumsTest.java | 0
.../isis/applib/util/EnumsTest_converts.java | 0
.../java/org/apache/isis/applib/util/Invoice.java | 0
.../org/apache/isis/applib/util/InvoiceItem.java | 0
.../java/org/apache/isis/applib/util/Numbered.java | 0
.../apache/isis/applib/util/NumberedEvaluator.java | 0
.../applib/util/ObjectContractsTest_compareTo.java | 75 +
.../applib/util/ObjectContractsTest_equals.java | 0
.../ObjectContractsTest_equals_and_hashCode.java | 128 ++
.../applib/util/ObjectContractsTest_toString.java | 0
.../apache/isis/applib/util/ReasonBufferTest.java | 0
.../org/apache/isis/applib/util/ReasonsTest.java | 0
.../apache/isis/applib/util/TitleBufferTest.java | 0
.../apache/isis/applib/util/TitleTestObject.java | 0
.../applib/util/schema/CommandDtoUtils_Test.java | 0
.../applib/util/schema/CommonDtoUtils_Test.java | 106 ++
.../schema/CommonDtoUtils_setValueOn_Test.java | 89 +
...eractionDtoUtilsTest_deriveLogicalMemberId.java | 0
.../apache/isis/applib/util/schema/Roundtrip.java | 0
.../apache/isis/applib/util/schema/Vertical.java | 0
.../isis/applib/value/BlobTest_constructor.java | 0
.../isis/applib/value/ClobTest_constructor.java | 0
.../org/apache/isis/applib/value/PasswordTest.java | 0
.../org/apache/isis/applib/value/TestClock.java | 0
.../unittestsupport => api/schema}/.gitignore | 0
api/schema/pom.xml | 170 ++
.../applib => api/schema}/src/main/doc/antora.yml | 0
.../reference-classes/issue-in-more-detail.png | Bin
.../prefixes/choices/dependent.png | Bin
.../reserved/cssClass/strikethrough.png | Bin
.../reserved/iconName/differing.pdn | Bin
.../reserved/iconName/differing.png | Bin
.../reserved/iconName/png-files.png | Bin
.../modules/schema}/images/value-types/markup.png | Bin
.../schema/src/main/doc/modules/schema}/nav.adoc | 0
.../src/main/doc/modules/schema/pages/about.adoc | 0
.../src/main/doc/modules/schema/pages/aim.adoc | 0
.../src/main/doc/modules/schema/pages/chg.adoc | 0
.../src/main/doc/modules/schema/pages/cmd.adoc | 0
.../src/main/doc/modules/schema/pages/common.adoc | 0
.../src/main/doc/modules/schema/pages/ixn.adoc | 0
.../src/main/doc/modules/schema/pages/mml.adoc | 0
.../doc/modules/schema/partials/module-nav.adoc | 0
.../org/apache/isis/schema/IsisModuleSchema.java | 27 +
...avaSqlTimestampXmlGregorianCalendarAdapter.java | 0
.../jaxbadapters/JodaDateTimeStringAdapter.java | 60 +
.../JodaDateTimeXMLGregorianCalendarAdapter.java | 0
.../jaxbadapters/JodaLocalDateStringAdapter.java | 61 +
.../JodaLocalDateTimeStringAdapter.java | 59 +
...daLocalDateTimeXMLGregorianCalendarAdapter.java | 0
.../JodaLocalDateXMLGregorianCalendarAdapter.java | 0
.../jaxbadapters/JodaLocalTimeStringAdapter.java | 59 +
.../JodaLocalTimeXMLGregorianCalendarAdapter.java | 0
.../apache/isis/schema/jaxbadapters/Strings.java | 0
.../schema/jaxbadapters/XmlCalendarFactory.java | 0
.../resources/org/apache/isis/schema/bindings.xml | 0
.../org/apache/isis/schema/chg/chg-1.1.xsd | 0
.../org/apache/isis/schema/cmd/cmd-1.4.xsd | 0
.../org/apache/isis/schema/common/common-1.1.xsd | 0
.../org/apache/isis/schema/ixn/ixn-1.3.xsd | 0
.../apache/isis/schema/metamodel/metamodel-1.0.xsd | 0
core/applib/pom.xml | 86 -
.../applib-ant/examples/annotation/Defaulted.java | 83 -
.../applib-ant/examples/annotation/Facets.java | 60 -
.../applib-ant/examples/annotation/Value.java | 103 --
.../examples/domain/DomainObjectList.java | 179 --
.../events/domain/AbstractDomainEvent.java | 346 ----
.../examples/events/domain/EventObjectBase.java | 79 -
.../examples/events/ui/AbstractUiEvent.java | 60 -
.../layout/component/CollectionLayoutData.java | 275 ---
.../examples/layout/component/FieldSet.java | 206 ---
.../layout/component/PropertyLayoutData.java | 314 ----
.../examples/layout/grid/GridAbstract.java | 208 ---
.../examples/layout/grid/bootstrap3/BS3Col.java | 281 ---
.../examples/layout/grid/bootstrap3/BS3Grid.java | 307 ----
.../examples/layout/grid/bootstrap3/BS3Row.java | 140 --
.../examples/layout/grid/bootstrap3/BS3Tab.java | 177 --
.../layout/grid/bootstrap3/BS3TabGroup.java | 138 --
.../examples/layout/menubars/MenuBarsAbstract.java | 69 -
.../layout/menubars/bootstrap3/BS3Menu.java | 111 --
.../layout/menubars/bootstrap3/BS3MenuBar.java | 61 -
.../layout/menubars/bootstrap3/BS3MenuBars.java | 227 ---
.../layout/menubars/bootstrap3/BS3MenuSection.java | 64 -
.../examples/mixins/dto/DtoMappingHelper.java | 78 -
.../examples/mixins/dto/Dto_downloadXsd.java | 124 --
.../examples/spec/AbstractSpecification2.java | 112 --
.../applib-cm/examples/tree/LazyTreeNode.java | 142 --
.../modules/applib-cm/examples/tree/TreeNode.java | 155 --
.../doc/modules/applib-cm/examples/util/Enums.java | 87 -
.../modules/applib-cm/examples/util/Equality.java | 75 -
.../modules/applib-cm/examples/util/Hashing.java | 66 -
.../applib-cm/examples/util/JaxbAdapters.java | 201 ---
.../modules/applib-cm/examples/util/JaxbUtil.java | 109 --
.../examples/util/ObjectContract_Parser.java | 179 --
.../applib-cm/examples/util/ObjectContracts.java | 231 ---
.../applib-cm/examples/util/ReasonBuffer2.java | 227 ---
.../applib-cm/examples/util/TitleBuffer.java | 467 -----
.../modules/applib-cm/examples/util/ToString.java | 123 --
.../examples/util/schema/ChangesDtoUtils.java | 101 --
.../examples/util/schema/CommandDtoUtils.java | 149 --
.../examples/util/schema/CommonDtoUtils.java | 494 ------
.../examples/util/schema/InteractionDtoUtils.java | 450 -----
.../util/schema/MemberExecutionDtoUtils.java | 119 --
.../applib-cm/examples/value/BlobClobFactory.java | 151 --
.../modules/applib-cm/examples/value/Image.java | 59 -
.../examples/value/LocalResourcePath.java | 96 --
.../modules/applib-cm/examples/value/Markup.java | 76 -
.../modules/applib-cm/examples/value/Password.java | 78 -
.../pages/classes/AppManifest-bootstrapping.adoc | 320 ----
.../pages/classes/contributee/HasUserName.adoc | 26 -
.../pages/classes/super/AbstractSubscriber.adoc | 14 -
.../services/appfeat/ApplicationMemberType.java | 33 -
.../examples/services/bookmark/Bookmark.java | 187 --
.../services/bookmark/BookmarkService.java | 70 -
.../services/confview/ConfigurationProperty.java | 84 -
.../services/conmap/ContentMappingService.java | 66 -
.../exceprecog/ExceptionRecognizerAbstract.java | 171 --
.../exceprecog/ExceptionRecognizerComposite.java | 178 --
.../exceprecog/ExceptionRecognizerForType.java | 181 --
.../examples/services/i18n/TranslatableString.java | 274 ---
.../examples/services/iactn/Interaction.java | 722 --------
.../jaxb/CatalogingSchemaOutputResolver.java | 154 --
.../examples/services/jaxb/JaxbService.java | 253 ---
.../services/layout/LayoutServiceMenu.java | 121 --
.../services/metamodel/MetaModelService.java | 183 --
.../services/metamodel/MetaModelServicesMenu.java | 252 ---
.../QueryResultsCacheDefault.java | 163 --
.../services/registry/ServiceRegistry.java | 173 --
.../examples/services/scratchpad/Scratchpad.java | 78 -
.../services/urlencoding/UrlEncodingService.java | 47 -
...rlEncodingServiceUsingBaseEncodingAbstract.java | 44 -
.../UrlEncodingServiceWithCompression.java | 66 -
.../pages/core-domain-api/EventBusService.adoc | 412 -----
.../UserRegistrationService.adoc | 93 -
.../java/org/apache/isis/applib/Identifier.java | 444 -----
.../isis/applib/NonRecoverableException.java | 142 --
.../apache/isis/applib/RecoverableException.java | 136 --
.../apache/isis/applib/annotation/Defaulted.java | 83 -
.../org/apache/isis/applib/annotation/Facets.java | 60 -
.../org/apache/isis/applib/annotation/Value.java | 103 --
.../apache/isis/applib/client/SuppressionType.java | 91 -
.../isis/applib/domain/DomainObjectList.java | 179 --
.../applib/events/domain/AbstractDomainEvent.java | 346 ----
.../isis/applib/events/domain/EventObjectBase.java | 79 -
.../isis/applib/events/ui/AbstractUiEvent.java | 60 -
.../jaxbadapters/PersistentEntitiesAdapter.java | 66 -
.../layout/component/CollectionLayoutData.java | 275 ---
.../isis/applib/layout/component/FieldSet.java | 206 ---
.../layout/component/PropertyLayoutData.java | 314 ----
.../isis/applib/layout/grid/GridAbstract.java | 208 ---
.../isis/applib/layout/grid/bootstrap3/BS3Col.java | 281 ---
.../applib/layout/grid/bootstrap3/BS3Grid.java | 307 ----
.../isis/applib/layout/grid/bootstrap3/BS3Row.java | 140 --
.../isis/applib/layout/grid/bootstrap3/BS3Tab.java | 177 --
.../applib/layout/grid/bootstrap3/BS3TabGroup.java | 138 --
.../applib/layout/menubars/MenuBarsAbstract.java | 69 -
.../applib/layout/menubars/bootstrap3/BS3Menu.java | 111 --
.../layout/menubars/bootstrap3/BS3MenuBar.java | 61 -
.../layout/menubars/bootstrap3/BS3MenuBars.java | 227 ---
.../layout/menubars/bootstrap3/BS3MenuSection.java | 64 -
.../isis/applib/mixins/dto/DtoMappingHelper.java | 78 -
.../isis/applib/mixins/dto/Dto_downloadXsd.java | 124 --
.../apache/isis/applib/query/QueryAbstract.java | 92 -
.../services/appfeat/ApplicationMemberType.java | 33 -
.../isis/applib/services/bookmark/Bookmark.java | 187 --
.../applib/services/bookmark/BookmarkService.java | 70 -
.../services/confview/ConfigurationProperty.java | 84 -
.../services/conmap/ContentMappingService.java | 66 -
.../exceprecog/ExceptionRecognizerAbstract.java | 171 --
.../exceprecog/ExceptionRecognizerComposite.java | 178 --
.../exceprecog/ExceptionRecognizerForType.java | 181 --
.../applib/services/i18n/TranslatableString.java | 274 ---
.../isis/applib/services/iactn/Interaction.java | 722 --------
.../jaxb/CatalogingSchemaOutputResolver.java | 154 --
.../isis/applib/services/jaxb/JaxbService.java | 253 ---
.../applib/services/layout/LayoutServiceMenu.java | 121 --
.../services/metamodel/MetaModelService.java | 183 --
.../services/metamodel/MetaModelServicesMenu.java | 252 ---
.../QueryResultsCacheDefault.java | 163 --
.../applib/services/registry/ServiceRegistry.java | 173 --
.../applib/services/scratchpad/Scratchpad.java | 78 -
.../services/urlencoding/UrlEncodingService.java | 47 -
...rlEncodingServiceUsingBaseEncodingAbstract.java | 44 -
.../UrlEncodingServiceWithCompression.java | 66 -
.../isis/applib/spec/AbstractSpecification2.java | 112 --
.../org/apache/isis/applib/tree/LazyTreeNode.java | 142 --
.../java/org/apache/isis/applib/tree/TreeNode.java | 155 --
.../java/org/apache/isis/applib/util/Enums.java | 87 -
.../java/org/apache/isis/applib/util/Equality.java | 75 -
.../java/org/apache/isis/applib/util/Hashing.java | 66 -
.../org/apache/isis/applib/util/JaxbAdapters.java | 201 ---
.../java/org/apache/isis/applib/util/JaxbUtil.java | 109 --
.../isis/applib/util/ObjectContract_Parser.java | 179 --
.../apache/isis/applib/util/ObjectContracts.java | 231 ---
.../org/apache/isis/applib/util/ReasonBuffer2.java | 227 ---
.../org/apache/isis/applib/util/TitleBuffer.java | 467 -----
.../java/org/apache/isis/applib/util/ToString.java | 123 --
.../isis/applib/util/schema/ChangesDtoUtils.java | 101 --
.../isis/applib/util/schema/CommandDtoUtils.java | 149 --
.../isis/applib/util/schema/CommonDtoUtils.java | 494 ------
.../applib/util/schema/InteractionDtoUtils.java | 450 -----
.../util/schema/MemberExecutionDtoUtils.java | 119 --
.../apache/isis/applib/value/BlobClobFactory.java | 151 --
.../java/org/apache/isis/applib/value/Image.java | 59 -
.../isis/applib/value/LocalResourcePath.java | 96 --
.../java/org/apache/isis/applib/value/Markup.java | 76 -
.../org/apache/isis/applib/value/Password.java | 78 -
.../ExceptionRecognizerCompositeTest.java | 104 --
.../services/i18n/TranslatableStringTest.java | 150 --
.../applib/services/urlencoding/MementosTest.java | 134 --
.../XmlSnapshotServiceAbstractTest.java | 115 --
.../applib/util/ObjectContractsTest_compareTo.java | 75 -
.../ObjectContractsTest_equals_and_hashCode.java | 128 --
.../applib/util/schema/CommonDtoUtils_Test.java | 106 --
.../schema/CommonDtoUtils_setValueOn_Test.java | 89 -
core/codegen-bytebuddy/pom.xml | 8 +-
.../bytebuddy/IsisModuleCodegenByteBuddy.java | 18 -
.../services/ClassLoadingStrategyAdvisor.java | 92 -
.../services/ProxyFactoryServiceByteBuddy.java | 147 --
.../bytebuddy/IsisModuleCoreCodegenByteBuddy.java | 18 +
.../services/ClassLoadingStrategyAdvisor.java | 92 +
.../services/ProxyFactoryServiceByteBuddy.java | 147 ++
core/commons/pom.xml | 11 +-
.../org/apache/isis/commons/IsisModuleCommons.java | 14 -
.../org/apache/isis/commons/collections/Can.java | 518 ------
.../apache/isis/commons/collections/Can_Empty.java | 133 --
.../isis/commons/collections/Can_Multiple.java | 152 --
.../isis/commons/collections/Can_Singleton.java | 144 --
.../isis/commons/collections/Cardinality.java | 54 -
.../apache/isis/commons/compression/ZipWriter.java | 118 --
.../isis/commons/concurrent/AwaitableLatch.java | 66 -
.../isis/commons/exceptions/ExceptionUtils.java | 350 ----
.../exceptions/IsisApplicationException.java | 54 -
.../isis/commons/exceptions/IsisException.java | 49 -
.../exceptions/UnexpectedCallException.java | 33 -
.../commons/exceptions/UnknownTypeException.java | 33 -
.../isis/commons/exceptions/package-info.java | 25 -
.../commons/handler/ChainOfResponsibility.java | 81 -
.../apache/isis/commons/internal/_Constants.java | 98 --
.../isis/commons/internal/assertions/_Assert.java | 67 -
.../isis/commons/internal/base/_Blackhole.java | 80 -
.../apache/isis/commons/internal/base/_Bytes.java | 245 ---
.../internal/base/_Bytes_GZipCompressor.java | 65 -
.../internal/base/_Bytes_GZipCompressorSmart.java | 74 -
.../apache/isis/commons/internal/base/_Casts.java | 150 --
.../apache/isis/commons/internal/base/_Either.java | 149 --
.../apache/isis/commons/internal/base/_Lazy.java | 84 -
.../isis/commons/internal/base/_Lazy_Simple.java | 60 -
.../commons/internal/base/_Lazy_ThreadSafe.java | 66 -
.../isis/commons/internal/base/_NullSafe.java | 252 ---
.../isis/commons/internal/base/_Oneshot.java | 64 -
.../isis/commons/internal/base/_Reduction.java | 102 --
.../isis/commons/internal/base/_Strings.java | 581 -------
.../commons/internal/base/_Strings_FastSplit.java | 66 -
.../internal/base/_Strings_HtmlEscaper.java | 56 -
.../internal/base/_Strings_KeyValuePair.java | 86 -
.../internal/base/_Strings_NaturalNames.java | 91 -
.../internal/base/_Strings_SplitIterator.java | 76 -
.../apache/isis/commons/internal/base/_Timing.java | 133 --
.../apache/isis/commons/internal/base/_Tuples.java | 77 -
.../apache/isis/commons/internal/base/_With.java | 340 ----
.../isis/commons/internal/base/package-info.java | 28 -
.../isis/commons/internal/collections/_Arrays.java | 442 -----
.../internal/collections/_Arrays_Collector.java | 99 --
.../collections/_Arrays_CollectorUnknownSize.java | 82 -
.../commons/internal/collections/_Collections.java | 324 ----
.../collections/_Collections_Collector.java | 81 -
.../collections/_Collections_SortedSetOfList.java | 152 --
.../isis/commons/internal/collections/_Inbox.java | 84 -
.../isis/commons/internal/collections/_Lists.java | 200 ---
.../isis/commons/internal/collections/_Maps.java | 358 ----
.../commons/internal/collections/_Multimaps.java | 393 -----
.../isis/commons/internal/collections/_Sets.java | 320 ----
.../commons/internal/collections/_Streams.java | 105 --
.../commons/internal/collections/package-info.java | 28 -
.../collections/snapshot/_VersionedList.java | 217 ---
.../commons/internal/compare/_Comparators.java | 53 -
.../compare/_Comparators_SequenceCompare.java | 109 --
.../commons/internal/compare/package-info.java | 28 -
.../internal/concurrent/_ConcurrentContext.java | 55 -
.../internal/concurrent/_ConcurrentTask.java | 188 --
.../internal/concurrent/_ConcurrentTaskList.java | 200 ---
.../isis/commons/internal/context/_Context.java | 375 ----
.../internal/context/_Context_ThreadLocal.java | 152 --
.../isis/commons/internal/context/_Plugin.java | 186 --
.../commons/internal/context/package-info.java | 28 -
.../apache/isis/commons/internal/debug/_Probe.java | 236 ---
.../isis/commons/internal/debug/package-info.java | 28 -
.../internal/encoding/DataInputExtended.java | 58 -
.../encoding/DataInputExtendedDecorator.java | 203 ---
.../internal/encoding/DataInputStreamExtended.java | 206 ---
.../internal/encoding/DataOutputExtended.java | 68 -
.../encoding/DataOutputExtendedDecorator.java | 206 ---
.../encoding/DataOutputStreamExtended.java | 227 ---
.../internal/encoding/DebugDataInputExtended.java | 103 --
.../internal/encoding/DebugDataOutputExtended.java | 100 --
.../isis/commons/internal/encoding/Encodable.java | 40 -
.../internal/encoding/EncodingConstants.java | 29 -
.../internal/encoding/FailedToDecodeException.java | 42 -
.../encoding/FailedToDeserializeException.java | 42 -
.../isis/commons/internal/encoding/FieldType.java | 1361 ---------------
.../internal/environment/DeploymentType.java | 39 -
.../environment/IsisSystemEnvironment.java | 203 ---
.../commons/internal/exceptions/_Exceptions.java | 407 -----
.../commons/internal/exceptions/package-info.java | 28 -
.../factory/InstanceCreationClassException.java | 34 -
.../factory/InstanceCreationException.java | 34 -
.../commons/internal/factory/InstanceUtil.java | 174 --
.../factory/UnavailableClassException.java | 42 -
.../commons/internal/factory/package-info.java | 28 -
.../commons/internal/functions/_Functions.java | 204 ---
.../_Functions_IndexAwareFunctionAdapter.java | 44 -
.../commons/internal/functions/_Predicates.java | 88 -
.../commons/internal/functions/package-info.java | 28 -
.../apache/isis/commons/internal/ioc/BeanSort.java | 96 --
.../isis/commons/internal/ioc/IocContainer.java | 69 -
.../commons/internal/ioc/ManagedBeanAdapter.java | 34 -
.../commons/internal/ioc/PriorityConstants.java | 53 -
.../commons/internal/ioc/cdi/BeanAdapterCDI.java | 54 -
.../isis/commons/internal/ioc/cdi/CdiPlugin.java | 52 -
.../apache/isis/commons/internal/ioc/cdi/_CDI.java | 242 ---
.../commons/internal/ioc/cdi/_CDI_Lifecycle.java | 44 -
.../internal/ioc/spring/BeanAdapterSpring.java | 52 -
.../commons/internal/ioc/spring/EventSpring.java | 75 -
.../internal/ioc/spring/IocContainerSpring.java | 123 --
.../isis/commons/internal/ioc/spring/_Spring.java | 228 ---
.../isis/commons/internal/memento/_Mementos.java | 195 ---
.../internal/memento/_Mementos_MementoDefault.java | 133 --
.../commons/internal/memento/package-info.java | 28 -
.../apache/isis/commons/internal/package-info.java | 28 -
.../internal/plugins/PluginResolveException.java | 37 -
.../internal/plugins/codegen/ProxyFactory.java | 77 -
.../plugins/codegen/ProxyFactoryService.java | 34 -
.../plugins/ioc/ConversationContextHandle.java | 30 -
.../plugins/ioc/ConversationContextService.java | 32 -
.../ioc/ConversationContextServiceDefault.java | 38 -
.../commons/internal/reflection/_Annotations.java | 230 ---
.../internal/reflection/_AnnotationsLegacy.java | 361 ----
.../reflection/_Annotations_AttributeMethods.java | 311 ----
.../reflection/_Annotations_SyntCache.java | 78 -
...nthesizedMergedAnnotationInvocationHandler.java | 235 ---
.../commons/internal/reflection/_MethodCache.java | 107 --
.../isis/commons/internal/reflection/_Reflect.java | 434 -----
.../commons/internal/reflection/package-info.java | 28 -
.../isis/commons/internal/resources/_Json.java | 329 ----
.../commons/internal/resources/_Resources.java | 158 --
.../commons/internal/resources/package-info.java | 28 -
.../isis/commons/internal/url/UrlDecoderUtil.java | 45 -
.../isis/core/commons/IsisModuleCoreCommons.java | 14 +
.../apache/isis/core/commons/collections/Can.java | 518 ++++++
.../isis/core/commons/collections/Can_Empty.java | 133 ++
.../core/commons/collections/Can_Multiple.java | 152 ++
.../core/commons/collections/Can_Singleton.java | 144 ++
.../isis/core/commons/collections/Cardinality.java | 54 +
.../core/commons/concurrent/AwaitableLatch.java | 66 +
.../core/commons/exceptions/ExceptionUtils.java | 350 ++++
.../exceptions/IsisApplicationException.java | 54 +
.../core/commons/exceptions/IsisException.java | 49 +
.../exceptions/UnexpectedCallException.java | 33 +
.../commons/exceptions/UnknownTypeException.java | 33 +
.../isis/core/commons/exceptions/package-info.java | 25 +
.../commons/handler/ChainOfResponsibility.java | 81 +
.../isis/core/commons/internal/_Constants.java | 98 ++
.../core/commons/internal/assertions/_Assert.java | 67 +
.../core/commons/internal/base/_Blackhole.java | 80 +
.../isis/core/commons/internal/base/_Bytes.java | 245 +++
.../internal/base/_Bytes_GZipCompressor.java | 65 +
.../internal/base/_Bytes_GZipCompressorSmart.java | 74 +
.../isis/core/commons/internal/base/_Casts.java | 150 ++
.../isis/core/commons/internal/base/_Either.java | 149 ++
.../isis/core/commons/internal/base/_Lazy.java | 84 +
.../core/commons/internal/base/_Lazy_Simple.java | 60 +
.../commons/internal/base/_Lazy_ThreadSafe.java | 66 +
.../isis/core/commons/internal/base/_NullSafe.java | 252 +++
.../isis/core/commons/internal/base/_Oneshot.java | 64 +
.../core/commons/internal/base/_Reduction.java | 102 ++
.../isis/core/commons/internal/base/_Strings.java | 581 +++++++
.../commons/internal/base/_Strings_FastSplit.java | 66 +
.../internal/base/_Strings_HtmlEscaper.java | 54 +
.../internal/base/_Strings_KeyValuePair.java | 84 +
.../internal/base/_Strings_NaturalNames.java | 91 +
.../internal/base/_Strings_SplitIterator.java | 76 +
.../isis/core/commons/internal/base/_Timing.java | 133 ++
.../isis/core/commons/internal/base/_Tuples.java | 77 +
.../isis/core/commons/internal/base/_With.java | 340 ++++
.../core/commons/internal/base/package-info.java | 28 +
.../core/commons/internal/collections/_Arrays.java | 441 +++++
.../internal/collections/_Arrays_Collector.java | 99 ++
.../collections/_Arrays_CollectorUnknownSize.java | 82 +
.../commons/internal/collections/_Collections.java | 323 ++++
.../collections/_Collections_Collector.java | 81 +
.../collections/_Collections_SortedSetOfList.java | 152 ++
.../core/commons/internal/collections/_Inbox.java | 84 +
.../core/commons/internal/collections/_Lists.java | 199 +++
.../core/commons/internal/collections/_Maps.java | 357 ++++
.../commons/internal/collections/_Multimaps.java | 392 +++++
.../core/commons/internal/collections/_Sets.java | 320 ++++
.../commons/internal/collections/_Streams.java | 105 ++
.../commons/internal/collections/package-info.java | 28 +
.../collections/snapshot/_VersionedList.java | 217 +++
.../commons/internal/compare/_Comparators.java | 53 +
.../compare/_Comparators_SequenceCompare.java | 109 ++
.../commons/internal/compare/package-info.java | 28 +
.../internal/concurrent/_ConcurrentContext.java | 55 +
.../internal/concurrent/_ConcurrentTask.java | 188 ++
.../internal/concurrent/_ConcurrentTaskList.java | 200 +++
.../core/commons/internal/context/_Context.java | 374 ++++
.../internal/context/_Context_ThreadLocal.java | 151 ++
.../core/commons/internal/context/_Plugin.java | 185 ++
.../commons/internal/context/package-info.java | 28 +
.../isis/core/commons/internal/debug/_Probe.java | 236 +++
.../core/commons/internal/debug/package-info.java | 28 +
.../internal/encoding/DataInputExtended.java | 58 +
.../encoding/DataInputExtendedDecorator.java | 203 +++
.../internal/encoding/DataInputStreamExtended.java | 206 +++
.../internal/encoding/DataOutputExtended.java | 68 +
.../encoding/DataOutputExtendedDecorator.java | 206 +++
.../encoding/DataOutputStreamExtended.java | 227 +++
.../internal/encoding/DebugDataInputExtended.java | 103 ++
.../internal/encoding/DebugDataOutputExtended.java | 100 ++
.../core/commons/internal/encoding/Encodable.java | 40 +
.../internal/encoding/EncodingConstants.java | 29 +
.../internal/encoding/FailedToDecodeException.java | 42 +
.../encoding/FailedToDeserializeException.java | 42 +
.../core/commons/internal/encoding/FieldType.java | 1361 +++++++++++++++
.../internal/environment/DeploymentType.java | 39 +
.../environment/IsisSystemEnvironment.java | 203 +++
.../commons/internal/exceptions/_Exceptions.java | 407 +++++
.../commons/internal/exceptions/package-info.java | 28 +
.../factory/InstanceCreationClassException.java | 34 +
.../factory/InstanceCreationException.java | 34 +
.../commons/internal/factory/InstanceUtil.java | 174 ++
.../factory/UnavailableClassException.java | 42 +
.../commons/internal/factory/package-info.java | 28 +
.../commons/internal/functions/_Functions.java | 204 +++
.../_Functions_IndexAwareFunctionAdapter.java | 44 +
.../commons/internal/functions/_Predicates.java | 88 +
.../commons/internal/functions/package-info.java | 28 +
.../isis/core/commons/internal/ioc/BeanSort.java | 96 ++
.../core/commons/internal/ioc/IocContainer.java | 69 +
.../commons/internal/ioc/ManagedBeanAdapter.java | 34 +
.../commons/internal/ioc/PriorityConstants.java | 53 +
.../commons/internal/ioc/cdi/BeanAdapterCDI.java | 54 +
.../core/commons/internal/ioc/cdi/CdiPlugin.java | 52 +
.../isis/core/commons/internal/ioc/cdi/_CDI.java | 243 +++
.../commons/internal/ioc/cdi/_CDI_Lifecycle.java | 44 +
.../internal/ioc/spring/BeanAdapterSpring.java | 52 +
.../commons/internal/ioc/spring/EventSpring.java | 75 +
.../internal/ioc/spring/IocContainerSpring.java | 122 ++
.../core/commons/internal/ioc/spring/_Spring.java | 228 +++
.../core/commons/internal/memento/_Mementos.java | 195 +++
.../internal/memento/_Mementos_MementoDefault.java | 132 ++
.../commons/internal/memento/package-info.java | 28 +
.../isis/core/commons/internal/package-info.java | 28 +
.../internal/plugins/PluginResolveException.java | 37 +
.../internal/plugins/codegen/ProxyFactory.java | 77 +
.../plugins/codegen/ProxyFactoryService.java | 34 +
.../plugins/ioc/ConversationContextHandle.java | 30 +
.../plugins/ioc/ConversationContextService.java | 32 +
.../ioc/ConversationContextServiceDefault.java | 38 +
.../commons/internal/reflection/_Annotations.java | 230 +++
.../internal/reflection/_AnnotationsLegacy.java | 362 ++++
.../reflection/_Annotations_AttributeMethods.java | 311 ++++
.../reflection/_Annotations_SyntCache.java | 78 +
...nthesizedMergedAnnotationInvocationHandler.java | 235 +++
.../commons/internal/reflection/_MethodCache.java | 106 ++
.../core/commons/internal/reflection/_Reflect.java | 435 +++++
.../commons/internal/reflection/package-info.java | 28 +
.../core/commons/internal/resources/_Json.java | 329 ++++
.../commons/internal/resources/_Resources.java | 157 ++
.../commons/internal/resources/package-info.java | 28 +
.../core/commons/internal/url/UrlDecoderUtil.java | 45 +
.../handlers/ChainOfResponsibilityTest.java | 121 --
.../isis/commons/internal/base/BytesTest.java | 202 ---
.../isis/commons/internal/base/NullSafeTest.java | 116 --
.../isis/commons/internal/base/ReductionTest.java | 74 -
.../isis/commons/internal/base/StringsTest.java | 306 ----
.../apache/isis/commons/internal/cdi/CDITest.java | 127 --
.../internal/cdi/ValidQualifierForTesting.java | 35 -
.../commons/internal/collections/_ArraysTest.java | 74 -
.../commons/internal/collections/_MapsTest.java | 127 --
.../collections/snapshot/VersionedListTest.java | 69 -
.../commons/internal/compare/ComparatorsTest.java | 157 --
.../concurrent/ConcurrentTaskListTest.java | 53 -
.../isis/commons/internal/context/ContextTest.java | 239 ---
.../encoding/ByteEncoderDecoderRoundtripTest.java | 176 --
.../commons/internal/resources/ResourcesTest.java | 66 -
.../isis/commons/internal/strings/FormatTest.java | 66 -
.../handlers/ChainOfResponsibilityTest.java | 121 ++
.../isis/core/commons/internal/base/BytesTest.java | 202 +++
.../core/commons/internal/base/NullSafeTest.java | 116 ++
.../core/commons/internal/base/ReductionTest.java | 74 +
.../core/commons/internal/base/StringsTest.java | 306 ++++
.../isis/core/commons/internal/cdi/CDITest.java | 128 ++
.../internal/cdi/ValidQualifierForTesting.java | 35 +
.../commons/internal/collections/_ArraysTest.java | 74 +
.../commons/internal/collections/_MapsTest.java | 127 ++
.../collections/snapshot/VersionedListTest.java | 69 +
.../commons/internal/compare/ComparatorsTest.java | 157 ++
.../concurrent/ConcurrentTaskListTest.java | 53 +
.../core/commons/internal/context/ContextTest.java | 239 +++
.../encoding/ByteEncoderDecoderRoundtripTest.java | 176 ++
.../commons/internal/resources/ResourcesTest.java | 66 +
.../core/commons/internal/strings/FormatTest.java | 66 +
core/config/pom.xml | 13 +-
.../doc/modules/config/pages/configuring-core.adoc | 2 +-
.../apache/isis/config/ConfigurationConstants.java | 41 -
.../org/apache/isis/config/IsisConfiguration.java | 1232 --------------
.../org/apache/isis/config/IsisModuleConfig.java | 69 -
.../apache/isis/config/RestEasyConfiguration.java | 79 -
.../IsisBeanFactoryPostProcessorForSpring.java | 100 --
.../isis/config/beans/IsisBeanTypeRegistry.java | 295 ----
.../config/beans/IsisBeanTypeRegistryHolder.java | 7 -
.../config/beans/IsisComponentScanInterceptor.java | 45 -
.../org/apache/isis/config/beans/TypeMetaData.java | 77 -
.../isis/config/messages/MessageRegistry.java | 42 -
.../facets/AuditObjectsConfiguration.java | 31 -
.../facets/CommandActionsConfiguration.java | 36 -
.../facets/CommandPropertiesConfiguration.java | 25 -
.../metamodel/facets/DefaultViewConfiguration.java | 36 -
.../facets/EditingObjectsConfiguration.java | 24 -
.../facets/PublishActionsConfiguration.java | 36 -
.../facets/PublishObjectsConfiguration.java | 30 -
.../facets/PublishPropertiesConfiguration.java | 24 -
.../apache/isis/config/metamodel/facets/Util.java | 41 -
.../ApplicationFeaturesInitConfiguration.java | 10 -
.../metamodel/specloader/IntrospectionMode.java | 67 -
.../isis/config/presets/DebugDiscovery.properties | 19 -
.../isis/config/presets/DebugMetaModel.properties | 19 -
.../presets/DebugProgrammingModel.properties | 19 -
.../apache/isis/config/presets/IsisPresets.java | 79 -
.../config/presets/SilenceMetaModel.properties | 19 -
.../presets/SilenceProgrammingModel.properties | 19 -
.../org/apache/isis/config/util/ConfigUtil.java | 61 -
.../PatternOptionalStringConstraintValidator.java | 43 -
.../isis/config/viewer/wicket/DialogMode.java | 26 -
.../config/viewer/wicket/WebAppConfiguration.java | 124 --
.../config/viewer/wicket/WebAppContextPath.java | 102 --
.../apache/isis/core/config/IsisConfiguration.java | 1233 ++++++++++++++
.../isis/core/config/IsisModuleCoreConfig.java | 69 +
.../isis/core/config/RestEasyConfiguration.java | 79 +
.../IsisBeanFactoryPostProcessorForSpring.java | 100 ++
.../core/config/beans/IsisBeanTypeRegistry.java | 295 ++++
.../config/beans/IsisBeanTypeRegistryHolder.java | 7 +
.../config/beans/IsisComponentScanInterceptor.java | 45 +
.../isis/core/config/beans/TypeMetaData.java | 77 +
.../isis/core/config/messages/MessageRegistry.java | 42 +
.../facets/AuditObjectsConfiguration.java | 31 +
.../facets/CommandActionsConfiguration.java | 36 +
.../facets/CommandPropertiesConfiguration.java | 25 +
.../metamodel/facets/DefaultViewConfiguration.java | 36 +
.../facets/EditingObjectsConfiguration.java | 24 +
.../facets/PublishActionsConfiguration.java | 36 +
.../facets/PublishObjectsConfiguration.java | 30 +
.../facets/PublishPropertiesConfiguration.java | 24 +
.../isis/core/config/metamodel/facets/Util.java | 41 +
.../ApplicationFeaturesInitConfiguration.java | 10 +
.../metamodel/specloader/IntrospectionMode.java | 67 +
.../presets/DataNucleusAutoCreate.properties | 0
.../core/config/presets/DebugDiscovery.properties | 19 +
.../core/config/presets/DebugMetaModel.properties | 19 +
.../config/presets/DebugPersistence.properties | 0
.../presets/DebugProgrammingModel.properties | 19 +
.../config/presets/H2InMemory.properties | 0
.../presets/H2InMemory_withUniqueSchema.properties | 0
.../config/presets/HsqlDbInMemory.properties | 0
.../config/presets/IsisIntegTest.properties | 0
.../isis/core/config/presets/IsisPresets.java | 79 +
.../config/presets/NoTranslations.properties | 0
.../config/presets/SilenceMetaModel.properties | 19 +
.../presets/SilenceProgrammingModel.properties | 19 +
.../config/presets/SilenceWicket.properties | 0
.../config/presets/UseLog4j2Test.properties | 0
.../apache/isis/core/config/util/ConfigUtil.java | 65 +
.../PatternOptionalStringConstraintValidator.java | 43 +
.../isis/core/config/viewer/wicket/DialogMode.java | 26 +
.../config/viewer/wicket/WebAppConfiguration.java | 124 ++
.../config/viewer/wicket/WebAppContextPath.java | 102 ++
.../services/javax.validation.ConstraintValidator | 2 +-
.../config/IsisConfiguration_createSubsetTest.java | 100 --
...ion_getMaxTitleLengthInParentedTables_Test.java | 61 -
...n_getMaxTitleLengthInStandaloneTables_Test.java | 61 -
.../isis/config/IsisConfiguration_primingTest.java | 66 -
.../config/IsisConfiguration_specialCharTest.java | 52 -
.../config/IsisConfiguration_whitespaceTest.java | 73 -
.../config/util/ConfigUtil_isProtected_Test.java | 66 -
.../isis/config/util/ConfigUtil_mask_Test.java | 49 -
.../WebAppContextPath_setContextPath_Test.java | 79 -
.../config/IsisConfiguration_createSubsetTest.java | 100 ++
...ion_getMaxTitleLengthInParentedTables_Test.java | 61 +
...n_getMaxTitleLengthInStandaloneTables_Test.java | 61 +
.../core/config/IsisConfiguration_primingTest.java | 66 +
.../config/IsisConfiguration_specialCharTest.java | 52 +
.../config/IsisConfiguration_whitespaceTest.java | 73 +
.../config/util/ConfigUtil_isProtected_Test.java | 66 +
.../core/config/util/ConfigUtil_mask_Test.java | 49 +
.../WebAppContextPath_setContextPath_Test.java | 79 +
core/detached-tests/pom.xml | 52 +-
.../commons/internal/reflection/ReflectTest.java | 143 --
.../commons/internal/reflection/ReflectTest.java | 143 ++
.../facets/object/mixin/MixinIntendedAs.java | 135 ++
.../object/mixin/MixinIntendedAsActionTest.java | 178 ++
.../facets/param/name/ParameterNameFacetTest.java | 128 ++
.../proxy/ProxyCreatorTestUsingCodegenPlugin.java | 98 ++
.../BidirectionalRelationshipContractTestAll.java | 36 +
.../unittestsupport/bidir/ChildDomainObject.java | 78 +
.../bidir/InstantiatorForChildDomainObject.java | 38 +
.../unittestsupport/bidir/ParentDomainObject.java | 67 +
.../unittestsupport/bidir/PeerDomainObject.java | 105 ++
.../bidir/PeerDomainObjectForTesting.java | 23 +
.../comparable/CategorizedDomainObject.java | 61 +
...mainObjectComparableContractTest_compareTo.java | 50 +
.../files/FilesTest_deleteFiles.java | 87 +
...ectServiceMethodMustBeFinalContractTestAll.java | 28 +
.../unittestsupport/inject/SomeDomainObject.java | 28 +
.../core/unittestsupport/inject/SomeService.java | 23 +
.../CollaboratingUsingConstructorInjection.java | 37 +
.../CollaboratingUsingSetterInjection.java | 40 +
.../unittestsupport/jmocking/Collaborator.java | 24 +
.../ImposteriserTestUsingCodegenPlugin.java | 347 ++++
...IsisActionsTest_returnNewTransientInstance.java | 93 +
.../jmocking/JMockActionsTest_returnArgument.java | 68 +
.../jmocking/JMockActionsTest_returnEach.java | 70 +
.../jmocking/JUnitRuleMockery2Test.java | 46 +
..._autoWiring_constructorInjection_happyCase.java | 57 +
...y2Test_autoWiring_sadCase_noClassUnderTest.java | 45 +
...est_autoWiring_sadCase_twoClassesUnderTest.java | 50 +
...2Test_autoWiring_setterInjection_happyCase.java | 57 +
...RuleMockery2Test_mockAnnotatedWithAllowing.java | 59 +
...RuleMockery2Test_mockAnnotatedWithChecking.java | 61 +
...RuleMockery2Test_mockAnnotatedWithIgnoring.java | 58 +
...kery2Test_mockAnnotatedWithNever_happyCase.java | 53 +
...ockery2Test_mockAnnotatedWithNever_sadCase.java | 59 +
...ockery2Test_mockAnnotatedWithOne_happyCase.java | 54 +
...eMockery2Test_mockAnnotatedWithOne_sadCase.java | 55 +
.../sortedsets/SomeDomainObject.java | 38 +
.../sortedsets/SortedSetsContractTestAll.java | 28 +
...lueTypeContractTestAbstract_BigIntegerTest.java | 37 +
.../ValueTypeContractTestAbstract_ColorTest.java | 38 +
.../ValueTypeContractTestAbstract_StringTest.java | 36 +
.../facets/object/mixin/MixinIntendedAs.java | 135 --
.../object/mixin/MixinIntendedAsActionTest.java | 178 --
.../facets/param/name/ParameterNameFacetTest.java | 128 --
.../BidirectionalRelationshipContractTestAll.java | 36 -
.../unittestsupport/bidir/ChildDomainObject.java | 78 -
.../bidir/InstantiatorForChildDomainObject.java | 38 -
.../unittestsupport/bidir/ParentDomainObject.java | 67 -
.../unittestsupport/bidir/PeerDomainObject.java | 105 --
.../bidir/PeerDomainObjectForTesting.java | 23 -
.../comparable/CategorizedDomainObject.java | 61 -
...mainObjectComparableContractTest_compareTo.java | 50 -
.../files/FilesTest_deleteFiles.java | 87 -
...ectServiceMethodMustBeFinalContractTestAll.java | 28 -
.../unittestsupport/inject/SomeDomainObject.java | 28 -
.../isis/unittestsupport/inject/SomeService.java | 23 -
.../CollaboratingUsingConstructorInjection.java | 37 -
.../CollaboratingUsingSetterInjection.java | 40 -
.../unittestsupport/jmocking/Collaborator.java | 24 -
.../ImposteriserTestUsingCodegenPlugin.java | 347 ----
...IsisActionsTest_returnNewTransientInstance.java | 93 -
.../jmocking/JMockActionsTest_returnArgument.java | 68 -
.../jmocking/JMockActionsTest_returnEach.java | 70 -
.../jmocking/JUnitRuleMockery2Test.java | 46 -
..._autoWiring_constructorInjection_happyCase.java | 57 -
...y2Test_autoWiring_sadCase_noClassUnderTest.java | 45 -
...est_autoWiring_sadCase_twoClassesUnderTest.java | 50 -
...2Test_autoWiring_setterInjection_happyCase.java | 57 -
...RuleMockery2Test_mockAnnotatedWithAllowing.java | 59 -
...RuleMockery2Test_mockAnnotatedWithChecking.java | 61 -
...RuleMockery2Test_mockAnnotatedWithIgnoring.java | 58 -
...kery2Test_mockAnnotatedWithNever_happyCase.java | 53 -
...ockery2Test_mockAnnotatedWithNever_sadCase.java | 59 -
...ockery2Test_mockAnnotatedWithOne_happyCase.java | 54 -
...eMockery2Test_mockAnnotatedWithOne_sadCase.java | 55 -
.../sortedsets/SomeDomainObject.java | 38 -
.../sortedsets/SortedSetsContractTestAll.java | 28 -
...lueTypeContractTestAbstract_BigIntegerTest.java | 37 -
.../ValueTypeContractTestAbstract_ColorTest.java | 38 -
.../ValueTypeContractTestAbstract_StringTest.java | 36 -
.../proxy/ProxyCreatorTestUsingCodegenPlugin.java | 99 --
core/metamodel/log4j2-test.xml | 2 +-
core/metamodel/pom.xml | 17 +-
.../core/metamodel/IsisModuleCoreMetamodel.java | 101 ++
.../isis/core/metamodel/adapter/ObjectAdapter.java | 61 +
.../metamodel/adapter/ObjectAdapterProvider.java | 35 +
.../adapter/oid/ObjectNotFoundException.java | 36 +
.../adapter/oid/ObjectPersistenceException.java | 42 +
.../isis/core/metamodel/adapter/oid/Oid.java | 140 ++
.../core/metamodel/adapter/oid/Oid_Marshaller.java | 254 +++
.../core/metamodel/adapter/oid/Oid_Parented.java | 147 ++
.../isis/core/metamodel/adapter/oid/Oid_Root.java | 167 ++
.../isis/core/metamodel/adapter/oid/Oid_Value.java | 87 +
.../core/metamodel/adapter/oid/ParentedOid.java | 56 +
.../adapter/oid/PojoRecreationException.java | 29 +
.../adapter/oid/PojoRefreshException.java | 32 +
.../isis/core/metamodel/adapter/oid/RootOid.java | 46 +
.../isis/core/metamodel/adapter/package-info.java | 32 +
.../authorization/standard/AuthorizationFacet.java | 32 +
.../standard/AuthorizationFacetAbstract.java | 78 +
.../standard/AuthorizationFacetFactory.java | 46 +
.../standard/AuthorizationFacetImpl.java | 30 +
.../authorization/standard/package-info.java | 33 +
.../core/metamodel/commons/ArrayExtensions.java | 69 +
.../isis/core/metamodel/commons/CanBeVoid.java | 25 +
.../core/metamodel/commons/ClassExtensions.java | 175 ++
.../core/metamodel/commons/ClassFunctions.java | 46 +
.../core/metamodel/commons/ClassPredicates.java | 37 +
.../isis/core/metamodel/commons/ClassUtil.java | 192 +++
.../metamodel/commons/CloseableExtensions.java | 40 +
.../core/metamodel/commons/DateExtensions.java | 35 +
.../metamodel/commons/InputStreamExtensions.java | 69 +
.../core/metamodel/commons/ListExtensions.java | 115 ++
.../isis/core/metamodel/commons/LocaleUtil.java | 40 +
.../isis/core/metamodel/commons/MapUtil.java | 48 +
.../core/metamodel/commons/MethodExtensions.java | 92 +
.../commons/MethodInvocationPreprocessor.java | 154 ++
.../isis/core/metamodel/commons/MethodUtil.java | 202 +++
.../core/metamodel/commons/ObjectExtensions.java | 82 +
.../isis/core/metamodel/commons/ResourceUtil.java | 83 +
.../core/metamodel/commons/StringExtensions.java | 393 +++++
.../metamodel/commons/ThrowableExtensions.java | 82 +
.../isis/core/metamodel/commons/ToString.java | 165 ++
.../isis/core/metamodel/commons/Wormhole.java | 50 +
.../isis/core/metamodel/commons/package-info.java | 27 +
.../apache/isis/core/metamodel/consent/Allow.java | 56 +
.../isis/core/metamodel/consent/Consent.java | 73 +
.../core/metamodel/consent/ConsentAbstract.java | 159 ++
.../core/metamodel/consent/InteractionAdvisor.java | 103 ++
.../metamodel/consent/InteractionContextType.java | 135 ++
.../metamodel/consent/InteractionInitiatedBy.java | 33 +
.../core/metamodel/consent/InteractionResult.java | 155 ++
.../metamodel/consent/InteractionResultSet.java | 104 ++
.../apache/isis/core/metamodel/consent/Veto.java | 48 +
.../core/metamodel/context/MetaModelContext.java | 212 +++
.../metamodel/context/MetaModelContextAware.java | 29 +
.../context/MetaModelContext_usingIoc.java | 172 ++
.../core/metamodel/context/MetaModelContexts.java | 44 +
.../metamodel/exceptions/MetaModelException.java | 43 +
.../persistence/ObjectNotFoundException.java | 38 +
.../persistence/ObjectPersistenceException.java | 42 +
.../persistence/PojoRecreationException.java | 31 +
.../persistence/PojoRefreshException.java | 34 +
.../apache/isis/core/metamodel/facetapi/Facet.java | 123 ++
.../core/metamodel/facetapi/FacetAbstract.java | 287 ++++
.../isis/core/metamodel/facetapi/FacetHolder.java | 150 ++
.../core/metamodel/facetapi/FacetHolderImpl.java | 168 ++
.../isis/core/metamodel/facetapi/FacetUtil.java | 96 ++
.../metamodel/facetapi/FacetWithAttributes.java | 32 +
.../isis/core/metamodel/facetapi/FeatureType.java | 159 ++
.../core/metamodel/facetapi/IdentifiedHolder.java | 31 +
.../core/metamodel/facetapi/MetaModelRefiner.java | 34 +
.../core/metamodel/facetapi/MethodRemover.java | 71 +
.../isis/core/metamodel/facets/Annotations.java | 695 ++++++++
.../core/metamodel/facets/CollectionUtils.java | 129 ++
.../facets/ContributeeMemberFacetFactory.java | 45 +
.../core/metamodel/facets/DependentArgUtils.java | 198 +++
.../core/metamodel/facets/DomainEventHelper.java | 441 +++++
.../isis/core/metamodel/facets/FacetFactory.java | 337 ++++
.../metamodel/facets/FacetFactoryAbstract.java | 70 +
.../isis/core/metamodel/facets/FacetedMethod.java | 216 +++
.../metamodel/facets/FacetedMethodParameter.java | 50 +
.../core/metamodel/facets/ImperativeFacet.java | 169 ++
.../metamodel/facets/ImperativeFacetMulti.java | 33 +
.../facets/MethodFilteringFacetFactory.java | 33 +
.../core/metamodel/facets/MethodFinderUtils.java | 239 +++
.../metamodel/facets/MethodLiteralConstants.java | 77 +
.../facets/MethodPrefixBasedFacetFactory.java | 39 +
.../MethodPrefixBasedFacetFactoryAbstract.java | 138 ++
.../metamodel/facets/MethodRemoverConstants.java | 44 +
.../core/metamodel/facets/MultipleValueFacet.java | 26 +
.../metamodel/facets/ObjectSpecIdFacetFactory.java | 37 +
.../facets/OrphanedSupportingMethodValidator.java | 126 ++
.../metamodel/facets/PostConstructMethodCache.java | 30 +
...ropertyOrCollectionIdentifyingFacetFactory.java | 83 +
...rCollectionIdentifyingFacetFactoryAbstract.java | 43 +
.../metamodel/facets/SingleClassValueFacet.java | 35 +
.../facets/SingleClassValueFacetAbstract.java | 60 +
.../core/metamodel/facets/SingleIntValueFacet.java | 27 +
.../facets/SingleIntValueFacetAbstract.java | 47 +
.../metamodel/facets/SingleStringValueFacet.java | 23 +
.../facets/SingleStringValueFacetAbstract.java | 58 +
.../core/metamodel/facets/SingleValueFacet.java | 28 +
.../metamodel/facets/SingleValueFacetAbstract.java | 46 +
.../isis/core/metamodel/facets/TypedHolder.java | 55 +
.../core/metamodel/facets/TypedHolderDefault.java | 58 +
.../core/metamodel/facets/WhereValueFacet.java | 29 +
.../metamodel/facets/WhereValueFacetAbstract.java | 57 +
...lementSpecificationProviderFromTypeOfFacet.java | 37 +
.../facets/actcoll/typeof/TypeOfFacet.java | 126 ++
.../facets/actcoll/typeof/TypeOfFacetAbstract.java | 40 +
.../actcoll/typeof/TypeOfFacetDefaultToObject.java | 30 +
.../typeof/TypeOfFacetInferredFromArray.java | 30 +
.../typeof/TypeOfFacetInferredFromGenerics.java | 30 +
.../action/ActionAnnotationFacetFactory.java | 287 ++++
...nChoicesForCollectionParameterFacetFactory.java | 161 ++
.../action/associateWith/AssociatedWithFacet.java | 30 +
.../associateWith/AssociatedWithFacetAbstract.java | 45 +
.../AssociatedWithFacetForActionAnnotation.java | 32 +
.../command/CommandFacetForActionAnnotation.java | 123 ++
...ommandFacetForActionAnnotationAsConfigured.java | 39 +
.../command/CommandFacetFromConfiguration.java | 46 +
.../hidden/HiddenFacetForActionAnnotation.java | 56 +
.../action/invocation/ActionDomainEventFacet.java | 33 +
.../invocation/ActionDomainEventFacetAbstract.java | 165 ++
.../invocation/ActionDomainEventFacetDefault.java | 33 +
.../ActionDomainEventFacetForActionAnnotation.java | 32 +
.../action/invocation/ActionInvocationFacet.java | 51 +
.../invocation/ActionInvocationFacetAbstract.java | 38 +
...ctionInvocationFacetForDomainEventAbstract.java | 513 ++++++
...ionFacetForDomainEventFromActionAnnotation.java | 40 +
...onInvocationFacetForDomainEventFromDefault.java | 40 +
.../actions/action/invocation/CommandUtil.java | 113 ++
.../PrototypeFacetForActionAnnotation.java | 51 +
.../PublishedActionFacetForActionAnnotation.java | 99 ++
...ActionFacetForActionAnnotationAsConfigured.java | 31 +
.../PublishedActionFacetFromConfiguration.java | 32 +
...ctionSemanticsFacetFallbackToNonIdempotent.java | 32 +
.../ActionSemanticsFacetForActionAnnotation.java | 49 +
.../typeof/TypeOfFacetForActionAnnotation.java | 33 +
.../facets/actions/command/CommandFacet.java | 55 +
.../actions/command/CommandFacetAbstract.java | 123 ++
.../actions/defaults/ActionDefaultsFacet.java | 35 +
.../defaults/ActionDefaultsFacetAbstract.java | 36 +
.../method/ActionDefaultsFacetViaMethod.java | 88 +
.../ActionDefaultsFacetViaMethodFactory.java | 88 +
.../FileAcceptFacetForActionAnnotation.java | 47 +
.../facets/actions/homepage/HomePageFacet.java | 34 +
.../actions/homepage/HomePageFacetAbstract.java | 36 +
.../facets/actions/homepage/HomePageFacetImpl.java | 30 +
.../annotation/HomePageFacetAnnotation.java | 31 +
.../annotation/HomePageFacetAnnotationFactory.java | 130 ++
.../actions/layout/ActionLayoutFacetFactory.java | 171 ++
...tionPositionFacetForActionLayoutAnnotation.java | 46 +
.../layout/ActionPositionFacetForActionXml.java | 41 +
...okmarkPolicyFacetForActionLayoutAnnotation.java | 58 +
.../layout/BookmarkPolicyFacetForActionXml.java | 42 +
.../CssClassFaFacetForActionLayoutAnnotation.java | 57 +
.../layout/CssClassFaFacetForActionXml.java | 44 +
.../CssClassFacetForActionLayoutAnnotation.java | 47 +
.../actions/layout/CssClassFacetForActionXml.java | 42 +
.../DescribedAsFacetForActionLayoutAnnotation.java | 47 +
.../layout/DescribedAsFacetForActionXml.java | 42 +
.../HiddenFacetForActionLayoutAnnotation.java | 56 +
.../actions/layout/HiddenFacetForActionXml.java | 51 +
.../NamedFacetForActionLayoutAnnotation.java | 48 +
.../actions/layout/NamedFacetForActionXml.java | 44 +
...tContributedFacetForActionLayoutAnnotation.java | 52 +
.../PromptStyleFacetForActionLayoutAnnotation.java | 97 ++
.../layout/PromptStyleFacetForActionXml.java | 57 +
.../RedirectFacetFromActionLayoutAnnotation.java | 47 +
.../actions/layout/RedirectFacetFromActionXml.java | 43 +
.../notcontributed/NotContributedFacet.java | 40 +
.../NotContributedFacetAbstract.java | 73 +
...tributedFacetDerivedFromDomainServiceFacet.java | 47 +
...dFacetDerivedFromDomainServiceFacetFactory.java | 58 +
.../NotContributedFacetDerivedFromMixinFacet.java | 37 +
...ntributedFacetDerivedFromMixinFacetFactory.java | 52 +
.../notinservicemenu/NotInServiceMenuFacet.java | 38 +
.../NotInServiceMenuFacetAbstract.java | 40 +
...viceMenuFacetDerivedFromDomainServiceFacet.java | 54 +
...uFacetDerivedFromDomainServiceFacetFactory.java | 59 +
.../actions/position/ActionPositionFacet.java | 44 +
.../position/ActionPositionFacetAbstract.java | 57 +
.../position/ActionPositionFacetFallback.java | 31 +
.../facets/actions/prototype/PrototypeFacet.java | 30 +
.../actions/prototype/PrototypeFacetAbstract.java | 56 +
.../actions/publish/PublishedActionFacet.java | 30 +
.../publish/PublishedActionFacetAbstract.java | 38 +
.../facets/actions/redirect/RedirectFacet.java | 33 +
.../actions/redirect/RedirectFacetAbstract.java | 66 +
.../actions/redirect/RedirectFacetFallback.java | 31 +
.../actions/semantics/ActionSemanticsFacet.java | 33 +
.../semantics/ActionSemanticsFacetAbstract.java | 39 +
.../validate/ActionParameterValidationFacet.java | 46 +
.../ActionParameterValidationFacetAbstract.java | 47 +
.../actions/validate/ActionValidationFacet.java | 49 +
.../validate/ActionValidationFacetAbstract.java | 47 +
.../ActionParameterValidationFacetViaMethod.java | 84 +
.../method/ActionValidationFacetViaMethod.java | 84 +
.../ActionValidationFacetViaMethodFactory.java | 117 ++
.../facets/all/deficiencies/DeficiencyFacet.java | 134 ++
.../facets/all/describedas/DescribedAsFacet.java | 33 +
.../all/describedas/DescribedAsFacetAbstract.java | 36 +
.../core/metamodel/facets/all/help/HelpFacet.java | 29 +
.../facets/all/help/HelpFacetAbstract.java | 36 +
.../metamodel/facets/all/hide/HiddenFacet.java | 31 +
.../all/i18n/DescribedAsFacetTranslated.java | 64 +
.../facets/all/i18n/NamedFacetTranslated.java | 72 +
.../facets/all/i18n/PluralFacetTranslated.java | 55 +
.../facets/all/i18n/TranslationFacetFactory.java | 119 ++
.../metamodel/facets/all/named/NamedFacet.java | 42 +
.../facets/all/named/NamedFacetAbstract.java | 59 +
.../facets/all/named/NamedFacetInferred.java | 31 +
.../collections/CollectionFacetAbstract.java | 40 +
.../CollectionAccessorFacetViaAccessor.java | 109 ++
.../CollectionAccessorFacetViaAccessorFactory.java | 112 ++
.../clear/CollectionClearFacetFactory.java | 70 +
.../clear/CollectionClearFacetViaAccessor.java | 79 +
.../clear/CollectionClearFacetViaClearMethod.java | 70 +
.../CollectionAnnotationFacetFactory.java | 293 ++++
.../collection/defaultview/DefaultViewFacet.java | 26 +
.../defaultview/DefaultViewFacetAbstract.java | 35 +
.../DisabledFacetForCollectionAnnotation.java | 69 +
.../hidden/HiddenFacetForCollectionAnnotation.java | 56 +
...ectionAddToFacetForDomainEventFromAbstract.java | 124 ++
...acetForDomainEventFromCollectionAnnotation.java | 43 +
...lectionAddToFacetForDomainEventFromDefault.java | 41 +
.../modify/CollectionDomainEventFacet.java | 34 +
.../modify/CollectionDomainEventFacetAbstract.java | 145 ++
.../modify/CollectionDomainEventFacetDefault.java | 32 +
...ionDomainEventFacetForCollectionAnnotation.java | 45 +
...nRemoveFromFacetForDomainEventFromAbstract.java | 123 ++
...acetForDomainEventFromCollectionAnnotation.java | 43 +
...onRemoveFromFacetForDomainEventFromDefault.java | 41 +
.../NotPersistedFacetForCollectionAnnotation.java | 55 +
...fFacetOnCollectionFromCollectionAnnotation.java | 47 +
...abledFacetOnCollectionDerivedFromImmutable.java | 39 +
...cetOnCollectionDerivedFromImmutableFactory.java | 45 +
.../javautilcollection/CollectionFacetFactory.java | 86 +
.../javautilcollection/JavaArrayFacet.java | 84 +
.../javautilcollection/JavaCollectionFacet.java | 78 +
.../layout/CollectionLayoutFacetFactory.java | 123 ++
...CssClassFacetForCollectionLayoutAnnotation.java | 45 +
.../layout/CssClassFacetForCollectionXml.java | 42 +
...aultViewFacetForCollectionLayoutAnnotation.java | 48 +
.../layout/DefaultViewFacetForCollectionXml.java | 42 +
...cribedAsFacetForCollectionLayoutAnnotation.java | 45 +
.../layout/DescribedAsFacetForCollectionXml.java | 42 +
.../HiddenFacetForCollectionLayoutAnnotation.java | 58 +
.../layout/HiddenFacetForCollectionXml.java | 51 +
.../NamedFacetForCollectionLayoutAnnotation.java | 52 +
.../layout/NamedFacetForCollectionXml.java | 47 +
.../PagedFacetForCollectionLayoutAnnotation.java | 46 +
.../layout/PagedFacetForCollectionXml.java | 41 +
...SortedByFacetForCollectionLayoutAnnotation.java | 53 +
.../layout/SortedByFacetForCollectionXml.java | 56 +
.../collections/modify/CollectionAddToFacet.java | 37 +
.../modify/CollectionAddToFacetAbstract.java | 36 +
.../modify/CollectionAddToFacetViaAccessor.java | 77 +
.../modify/CollectionAddToFacetViaMethod.java | 74 +
...tionAddToRemoveFromAndValidateFacetFactory.java | 177 ++
.../collections/modify/CollectionClearFacet.java | 36 +
.../modify/CollectionClearFacetAbstract.java | 36 +
.../facets/collections/modify/CollectionFacet.java | 112 ++
.../modify/CollectionRemoveFromFacet.java | 39 +
.../modify/CollectionRemoveFromFacetAbstract.java | 36 +
.../CollectionRemoveFromFacetViaAccessor.java | 80 +
.../modify/CollectionRemoveFromFacetViaMethod.java | 74 +
.../TypeOfFacetInferredFromSupportingMethods.java | 31 +
.../parented/ParentedCollectionFacetDefault.java | 37 +
.../ParentedFacetSinceCollectionFactory.java | 53 +
.../facets/collections/sortedby/SortedByFacet.java | 32 +
.../sortedby/SortedByFacetAbstract.java | 38 +
.../annotation/SortedByFacetAnnotationFactory.java | 90 +
.../validate/CollectionValidateAddToFacet.java | 40 +
.../CollectionValidateAddToFacetAbstract.java | 48 +
.../CollectionValidateAddToFacetViaMethod.java | 82 +
.../CollectionValidateRemoveFromFacet.java | 39 +
.../CollectionValidateRemoveFromFacetAbstract.java | 47 +
...CollectionValidateRemoveFromFacetViaMethod.java | 83 +
.../collparam/semantics/CollectionSemantics.java | 125 ++
.../semantics/CollectionSemanticsFacet.java | 29 +
.../semantics/CollectionSemanticsFacetDefault.java | 47 +
.../facets/fallback/ActionChoicesFacetNone.java | 45 +
.../facets/fallback/ActionDefaultsFacetNone.java | 42 +
.../facets/fallback/DescribedAsFacetNone.java | 39 +
.../facets/fallback/FallbackFacetFactory.java | 144 ++
.../metamodel/facets/fallback/HelpFacetNone.java | 44 +
.../LabelAtFacetFromLayoutConfiguration.java | 30 +
.../facets/fallback/MaxLengthFacetUnlimited.java | 46 +
.../facets/fallback/MultiLineFacetNone.java | 36 +
.../facets/fallback/NamedFacetDefault.java | 33 +
.../metamodel/facets/fallback/NamedFacetNone.java | 44 +
.../fallback/PagedFacetFromConfiguration.java | 29 +
.../metamodel/facets/fallback/TitleFacetNone.java | 42 +
.../metamodel/facets/jaxb/JaxbFacetFactory.java | 399 +++++
.../facets/jaxb/XmlAccessorTypeFacet.java | 31 +
.../facets/jaxb/XmlAccessorTypeFacetAbstract.java | 40 +
.../facets/jaxb/XmlAccessorTypeFacetDefault.java | 33 +
.../facets/jaxb/XmlJavaTypeAdapterFacet.java | 29 +
.../jaxb/XmlJavaTypeAdapterFacetAbstract.java | 38 +
.../jaxb/XmlJavaTypeAdapterFacetDefault.java | 31 +
.../metamodel/facets/jaxb/XmlTransientFacet.java | 29 +
.../facets/jaxb/XmlTransientFacetAbstract.java | 37 +
.../facets/jaxb/XmlTransientFacetDefault.java | 30 +
.../facets/members/cssclass/CssClassFacet.java | 38 +
.../members/cssclass/CssClassFacetAbstract.java | 51 +
.../members/cssclass/CssClassFacetAbstract2.java | 36 +
.../CssClassFacetOnActionFromConfiguredRegex.java | 30 +
...assFacetOnActionFromConfiguredRegexFactory.java | 120 ++
.../facets/members/cssclassfa/CssClassFaFacet.java | 37 +
.../cssclassfa/CssClassFaFacetAbstract.java | 79 +
.../members/cssclassfa/CssClassFaPosition.java | 104 ++
.../annotprop/CssClassFaFacetOnMemberFactory.java | 103 ++
...CssClassFaFacetOnMemberFromConfiguredRegex.java | 31 +
.../CssClassFaFacetOnMemberFromProperties.java | 40 +
.../cssclassfa/annotprop/MixinInterceptor.java | 64 +
.../DescribedAsFacetOnMemberDerivedFromType.java | 32 +
.../annotprop/DescribedAsFacetOnMemberFactory.java | 64 +
.../DescribedAsFacetOnMemberFromProperties.java | 37 +
.../facets/members/disabled/DisabledFacet.java | 54 +
.../members/disabled/DisabledFacetAbstract.java | 102 ++
.../DisabledFacetAbstractAlwaysEverywhere.java | 40 +
.../disabled/DisabledFacetAbstractImpl.java | 83 +
.../disabled/DisabledFacetForContributee.java | 30 +
.../disabled/method/DisableForContextFacet.java | 37 +
.../method/DisableForContextFacetAbstract.java | 37 +
.../method/DisableForContextFacetNone.java | 49 +
.../method/DisableForContextFacetViaMethod.java | 100 ++
.../DisableForContextFacetViaMethodFactory.java | 94 +
.../facets/members/hidden/HiddenFacetAbstract.java | 86 +
.../HiddenFacetAbstractAlwaysEverywhere.java | 50 +
.../members/hidden/HiddenFacetAbstractImpl.java | 52 +
.../HiddenFacetFromLayoutPropertiesAbstract.java | 53 +
.../members/hidden/method/HideForContextFacet.java | 37 +
.../hidden/method/HideForContextFacetAbstract.java | 37 +
.../hidden/method/HideForContextFacetNone.java | 45 +
.../method/HideForContextFacetViaMethod.java | 78 +
.../HideForContextFacetViaMethodFactory.java | 82 +
.../facets/members/order/MemberOrderFacet.java | 59 +
.../members/order/MemberOrderFacetAbstract.java | 107 ++
.../annotprop/MemberOrderFacetAnnotation.java | 35 +
.../order/annotprop/MemberOrderFacetFactory.java | 69 +
.../MemberOrderFacetForActionAnnotation.java | 34 +
.../annotprop/MemberOrderFacetProperties.java | 49 +
.../order/annotprop/MemberOrderFacetXml.java | 35 +
.../ViewModelSemanticCheckingFacetFactory.java | 209 +++
.../facets/object/audit/AuditableFacet.java | 40 +
.../object/audit/AuditableFacetAbstract.java | 61 +
.../facets/object/audit/AuditableFacetImpl.java | 30 +
.../object/autocomplete/AutoCompleteFacet.java | 35 +
.../autocomplete/AutoCompleteFacetAbstract.java | 126 ++
.../object/bookmarkpolicy/BookmarkPolicyFacet.java | 31 +
.../BookmarkPolicyFacetAbstract.java | 59 +
.../BookmarkPolicyFacetFallback.java | 32 +
.../BookmarkPolicyFacetFallbackFactory.java | 88 +
.../facets/object/callbacks/CallbackFacet.java | 53 +
.../object/callbacks/CallbackFacetAbstract.java | 35 +
.../object/callbacks/CreatedCallbackFacet.java | 36 +
.../callbacks/CreatedCallbackFacetAbstract.java | 35 +
.../callbacks/CreatedCallbackFacetFactory.java | 51 +
.../callbacks/CreatedCallbackFacetViaMethod.java | 70 +
.../callbacks/CreatedLifecycleEventFacet.java | 30 +
...fecycleEventFacetForDomainObjectAnnotation.java | 46 +
.../object/callbacks/LifecycleEventFacet.java | 28 +
.../object/callbacks/LoadCallbackFacetFactory.java | 63 +
.../object/callbacks/LoadedCallbackFacet.java | 37 +
.../callbacks/LoadedCallbackFacetAbstract.java | 35 +
.../callbacks/LoadedCallbackFacetViaMethod.java | 71 +
.../callbacks/LoadedLifecycleEventFacet.java | 30 +
...fecycleEventFacetForDomainObjectAnnotation.java | 44 +
.../object/callbacks/LoadingCallbackFacet.java | 28 +
.../callbacks/LoadingCallbackFacetAbstract.java | 39 +
.../callbacks/LoadingCallbackFacetViaMethod.java | 75 +
.../callbacks/PersistCallbackFacetFactory.java | 78 +
.../PersistCallbackViaSaveMethodFacetFactory.java | 78 +
.../object/callbacks/PersistedCallbackFacet.java | 36 +
.../callbacks/PersistedCallbackFacetAbstract.java | 35 +
.../callbacks/PersistedCallbackFacetViaMethod.java | 71 +
.../callbacks/PersistedLifecycleEventFacet.java | 30 +
...fecycleEventFacetForDomainObjectAnnotation.java | 44 +
.../object/callbacks/PersistingCallbackFacet.java | 37 +
.../callbacks/PersistingCallbackFacetAbstract.java | 35 +
.../PersistingCallbackFacetViaMethod.java | 71 +
.../callbacks/PersistingLifecycleEventFacet.java | 30 +
...fecycleEventFacetForDomainObjectAnnotation.java | 45 +
.../callbacks/RemoveCallbackFacetFactory.java | 79 +
.../RemoveCallbackViaDeleteMethodFacetFactory.java | 79 +
.../object/callbacks/RemovedCallbackFacet.java | 35 +
.../callbacks/RemovedCallbackFacetAbstract.java | 39 +
.../callbacks/RemovedCallbackFacetViaMethod.java | 75 +
.../object/callbacks/RemovingCallbackFacet.java | 34 +
.../callbacks/RemovingCallbackFacetAbstract.java | 35 +
.../callbacks/RemovingCallbackFacetViaMethod.java | 71 +
.../callbacks/RemovingLifecycleEventFacet.java | 30 +
...fecycleEventFacetForDomainObjectAnnotation.java | 45 +
.../callbacks/UpdateCallbackFacetFactory.java | 68 +
.../object/callbacks/UpdatedCallbackFacet.java | 37 +
.../callbacks/UpdatedCallbackFacetAbstract.java | 35 +
.../callbacks/UpdatedCallbackFacetViaMethod.java | 71 +
.../callbacks/UpdatedLifecycleEventFacet.java | 30 +
...fecycleEventFacetForDomainObjectAnnotation.java | 45 +
.../object/callbacks/UpdatingCallbackFacet.java | 37 +
.../callbacks/UpdatingCallbackFacetAbstract.java | 35 +
.../callbacks/UpdatingCallbackFacetViaMethod.java | 71 +
.../callbacks/UpdatingLifecycleEventFacet.java | 30 +
...fecycleEventFacetForDomainObjectAnnotation.java | 45 +
.../choices/ChoicesFacetFromBoundedAbstract.java | 119 ++
.../facets/object/choices/ChoicesFacetUtils.java | 42 +
.../facets/object/choices/QueryFindAllChoices.java | 57 +
.../object/choices/enums/ChoicesFacetEnum.java | 49 +
.../facets/object/choices/enums/EnumFacet.java | 26 +
...ingValueFacetUsingSemanticsProviderFactory.java | 49 +
.../choices/enums/EnumValueSemanticsProvider.java | 152 ++
.../cssclass/method/CssClassFacetMethod.java | 61 +
.../method/CssClassFacetMethodFactory.java | 52 +
...ssClassFaFacetForDomainObjectLayoutFactory.java | 43 +
.../CssClassFaFacetForViewModelLayoutFactory.java | 45 +
.../facets/object/defaults/DefaultedFacet.java | 47 +
.../object/defaults/DefaultedFacetAbstract.java | 84 +
.../DefaultedFacetUsingDefaultsProvider.java | 47 +
.../object/defaults/DefaultsProviderUtil.java | 75 +
.../annotcfg/DefaultedFacetAnnotation.java | 62 +
...tedFacetAnnotationElseConfigurationFactory.java | 71 +
.../annotcfg/DefaultedFacetFromConfiguration.java | 31 +
.../object/disabled/DisabledObjectFacet.java | 54 +
.../disabled/DisabledObjectFacetAbstract.java | 52 +
.../method/DisabledObjectFacetViaMethod.java | 93 +
.../DisabledObjectFacetViaMethodFactory.java | 88 +
.../DomainObjectAnnotationFacetFactory.java | 570 +++++++
.../AuditableFacetForDomainObjectAnnotation.java | 74 +
...FacetForDomainObjectAnnotationAsConfigured.java | 31 +
.../auditing/AuditableFacetFromConfiguration.java | 36 +
...AutoCompleteFacetForDomainObjectAnnotation.java | 46 +
.../ChoicesFacetForDomainObjectAnnotation.java | 49 +
...EventDefaultFacetForDomainObjectAnnotation.java | 52 +
...EventDefaultFacetForDomainObjectAnnotation.java | 51 +
...EventDefaultFacetForDomainObjectAnnotation.java | 51 +
.../ImmutableFacetForDomainObjectAnnotation.java | 101 ++
...FacetForDomainObjectAnnotationAsConfigured.java | 30 +
.../editing/ImmutableFacetFromConfiguration.java | 58 +
...ObjectSpecIdFacetForDomainObjectAnnotation.java | 47 +
...lishedObjectFacetForDomainObjectAnnotation.java | 67 +
...FacetForDomainObjectAnnotationAsConfigured.java | 30 +
.../PublishedObjectFacetFromConfiguration.java | 31 +
...atableObjectFacetForDomainObjectAnnotation.java | 73 +
...PolicyFacetForDomainObjectLayoutAnnotation.java | 46 +
.../BookmarkPolicyFacetForDomainObjectXml.java | 42 +
...arkPolicyFacetForViewModelLayoutAnnotation.java | 47 +
...lassFaFacetForDomainObjectLayoutAnnotation.java | 55 +
.../CssClassFaFacetForDomainObjectXml.java | 44 +
...ssClassFaFacetForViewModelLayoutAnnotation.java | 54 +
...sClassFacetForDomainObjectLayoutAnnotation.java | 57 +
.../CssClassFacetForDomainObjectXml.java | 42 +
.../CssClassFacetForViewModelLayoutAnnotation.java | 45 +
...ObjectLayoutAnnotationUsingCssClassUiEvent.java | 121 ++
...wModelLayoutAnnotationUsingCssClassUiEvent.java | 118 ++
...ibedAsFacetForDomainObjectLayoutAnnotation.java | 46 +
.../DescribedAsFacetForDomainObjectXml.java | 42 +
...scribedAsFacetForViewModelLayoutAnnotation.java | 47 +
.../DomainObjectLayoutFacetFactory.java | 113 ++
...mainObjectLayoutAnnotationUsingIconUiEvent.java | 117 ++
...aViewModelLayoutAnnotationUsingIconUiEvent.java | 118 ++
...inObjectLayoutAnnotationUsingLayoutUiEvent.java | 118 ++
...iewModelLayoutAnnotationUsingLayoutUiEvent.java | 117 ++
.../NamedFacetForDomainObjectLayoutAnnotation.java | 47 +
.../NamedFacetForDomainObjectXml.java | 44 +
.../NamedFacetForViewModelLayoutAnnotation.java | 45 +
.../PagedFacetForDomainObjectLayoutAnnotation.java | 46 +
.../PagedFacetForViewModelLayoutAnnotation.java | 46 +
...PluralFacetForDomainObjectLayoutAnnotation.java | 47 +
.../PluralFacetForDomainObjectXml.java | 40 +
.../PluralFacetForViewModelLayoutAnnotation.java | 47 +
...ainObjectLayoutAnnotationUsingTitleUiEvent.java | 135 ++
...ViewModelLayoutAnnotationUsingTitleUiEvent.java | 135 ++
.../object/domainservice/DomainServiceFacet.java | 54 +
.../domainservice/DomainServiceFacetAbstract.java | 65 +
.../annotation/DomainServiceFacetAnnotation.java | 35 +
.../DomainServiceFacetAnnotationFactory.java | 153 ++
...conFacetDerivedFromDomainServiceAnnotation.java | 47 +
.../DomainServiceLayoutFacet.java | 36 +
.../DomainServiceLayoutFacetAbstract.java | 54 +
.../DomainServiceLayoutFacetFactory.java | 70 +
...NamedFacetForDomainServiceLayoutAnnotation.java | 36 +
.../DomainServiceLayoutFacetAnnotation.java | 34 +
.../facets/object/encodeable/EncodableFacet.java | 42 +
.../object/encodeable/EncodableFacetAbstract.java | 85 +
.../object/encodeable/EncoderDecoderUtil.java | 36 +
.../annotcfg/EncodableFacetFromConfiguration.java | 33 +
.../encoder/EncodableFacetUsingEncoderDecoder.java | 75 +
.../facets/object/entity/EntityFacet.java | 54 +
.../facets/object/facets/FacetsFacet.java | 48 +
.../facets/object/facets/FacetsFacetAbstract.java | 94 +
.../facets/annotation/FacetsFacetAnnotation.java | 32 +
.../annotation/FacetsFacetAnnotationFactory.java | 54 +
.../metamodel/facets/object/grid/GridFacet.java | 41 +
.../facets/object/grid/GridFacetDefault.java | 84 +
.../facets/object/grid/GridFacetFactory.java | 46 +
.../facets/object/hidden/HiddenObjectFacet.java | 56 +
.../object/hidden/HiddenObjectFacetAbstract.java | 50 +
.../hidden/method/HiddenObjectFacetViaMethod.java | 65 +
.../method/HiddenObjectFacetViaMethodFactory.java | 91 +
.../metamodel/facets/object/icon/IconFacet.java | 44 +
.../facets/object/icon/IconFacetAbstract.java | 36 +
.../facets/object/icon/method/IconFacetMethod.java | 52 +
.../object/icon/method/IconFacetMethodFactory.java | 53 +
.../RemoveAnnotatedMethodsFacetFactory.java | 99 ++
...oveDatanucleusPersistableTypesFacetFactory.java | 67 +
.../RemoveDnPrefixedMethodsFacetFactory.java | 46 +
.../javalang/IteratorFilteringFacetFactory.java | 55 +
.../ignore/javalang/RemoveMethodsFacetFactory.java | 132 ++
.../jdo/RemoveJdoEnhancementTypesFacetFactory.java | 66 +
.../jdo/RemoveJdoPrefixedMethodsFacetFactory.java | 48 +
.../facets/object/immutable/ImmutableFacet.java | 69 +
.../object/immutable/ImmutableFacetAbstract.java | 61 +
.../CopyImmutableFacetOntoMembersFactory.java | 45 +
.../facets/object/layout/LayoutFacet.java | 37 +
.../facets/object/layout/LayoutFacetAbstract.java | 41 +
.../facets/object/layout/LayoutFacetFactory.java | 56 +
.../facets/object/layout/LayoutFacetFallback.java | 44 +
.../facets/object/layout/LayoutFacetMethod.java | 54 +
.../mixin/MetaModelValidatorForMixinTypes.java | 55 +
.../metamodel/facets/object/mixin/MixinFacet.java | 74 +
.../facets/object/mixin/MixinFacetAbstract.java | 143 ++
.../mixin/MixinFacetForDomainObjectAnnotation.java | 72 +
.../object/mixin/MixinFacetForMixinAnnotation.java | 64 +
.../mixin/MixinFacetForMixinAnnotationFactory.java | 64 +
.../object/navparent/NavigableParentFacet.java | 43 +
.../navparent/NavigableParentFacetAbstract.java | 36 +
.../NavigableParentAnnotationFacetFactory.java | 161 ++
.../method/NavigableParentFacetMethod.java | 60 +
.../object/objectspecid/ObjectSpecIdFacet.java | 33 +
.../objectspecid/ObjectSpecIdFacetAbstract.java | 66 +
.../ObjectSpecIdFacetDerivedFromClassName.java | 35 +
...jectSpecIdFacetDerivedFromClassNameFactory.java | 205 +++
...ectSpecIdFacetDerivedFromIoCNamingStrategy.java | 34 +
.../ObjectSpecIdFacetOnStandaloneList.java | 31 +
.../ObjectValidPropertiesFacet.java | 42 +
.../ObjectValidPropertiesFacetAbstract.java | 48 +
.../impl/ObjectValidPropertiesFacetImpl.java | 70 +
.../ObjectValidPropertiesFacetImplFactory.java | 35 +
.../metamodel/facets/object/paged/PagedFacet.java | 31 +
.../facets/object/paged/PagedFacetAbstract.java | 50 +
.../PagedFacetForPagedAnnotationOnType.java | 34 +
.../object/parented/ParentedCollectionFacet.java | 40 +
.../parented/ParentedCollectionFacetAbstract.java | 36 +
.../object/parseable/InvalidEntryException.java | 42 +
.../facets/object/parseable/ParseableFacet.java | 55 +
.../object/parseable/ParseableFacetAbstract.java | 90 +
.../facets/object/parseable/ParserUtil.java | 46 +
.../object/parseable/TextEntryParseException.java | 47 +
.../annotcfg/ParseableFacetFromConfiguration.java | 33 +
.../parser/ParseableFacetUsingParser.java | 132 ++
.../facets/object/plural/PluralFacet.java | 41 +
.../facets/object/plural/PluralFacetAbstract.java | 42 +
.../plural/inferred/PluralFacetInferred.java | 31 +
.../facets/object/projection/ProjectionFacet.java | 29 +
.../object/projection/ProjectionFacetAbstract.java | 42 +
.../ProjectionFacetFromProjectingProperty.java | 65 +
.../CssClassFacetDerivedFromProjectionFacet.java | 54 +
.../ident/IconFacetDerivedFromProjectionFacet.java | 52 +
.../TitleFacetDerivedFromProjectionFacet.java | 52 +
.../object/promptStyle/PromptStyleFacet.java | 33 +
.../promptStyle/PromptStyleFacetAbstract.java | 42 +
.../promptStyle/PromptStyleFacetAsConfigured.java | 45 +
.../PromptStyleFacetFallBackToInline.java | 37 +
.../publishedobject/PublishedObjectFacet.java | 30 +
.../PublishedObjectFacetAbstract.java | 38 +
...etOnCollectionDerivedFromRecreatableObject.java | 46 +
...CollectionDerivedFromViewModelFacetFactory.java | 54 +
...acetOnPropertyDerivedFromRecreatableObject.java | 48 +
...tyDerivedFromRecreatableObjectFacetFactory.java | 52 +
.../RecreatableObjectFacetAbstract.java | 129 ++
...ObjectFacetDeclarativeInitializingAbstract.java | 145 ++
.../recreatable/RecreatableObjectFacetFactory.java | 131 ++
...ctFacetForRecreatableDomainObjectInterface.java | 46 +
...eObjectFacetForRecreatableObjectAnnotation.java | 34 +
...leObjectFacetForRecreatableObjectInterface.java | 45 +
...creatableObjectFacetForViewModelAnnotation.java | 35 +
...ableObjectFacetForXmlRootElementAnnotation.java | 81 +
.../metamodel/facets/object/recreatable/Util.java | 33 +
.../metamodel/facets/object/title/TitleFacet.java | 55 +
.../facets/object/title/TitleFacetAbstract.java | 45 +
.../annotation/TitleAnnotationFacetFactory.java | 188 ++
.../annotation/TitleFacetViaTitleAnnotation.java | 169 ++
.../title/methods/TitleFacetViaMethodsFactory.java | 95 ++
.../title/methods/TitleFacetViaTitleMethod.java | 93 +
.../title/methods/TitleFacetViaToStringMethod.java | 70 +
.../object/title/parser/TitleFacetUsingParser.java | 79 +
.../validateobject/ValidateObjectFacet.java | 55 +
.../ValidateObjectFacetAbstract.java | 49 +
.../method/ValidateObjectFacetMethod.java | 80 +
.../method/ValidateObjectFacetMethodFactory.java | 60 +
.../facets/object/value/EqualByContentFacet.java | 33 +
.../object/value/EqualByContentFacetAbstract.java | 36 +
.../EqualByContentFacetViaValueSemantics.java | 30 +
.../value/ImmutableFacetViaValueSemantics.java | 39 +
.../object/value/MaxLengthFacetUsingParser.java | 58 +
.../value/TypicalLengthFacetUsingParser.java | 53 +
.../metamodel/facets/object/value/ValueFacet.java | 35 +
.../facets/object/value/ValueFacetAbstract.java | 155 ++
.../facets/object/value/ValueFacetSimple.java | 37 +
.../value/annotcfg/ValueFacetAnnotation.java | 81 +
...ValueFacetAnnotationOrConfigurationFactory.java | 113 ++
.../annotcfg/ValueFacetFromConfiguration.java | 38 +
.../vsp/ValueFacetUsingSemanticsProvider.java | 41 +
.../ValueFacetUsingSemanticsProviderFactory.java | 46 +
.../ValueSemanticsProviderAndFacetAbstract.java | 328 ++++
.../value/vsp/ValueSemanticsProviderUtil.java | 67 +
.../facets/object/viewmodel/ViewModelFacet.java | 125 ++
.../facets/object/wizard/WizardFacet.java | 41 +
.../facets/object/wizard/WizardFacetAbstract.java | 36 +
.../facets/objectvalue/choices/ChoicesFacet.java | 49 +
.../objectvalue/choices/ChoicesFacetAbstract.java | 36 +
.../objectvalue/fileaccept/FileAcceptFacet.java | 35 +
.../fileaccept/FileAcceptFacetAbstract.java | 37 +
.../facets/objectvalue/labelat/LabelAtFacet.java | 36 +
.../objectvalue/labelat/LabelAtFacetAbstract.java | 56 +
.../LabelAtFacetInferredFromMultiLineFacet.java | 38 +
.../objectvalue/mandatory/MandatoryFacet.java | 57 +
.../mandatory/MandatoryFacetAbstract.java | 110 ++
.../mandatory/MandatoryFacetDefault.java | 43 +
.../facets/objectvalue/maxlen/MaxLengthFacet.java | 41 +
.../objectvalue/maxlen/MaxLengthFacetAbstract.java | 75 +
.../objectvalue/multiline/MultiLineFacet.java | 51 +
.../multiline/MultiLineFacetAbstract.java | 63 +
.../MustSatisfySpecificationFacet.java | 27 +
.../MustSatisfySpecificationFacetAbstract.java | 124 ++
.../mustsatisfyspec/SpecificationEvaluator.java | 80 +
.../facets/objectvalue/regex/RegExFacet.java | 38 +
.../objectvalue/regex/RegExFacetAbstract.java | 104 ++
.../renderedadjusted/RenderedAdjustedFacet.java | 39 +
.../RenderedAdjustedFacetAbstract.java | 56 +
.../objectvalue/typicallen/TypicalLengthFacet.java | 40 +
.../typicallen/TypicalLengthFacetAbstract.java | 45 +
.../ActionParameterAutoCompleteFacet.java | 47 +
.../ActionParameterAutoCompleteFacetAbstract.java | 41 +
.../facets/param/autocomplete/MinLengthUtil.java | 56 +
.../ActionParameterAutoCompleteFacetViaMethod.java | 121 ++
...ParameterAutoCompleteFacetViaMethodFactory.java | 88 +
...ameterFromJavaxValidationAnnotationFactory.java | 56 +
...rameterFromJavaxValidationDigitsAnnotation.java | 59 +
.../facets/param/choices/ActionChoicesFacet.java | 38 +
.../param/choices/ActionChoicesFacetAbstract.java | 36 +
.../param/choices/ActionParameterChoicesFacet.java | 42 +
.../ActionParameterChoicesFacetAbstract.java | 38 +
.../choices/ActionParameterChoicesFacetNone.java | 48 +
...rameterChoicesFacetDerivedFromChoicesFacet.java | 55 +
...ChoicesFacetDerivedFromChoicesFacetFactory.java | 55 +
.../method/ActionChoicesFacetViaMethod.java | 121 ++
.../method/ActionChoicesFacetViaMethodFactory.java | 100 ++
.../ActionParameterChoicesFacetViaMethod.java | 108 ++
...ctionParameterChoicesFacetViaMethodFactory.java | 99 ++
.../defaults/ActionParameterDefaultsFacet.java | 41 +
.../ActionParameterDefaultsFacetAbstract.java | 36 +
...ParameterDefaultFacetDerivedFromTypeFacets.java | 60 +
...arameterDefaultFacetDerivedFromTypeFactory.java | 64 +
.../ActionParameterDefaultsFacetViaMethod.java | 117 ++
...tionParameterDefaultsFacetViaMethodFactory.java | 134 ++
...ameterAnnotationElseDerivedFromTypeFactory.java | 55 +
...DescribedAsFacetOnParameterDerivedFromType.java | 32 +
.../disable/ActionParameterDisabledFacet.java | 41 +
.../ActionParameterDisabledFacetAbstract.java | 49 +
.../ActionParameterDisabledFacetViaMethod.java | 95 ++
...tionParameterDisabledFacetViaMethodFactory.java | 94 +
.../param/hide/ActionParameterHiddenFacet.java | 42 +
.../hide/ActionParameterHiddenFacetAbstract.java | 55 +
.../ActionParameterHiddenFacetViaMethod.java | 82 +
...ActionParameterHiddenFacetViaMethodFactory.java | 91 +
.../CssClassFacetForParameterLayoutAnnotation.java | 46 +
...scribedAsFacetForParameterLayoutAnnotation.java | 46 +
.../LabelAtFacetForParameterLayoutAnnotation.java | 47 +
...MultiLineFacetForParameterLayoutAnnotation.java | 45 +
.../NamedFacetForParameterLayoutAnnotation.java | 51 +
.../param/layout/ParameterLayoutFacetFactory.java | 58 +
...dAdjustedFacetForParameterLayoutAnnotation.java | 58 +
...calLengthFacetForParameterLayoutAnnotation.java | 60 +
.../MandatoryFacetOnParametersDefaultFactory.java | 56 +
.../NamedFacetForParameterUsingReflection.java | 34 +
.../ParameterNameFacetFactoryUsingReflection.java | 74 +
.../parameter/ParameterAnnotationFacetFactory.java | 134 ++
.../FileAcceptFacetForParameterAnnotation.java | 47 +
.../MandatoryFacetForParameterAnnotation.java | 81 +
...cetInvertedByNullableAnnotationOnParameter.java | 59 +
.../MaxLengthFacetForParameterAnnotation.java | 46 +
...fySpecificationFacetForParameterAnnotation.java | 69 +
.../regex/RegExFacetForParameterAnnotation.java | 72 +
.../RegExFacetForPatternAnnotationOnParameter.java | 66 +
.../TypicalLengthFacetOnParameterAnnotation.java | 50 +
...picalLengthFacetOnParameterDerivedFromType.java | 49 +
...acetOnParameterDerivedFromTypeFacetFactory.java | 56 +
.../validate/ActionParameterValidationFacet.java | 46 +
.../ActionParameterValidationFacetAbstract.java | 47 +
.../ActionParameterValidationFacetViaMethod.java | 84 +
...onParameterValidationFacetViaMethodFactory.java | 83 +
.../PropertyOrCollectionAccessorFacet.java | 53 +
.../PropertyOrCollectionAccessorFacetAbstract.java | 57 +
.../propcoll/notpersisted/NotPersistedFacet.java | 38 +
.../notpersisted/NotPersistedFacetAbstract.java | 36 +
.../accessor/PropertyAccessorFacetViaAccessor.java | 96 ++
.../PropertyAccessorFacetViaAccessorFactory.java | 113 ++
.../autocomplete/PropertyAutoCompleteFacet.java | 51 +
.../PropertyAutoCompleteFacetAbstract.java | 39 +
.../method/PropertyAutoCompleteFacetMethod.java | 114 ++
.../PropertyAutoCompleteFacetMethodFactory.java | 79 +
...ropertyFromJavaxValidationDigitsAnnotation.java | 60 +
...FromJavaxValidationDigitsAnnotationFactory.java | 59 +
.../properties/businesskey/BusinessKeyFacet.java | 36 +
.../businesskey/BusinessKeyFacetAbstract.java | 36 +
.../properties/choices/PropertyChoicesFacet.java | 50 +
.../choices/PropertyChoicesFacetAbstract.java | 36 +
...ropertyChoicesFacetDerivedFromChoicesFacet.java | 52 +
...ChoicesFacetDerivedFromChoicesFacetFactory.java | 45 +
.../method/PropertyChoicesFacetViaMethod.java | 93 +
.../PropertyChoicesFacetViaMethodFactory.java | 77 +
.../properties/defaults/PropertyDefaultFacet.java | 46 +
.../defaults/PropertyDefaultFacetAbstract.java | 36 +
.../defaults/PropertyDefaultFacetNone.java | 44 +
...pertyDefaultFacetDerivedFromDefaultedFacet.java | 57 +
...PropertyDefaultFacetDerivedFromTypeFactory.java | 64 +
.../method/PropertyDefaultFacetViaMethod.java | 88 +
.../PropertyDefaultFacetViaMethodFactory.java | 77 +
...isabledFacetOnPropertyDerivedFromImmutable.java | 38 +
...FacetOnPropertyDerivedFromImmutableFactory.java | 52 +
.../inferred/DisabledFacetOnPropertyInferred.java | 32 +
.../DisabledFacetOnPropertyInferredFactory.java | 56 +
.../MandatoryFacetOnProperyDefaultFactory.java | 57 +
.../MultiLineFacetOnPropertyAnnotation.java | 35 +
.../properties/projection/ProjectingFacet.java | 30 +
.../projection/ProjectingFacetAbstract.java | 41 +
.../ProjectingFacetFromPropertyAnnotation.java | 70 +
.../property/PropertyAnnotationFacetFactory.java | 377 ++++
.../command/CommandFacetForPropertyAnnotation.java | 99 ++
...mandFacetForPropertyAnnotationAsConfigured.java | 37 +
.../DisabledFacetForPropertyAnnotation.java | 65 +
...acetForPropertyAnnotationInvertedSemantics.java | 32 +
.../FileAcceptFacetForPropertyAnnotation.java | 47 +
.../hidden/HiddenFacetForPropertyAnnotation.java | 56 +
.../MandatoryFacetForPropertyAnnotation.java | 90 +
...acetInvertedByNullableAnnotationOnProperty.java | 61 +
.../MaxLengthFacetForPropertyAnnotation.java | 46 +
...ropertyClearFacetForDomainEventFromDefault.java | 41 +
...rFacetForDomainEventFromPropertyAnnotation.java | 41 +
.../property/modify/PropertyDomainEventFacet.java | 33 +
.../modify/PropertyDomainEventFacetAbstract.java | 167 ++
.../modify/PropertyDomainEventFacetDefault.java | 40 +
...pertyDomainEventFacetForPropertyAnnotation.java | 40 +
...opertySetterFacetForDomainEventFromDefault.java | 42 +
...rFacetForDomainEventFromPropertyAnnotation.java | 41 +
...tySetterOrClearFacetForDomainEventAbstract.java | 340 ++++
.../facets/properties/property/modify/Utils.java | 23 +
...sfySpecificationFacetForPropertyAnnotation.java | 66 +
.../NotPersistedFacetForPropertyAnnotation.java | 46 +
...ublishedPropertyFacetForPropertyAnnotation.java | 79 +
...ertyFacetForPropertyAnnotationAsConfigured.java | 27 +
.../PublishedPropertyFacetFromConfiguration.java | 31 +
.../RegExFacetForPatternAnnotationOnProperty.java | 76 +
.../regex/RegExFacetForPropertyAnnotation.java | 70 +
.../CssClassFacetForPropertyLayoutAnnotation.java | 47 +
.../CssClassFacetForPropertyXml.java | 42 +
...escribedAsFacetForPropertyLayoutAnnotation.java | 47 +
.../DescribedAsFacetForPropertyXml.java | 42 +
.../HiddenFacetForPropertyLayoutAnnotation.java | 56 +
.../propertylayout/HiddenFacetForPropertyXml.java | 51 +
.../LabelAtFacetForPropertyLayoutAnnotation.java | 47 +
.../propertylayout/LabelAtFacetForPropertyXml.java | 42 +
.../MultiLineFacetForPropertyLayoutAnnotation.java | 46 +
.../MultiLineFacetForPropertyXml.java | 41 +
.../NamedFacetForPropertyLayoutAnnotation.java | 51 +
.../propertylayout/NamedFacetForPropertyXml.java | 47 +
...romptStyleFacetForPropertyLayoutAnnotation.java | 96 ++
.../PromptStyleFacetForPropertyXml.java | 57 +
.../propertylayout/PropertyLayoutFacetFactory.java | 194 +++
...edAdjustedFacetForPropertyLayoutAnnotation.java | 58 +
.../RenderedAdjustedFacetForPropertyXml.java | 45 +
...icalLengthFacetForPropertyLayoutAnnotation.java | 61 +
.../TypicalLengthFacetForPropertyXml.java | 57 +
...UnchangingFacetForPropertyLayoutAnnotation.java | 59 +
.../UnchangingFacetForPropertyXml.java | 42 +
.../properties/publish/PublishedPropertyFacet.java | 29 +
.../publish/PublishedPropertyFacetAbstract.java | 38 +
...nderedAsDayBeforeFacetAnnotationOnProperty.java | 38 +
.../renderunchanged/UnchangingFacet.java | 30 +
.../renderunchanged/UnchangingFacetAbstract.java | 36 +
.../properties/searchable/SearchableFacet.java | 49 +
.../searchable/SearchableFacetAbstract.java | 51 +
.../TypicalLengthFacetOnPropertyAnnotation.java | 50 +
...ypicalLengthFacetOnPropertyDerivedFromType.java | 49 +
...FacetOnPropertyDerivedFromTypeFacetFactory.java | 55 +
.../update/NotPersistableFacetInferred.java | 31 +
.../update/PropertyModifyFacetFactory.java | 68 +
.../update/PropertySetAndClearFacetFactory.java | 122 ++
.../update/clear/PropertyClearFacet.java | 43 +
.../update/clear/PropertyClearFacetAbstract.java | 35 +
.../clear/PropertyClearFacetViaClearMethod.java | 74 +
.../clear/PropertyClearFacetViaSetterMethod.java | 75 +
.../update/init/PropertyInitializationFacet.java | 50 +
.../init/PropertyInitializationFacetAbstract.java | 35 +
...PropertyInitializationFacetViaSetterMethod.java | 70 +
.../update/modify/PropertySetterFacet.java | 51 +
.../update/modify/PropertySetterFacetAbstract.java | 35 +
.../modify/PropertySetterFacetViaModifyMethod.java | 81 +
.../modify/PropertySetterFacetViaSetterMethod.java | 76 +
.../validating/PropertyValidateFacet.java | 50 +
.../validating/PropertyValidateFacetAbstract.java | 57 +
.../validating/PropertyValidateFacetNone.java | 47 +
.../dflt/PropertyValidateFacetDefault.java | 49 +
.../dflt/PropertyValidateFacetDefaultFactory.java | 58 +
.../method/PropertyValidateFacetViaMethod.java | 83 +
.../PropertyValidateFacetViaMethodFactory.java | 76 +
.../DateAndTimeValueSemanticsProviderAbstract.java | 116 ++
.../core/metamodel/facets/value/JodaFunctions.java | 43 +
.../ValueSemanticsProviderAbstractTemporal.java | 373 ++++
.../value/bigdecimal/BigDecimalValueFacet.java | 60 +
.../bigdecimal/BigDecimalValueFacetAbstract.java | 37 +
...malValueFacetUsingSemanticsProviderFactory.java | 44 +
.../BigDecimalValueSemanticsProvider.java | 143 ++
.../value/biginteger/BigIntegerValueFacet.java | 26 +
...gerValueFacetUsingSemanticsProviderFactory.java | 43 +
.../BigIntegerValueSemanticsProvider.java | 110 ++
.../facets/value/blobs/BlobValueFacet.java | 26 +
...lobValueFacetUsingSemanticsProviderFactory.java | 41 +
.../value/blobs/BlobValueSemanticsProvider.java | 123 ++
...iveValueFacetUsingSemanticsProviderFactory.java | 42 +
.../BooleanPrimitiveValueSemanticsProvider.java | 55 +
.../facets/value/booleans/BooleanValueFacet.java | 29 +
.../BooleanValueSemanticsProviderAbstract.java | 129 ++
...perValueFacetUsingSemanticsProviderFactory.java | 42 +
.../BooleanWrapperValueSemanticsProvider.java | 69 +
...iveValueFacetUsingSemanticsProviderFactory.java | 42 +
.../bytes/BytePrimitiveValueSemanticsProvider.java | 52 +
.../facets/value/bytes/ByteValueFacet.java | 30 +
.../bytes/ByteValueSemanticsProviderAbstract.java | 116 ++
...perValueFacetUsingSemanticsProviderFactory.java | 42 +
.../bytes/ByteWrapperValueSemanticsProvider.java | 41 +
...iveValueFacetUsingSemanticsProviderFactory.java | 42 +
.../chars/CharPrimitiveValueSemanticsProvider.java | 54 +
.../facets/value/chars/CharValueFacet.java | 30 +
.../chars/CharValueSemanticsProviderAbstract.java | 103 ++
...perValueFacetUsingSemanticsProviderFactory.java | 42 +
.../chars/CharWrapperValueSemanticsProvider.java | 41 +
.../facets/value/clobs/ClobValueFacet.java | 26 +
...lobValueFacetUsingSemanticsProviderFactory.java | 42 +
.../value/clobs/ClobValueSemanticsProvider.java | 117 ++
.../facets/value/date/DateValueFacet.java | 33 +
.../date/DateValueSemanticsProviderAbstract.java | 121 ++
.../value/datejdk8local/Jdk8LocalDateUtil.java | 170 ++
.../datejdk8local/Jdk8LocalDateValueFacet.java | 33 +
...ateValueFacetUsingSemanticsProviderFactory.java | 45 +
.../Jdk8LocalDateValueSemanticsProvider.java | 252 +++
.../facets/value/datejdk8local/TimeFormatter.java | 27 +
.../facets/value/datejdk8local/TimeParser.java | 27 +
.../value/datejodalocal/JodaLocalDateUtil.java | 130 ++
.../datejodalocal/JodaLocalDateValueFacet.java | 33 +
...ateValueFacetUsingSemanticsProviderFactory.java | 45 +
.../JodaLocalDateValueSemanticsProvider.java | 257 +++
...ateValueFacetUsingSemanticsProviderFactory.java | 45 +
.../datesql/JavaSqlDateValueSemanticsProvider.java | 98 ++
.../datetimejdk8local/Jdk8LocalDateTimeUtil.java | 157 ++
.../Jdk8LocalDateTimeValueFacet.java | 33 +
...imeValueFacetUsingSemanticsProviderFactory.java | 45 +
.../Jdk8LocalDateTimeValueSemanticsProvider.java | 272 +++
.../value/datetimejdk8local/TimeFormatter.java | 27 +
.../facets/value/datetimejdk8local/TimeParser.java | 27 +
.../Jdk8OffsetDateTimeValueFacet.java | 33 +
...imeValueFacetUsingSemanticsProviderFactory.java | 45 +
.../Jdk8OffsetDateTimeValueSemanticsProvider.java | 103 ++
...fsetDateTimeValueSemanticsProviderAbstract.java | 121 ++
.../value/datetimejoda/JodaDateTimeValueFacet.java | 33 +
...imeValueFacetUsingSemanticsProviderFactory.java | 45 +
.../JodaDateTimeValueSemanticsProvider.java | 103 ++
...JodaDateTimeValueSemanticsProviderAbstract.java | 121 ++
.../datetimejodalocal/JodaLocalDateTimeUtil.java | 127 ++
.../JodaLocalDateTimeValueFacet.java | 33 +
...imeValueFacetUsingSemanticsProviderFactory.java | 45 +
.../JodaLocalDateTimeValueSemanticsProvider.java | 259 +++
...ateValueFacetUsingSemanticsProviderFactory.java | 46 +
.../JavaUtilDateValueSemanticsProvider.java | 85 +
.../doubles/DoubleFloatingPointValueFacet.java | 30 +
...iveValueFacetUsingSemanticsProviderFactory.java | 42 +
.../DoublePrimitiveValueSemanticsProvider.java | 54 +
.../DoubleValueSemanticsProviderAbstract.java | 120 ++
...perValueFacetUsingSemanticsProviderFactory.java | 42 +
.../DoubleWrapperValueSemanticsProvider.java | 42 +
...iveValueFacetUsingSemanticsProviderFactory.java | 42 +
.../FloatPrimitiveValueSemanticsProvider.java | 54 +
.../FloatValueSemanticsProviderAbstract.java | 116 ++
...perValueFacetUsingSemanticsProviderFactory.java | 42 +
.../floats/FloatWrapperValueSemanticsProvider.java | 41 +
.../value/floats/FloatingPointValueFacet.java | 30 +
.../facets/value/image/ImageValueFacet.java | 34 +
...ageValueFacetUsingSemanticsProviderFactory.java | 43 +
.../value/image/ImageValueSemanticsProvider.java | 100 ++
.../image/ImageValueSemanticsProviderAbstract.java | 298 ++++
...ageValueFacetUsingSemanticsProviderFactory.java | 44 +
.../JavaAwtImageValueSemanticsProvider.java | 83 +
...iveValueFacetUsingSemanticsProviderFactory.java | 42 +
.../IntPrimitiveValueSemanticsProvider.java | 54 +
.../integer/IntValueSemanticsProviderAbstract.java | 114 ++
...perValueFacetUsingSemanticsProviderFactory.java | 42 +
.../integer/IntWrapperValueSemanticsProvider.java | 41 +
.../facets/value/integer/IntegerValueFacet.java | 30 +
.../localrespath/LocalResourcePathValueFacet.java | 32 +
...athValueFacetUsingSemanticsProviderFactory.java | 44 +
.../LocalResourcePathValueSemanticsProvider.java | 130 ++
...iveValueFacetUsingSemanticsProviderFactory.java | 42 +
.../longs/LongPrimitiveValueSemanticsProvider.java | 52 +
.../facets/value/longs/LongValueFacet.java | 30 +
.../longs/LongValueSemanticsProviderAbstract.java | 113 ++
...perValueFacetUsingSemanticsProviderFactory.java | 42 +
.../longs/LongWrapperValueSemanticsProvider.java | 41 +
.../facets/value/markup/MarkupValueFacet.java | 30 +
...kupValueFacetUsingSemanticsProviderFactory.java | 38 +
.../value/markup/MarkupValueSemanticsProvider.java | 114 ++
.../facets/value/password/PasswordValueFacet.java | 33 +
...ordValueFacetUsingSemanticsProviderFactory.java | 43 +
.../password/PasswordValueSemanticsProvider.java | 119 ++
...iveValueFacetUsingSemanticsProviderFactory.java | 42 +
.../ShortPrimitiveValueSemanticsProvider.java | 52 +
.../facets/value/shortint/ShortValueFacet.java | 30 +
.../ShortValueSemanticsProviderAbstract.java | 115 ++
...perValueFacetUsingSemanticsProviderFactory.java | 42 +
.../ShortWrapperValueSemanticsProvider.java | 41 +
.../facets/value/string/StringValueFacet.java | 31 +
...ingValueFacetUsingSemanticsProviderFactory.java | 42 +
.../value/string/StringValueSemanticsProvider.java | 126 ++
.../time/TimeValueSemanticsProviderAbstract.java | 110 ++
.../JodaLocalTimeValueFacetSimpleFactory.java | 46 +
...imeValueFacetUsingSemanticsProviderFactory.java | 46 +
.../timesql/JavaSqlTimeValueSemanticsProvider.java | 95 ++
...ampValueFacetUsingSemanticsProviderFactory.java | 47 +
.../JavaSqlTimeStampValueSemanticsProvider.java | 84 +
.../TimeStampValueSemanticsProviderAbstract.java | 101 ++
.../facets/value/treenode/TreeNodeValueFacet.java | 27 +
...odeValueFacetUsingSemanticsProviderFactory.java | 40 +
.../treenode/TreeNodeValueSemanticsProvider.java | 136 ++
.../metamodel/facets/value/url/URLValueFacet.java | 31 +
...URLValueFacetUsingSemanticsProviderFactory.java | 44 +
.../value/url/URLValueSemanticsProvider.java | 127 ++
.../facets/value/uuid/UUIDValueFacet.java | 33 +
...UIDValueFacetUsingSemanticsProviderFactory.java | 44 +
.../value/uuid/UUIDValueSemanticsProvider.java | 112 ++
.../core/metamodel/interactions/AccessContext.java | 42 +
.../interactions/ActionArgUsabilityContext.java | 76 +
.../interactions/ActionArgValidityContext.java | 68 +
.../interactions/ActionArgVisibilityContext.java | 76 +
.../interactions/ActionInteractionContext.java | 31 +
.../interactions/ActionUsabilityContext.java | 60 +
.../interactions/ActionValidityContext.java | 64 +
.../interactions/ActionVisibilityContext.java | 60 +
.../interactions/CollectionAccessContext.java | 48 +
.../interactions/CollectionAddToContext.java | 56 +
.../interactions/CollectionRemoveFromContext.java | 58 +
.../interactions/CollectionUsabilityContext.java | 48 +
.../interactions/CollectionVisibilityContext.java | 50 +
.../interactions/DisablingInteractionAdvisor.java | 46 +
.../interactions/HidingInteractionAdvisor.java | 47 +
.../interactions/InteractionAdvisorFacet.java | 45 +
.../metamodel/interactions/InteractionContext.java | 171 ++
.../metamodel/interactions/InteractionUtils.java | 81 +
.../metamodel/interactions/ObjectTitleContext.java | 56 +
.../interactions/ObjectValidityContext.java | 53 +
.../interactions/ObjectVisibilityContext.java | 55 +
.../metamodel/interactions/ParseValueContext.java | 59 +
.../interactions/PropertyAccessContext.java | 60 +
.../interactions/PropertyModifyContext.java | 61 +
.../interactions/PropertyUsabilityContext.java | 50 +
.../interactions/PropertyVisibilityContext.java | 50 +
.../metamodel/interactions/ProposedHolder.java | 38 +
.../metamodel/interactions/UsabilityContext.java | 55 +
.../interactions/ValidatingInteractionAdvisor.java | 51 +
.../metamodel/interactions/ValidityContext.java | 42 +
.../metamodel/interactions/VisibilityContext.java | 54 +
.../isis/core/metamodel/layout/DeweyOrderSet.java | 404 +++++
.../MemberIdentifierComparator.java | 44 +
.../memberorderfacet/MemberOrderComparator.java | 90 +
.../MemberOrderFacetComparator.java | 56 +
.../OrderSetGroupNameComparator.java | 55 +
.../metamodel/objectmanager/ObjectManager.java | 107 ++
.../objectmanager/ObjectManagerDefault.java | 77 +
.../objectmanager/create/ObjectCreator.java | 82 +
.../create/ObjectCreator_builtinHandlers.java | 386 +++++
.../objectmanager/identify/ObjectIdentifier.java | 63 +
.../identify/ObjectIdentifier_builtinHandlers.java | 139 ++
.../metamodel/objectmanager/load/ObjectLoader.java | 80 +
.../load/ObjectLoader_builtinHandlers.java | 258 +++
.../objectmanager/refresh/ObjectRefresher.java | 67 +
.../refresh/ObjectRefresher_builtinHandlers.java | 107 ++
...arameterChoicesFacetFromParentedCollection.java | 76 +
...meterDefaultsFacetFromAssociatedCollection.java | 64 +
.../param/DeriveFacetsPostProcessor.java | 635 +++++++
.../ObjectSpecificationPostProcessor.java | 28 +
.../core/metamodel/progmodel/ProgrammingModel.java | 179 ++
.../progmodel/ProgrammingModelAbstract.java | 253 +++
.../progmodel/ProgrammingModelInitFilter.java | 80 +
.../ProgrammingModelInitFilterDefault.java | 87 +
.../progmodel/ProgrammingModelService.java | 32 +
.../dflt/ProgrammingModelFacetsJava8.java | 388 +++++
.../core/metamodel/services/CollectionHelper.java | 100 ++
.../metamodel/services/ServiceInjectorDefault.java | 75 +
.../metamodel/services/ServiceInjectorLegacy.java | 286 ++++
.../isis/core/metamodel/services/ServiceUtil.java | 41 +
.../services/appfeat/ApplicationFeature.java | 324 ++++
.../appfeat/ApplicationFeatureFactory.java | 45 +
.../services/appfeat/ApplicationFeatureId.java | 492 ++++++
.../ApplicationFeatureRepositoryDefault.java | 556 ++++++
.../services/appfeat/ApplicationFeatureType.java | 102 ++
.../classsubstitutor/ClassSubstitutor.java | 28 +
.../classsubstitutor/ClassSubstitutorAbstract.java | 137 ++
.../classsubstitutor/ClassSubstitutorDefault.java | 76 +
.../ClassSubstitutorForCollections.java | 64 +
.../classsubstitutor/ClassSubstitutorRegistry.java | 80 +
.../command/CommandDtoServiceInternal.java | 71 +
.../services/container/query/QueryCardinality.java | 31 +
.../metamodel/services/devutils/MemberType.java | 25 +
.../services/events/MetamodelEventService.java | 94 +
.../events/MetamodelEventSupport_Spring.java | 77 +
.../exceprecog/ExceptionRecognizerDocDefault.java | 88 +
.../services/grid/GridLoaderServiceDefault.java | 257 +++
.../services/grid/GridReaderUsingJaxb.java | 76 +
.../services/grid/GridServiceDefault.java | 209 +++
.../services/grid/GridSystemServiceAbstract.java | 699 ++++++++
.../grid/bootstrap3/DefaultGrid.layout.xml | 0
.../grid/bootstrap3/GridSystemServiceBS3.java | 674 ++++++++
.../services/homepage/HomePageAction.java | 63 +
.../services/homepage/HomePageResolverService.java | 35 +
.../metamodel/services/homepage/package-info.java | 26 +
.../ixn/InteractionDtoServiceInternal.java | 51 +
.../services/layout/LayoutServiceDefault.java | 147 ++
.../services/message/MessageServiceNoop.java | 88 +
.../services/metamodel/DomainMemberDefault.java | 301 ++++
.../services/metamodel/DomainModelDefault.java | 58 +
.../services/metamodel/MetaModelExportSupport.java | 31 +
.../services/metamodel/MetaModelExporter.java | 570 +++++++
.../metamodel/MetaModelServiceDefault.java | 272 +++
.../core/metamodel/services/metamodel/Util.java | 35 +
.../publishing/PublisherDispatchService.java | 46 +
.../services/registry/ServiceRegistryDefault.java | 103 ++
.../services/registry/SpringContextProvider.java | 23 +
.../services/title/TitleServiceDefault.java | 83 +
.../title/TitlesAndTranslationsValidator.java | 166 ++
.../services/user/UserServiceDefault.java | 177 ++
.../isis/core/metamodel/spec/ActionType.java | 41 +
.../isis/core/metamodel/spec/DefaultProvider.java | 31 +
.../apache/isis/core/metamodel/spec/Described.java | 35 +
.../core/metamodel/spec/DomainModelException.java | 47 +
.../spec/ElementSpecificationProvider.java | 44 +
.../isis/core/metamodel/spec/EntityState.java | 49 +
.../isis/core/metamodel/spec/FreeStandingList.java | 96 ++
.../isis/core/metamodel/spec/Hierarchical.java | 65 +
.../metamodel/spec/InjectorMethodEvaluator.java | 31 +
.../isis/core/metamodel/spec/ManagedObject.java | 734 ++++++++
.../spec/ObjectInstantiationException.java | 41 +
.../isis/core/metamodel/spec/ObjectSpecId.java | 62 +
.../core/metamodel/spec/ObjectSpecification.java | 445 +++++
.../spec/ObjectSpecificationException.java | 36 +
.../isis/core/metamodel/spec/Specification.java | 50 +
.../core/metamodel/spec/feature/Contributed.java | 31 +
.../core/metamodel/spec/feature/CurrentHolder.java | 46 +
.../spec/feature/MutableCurrentHolder.java | 64 +
.../core/metamodel/spec/feature/ObjectAction.java | 589 +++++++
.../spec/feature/ObjectActionContainer.java | 80 +
.../spec/feature/ObjectActionParameter.java | 235 +++
.../metamodel/spec/feature/ObjectAssociation.java | 253 +++
.../spec/feature/ObjectAssociationContainer.java | 72 +
.../core/metamodel/spec/feature/ObjectFeature.java | 79 +
.../core/metamodel/spec/feature/ObjectMember.java | 228 +++
.../spec/feature/OneToManyActionParameter.java | 28 +
.../spec/feature/OneToManyAssociation.java | 101 ++
.../metamodel/spec/feature/OneToManyFeature.java | 40 +
.../spec/feature/OneToOneActionParameter.java | 28 +
.../spec/feature/OneToOneAssociation.java | 53 +
.../metamodel/spec/feature/OneToOneFeature.java | 28 +
.../core/metamodel/specloader/CollectionUtils.java | 61 +
.../specloader/InjectorMethodEvaluatorDefault.java | 91 +
.../specloader/ProgrammingModelServiceDefault.java | 104 ++
.../specloader/ReflectiveActionException.java | 43 +
.../specloader/SpecificationCacheDefault.java | 134 ++
.../metamodel/specloader/SpecificationLoader.java | 137 ++
.../specloader/SpecificationLoaderDefault.java | 521 ++++++
.../SpecificationLoaderDefault_debug.java | 79 +
.../specloader/classsubstitutor/ProxyEnhanced.java | 28 +
.../specloader/facetprocessor/FacetProcessor.java | 486 ++++++
.../core/metamodel/specloader/package-info.java | 43 +
.../specloader/postprocessor/PostProcessor.java | 59 +
.../specloader/specimpl/ContributeeMember.java | 67 +
.../specloader/specimpl/FacetedMethodsBuilder.java | 614 +++++++
.../metamodel/specloader/specimpl/Factories.java | 96 ++
.../specloader/specimpl/IntrospectionState.java | 47 +
.../specloader/specimpl/MixedInMember.java | 40 +
.../specimpl/ObjectActionContributee.java | 253 +++
.../specloader/specimpl/ObjectActionDefault.java | 688 ++++++++
.../specloader/specimpl/ObjectActionMixedIn.java | 260 +++
.../specimpl/ObjectActionParameterAbstract.java | 492 ++++++
.../specimpl/ObjectActionParameterContributee.java | 25 +
.../ObjectActionParameterContributeeAbstract.java | 93 +
.../specimpl/ObjectActionParameterMixedIn.java | 25 +
.../ObjectActionParameterMixedInAbstract.java | 85 +
.../specimpl/ObjectAssociationAbstract.java | 97 ++
.../specloader/specimpl/ObjectMemberAbstract.java | 409 +++++
.../specimpl/ObjectSpecificationAbstract.java | 1119 ++++++++++++
.../OneToManyActionParameterContributee.java | 43 +
.../specimpl/OneToManyActionParameterDefault.java | 43 +
.../specimpl/OneToManyActionParameterMixedIn.java | 40 +
.../specimpl/OneToManyAssociationContributee.java | 191 +++
.../specimpl/OneToManyAssociationDefault.java | 288 ++++
.../specimpl/OneToManyAssociationMixedIn.java | 221 +++
.../OneToOneActionParameterContributee.java | 38 +
.../specimpl/OneToOneActionParameterDefault.java | 37 +
.../specimpl/OneToOneActionParameterMixedIn.java | 35 +
.../specimpl/OneToOneAssociationContributee.java | 174 ++
.../specimpl/OneToOneAssociationDefault.java | 361 ++++
.../specimpl/OneToOneAssociationMixedIn.java | 206 +++
.../metamodel/specloader/specimpl/Predicates.java | 168 ++
.../core/metamodel/specloader/specimpl/Utils.java | 103 ++
.../specimpl/dflt/ObjectSpecificationDefault.java | 456 +++++
.../CollectionFacetOnStandaloneList.java | 73 +
.../DescribedAsFacetOnStandaloneList.java | 31 +
.../standalonelist/NamedFacetOnStandaloneList.java | 31 +
.../ObjectSpecificationOnStandaloneList.java | 186 ++
.../PluralFacetOnStandaloneList.java | 31 +
.../traverser/TypeExtractorAbstract.java | 84 +
.../traverser/TypeExtractorMethodParameters.java | 60 +
.../traverser/TypeExtractorMethodReturn.java | 47 +
.../validator/MetaModelInvalidException.java | 33 +
.../specloader/validator/MetaModelValidator.java | 44 +
.../validator/MetaModelValidatorAbstract.java | 69 +
...etaModelValidatorForConflictingOptionality.java | 62 +
.../MetaModelValidatorForDeprecatedAbstract.java | 68 +
.../MetaModelValidatorForDeprecatedAnnotation.java | 54 +
...etaModelValidatorForDeprecatedMethodPrefix.java | 52 +
.../MetaModelValidatorForValidationFailures.java | 23 +
.../validator/MetaModelValidatorVisiting.java | 111 ++
.../specloader/validator/ValidationFailure.java | 61 +
.../specloader/validator/ValidationFailures.java | 112 ++
.../core/metamodel/util/DeweyOrderComparator.java | 37 +
.../apache/isis/core/metamodel/util/EventUtil.java | 43 +
.../core/metamodel/util/pchain/ParentChain.java | 83 +
.../metamodel/util/pchain/ParentChainDefault.java | 49 +
.../isis/core/metamodel/util/snapshot/Helper.java | 91 +
.../core/metamodel/util/snapshot/IsisSchema.java | 181 ++
.../isis/core/metamodel/util/snapshot/Place.java | 65 +
.../core/metamodel/util/snapshot/XmlSchema.java | 648 +++++++
.../core/metamodel/util/snapshot/XmlSnapshot.java | 916 ++++++++++
.../core/metamodel/util/snapshot/XsMetaModel.java | 337 ++++
.../metamodel/valuetypes/ValueTypeDefinition.java | 45 +
.../metamodel/valuetypes/ValueTypeProvider.java | 29 +
.../valuetypes/ValueTypeProviderDefault.java | 54 +
.../ValueTypeProviderForCollections.java | 51 +
.../metamodel/valuetypes/ValueTypeRegistry.java | 96 ++
.../apache/isis/metamodel/IsisModuleMetamodel.java | 101 --
.../isis/metamodel/adapter/ObjectAdapter.java | 61 -
.../metamodel/adapter/ObjectAdapterProvider.java | 35 -
.../adapter/oid/ObjectNotFoundException.java | 36 -
.../adapter/oid/ObjectPersistenceException.java | 42 -
.../org/apache/isis/metamodel/adapter/oid/Oid.java | 140 --
.../isis/metamodel/adapter/oid/Oid_Marshaller.java | 254 ---
.../isis/metamodel/adapter/oid/Oid_Parented.java | 146 --
.../isis/metamodel/adapter/oid/Oid_Root.java | 167 --
.../isis/metamodel/adapter/oid/Oid_Value.java | 87 -
.../isis/metamodel/adapter/oid/ParentedOid.java | 54 -
.../adapter/oid/PojoRecreationException.java | 29 -
.../adapter/oid/PojoRefreshException.java | 32 -
.../apache/isis/metamodel/adapter/oid/RootOid.java | 46 -
.../isis/metamodel/adapter/package-info.java | 32 -
.../authorization/standard/AuthorizationFacet.java | 32 -
.../standard/AuthorizationFacetAbstract.java | 78 -
.../standard/AuthorizationFacetFactory.java | 46 -
.../standard/AuthorizationFacetImpl.java | 30 -
.../authorization/standard/package-info.java | 33 -
.../isis/metamodel/commons/ArrayExtensions.java | 69 -
.../apache/isis/metamodel/commons/CanBeVoid.java | 25 -
.../isis/metamodel/commons/ClassExtensions.java | 175 --
.../isis/metamodel/commons/ClassFunctions.java | 46 -
.../isis/metamodel/commons/ClassPredicates.java | 37 -
.../apache/isis/metamodel/commons/ClassUtil.java | 192 ---
.../metamodel/commons/CloseableExtensions.java | 40 -
.../isis/metamodel/commons/DateExtensions.java | 35 -
.../metamodel/commons/InputStreamExtensions.java | 69 -
.../isis/metamodel/commons/ListExtensions.java | 115 --
.../apache/isis/metamodel/commons/LocaleUtil.java | 40 -
.../org/apache/isis/metamodel/commons/MapUtil.java | 48 -
.../isis/metamodel/commons/MethodExtensions.java | 92 -
.../commons/MethodInvocationPreprocessor.java | 154 --
.../apache/isis/metamodel/commons/MethodUtil.java | 202 ---
.../isis/metamodel/commons/ObjectExtensions.java | 82 -
.../isis/metamodel/commons/ResourceUtil.java | 83 -
.../isis/metamodel/commons/StringExtensions.java | 393 -----
.../metamodel/commons/ThrowableExtensions.java | 82 -
.../apache/isis/metamodel/commons/ToString.java | 165 --
.../apache/isis/metamodel/commons/Wormhole.java | 50 -
.../isis/metamodel/commons/package-info.java | 27 -
.../org/apache/isis/metamodel/consent/Allow.java | 56 -
.../org/apache/isis/metamodel/consent/Consent.java | 73 -
.../isis/metamodel/consent/ConsentAbstract.java | 159 --
.../isis/metamodel/consent/InteractionAdvisor.java | 103 --
.../metamodel/consent/InteractionContextType.java | 135 --
.../metamodel/consent/InteractionInitiatedBy.java | 33 -
.../isis/metamodel/consent/InteractionResult.java | 155 --
.../metamodel/consent/InteractionResultSet.java | 104 --
.../org/apache/isis/metamodel/consent/Veto.java | 48 -
.../isis/metamodel/context/MetaModelContext.java | 213 ---
.../metamodel/context/MetaModelContextAware.java | 29 -
.../context/MetaModelContext_usingIoc.java | 173 --
.../isis/metamodel/context/MetaModelContexts.java | 44 -
.../metamodel/exceptions/MetaModelException.java | 43 -
.../persistence/ObjectNotFoundException.java | 38 -
.../persistence/ObjectPersistenceException.java | 42 -
.../persistence/PojoRecreationException.java | 31 -
.../persistence/PojoRefreshException.java | 34 -
.../org/apache/isis/metamodel/facetapi/Facet.java | 123 --
.../isis/metamodel/facetapi/FacetAbstract.java | 287 ----
.../isis/metamodel/facetapi/FacetHolder.java | 150 --
.../isis/metamodel/facetapi/FacetHolderImpl.java | 168 --
.../apache/isis/metamodel/facetapi/FacetUtil.java | 96 --
.../metamodel/facetapi/FacetWithAttributes.java | 32 -
.../isis/metamodel/facetapi/FeatureType.java | 159 --
.../isis/metamodel/facetapi/IdentifiedHolder.java | 31 -
.../isis/metamodel/facetapi/MetaModelRefiner.java | 34 -
.../isis/metamodel/facetapi/MethodRemover.java | 71 -
.../apache/isis/metamodel/facets/Annotations.java | 695 --------
.../isis/metamodel/facets/CollectionUtils.java | 129 --
.../facets/ContributeeMemberFacetFactory.java | 45 -
.../isis/metamodel/facets/DependentArgUtils.java | 199 ---
.../isis/metamodel/facets/DomainEventHelper.java | 441 -----
.../apache/isis/metamodel/facets/FacetFactory.java | 337 ----
.../metamodel/facets/FacetFactoryAbstract.java | 70 -
.../isis/metamodel/facets/FacetedMethod.java | 215 ---
.../metamodel/facets/FacetedMethodParameter.java | 50 -
.../isis/metamodel/facets/ImperativeFacet.java | 169 --
.../metamodel/facets/ImperativeFacetMulti.java | 33 -
.../facets/MethodFilteringFacetFactory.java | 33 -
.../isis/metamodel/facets/MethodFinderUtils.java | 239 ---
.../metamodel/facets/MethodLiteralConstants.java | 77 -
.../facets/MethodPrefixBasedFacetFactory.java | 39 -
.../MethodPrefixBasedFacetFactoryAbstract.java | 140 --
.../metamodel/facets/MethodRemoverConstants.java | 44 -
.../isis/metamodel/facets/MultipleValueFacet.java | 26 -
.../metamodel/facets/ObjectSpecIdFacetFactory.java | 37 -
.../facets/OrphanedSupportingMethodValidator.java | 126 --
.../metamodel/facets/PostConstructMethodCache.java | 30 -
...ropertyOrCollectionIdentifyingFacetFactory.java | 83 -
...rCollectionIdentifyingFacetFactoryAbstract.java | 43 -
.../metamodel/facets/SingleClassValueFacet.java | 35 -
.../facets/SingleClassValueFacetAbstract.java | 60 -
.../isis/metamodel/facets/SingleIntValueFacet.java | 27 -
.../facets/SingleIntValueFacetAbstract.java | 47 -
.../metamodel/facets/SingleStringValueFacet.java | 23 -
.../facets/SingleStringValueFacetAbstract.java | 58 -
.../isis/metamodel/facets/SingleValueFacet.java | 28 -
.../metamodel/facets/SingleValueFacetAbstract.java | 46 -
.../apache/isis/metamodel/facets/TypedHolder.java | 55 -
.../isis/metamodel/facets/TypedHolderDefault.java | 58 -
.../isis/metamodel/facets/WhereValueFacet.java | 29 -
.../metamodel/facets/WhereValueFacetAbstract.java | 57 -
...lementSpecificationProviderFromTypeOfFacet.java | 37 -
.../facets/actcoll/typeof/TypeOfFacet.java | 126 --
.../facets/actcoll/typeof/TypeOfFacetAbstract.java | 40 -
.../actcoll/typeof/TypeOfFacetDefaultToObject.java | 30 -
.../typeof/TypeOfFacetInferredFromArray.java | 30 -
.../typeof/TypeOfFacetInferredFromGenerics.java | 30 -
.../action/ActionAnnotationFacetFactory.java | 287 ----
...nChoicesForCollectionParameterFacetFactory.java | 161 --
.../action/associateWith/AssociatedWithFacet.java | 30 -
.../associateWith/AssociatedWithFacetAbstract.java | 45 -
.../AssociatedWithFacetForActionAnnotation.java | 32 -
.../command/CommandFacetForActionAnnotation.java | 123 --
...ommandFacetForActionAnnotationAsConfigured.java | 39 -
.../command/CommandFacetFromConfiguration.java | 46 -
.../hidden/HiddenFacetForActionAnnotation.java | 56 -
.../action/invocation/ActionDomainEventFacet.java | 33 -
.../invocation/ActionDomainEventFacetAbstract.java | 165 --
.../invocation/ActionDomainEventFacetDefault.java | 33 -
.../ActionDomainEventFacetForActionAnnotation.java | 32 -
.../action/invocation/ActionInvocationFacet.java | 52 -
.../invocation/ActionInvocationFacetAbstract.java | 38 -
...ctionInvocationFacetForDomainEventAbstract.java | 513 ------
...ionFacetForDomainEventFromActionAnnotation.java | 40 -
...onInvocationFacetForDomainEventFromDefault.java | 40 -
.../actions/action/invocation/CommandUtil.java | 114 --
.../PrototypeFacetForActionAnnotation.java | 51 -
.../PublishedActionFacetForActionAnnotation.java | 99 --
...ActionFacetForActionAnnotationAsConfigured.java | 31 -
.../PublishedActionFacetFromConfiguration.java | 32 -
...ctionSemanticsFacetFallbackToNonIdempotent.java | 32 -
.../ActionSemanticsFacetForActionAnnotation.java | 49 -
.../typeof/TypeOfFacetForActionAnnotation.java | 33 -
.../facets/actions/command/CommandFacet.java | 55 -
.../actions/command/CommandFacetAbstract.java | 123 --
.../actions/defaults/ActionDefaultsFacet.java | 35 -
.../defaults/ActionDefaultsFacetAbstract.java | 36 -
.../method/ActionDefaultsFacetViaMethod.java | 88 -
.../ActionDefaultsFacetViaMethodFactory.java | 88 -
.../FileAcceptFacetForActionAnnotation.java | 47 -
.../facets/actions/homepage/HomePageFacet.java | 34 -
.../actions/homepage/HomePageFacetAbstract.java | 36 -
.../facets/actions/homepage/HomePageFacetImpl.java | 30 -
.../annotation/HomePageFacetAnnotation.java | 31 -
.../annotation/HomePageFacetAnnotationFactory.java | 130 --
.../actions/layout/ActionLayoutFacetFactory.java | 171 --
...tionPositionFacetForActionLayoutAnnotation.java | 46 -
.../layout/ActionPositionFacetForActionXml.java | 41 -
...okmarkPolicyFacetForActionLayoutAnnotation.java | 58 -
.../layout/BookmarkPolicyFacetForActionXml.java | 42 -
.../CssClassFaFacetForActionLayoutAnnotation.java | 57 -
.../layout/CssClassFaFacetForActionXml.java | 44 -
.../CssClassFacetForActionLayoutAnnotation.java | 47 -
.../actions/layout/CssClassFacetForActionXml.java | 42 -
.../DescribedAsFacetForActionLayoutAnnotation.java | 47 -
.../layout/DescribedAsFacetForActionXml.java | 42 -
.../HiddenFacetForActionLayoutAnnotation.java | 56 -
.../actions/layout/HiddenFacetForActionXml.java | 51 -
.../NamedFacetForActionLayoutAnnotation.java | 48 -
.../actions/layout/NamedFacetForActionXml.java | 44 -
...tContributedFacetForActionLayoutAnnotation.java | 52 -
.../PromptStyleFacetForActionLayoutAnnotation.java | 97 --
.../layout/PromptStyleFacetForActionXml.java | 57 -
.../RedirectFacetFromActionLayoutAnnotation.java | 47 -
.../actions/layout/RedirectFacetFromActionXml.java | 43 -
.../notcontributed/NotContributedFacet.java | 40 -
.../NotContributedFacetAbstract.java | 73 -
...tributedFacetDerivedFromDomainServiceFacet.java | 47 -
...dFacetDerivedFromDomainServiceFacetFactory.java | 58 -
.../NotContributedFacetDerivedFromMixinFacet.java | 37 -
...ntributedFacetDerivedFromMixinFacetFactory.java | 52 -
.../notinservicemenu/NotInServiceMenuFacet.java | 38 -
.../NotInServiceMenuFacetAbstract.java | 40 -
...viceMenuFacetDerivedFromDomainServiceFacet.java | 54 -
...uFacetDerivedFromDomainServiceFacetFactory.java | 59 -
.../actions/position/ActionPositionFacet.java | 44 -
.../position/ActionPositionFacetAbstract.java | 57 -
.../position/ActionPositionFacetFallback.java | 31 -
.../facets/actions/prototype/PrototypeFacet.java | 30 -
.../actions/prototype/PrototypeFacetAbstract.java | 56 -
.../actions/publish/PublishedActionFacet.java | 30 -
.../publish/PublishedActionFacetAbstract.java | 38 -
.../facets/actions/redirect/RedirectFacet.java | 33 -
.../actions/redirect/RedirectFacetAbstract.java | 66 -
.../actions/redirect/RedirectFacetFallback.java | 31 -
.../actions/semantics/ActionSemanticsFacet.java | 33 -
.../semantics/ActionSemanticsFacetAbstract.java | 39 -
.../validate/ActionParameterValidationFacet.java | 45 -
.../ActionParameterValidationFacetAbstract.java | 47 -
.../actions/validate/ActionValidationFacet.java | 50 -
.../validate/ActionValidationFacetAbstract.java | 47 -
.../ActionParameterValidationFacetViaMethod.java | 84 -
.../method/ActionValidationFacetViaMethod.java | 85 -
.../ActionValidationFacetViaMethodFactory.java | 117 --
.../facets/all/deficiencies/DeficiencyFacet.java | 134 --
.../facets/all/describedas/DescribedAsFacet.java | 33 -
.../all/describedas/DescribedAsFacetAbstract.java | 36 -
.../isis/metamodel/facets/all/help/HelpFacet.java | 29 -
.../facets/all/help/HelpFacetAbstract.java | 36 -
.../metamodel/facets/all/hide/HiddenFacet.java | 31 -
.../all/i18n/DescribedAsFacetTranslated.java | 64 -
.../facets/all/i18n/NamedFacetTranslated.java | 72 -
.../facets/all/i18n/PluralFacetTranslated.java | 55 -
.../facets/all/i18n/TranslationFacetFactory.java | 119 --
.../metamodel/facets/all/named/NamedFacet.java | 42 -
.../facets/all/named/NamedFacetAbstract.java | 59 -
.../facets/all/named/NamedFacetInferred.java | 31 -
.../collections/CollectionFacetAbstract.java | 40 -
.../CollectionAccessorFacetViaAccessor.java | 109 --
.../CollectionAccessorFacetViaAccessorFactory.java | 112 --
.../clear/CollectionClearFacetFactory.java | 70 -
.../clear/CollectionClearFacetViaAccessor.java | 79 -
.../clear/CollectionClearFacetViaClearMethod.java | 70 -
.../CollectionAnnotationFacetFactory.java | 293 ----
.../collection/defaultview/DefaultViewFacet.java | 26 -
.../defaultview/DefaultViewFacetAbstract.java | 35 -
.../DisabledFacetForCollectionAnnotation.java | 69 -
.../hidden/HiddenFacetForCollectionAnnotation.java | 56 -
...ectionAddToFacetForDomainEventFromAbstract.java | 124 --
...acetForDomainEventFromCollectionAnnotation.java | 43 -
...lectionAddToFacetForDomainEventFromDefault.java | 41 -
.../modify/CollectionDomainEventFacet.java | 34 -
.../modify/CollectionDomainEventFacetAbstract.java | 145 --
.../modify/CollectionDomainEventFacetDefault.java | 32 -
...ionDomainEventFacetForCollectionAnnotation.java | 45 -
...nRemoveFromFacetForDomainEventFromAbstract.java | 123 --
...acetForDomainEventFromCollectionAnnotation.java | 43 -
...onRemoveFromFacetForDomainEventFromDefault.java | 41 -
.../NotPersistedFacetForCollectionAnnotation.java | 55 -
...fFacetOnCollectionFromCollectionAnnotation.java | 47 -
...abledFacetOnCollectionDerivedFromImmutable.java | 39 -
...cetOnCollectionDerivedFromImmutableFactory.java | 45 -
.../javautilcollection/CollectionFacetFactory.java | 86 -
.../javautilcollection/JavaArrayFacet.java | 84 -
.../javautilcollection/JavaCollectionFacet.java | 78 -
.../layout/CollectionLayoutFacetFactory.java | 123 --
...CssClassFacetForCollectionLayoutAnnotation.java | 45 -
.../layout/CssClassFacetForCollectionXml.java | 42 -
...aultViewFacetForCollectionLayoutAnnotation.java | 48 -
.../layout/DefaultViewFacetForCollectionXml.java | 42 -
...cribedAsFacetForCollectionLayoutAnnotation.java | 45 -
.../layout/DescribedAsFacetForCollectionXml.java | 42 -
.../HiddenFacetForCollectionLayoutAnnotation.java | 58 -
.../layout/HiddenFacetForCollectionXml.java | 51 -
.../NamedFacetForCollectionLayoutAnnotation.java | 52 -
.../layout/NamedFacetForCollectionXml.java | 47 -
.../PagedFacetForCollectionLayoutAnnotation.java | 46 -
.../layout/PagedFacetForCollectionXml.java | 41 -
...SortedByFacetForCollectionLayoutAnnotation.java | 53 -
.../layout/SortedByFacetForCollectionXml.java | 56 -
.../collections/modify/CollectionAddToFacet.java | 37 -
.../modify/CollectionAddToFacetAbstract.java | 36 -
.../modify/CollectionAddToFacetViaAccessor.java | 77 -
.../modify/CollectionAddToFacetViaMethod.java | 74 -
...tionAddToRemoveFromAndValidateFacetFactory.java | 177 --
.../collections/modify/CollectionClearFacet.java | 36 -
.../modify/CollectionClearFacetAbstract.java | 36 -
.../facets/collections/modify/CollectionFacet.java | 112 --
.../modify/CollectionRemoveFromFacet.java | 39 -
.../modify/CollectionRemoveFromFacetAbstract.java | 36 -
.../CollectionRemoveFromFacetViaAccessor.java | 80 -
.../modify/CollectionRemoveFromFacetViaMethod.java | 74 -
.../TypeOfFacetInferredFromSupportingMethods.java | 31 -
.../parented/ParentedCollectionFacetDefault.java | 37 -
.../ParentedFacetSinceCollectionFactory.java | 53 -
.../facets/collections/sortedby/SortedByFacet.java | 32 -
.../sortedby/SortedByFacetAbstract.java | 38 -
.../annotation/SortedByFacetAnnotationFactory.java | 91 -
.../validate/CollectionValidateAddToFacet.java | 40 -
.../CollectionValidateAddToFacetAbstract.java | 48 -
.../CollectionValidateAddToFacetViaMethod.java | 82 -
.../CollectionValidateRemoveFromFacet.java | 39 -
.../CollectionValidateRemoveFromFacetAbstract.java | 47 -
...CollectionValidateRemoveFromFacetViaMethod.java | 83 -
.../collparam/semantics/CollectionSemantics.java | 125 --
.../semantics/CollectionSemanticsFacet.java | 29 -
.../semantics/CollectionSemanticsFacetDefault.java | 47 -
.../facets/fallback/ActionChoicesFacetNone.java | 45 -
.../facets/fallback/ActionDefaultsFacetNone.java | 42 -
.../facets/fallback/DescribedAsFacetNone.java | 39 -
.../facets/fallback/FallbackFacetFactory.java | 144 --
.../metamodel/facets/fallback/HelpFacetNone.java | 44 -
.../LabelAtFacetFromLayoutConfiguration.java | 30 -
.../facets/fallback/MaxLengthFacetUnlimited.java | 46 -
.../facets/fallback/MultiLineFacetNone.java | 36 -
.../facets/fallback/NamedFacetDefault.java | 33 -
.../metamodel/facets/fallback/NamedFacetNone.java | 44 -
.../fallback/PagedFacetFromConfiguration.java | 29 -
.../metamodel/facets/fallback/TitleFacetNone.java | 42 -
.../metamodel/facets/jaxb/JaxbFacetFactory.java | 399 -----
.../facets/jaxb/XmlAccessorTypeFacet.java | 31 -
.../facets/jaxb/XmlAccessorTypeFacetAbstract.java | 40 -
.../facets/jaxb/XmlAccessorTypeFacetDefault.java | 33 -
.../facets/jaxb/XmlJavaTypeAdapterFacet.java | 29 -
.../jaxb/XmlJavaTypeAdapterFacetAbstract.java | 38 -
.../jaxb/XmlJavaTypeAdapterFacetDefault.java | 31 -
.../metamodel/facets/jaxb/XmlTransientFacet.java | 29 -
.../facets/jaxb/XmlTransientFacetAbstract.java | 37 -
.../facets/jaxb/XmlTransientFacetDefault.java | 30 -
.../facets/members/cssclass/CssClassFacet.java | 37 -
.../members/cssclass/CssClassFacetAbstract.java | 51 -
.../members/cssclass/CssClassFacetAbstract2.java | 36 -
.../CssClassFacetOnActionFromConfiguredRegex.java | 30 -
...assFacetOnActionFromConfiguredRegexFactory.java | 120 --
.../facets/members/cssclassfa/CssClassFaFacet.java | 37 -
.../cssclassfa/CssClassFaFacetAbstract.java | 79 -
.../members/cssclassfa/CssClassFaPosition.java | 104 --
.../annotprop/CssClassFaFacetOnMemberFactory.java | 103 --
...CssClassFaFacetOnMemberFromConfiguredRegex.java | 31 -
.../CssClassFaFacetOnMemberFromProperties.java | 40 -
.../cssclassfa/annotprop/MixinInterceptor.java | 64 -
.../DescribedAsFacetOnMemberDerivedFromType.java | 32 -
.../annotprop/DescribedAsFacetOnMemberFactory.java | 64 -
.../DescribedAsFacetOnMemberFromProperties.java | 37 -
.../facets/members/disabled/DisabledFacet.java | 54 -
.../members/disabled/DisabledFacetAbstract.java | 102 --
.../DisabledFacetAbstractAlwaysEverywhere.java | 40 -
.../disabled/DisabledFacetAbstractImpl.java | 83 -
.../disabled/DisabledFacetForContributee.java | 30 -
.../disabled/method/DisableForContextFacet.java | 37 -
.../method/DisableForContextFacetAbstract.java | 37 -
.../method/DisableForContextFacetNone.java | 49 -
.../method/DisableForContextFacetViaMethod.java | 100 --
.../DisableForContextFacetViaMethodFactory.java | 94 -
.../facets/members/hidden/HiddenFacetAbstract.java | 84 -
.../HiddenFacetAbstractAlwaysEverywhere.java | 50 -
.../members/hidden/HiddenFacetAbstractImpl.java | 52 -
.../HiddenFacetFromLayoutPropertiesAbstract.java | 53 -
.../members/hidden/method/HideForContextFacet.java | 37 -
.../hidden/method/HideForContextFacetAbstract.java | 37 -
.../hidden/method/HideForContextFacetNone.java | 45 -
.../method/HideForContextFacetViaMethod.java | 78 -
.../HideForContextFacetViaMethodFactory.java | 82 -
.../facets/members/order/MemberOrderFacet.java | 59 -
.../members/order/MemberOrderFacetAbstract.java | 107 --
.../annotprop/MemberOrderFacetAnnotation.java | 35 -
.../order/annotprop/MemberOrderFacetFactory.java | 69 -
.../MemberOrderFacetForActionAnnotation.java | 34 -
.../annotprop/MemberOrderFacetProperties.java | 49 -
.../order/annotprop/MemberOrderFacetXml.java | 35 -
.../ViewModelSemanticCheckingFacetFactory.java | 209 ---
.../facets/object/audit/AuditableFacet.java | 40 -
.../object/audit/AuditableFacetAbstract.java | 61 -
.../facets/object/audit/AuditableFacetImpl.java | 30 -
.../object/autocomplete/AutoCompleteFacet.java | 35 -
.../autocomplete/AutoCompleteFacetAbstract.java | 126 --
.../object/bookmarkpolicy/BookmarkPolicyFacet.java | 31 -
.../BookmarkPolicyFacetAbstract.java | 59 -
.../BookmarkPolicyFacetFallback.java | 32 -
.../BookmarkPolicyFacetFallbackFactory.java | 88 -
.../facets/object/callbacks/CallbackFacet.java | 53 -
.../object/callbacks/CallbackFacetAbstract.java | 35 -
.../object/callbacks/CreatedCallbackFacet.java | 36 -
.../callbacks/CreatedCallbackFacetAbstract.java | 35 -
.../callbacks/CreatedCallbackFacetFactory.java | 51 -
.../callbacks/CreatedCallbackFacetViaMethod.java | 70 -
.../callbacks/CreatedLifecycleEventFacet.java | 30 -
...fecycleEventFacetForDomainObjectAnnotation.java | 46 -
.../object/callbacks/LifecycleEventFacet.java | 28 -
.../object/callbacks/LoadCallbackFacetFactory.java | 65 -
.../object/callbacks/LoadedCallbackFacet.java | 37 -
.../callbacks/LoadedCallbackFacetAbstract.java | 35 -
.../callbacks/LoadedCallbackFacetViaMethod.java | 71 -
.../callbacks/LoadedLifecycleEventFacet.java | 30 -
...fecycleEventFacetForDomainObjectAnnotation.java | 44 -
.../object/callbacks/LoadingCallbackFacet.java | 28 -
.../callbacks/LoadingCallbackFacetAbstract.java | 39 -
.../callbacks/LoadingCallbackFacetViaMethod.java | 75 -
.../callbacks/PersistCallbackFacetFactory.java | 78 -
.../PersistCallbackViaSaveMethodFacetFactory.java | 78 -
.../object/callbacks/PersistedCallbackFacet.java | 36 -
.../callbacks/PersistedCallbackFacetAbstract.java | 35 -
.../callbacks/PersistedCallbackFacetViaMethod.java | 71 -
.../callbacks/PersistedLifecycleEventFacet.java | 30 -
...fecycleEventFacetForDomainObjectAnnotation.java | 44 -
.../object/callbacks/PersistingCallbackFacet.java | 37 -
.../callbacks/PersistingCallbackFacetAbstract.java | 35 -
.../PersistingCallbackFacetViaMethod.java | 71 -
.../callbacks/PersistingLifecycleEventFacet.java | 30 -
...fecycleEventFacetForDomainObjectAnnotation.java | 45 -
.../callbacks/RemoveCallbackFacetFactory.java | 81 -
.../RemoveCallbackViaDeleteMethodFacetFactory.java | 81 -
.../object/callbacks/RemovedCallbackFacet.java | 35 -
.../callbacks/RemovedCallbackFacetAbstract.java | 39 -
.../callbacks/RemovedCallbackFacetViaMethod.java | 75 -
.../object/callbacks/RemovingCallbackFacet.java | 34 -
.../callbacks/RemovingCallbackFacetAbstract.java | 35 -
.../callbacks/RemovingCallbackFacetViaMethod.java | 71 -
.../callbacks/RemovingLifecycleEventFacet.java | 30 -
...fecycleEventFacetForDomainObjectAnnotation.java | 45 -
.../callbacks/UpdateCallbackFacetFactory.java | 68 -
.../object/callbacks/UpdatedCallbackFacet.java | 37 -
.../callbacks/UpdatedCallbackFacetAbstract.java | 35 -
.../callbacks/UpdatedCallbackFacetViaMethod.java | 71 -
.../callbacks/UpdatedLifecycleEventFacet.java | 30 -
...fecycleEventFacetForDomainObjectAnnotation.java | 45 -
.../object/callbacks/UpdatingCallbackFacet.java | 37 -
.../callbacks/UpdatingCallbackFacetAbstract.java | 35 -
.../callbacks/UpdatingCallbackFacetViaMethod.java | 71 -
.../callbacks/UpdatingLifecycleEventFacet.java | 30 -
...fecycleEventFacetForDomainObjectAnnotation.java | 45 -
.../choices/ChoicesFacetFromBoundedAbstract.java | 119 --
.../facets/object/choices/ChoicesFacetUtils.java | 42 -
.../facets/object/choices/QueryFindAllChoices.java | 57 -
.../object/choices/enums/ChoicesFacetEnum.java | 49 -
.../facets/object/choices/enums/EnumFacet.java | 26 -
...ingValueFacetUsingSemanticsProviderFactory.java | 49 -
.../choices/enums/EnumValueSemanticsProvider.java | 152 --
.../cssclass/method/CssClassFacetMethod.java | 61 -
.../method/CssClassFacetMethodFactory.java | 52 -
...ssClassFaFacetForDomainObjectLayoutFactory.java | 43 -
.../CssClassFaFacetForViewModelLayoutFactory.java | 45 -
.../facets/object/defaults/DefaultedFacet.java | 47 -
.../object/defaults/DefaultedFacetAbstract.java | 84 -
.../DefaultedFacetUsingDefaultsProvider.java | 47 -
.../object/defaults/DefaultsProviderUtil.java | 75 -
.../annotcfg/DefaultedFacetAnnotation.java | 62 -
...tedFacetAnnotationElseConfigurationFactory.java | 71 -
.../annotcfg/DefaultedFacetFromConfiguration.java | 31 -
.../object/disabled/DisabledObjectFacet.java | 54 -
.../disabled/DisabledObjectFacetAbstract.java | 52 -
.../method/DisabledObjectFacetViaMethod.java | 93 -
.../DisabledObjectFacetViaMethodFactory.java | 88 -
.../DomainObjectAnnotationFacetFactory.java | 570 -------
.../AuditableFacetForDomainObjectAnnotation.java | 74 -
...FacetForDomainObjectAnnotationAsConfigured.java | 31 -
.../auditing/AuditableFacetFromConfiguration.java | 36 -
...AutoCompleteFacetForDomainObjectAnnotation.java | 46 -
.../ChoicesFacetForDomainObjectAnnotation.java | 49 -
...EventDefaultFacetForDomainObjectAnnotation.java | 52 -
...EventDefaultFacetForDomainObjectAnnotation.java | 51 -
...EventDefaultFacetForDomainObjectAnnotation.java | 51 -
.../ImmutableFacetForDomainObjectAnnotation.java | 101 --
...FacetForDomainObjectAnnotationAsConfigured.java | 30 -
.../editing/ImmutableFacetFromConfiguration.java | 58 -
...ObjectSpecIdFacetForDomainObjectAnnotation.java | 47 -
...lishedObjectFacetForDomainObjectAnnotation.java | 67 -
...FacetForDomainObjectAnnotationAsConfigured.java | 30 -
.../PublishedObjectFacetFromConfiguration.java | 31 -
...atableObjectFacetForDomainObjectAnnotation.java | 73 -
...PolicyFacetForDomainObjectLayoutAnnotation.java | 46 -
.../BookmarkPolicyFacetForDomainObjectXml.java | 42 -
...arkPolicyFacetForViewModelLayoutAnnotation.java | 47 -
...lassFaFacetForDomainObjectLayoutAnnotation.java | 55 -
.../CssClassFaFacetForDomainObjectXml.java | 44 -
...ssClassFaFacetForViewModelLayoutAnnotation.java | 54 -
...sClassFacetForDomainObjectLayoutAnnotation.java | 57 -
.../CssClassFacetForDomainObjectXml.java | 42 -
.../CssClassFacetForViewModelLayoutAnnotation.java | 45 -
...ObjectLayoutAnnotationUsingCssClassUiEvent.java | 121 --
...wModelLayoutAnnotationUsingCssClassUiEvent.java | 118 --
...ibedAsFacetForDomainObjectLayoutAnnotation.java | 46 -
.../DescribedAsFacetForDomainObjectXml.java | 42 -
...scribedAsFacetForViewModelLayoutAnnotation.java | 47 -
.../DomainObjectLayoutFacetFactory.java | 113 --
...mainObjectLayoutAnnotationUsingIconUiEvent.java | 117 --
...aViewModelLayoutAnnotationUsingIconUiEvent.java | 118 --
...inObjectLayoutAnnotationUsingLayoutUiEvent.java | 118 --
...iewModelLayoutAnnotationUsingLayoutUiEvent.java | 117 --
.../NamedFacetForDomainObjectLayoutAnnotation.java | 47 -
.../NamedFacetForDomainObjectXml.java | 44 -
.../NamedFacetForViewModelLayoutAnnotation.java | 45 -
.../PagedFacetForDomainObjectLayoutAnnotation.java | 46 -
.../PagedFacetForViewModelLayoutAnnotation.java | 46 -
...PluralFacetForDomainObjectLayoutAnnotation.java | 47 -
.../PluralFacetForDomainObjectXml.java | 40 -
.../PluralFacetForViewModelLayoutAnnotation.java | 47 -
...ainObjectLayoutAnnotationUsingTitleUiEvent.java | 135 --
...ViewModelLayoutAnnotationUsingTitleUiEvent.java | 135 --
.../object/domainservice/DomainServiceFacet.java | 52 -
.../domainservice/DomainServiceFacetAbstract.java | 65 -
.../annotation/DomainServiceFacetAnnotation.java | 35 -
.../DomainServiceFacetAnnotationFactory.java | 153 --
...conFacetDerivedFromDomainServiceAnnotation.java | 47 -
.../DomainServiceLayoutFacet.java | 36 -
.../DomainServiceLayoutFacetAbstract.java | 54 -
.../DomainServiceLayoutFacetFactory.java | 70 -
...NamedFacetForDomainServiceLayoutAnnotation.java | 36 -
.../DomainServiceLayoutFacetAnnotation.java | 34 -
.../facets/object/encodeable/EncodableFacet.java | 42 -
.../object/encodeable/EncodableFacetAbstract.java | 85 -
.../object/encodeable/EncoderDecoderUtil.java | 36 -
.../annotcfg/EncodableFacetFromConfiguration.java | 33 -
.../encoder/EncodableFacetUsingEncoderDecoder.java | 75 -
.../facets/object/entity/EntityFacet.java | 54 -
.../facets/object/facets/FacetsFacet.java | 48 -
.../facets/object/facets/FacetsFacetAbstract.java | 94 -
.../facets/annotation/FacetsFacetAnnotation.java | 32 -
.../annotation/FacetsFacetAnnotationFactory.java | 54 -
.../metamodel/facets/object/grid/GridFacet.java | 41 -
.../facets/object/grid/GridFacetDefault.java | 84 -
.../facets/object/grid/GridFacetFactory.java | 46 -
.../facets/object/hidden/HiddenObjectFacet.java | 55 -
.../object/hidden/HiddenObjectFacetAbstract.java | 50 -
.../hidden/method/HiddenObjectFacetViaMethod.java | 65 -
.../method/HiddenObjectFacetViaMethodFactory.java | 90 -
.../metamodel/facets/object/icon/IconFacet.java | 44 -
.../facets/object/icon/IconFacetAbstract.java | 36 -
.../facets/object/icon/method/IconFacetMethod.java | 52 -
.../object/icon/method/IconFacetMethodFactory.java | 53 -
.../RemoveAnnotatedMethodsFacetFactory.java | 99 --
...oveDatanucleusPersistableTypesFacetFactory.java | 67 -
.../RemoveDnPrefixedMethodsFacetFactory.java | 46 -
.../javalang/IteratorFilteringFacetFactory.java | 55 -
.../ignore/javalang/RemoveMethodsFacetFactory.java | 132 --
.../jdo/RemoveJdoEnhancementTypesFacetFactory.java | 66 -
.../jdo/RemoveJdoPrefixedMethodsFacetFactory.java | 48 -
.../facets/object/immutable/ImmutableFacet.java | 69 -
.../object/immutable/ImmutableFacetAbstract.java | 60 -
.../CopyImmutableFacetOntoMembersFactory.java | 45 -
.../facets/object/layout/LayoutFacet.java | 37 -
.../facets/object/layout/LayoutFacetAbstract.java | 41 -
.../facets/object/layout/LayoutFacetFactory.java | 56 -
.../facets/object/layout/LayoutFacetFallback.java | 43 -
.../facets/object/layout/LayoutFacetMethod.java | 54 -
.../mixin/MetaModelValidatorForMixinTypes.java | 55 -
.../metamodel/facets/object/mixin/MixinFacet.java | 74 -
.../facets/object/mixin/MixinFacetAbstract.java | 143 --
.../mixin/MixinFacetForDomainObjectAnnotation.java | 72 -
.../object/mixin/MixinFacetForMixinAnnotation.java | 64 -
.../mixin/MixinFacetForMixinAnnotationFactory.java | 64 -
.../object/navparent/NavigableParentFacet.java | 43 -
.../navparent/NavigableParentFacetAbstract.java | 36 -
.../NavigableParentAnnotationFacetFactory.java | 161 --
.../method/NavigableParentFacetMethod.java | 60 -
.../object/objectspecid/ObjectSpecIdFacet.java | 33 -
.../objectspecid/ObjectSpecIdFacetAbstract.java | 66 -
.../ObjectSpecIdFacetDerivedFromClassName.java | 35 -
...jectSpecIdFacetDerivedFromClassNameFactory.java | 205 ---
...ectSpecIdFacetDerivedFromIoCNamingStrategy.java | 34 -
.../ObjectSpecIdFacetOnStandaloneList.java | 31 -
.../ObjectValidPropertiesFacet.java | 42 -
.../ObjectValidPropertiesFacetAbstract.java | 48 -
.../impl/ObjectValidPropertiesFacetImpl.java | 70 -
.../ObjectValidPropertiesFacetImplFactory.java | 35 -
.../metamodel/facets/object/paged/PagedFacet.java | 31 -
.../facets/object/paged/PagedFacetAbstract.java | 50 -
.../PagedFacetForPagedAnnotationOnType.java | 34 -
.../object/parented/ParentedCollectionFacet.java | 40 -
.../parented/ParentedCollectionFacetAbstract.java | 36 -
.../object/parseable/InvalidEntryException.java | 42 -
.../facets/object/parseable/ParseableFacet.java | 55 -
.../object/parseable/ParseableFacetAbstract.java | 90 -
.../facets/object/parseable/ParserUtil.java | 46 -
.../object/parseable/TextEntryParseException.java | 47 -
.../annotcfg/ParseableFacetFromConfiguration.java | 33 -
.../parser/ParseableFacetUsingParser.java | 132 --
.../facets/object/plural/PluralFacet.java | 41 -
.../facets/object/plural/PluralFacetAbstract.java | 41 -
.../plural/inferred/PluralFacetInferred.java | 31 -
.../facets/object/projection/ProjectionFacet.java | 29 -
.../object/projection/ProjectionFacetAbstract.java | 42 -
.../ProjectionFacetFromProjectingProperty.java | 65 -
.../CssClassFacetDerivedFromProjectionFacet.java | 54 -
.../ident/IconFacetDerivedFromProjectionFacet.java | 52 -
.../TitleFacetDerivedFromProjectionFacet.java | 52 -
.../object/promptStyle/PromptStyleFacet.java | 33 -
.../promptStyle/PromptStyleFacetAbstract.java | 42 -
.../promptStyle/PromptStyleFacetAsConfigured.java | 45 -
.../PromptStyleFacetFallBackToInline.java | 37 -
.../publishedobject/PublishedObjectFacet.java | 30 -
.../PublishedObjectFacetAbstract.java | 38 -
...etOnCollectionDerivedFromRecreatableObject.java | 46 -
...CollectionDerivedFromViewModelFacetFactory.java | 54 -
...acetOnPropertyDerivedFromRecreatableObject.java | 48 -
...tyDerivedFromRecreatableObjectFacetFactory.java | 52 -
.../RecreatableObjectFacetAbstract.java | 129 --
...ObjectFacetDeclarativeInitializingAbstract.java | 145 --
.../recreatable/RecreatableObjectFacetFactory.java | 130 --
...ctFacetForRecreatableDomainObjectInterface.java | 46 -
...eObjectFacetForRecreatableObjectAnnotation.java | 34 -
...leObjectFacetForRecreatableObjectInterface.java | 45 -
...creatableObjectFacetForViewModelAnnotation.java | 35 -
...ableObjectFacetForXmlRootElementAnnotation.java | 81 -
.../metamodel/facets/object/recreatable/Util.java | 33 -
.../metamodel/facets/object/title/TitleFacet.java | 55 -
.../facets/object/title/TitleFacetAbstract.java | 45 -
.../annotation/TitleAnnotationFacetFactory.java | 187 --
.../annotation/TitleFacetViaTitleAnnotation.java | 169 --
.../title/methods/TitleFacetViaMethodsFactory.java | 95 --
.../title/methods/TitleFacetViaTitleMethod.java | 93 -
.../title/methods/TitleFacetViaToStringMethod.java | 70 -
.../object/title/parser/TitleFacetUsingParser.java | 79 -
.../validateobject/ValidateObjectFacet.java | 55 -
.../ValidateObjectFacetAbstract.java | 49 -
.../method/ValidateObjectFacetMethod.java | 80 -
.../method/ValidateObjectFacetMethodFactory.java | 61 -
.../facets/object/value/EqualByContentFacet.java | 33 -
.../object/value/EqualByContentFacetAbstract.java | 36 -
.../EqualByContentFacetViaValueSemantics.java | 30 -
.../value/ImmutableFacetViaValueSemantics.java | 39 -
.../object/value/MaxLengthFacetUsingParser.java | 58 -
.../value/TypicalLengthFacetUsingParser.java | 53 -
.../metamodel/facets/object/value/ValueFacet.java | 35 -
.../facets/object/value/ValueFacetAbstract.java | 155 --
.../facets/object/value/ValueFacetSimple.java | 37 -
.../value/annotcfg/ValueFacetAnnotation.java | 81 -
...ValueFacetAnnotationOrConfigurationFactory.java | 113 --
.../annotcfg/ValueFacetFromConfiguration.java | 38 -
.../vsp/ValueFacetUsingSemanticsProvider.java | 41 -
.../ValueFacetUsingSemanticsProviderFactory.java | 46 -
.../ValueSemanticsProviderAndFacetAbstract.java | 328 ----
.../value/vsp/ValueSemanticsProviderUtil.java | 67 -
.../facets/object/viewmodel/ViewModelFacet.java | 125 --
.../facets/object/wizard/WizardFacet.java | 41 -
.../facets/object/wizard/WizardFacetAbstract.java | 36 -
.../facets/objectvalue/choices/ChoicesFacet.java | 49 -
.../objectvalue/choices/ChoicesFacetAbstract.java | 36 -
.../objectvalue/fileaccept/FileAcceptFacet.java | 35 -
.../fileaccept/FileAcceptFacetAbstract.java | 37 -
.../facets/objectvalue/labelat/LabelAtFacet.java | 36 -
.../objectvalue/labelat/LabelAtFacetAbstract.java | 56 -
.../LabelAtFacetInferredFromMultiLineFacet.java | 38 -
.../objectvalue/mandatory/MandatoryFacet.java | 57 -
.../mandatory/MandatoryFacetAbstract.java | 110 --
.../mandatory/MandatoryFacetDefault.java | 43 -
.../facets/objectvalue/maxlen/MaxLengthFacet.java | 41 -
.../objectvalue/maxlen/MaxLengthFacetAbstract.java | 75 -
.../objectvalue/multiline/MultiLineFacet.java | 51 -
.../multiline/MultiLineFacetAbstract.java | 63 -
.../MustSatisfySpecificationFacet.java | 27 -
.../MustSatisfySpecificationFacetAbstract.java | 124 --
.../mustsatisfyspec/SpecificationEvaluator.java | 80 -
.../facets/objectvalue/regex/RegExFacet.java | 38 -
.../objectvalue/regex/RegExFacetAbstract.java | 104 --
.../renderedadjusted/RenderedAdjustedFacet.java | 39 -
.../RenderedAdjustedFacetAbstract.java | 56 -
.../objectvalue/typicallen/TypicalLengthFacet.java | 40 -
.../typicallen/TypicalLengthFacetAbstract.java | 45 -
.../ActionParameterAutoCompleteFacet.java | 48 -
.../ActionParameterAutoCompleteFacetAbstract.java | 41 -
.../facets/param/autocomplete/MinLengthUtil.java | 56 -
.../ActionParameterAutoCompleteFacetViaMethod.java | 121 --
...ParameterAutoCompleteFacetViaMethodFactory.java | 88 -
...ameterFromJavaxValidationAnnotationFactory.java | 56 -
...rameterFromJavaxValidationDigitsAnnotation.java | 59 -
.../facets/param/choices/ActionChoicesFacet.java | 38 -
.../param/choices/ActionChoicesFacetAbstract.java | 36 -
.../param/choices/ActionParameterChoicesFacet.java | 43 -
.../ActionParameterChoicesFacetAbstract.java | 38 -
.../choices/ActionParameterChoicesFacetNone.java | 49 -
...rameterChoicesFacetDerivedFromChoicesFacet.java | 56 -
...ChoicesFacetDerivedFromChoicesFacetFactory.java | 55 -
.../method/ActionChoicesFacetViaMethod.java | 121 --
.../method/ActionChoicesFacetViaMethodFactory.java | 100 --
.../ActionParameterChoicesFacetViaMethod.java | 108 --
...ctionParameterChoicesFacetViaMethodFactory.java | 99 --
.../defaults/ActionParameterDefaultsFacet.java | 42 -
.../ActionParameterDefaultsFacetAbstract.java | 36 -
...ParameterDefaultFacetDerivedFromTypeFacets.java | 60 -
...arameterDefaultFacetDerivedFromTypeFactory.java | 64 -
.../ActionParameterDefaultsFacetViaMethod.java | 118 --
...tionParameterDefaultsFacetViaMethodFactory.java | 134 --
...ameterAnnotationElseDerivedFromTypeFactory.java | 55 -
...DescribedAsFacetOnParameterDerivedFromType.java | 32 -
.../disable/ActionParameterDisabledFacet.java | 42 -
.../ActionParameterDisabledFacetAbstract.java | 49 -
.../ActionParameterDisabledFacetViaMethod.java | 96 --
...tionParameterDisabledFacetViaMethodFactory.java | 94 -
.../param/hide/ActionParameterHiddenFacet.java | 43 -
.../hide/ActionParameterHiddenFacetAbstract.java | 55 -
.../ActionParameterHiddenFacetViaMethod.java | 83 -
...ActionParameterHiddenFacetViaMethodFactory.java | 91 -
.../CssClassFacetForParameterLayoutAnnotation.java | 46 -
...scribedAsFacetForParameterLayoutAnnotation.java | 46 -
.../LabelAtFacetForParameterLayoutAnnotation.java | 47 -
...MultiLineFacetForParameterLayoutAnnotation.java | 45 -
.../NamedFacetForParameterLayoutAnnotation.java | 51 -
.../param/layout/ParameterLayoutFacetFactory.java | 58 -
...dAdjustedFacetForParameterLayoutAnnotation.java | 58 -
...calLengthFacetForParameterLayoutAnnotation.java | 60 -
.../MandatoryFacetOnParametersDefaultFactory.java | 56 -
.../NamedFacetForParameterUsingReflection.java | 34 -
.../ParameterNameFacetFactoryUsingReflection.java | 74 -
.../parameter/ParameterAnnotationFacetFactory.java | 134 --
.../FileAcceptFacetForParameterAnnotation.java | 47 -
.../MandatoryFacetForParameterAnnotation.java | 81 -
...cetInvertedByNullableAnnotationOnParameter.java | 59 -
.../MaxLengthFacetForParameterAnnotation.java | 46 -
...fySpecificationFacetForParameterAnnotation.java | 69 -
.../regex/RegExFacetForParameterAnnotation.java | 72 -
.../RegExFacetForPatternAnnotationOnParameter.java | 66 -
.../TypicalLengthFacetOnParameterAnnotation.java | 50 -
...picalLengthFacetOnParameterDerivedFromType.java | 49 -
...acetOnParameterDerivedFromTypeFacetFactory.java | 56 -
.../validate/ActionParameterValidationFacet.java | 45 -
.../ActionParameterValidationFacetAbstract.java | 47 -
.../ActionParameterValidationFacetViaMethod.java | 84 -
...onParameterValidationFacetViaMethodFactory.java | 82 -
.../PropertyOrCollectionAccessorFacet.java | 53 -
.../PropertyOrCollectionAccessorFacetAbstract.java | 57 -
.../propcoll/notpersisted/NotPersistedFacet.java | 38 -
.../notpersisted/NotPersistedFacetAbstract.java | 36 -
.../accessor/PropertyAccessorFacetViaAccessor.java | 96 --
.../PropertyAccessorFacetViaAccessorFactory.java | 113 --
.../autocomplete/PropertyAutoCompleteFacet.java | 51 -
.../PropertyAutoCompleteFacetAbstract.java | 39 -
.../method/PropertyAutoCompleteFacetMethod.java | 114 --
.../PropertyAutoCompleteFacetMethodFactory.java | 79 -
...ropertyFromJavaxValidationDigitsAnnotation.java | 60 -
...FromJavaxValidationDigitsAnnotationFactory.java | 59 -
.../properties/businesskey/BusinessKeyFacet.java | 36 -
.../businesskey/BusinessKeyFacetAbstract.java | 36 -
.../properties/choices/PropertyChoicesFacet.java | 50 -
.../choices/PropertyChoicesFacetAbstract.java | 36 -
...ropertyChoicesFacetDerivedFromChoicesFacet.java | 52 -
...ChoicesFacetDerivedFromChoicesFacetFactory.java | 45 -
.../method/PropertyChoicesFacetViaMethod.java | 93 -
.../PropertyChoicesFacetViaMethodFactory.java | 77 -
.../properties/defaults/PropertyDefaultFacet.java | 46 -
.../defaults/PropertyDefaultFacetAbstract.java | 36 -
.../defaults/PropertyDefaultFacetNone.java | 44 -
...pertyDefaultFacetDerivedFromDefaultedFacet.java | 57 -
...PropertyDefaultFacetDerivedFromTypeFactory.java | 64 -
.../method/PropertyDefaultFacetViaMethod.java | 88 -
.../PropertyDefaultFacetViaMethodFactory.java | 77 -
...isabledFacetOnPropertyDerivedFromImmutable.java | 38 -
...FacetOnPropertyDerivedFromImmutableFactory.java | 52 -
.../inferred/DisabledFacetOnPropertyInferred.java | 32 -
.../DisabledFacetOnPropertyInferredFactory.java | 56 -
.../MandatoryFacetOnProperyDefaultFactory.java | 57 -
.../MultiLineFacetOnPropertyAnnotation.java | 35 -
.../properties/projection/ProjectingFacet.java | 30 -
.../projection/ProjectingFacetAbstract.java | 41 -
.../ProjectingFacetFromPropertyAnnotation.java | 70 -
.../property/PropertyAnnotationFacetFactory.java | 377 ----
.../command/CommandFacetForPropertyAnnotation.java | 99 --
...mandFacetForPropertyAnnotationAsConfigured.java | 37 -
.../DisabledFacetForPropertyAnnotation.java | 65 -
...acetForPropertyAnnotationInvertedSemantics.java | 32 -
.../FileAcceptFacetForPropertyAnnotation.java | 47 -
.../hidden/HiddenFacetForPropertyAnnotation.java | 56 -
.../MandatoryFacetForPropertyAnnotation.java | 90 -
...acetInvertedByNullableAnnotationOnProperty.java | 61 -
.../MaxLengthFacetForPropertyAnnotation.java | 46 -
...ropertyClearFacetForDomainEventFromDefault.java | 41 -
...rFacetForDomainEventFromPropertyAnnotation.java | 41 -
.../property/modify/PropertyDomainEventFacet.java | 33 -
.../modify/PropertyDomainEventFacetAbstract.java | 167 --
.../modify/PropertyDomainEventFacetDefault.java | 40 -
...pertyDomainEventFacetForPropertyAnnotation.java | 40 -
...opertySetterFacetForDomainEventFromDefault.java | 42 -
...rFacetForDomainEventFromPropertyAnnotation.java | 41 -
...tySetterOrClearFacetForDomainEventAbstract.java | 340 ----
.../facets/properties/property/modify/Utils.java | 23 -
...sfySpecificationFacetForPropertyAnnotation.java | 66 -
.../NotPersistedFacetForPropertyAnnotation.java | 46 -
...ublishedPropertyFacetForPropertyAnnotation.java | 79 -
...ertyFacetForPropertyAnnotationAsConfigured.java | 27 -
.../PublishedPropertyFacetFromConfiguration.java | 31 -
.../RegExFacetForPatternAnnotationOnProperty.java | 76 -
.../regex/RegExFacetForPropertyAnnotation.java | 70 -
.../CssClassFacetForPropertyLayoutAnnotation.java | 47 -
.../CssClassFacetForPropertyXml.java | 42 -
...escribedAsFacetForPropertyLayoutAnnotation.java | 47 -
.../DescribedAsFacetForPropertyXml.java | 42 -
.../HiddenFacetForPropertyLayoutAnnotation.java | 56 -
.../propertylayout/HiddenFacetForPropertyXml.java | 51 -
.../LabelAtFacetForPropertyLayoutAnnotation.java | 47 -
.../propertylayout/LabelAtFacetForPropertyXml.java | 42 -
.../MultiLineFacetForPropertyLayoutAnnotation.java | 46 -
.../MultiLineFacetForPropertyXml.java | 41 -
.../NamedFacetForPropertyLayoutAnnotation.java | 51 -
.../propertylayout/NamedFacetForPropertyXml.java | 47 -
...romptStyleFacetForPropertyLayoutAnnotation.java | 96 --
.../PromptStyleFacetForPropertyXml.java | 57 -
.../propertylayout/PropertyLayoutFacetFactory.java | 194 ---
...edAdjustedFacetForPropertyLayoutAnnotation.java | 58 -
.../RenderedAdjustedFacetForPropertyXml.java | 45 -
...icalLengthFacetForPropertyLayoutAnnotation.java | 60 -
.../TypicalLengthFacetForPropertyXml.java | 56 -
...UnchangingFacetForPropertyLayoutAnnotation.java | 59 -
.../UnchangingFacetForPropertyXml.java | 42 -
.../properties/publish/PublishedPropertyFacet.java | 29 -
.../publish/PublishedPropertyFacetAbstract.java | 38 -
...nderedAsDayBeforeFacetAnnotationOnProperty.java | 38 -
.../renderunchanged/UnchangingFacet.java | 30 -
.../renderunchanged/UnchangingFacetAbstract.java | 36 -
.../properties/searchable/SearchableFacet.java | 49 -
.../searchable/SearchableFacetAbstract.java | 51 -
.../TypicalLengthFacetOnPropertyAnnotation.java | 50 -
...ypicalLengthFacetOnPropertyDerivedFromType.java | 49 -
...FacetOnPropertyDerivedFromTypeFacetFactory.java | 55 -
.../update/NotPersistableFacetInferred.java | 31 -
.../update/PropertyModifyFacetFactory.java | 68 -
.../update/PropertySetAndClearFacetFactory.java | 122 --
.../update/clear/PropertyClearFacet.java | 43 -
.../update/clear/PropertyClearFacetAbstract.java | 35 -
.../clear/PropertyClearFacetViaClearMethod.java | 74 -
.../clear/PropertyClearFacetViaSetterMethod.java | 75 -
.../update/init/PropertyInitializationFacet.java | 48 -
.../init/PropertyInitializationFacetAbstract.java | 35 -
...PropertyInitializationFacetViaSetterMethod.java | 70 -
.../update/modify/PropertySetterFacet.java | 49 -
.../update/modify/PropertySetterFacetAbstract.java | 35 -
.../modify/PropertySetterFacetViaModifyMethod.java | 81 -
.../modify/PropertySetterFacetViaSetterMethod.java | 76 -
.../validating/PropertyValidateFacet.java | 50 -
.../validating/PropertyValidateFacetAbstract.java | 57 -
.../validating/PropertyValidateFacetNone.java | 47 -
.../dflt/PropertyValidateFacetDefault.java | 49 -
.../dflt/PropertyValidateFacetDefaultFactory.java | 58 -
.../method/PropertyValidateFacetViaMethod.java | 83 -
.../PropertyValidateFacetViaMethodFactory.java | 76 -
.../DateAndTimeValueSemanticsProviderAbstract.java | 116 --
.../isis/metamodel/facets/value/JodaFunctions.java | 43 -
.../ValueSemanticsProviderAbstractTemporal.java | 373 ----
.../value/bigdecimal/BigDecimalValueFacet.java | 60 -
.../bigdecimal/BigDecimalValueFacetAbstract.java | 37 -
...malValueFacetUsingSemanticsProviderFactory.java | 44 -
.../BigDecimalValueSemanticsProvider.java | 143 --
.../value/biginteger/BigIntegerValueFacet.java | 26 -
...gerValueFacetUsingSemanticsProviderFactory.java | 43 -
.../BigIntegerValueSemanticsProvider.java | 110 --
.../facets/value/blobs/BlobValueFacet.java | 26 -
...lobValueFacetUsingSemanticsProviderFactory.java | 41 -
.../value/blobs/BlobValueSemanticsProvider.java | 123 --
...iveValueFacetUsingSemanticsProviderFactory.java | 42 -
.../BooleanPrimitiveValueSemanticsProvider.java | 55 -
.../facets/value/booleans/BooleanValueFacet.java | 29 -
.../BooleanValueSemanticsProviderAbstract.java | 129 --
...perValueFacetUsingSemanticsProviderFactory.java | 42 -
.../BooleanWrapperValueSemanticsProvider.java | 69 -
...iveValueFacetUsingSemanticsProviderFactory.java | 42 -
.../bytes/BytePrimitiveValueSemanticsProvider.java | 52 -
.../facets/value/bytes/ByteValueFacet.java | 30 -
.../bytes/ByteValueSemanticsProviderAbstract.java | 116 --
...perValueFacetUsingSemanticsProviderFactory.java | 42 -
.../bytes/ByteWrapperValueSemanticsProvider.java | 41 -
...iveValueFacetUsingSemanticsProviderFactory.java | 42 -
.../chars/CharPrimitiveValueSemanticsProvider.java | 54 -
.../facets/value/chars/CharValueFacet.java | 30 -
.../chars/CharValueSemanticsProviderAbstract.java | 103 --
...perValueFacetUsingSemanticsProviderFactory.java | 42 -
.../chars/CharWrapperValueSemanticsProvider.java | 41 -
.../facets/value/clobs/ClobValueFacet.java | 26 -
...lobValueFacetUsingSemanticsProviderFactory.java | 42 -
.../value/clobs/ClobValueSemanticsProvider.java | 117 --
.../facets/value/date/DateValueFacet.java | 33 -
.../date/DateValueSemanticsProviderAbstract.java | 121 --
.../value/datejdk8local/Jdk8LocalDateUtil.java | 170 --
.../datejdk8local/Jdk8LocalDateValueFacet.java | 33 -
...ateValueFacetUsingSemanticsProviderFactory.java | 45 -
.../Jdk8LocalDateValueSemanticsProvider.java | 257 ---
.../facets/value/datejdk8local/TimeFormatter.java | 27 -
.../facets/value/datejdk8local/TimeParser.java | 27 -
.../value/datejodalocal/JodaLocalDateUtil.java | 130 --
.../datejodalocal/JodaLocalDateValueFacet.java | 33 -
...ateValueFacetUsingSemanticsProviderFactory.java | 45 -
.../JodaLocalDateValueSemanticsProvider.java | 257 ---
...ateValueFacetUsingSemanticsProviderFactory.java | 45 -
.../datesql/JavaSqlDateValueSemanticsProvider.java | 98 --
.../datetimejdk8local/Jdk8LocalDateTimeUtil.java | 157 --
.../Jdk8LocalDateTimeValueFacet.java | 33 -
...imeValueFacetUsingSemanticsProviderFactory.java | 45 -
.../Jdk8LocalDateTimeValueSemanticsProvider.java | 275 ---
.../value/datetimejdk8local/TimeFormatter.java | 27 -
.../facets/value/datetimejdk8local/TimeParser.java | 27 -
.../Jdk8OffsetDateTimeValueFacet.java | 33 -
...imeValueFacetUsingSemanticsProviderFactory.java | 45 -
.../Jdk8OffsetDateTimeValueSemanticsProvider.java | 103 --
...fsetDateTimeValueSemanticsProviderAbstract.java | 121 --
.../value/datetimejoda/JodaDateTimeValueFacet.java | 33 -
...imeValueFacetUsingSemanticsProviderFactory.java | 45 -
.../JodaDateTimeValueSemanticsProvider.java | 103 --
...JodaDateTimeValueSemanticsProviderAbstract.java | 121 --
.../datetimejodalocal/JodaLocalDateTimeUtil.java | 127 --
.../JodaLocalDateTimeValueFacet.java | 33 -
...imeValueFacetUsingSemanticsProviderFactory.java | 45 -
.../JodaLocalDateTimeValueSemanticsProvider.java | 259 ---
...ateValueFacetUsingSemanticsProviderFactory.java | 46 -
.../JavaUtilDateValueSemanticsProvider.java | 85 -
.../doubles/DoubleFloatingPointValueFacet.java | 30 -
...iveValueFacetUsingSemanticsProviderFactory.java | 42 -
.../DoublePrimitiveValueSemanticsProvider.java | 54 -
.../DoubleValueSemanticsProviderAbstract.java | 120 --
...perValueFacetUsingSemanticsProviderFactory.java | 42 -
.../DoubleWrapperValueSemanticsProvider.java | 42 -
...iveValueFacetUsingSemanticsProviderFactory.java | 42 -
.../FloatPrimitiveValueSemanticsProvider.java | 54 -
.../FloatValueSemanticsProviderAbstract.java | 116 --
...perValueFacetUsingSemanticsProviderFactory.java | 42 -
.../floats/FloatWrapperValueSemanticsProvider.java | 41 -
.../value/floats/FloatingPointValueFacet.java | 30 -
.../facets/value/image/ImageValueFacet.java | 34 -
...ageValueFacetUsingSemanticsProviderFactory.java | 43 -
.../value/image/ImageValueSemanticsProvider.java | 100 --
.../image/ImageValueSemanticsProviderAbstract.java | 298 ----
...ageValueFacetUsingSemanticsProviderFactory.java | 44 -
.../JavaAwtImageValueSemanticsProvider.java | 83 -
...iveValueFacetUsingSemanticsProviderFactory.java | 42 -
.../IntPrimitiveValueSemanticsProvider.java | 54 -
.../integer/IntValueSemanticsProviderAbstract.java | 114 --
...perValueFacetUsingSemanticsProviderFactory.java | 42 -
.../integer/IntWrapperValueSemanticsProvider.java | 41 -
.../facets/value/integer/IntegerValueFacet.java | 30 -
.../localrespath/LocalResourcePathValueFacet.java | 32 -
...athValueFacetUsingSemanticsProviderFactory.java | 44 -
.../LocalResourcePathValueSemanticsProvider.java | 130 --
...iveValueFacetUsingSemanticsProviderFactory.java | 42 -
.../longs/LongPrimitiveValueSemanticsProvider.java | 52 -
.../facets/value/longs/LongValueFacet.java | 30 -
.../longs/LongValueSemanticsProviderAbstract.java | 113 --
...perValueFacetUsingSemanticsProviderFactory.java | 42 -
.../longs/LongWrapperValueSemanticsProvider.java | 41 -
.../facets/value/markup/MarkupValueFacet.java | 30 -
...kupValueFacetUsingSemanticsProviderFactory.java | 38 -
.../value/markup/MarkupValueSemanticsProvider.java | 114 --
.../facets/value/password/PasswordValueFacet.java | 33 -
...ordValueFacetUsingSemanticsProviderFactory.java | 43 -
.../password/PasswordValueSemanticsProvider.java | 119 --
...iveValueFacetUsingSemanticsProviderFactory.java | 42 -
.../ShortPrimitiveValueSemanticsProvider.java | 52 -
.../facets/value/shortint/ShortValueFacet.java | 30 -
.../ShortValueSemanticsProviderAbstract.java | 115 --
...perValueFacetUsingSemanticsProviderFactory.java | 42 -
.../ShortWrapperValueSemanticsProvider.java | 41 -
.../facets/value/string/StringValueFacet.java | 31 -
...ingValueFacetUsingSemanticsProviderFactory.java | 42 -
.../value/string/StringValueSemanticsProvider.java | 126 --
.../time/TimeValueSemanticsProviderAbstract.java | 110 --
.../JodaLocalTimeValueFacetSimpleFactory.java | 46 -
...imeValueFacetUsingSemanticsProviderFactory.java | 46 -
.../timesql/JavaSqlTimeValueSemanticsProvider.java | 95 --
...ampValueFacetUsingSemanticsProviderFactory.java | 47 -
.../JavaSqlTimeStampValueSemanticsProvider.java | 84 -
.../TimeStampValueSemanticsProviderAbstract.java | 101 --
.../facets/value/treenode/TreeNodeValueFacet.java | 27 -
...odeValueFacetUsingSemanticsProviderFactory.java | 40 -
.../treenode/TreeNodeValueSemanticsProvider.java | 136 --
.../metamodel/facets/value/url/URLValueFacet.java | 31 -
...URLValueFacetUsingSemanticsProviderFactory.java | 44 -
.../value/url/URLValueSemanticsProvider.java | 127 --
.../facets/value/uuid/UUIDValueFacet.java | 33 -
...UIDValueFacetUsingSemanticsProviderFactory.java | 44 -
.../value/uuid/UUIDValueSemanticsProvider.java | 112 --
.../isis/metamodel/interactions/AccessContext.java | 42 -
.../interactions/ActionArgUsabilityContext.java | 76 -
.../interactions/ActionArgValidityContext.java | 68 -
.../interactions/ActionArgVisibilityContext.java | 76 -
.../interactions/ActionInteractionContext.java | 31 -
.../interactions/ActionUsabilityContext.java | 60 -
.../interactions/ActionValidityContext.java | 64 -
.../interactions/ActionVisibilityContext.java | 60 -
.../interactions/CollectionAccessContext.java | 48 -
.../interactions/CollectionAddToContext.java | 56 -
.../interactions/CollectionRemoveFromContext.java | 58 -
.../interactions/CollectionUsabilityContext.java | 48 -
.../interactions/CollectionVisibilityContext.java | 50 -
.../interactions/DisablingInteractionAdvisor.java | 46 -
.../interactions/HidingInteractionAdvisor.java | 47 -
.../interactions/InteractionAdvisorFacet.java | 45 -
.../metamodel/interactions/InteractionContext.java | 171 --
.../metamodel/interactions/InteractionUtils.java | 81 -
.../metamodel/interactions/ObjectTitleContext.java | 56 -
.../interactions/ObjectValidityContext.java | 53 -
.../interactions/ObjectVisibilityContext.java | 55 -
.../metamodel/interactions/ParseValueContext.java | 59 -
.../interactions/PropertyAccessContext.java | 60 -
.../interactions/PropertyModifyContext.java | 61 -
.../interactions/PropertyUsabilityContext.java | 50 -
.../interactions/PropertyVisibilityContext.java | 50 -
.../metamodel/interactions/ProposedHolder.java | 38 -
.../metamodel/interactions/UsabilityContext.java | 55 -
.../interactions/ValidatingInteractionAdvisor.java | 51 -
.../metamodel/interactions/ValidityContext.java | 42 -
.../metamodel/interactions/VisibilityContext.java | 54 -
.../isis/metamodel/layout/DeweyOrderSet.java | 404 -----
.../MemberIdentifierComparator.java | 44 -
.../memberorderfacet/MemberOrderComparator.java | 90 -
.../MemberOrderFacetComparator.java | 56 -
.../OrderSetGroupNameComparator.java | 55 -
.../metamodel/objectmanager/ObjectManager.java | 107 --
.../objectmanager/ObjectManagerDefault.java | 77 -
.../objectmanager/create/ObjectCreator.java | 82 -
.../create/ObjectCreator_builtinHandlers.java | 386 -----
.../objectmanager/identify/ObjectIdentifier.java | 63 -
.../identify/ObjectIdentifier_builtinHandlers.java | 139 --
.../metamodel/objectmanager/load/ObjectLoader.java | 80 -
.../load/ObjectLoader_builtinHandlers.java | 259 ---
.../objectmanager/refresh/ObjectRefresher.java | 67 -
.../refresh/ObjectRefresher_builtinHandlers.java | 107 --
...arameterChoicesFacetFromParentedCollection.java | 76 -
...meterDefaultsFacetFromAssociatedCollection.java | 64 -
.../param/DeriveFacetsPostProcessor.java | 633 -------
.../ObjectSpecificationPostProcessor.java | 28 -
.../isis/metamodel/progmodel/ProgrammingModel.java | 179 --
.../progmodel/ProgrammingModelAbstract.java | 253 ---
.../progmodel/ProgrammingModelInitFilter.java | 81 -
.../ProgrammingModelInitFilterDefault.java | 86 -
.../progmodel/ProgrammingModelService.java | 32 -
.../dflt/ProgrammingModelFacetsJava8.java | 388 -----
.../isis/metamodel/services/CollectionHelper.java | 100 --
.../metamodel/services/ServiceInjectorDefault.java | 75 -
.../metamodel/services/ServiceInjectorLegacy.java | 286 ----
.../isis/metamodel/services/ServiceUtil.java | 41 -
.../services/appfeat/ApplicationFeature.java | 324 ----
.../appfeat/ApplicationFeatureFactory.java | 45 -
.../services/appfeat/ApplicationFeatureId.java | 492 ------
.../ApplicationFeatureRepositoryDefault.java | 555 ------
.../services/appfeat/ApplicationFeatureType.java | 102 --
.../classsubstitutor/ClassSubstitutor.java | 28 -
.../classsubstitutor/ClassSubstitutorAbstract.java | 137 --
.../classsubstitutor/ClassSubstitutorDefault.java | 76 -
.../ClassSubstitutorForCollections.java | 66 -
.../classsubstitutor/ClassSubstitutorRegistry.java | 80 -
.../command/CommandDtoServiceInternal.java | 72 -
.../services/container/query/QueryCardinality.java | 31 -
.../metamodel/services/devutils/MemberType.java | 25 -
.../services/events/MetamodelEventService.java | 94 -
.../events/MetamodelEventSupport_Spring.java | 77 -
.../exceprecog/ExceptionRecognizerDocDefault.java | 88 -
.../services/grid/GridLoaderServiceDefault.java | 257 ---
.../services/grid/GridReaderUsingJaxb.java | 76 -
.../services/grid/GridServiceDefault.java | 209 ---
.../services/grid/GridSystemServiceAbstract.java | 699 --------
.../grid/bootstrap3/GridSystemServiceBS3.java | 674 --------
.../services/homepage/HomePageAction.java | 64 -
.../services/homepage/HomePageResolverService.java | 35 -
.../metamodel/services/homepage/package-info.java | 26 -
.../ixn/InteractionDtoServiceInternal.java | 52 -
.../services/layout/LayoutServiceDefault.java | 147 --
.../services/message/MessageServiceNoop.java | 88 -
.../services/metamodel/DomainMemberDefault.java | 301 ----
.../services/metamodel/DomainModelDefault.java | 58 -
.../services/metamodel/MetaModelExportSupport.java | 31 -
.../services/metamodel/MetaModelExporter.java | 570 -------
.../metamodel/MetaModelServiceDefault.java | 272 ---
.../isis/metamodel/services/metamodel/Util.java | 35 -
.../publishing/PublisherDispatchService.java | 46 -
.../services/registry/ServiceRegistryDefault.java | 103 --
.../services/registry/SpringContextProvider.java | 23 -
.../services/title/TitleServiceDefault.java | 83 -
.../title/TitlesAndTranslationsValidator.java | 166 --
.../services/user/UserServiceDefault.java | 177 --
.../org/apache/isis/metamodel/spec/ActionType.java | 41 -
.../isis/metamodel/spec/DefaultProvider.java | 31 -
.../org/apache/isis/metamodel/spec/Described.java | 35 -
.../isis/metamodel/spec/DomainModelException.java | 47 -
.../spec/ElementSpecificationProvider.java | 44 -
.../apache/isis/metamodel/spec/EntityState.java | 49 -
.../isis/metamodel/spec/FreeStandingList.java | 96 --
.../apache/isis/metamodel/spec/Hierarchical.java | 65 -
.../metamodel/spec/InjectorMethodEvaluator.java | 31 -
.../apache/isis/metamodel/spec/ManagedObject.java | 734 --------
.../spec/ObjectInstantiationException.java | 41 -
.../apache/isis/metamodel/spec/ObjectSpecId.java | 62 -
.../isis/metamodel/spec/ObjectSpecification.java | 444 -----
.../spec/ObjectSpecificationException.java | 36 -
.../apache/isis/metamodel/spec/Specification.java | 50 -
.../isis/metamodel/spec/feature/Contributed.java | 31 -
.../isis/metamodel/spec/feature/CurrentHolder.java | 46 -
.../spec/feature/MutableCurrentHolder.java | 64 -
.../isis/metamodel/spec/feature/ObjectAction.java | 589 -------
.../spec/feature/ObjectActionContainer.java | 80 -
.../spec/feature/ObjectActionParameter.java | 235 ---
.../metamodel/spec/feature/ObjectAssociation.java | 253 ---
.../spec/feature/ObjectAssociationContainer.java | 72 -
.../isis/metamodel/spec/feature/ObjectFeature.java | 79 -
.../isis/metamodel/spec/feature/ObjectMember.java | 227 ---
.../spec/feature/OneToManyActionParameter.java | 28 -
.../spec/feature/OneToManyAssociation.java | 101 --
.../metamodel/spec/feature/OneToManyFeature.java | 40 -
.../spec/feature/OneToOneActionParameter.java | 28 -
.../spec/feature/OneToOneAssociation.java | 53 -
.../metamodel/spec/feature/OneToOneFeature.java | 28 -
.../isis/metamodel/specloader/CollectionUtils.java | 61 -
.../specloader/InjectorMethodEvaluatorDefault.java | 91 -
.../specloader/ProgrammingModelServiceDefault.java | 104 --
.../specloader/ReflectiveActionException.java | 43 -
.../specloader/SpecificationCacheDefault.java | 134 --
.../metamodel/specloader/SpecificationLoader.java | 137 --
.../specloader/SpecificationLoaderDefault.java | 521 ------
.../SpecificationLoaderDefault_debug.java | 79 -
.../specloader/classsubstitutor/ProxyEnhanced.java | 28 -
.../specloader/facetprocessor/FacetProcessor.java | 486 ------
.../isis/metamodel/specloader/package-info.java | 43 -
.../specloader/postprocessor/PostProcessor.java | 59 -
.../specloader/specimpl/ContributeeMember.java | 67 -
.../specloader/specimpl/FacetedMethodsBuilder.java | 614 -------
.../metamodel/specloader/specimpl/Factories.java | 96 --
.../specloader/specimpl/IntrospectionState.java | 47 -
.../specloader/specimpl/MixedInMember.java | 40 -
.../specimpl/ObjectActionContributee.java | 253 ---
.../specloader/specimpl/ObjectActionDefault.java | 688 --------
.../specloader/specimpl/ObjectActionMixedIn.java | 260 ---
.../specimpl/ObjectActionParameterAbstract.java | 492 ------
.../specimpl/ObjectActionParameterContributee.java | 25 -
.../ObjectActionParameterContributeeAbstract.java | 94 -
.../specimpl/ObjectActionParameterMixedIn.java | 25 -
.../ObjectActionParameterMixedInAbstract.java | 85 -
.../specimpl/ObjectAssociationAbstract.java | 97 --
.../specloader/specimpl/ObjectMemberAbstract.java | 409 -----
.../specimpl/ObjectSpecificationAbstract.java | 1118 ------------
.../OneToManyActionParameterContributee.java | 43 -
.../specimpl/OneToManyActionParameterDefault.java | 43 -
.../specimpl/OneToManyActionParameterMixedIn.java | 40 -
.../specimpl/OneToManyAssociationContributee.java | 192 ---
.../specimpl/OneToManyAssociationDefault.java | 288 ----
.../specimpl/OneToManyAssociationMixedIn.java | 221 ---
.../OneToOneActionParameterContributee.java | 38 -
.../specimpl/OneToOneActionParameterDefault.java | 37 -
.../specimpl/OneToOneActionParameterMixedIn.java | 35 -
.../specimpl/OneToOneAssociationContributee.java | 175 --
.../specimpl/OneToOneAssociationDefault.java | 361 ----
.../specimpl/OneToOneAssociationMixedIn.java | 207 ---
.../metamodel/specloader/specimpl/Predicates.java | 168 --
.../isis/metamodel/specloader/specimpl/Utils.java | 103 --
.../specimpl/dflt/ObjectSpecificationDefault.java | 456 -----
.../CollectionFacetOnStandaloneList.java | 73 -
.../DescribedAsFacetOnStandaloneList.java | 31 -
.../standalonelist/NamedFacetOnStandaloneList.java | 31 -
.../ObjectSpecificationOnStandaloneList.java | 186 --
.../PluralFacetOnStandaloneList.java | 31 -
.../traverser/TypeExtractorAbstract.java | 84 -
.../traverser/TypeExtractorMethodParameters.java | 60 -
.../traverser/TypeExtractorMethodReturn.java | 47 -
.../validator/MetaModelInvalidException.java | 33 -
.../specloader/validator/MetaModelValidator.java | 44 -
.../validator/MetaModelValidatorAbstract.java | 69 -
...etaModelValidatorForConflictingOptionality.java | 62 -
.../MetaModelValidatorForDeprecatedAbstract.java | 68 -
.../MetaModelValidatorForDeprecatedAnnotation.java | 54 -
...etaModelValidatorForDeprecatedMethodPrefix.java | 52 -
.../MetaModelValidatorForValidationFailures.java | 23 -
.../validator/MetaModelValidatorVisiting.java | 111 --
.../specloader/validator/ValidationFailure.java | 61 -
.../specloader/validator/ValidationFailures.java | 112 --
.../isis/metamodel/util/DeweyOrderComparator.java | 37 -
.../org/apache/isis/metamodel/util/EventUtil.java | 43 -
.../isis/metamodel/util/pchain/ParentChain.java | 83 -
.../metamodel/util/pchain/ParentChainDefault.java | 49 -
.../isis/metamodel/util/snapshot/Helper.java | 91 -
.../isis/metamodel/util/snapshot/IsisSchema.java | 181 --
.../apache/isis/metamodel/util/snapshot/Place.java | 65 -
.../isis/metamodel/util/snapshot/XmlSchema.java | 648 -------
.../isis/metamodel/util/snapshot/XmlSnapshot.java | 916 ----------
.../isis/metamodel/util/snapshot/XsMetaModel.java | 337 ----
.../metamodel/valuetypes/ValueTypeDefinition.java | 45 -
.../metamodel/valuetypes/ValueTypeProvider.java | 34 -
.../valuetypes/ValueTypeProviderDefault.java | 55 -
.../ValueTypeProviderForCollections.java | 56 -
.../metamodel/valuetypes/ValueTypeRegistry.java | 96 --
.../metamodel/MetaModelContext_configTest.java | 77 +
.../metamodel/MetaModelContext_forTesting.java | 256 +++
.../core/metamodel/ServiceInjector_forTesting.java | 70 +
.../core/metamodel/ServiceRegistry_forTesting.java | 154 ++
.../oid/CollectionOidTest_valueSemantics.java | 47 +
.../adapter/oid/OidMarshallerTest_marshall.java | 50 +
.../oid/OidMarshallerTest_roundtripping.java | 59 +
.../adapter/oid/OidMarshallerTest_unmarshal.java | 154 ++
.../core/metamodel/adapter/oid/OidVersionTest.java | 70 +
...dDefaultTest_valueSemantics_whenPersistent.java | 45 +
...idDefaultTest_valueSemantics_whenTransient.java | 46 +
.../metamodel/adapter/oid/RootOidTest_create.java | 62 +
.../core/metamodel/commons/IoUtils_CopyTest.java | 136 ++
.../commons/JavaClassUtilsTest_getBuiltIn.java | 41 +
.../metamodel/commons/ListUtilsTest_adjust.java | 67 +
.../metamodel/commons/ListUtilsTest_insert.java | 84 +
.../commons/ListUtilsTest_mutableCopy.java | 89 +
.../core/metamodel/commons/LocaleUtilsTest.java | 36 +
.../isis/core/metamodel/commons/NameUtilTest.java | 68 +
.../isis/core/metamodel/commons/PrintLocale.java | 59 +
.../commons/StringUtilsTest_enumTitle.java | 41 +
.../commons/StringUtils_NaturalNameTest.java | 59 +
.../commons/StringUtils_NaturalizeTest.java | 49 +
.../commons/StringUtils_NormalizedTest.java | 65 +
.../StringUtils_RemoveLeadingWhiteSpace.java | 51 +
.../commons/StringUtils_SplitOnCommas.java | 80 +
.../commons/StringUtils_StripLeadingSlashTest.java | 49 +
.../commons/StringUtils_StripNewLinesTest.java | 59 +
.../commons/StringUtils_camelLowerFirst.java | 38 +
.../commons/StringUtils_toLineSeparated.java | 52 +
.../commons/StringUtils_toLowerDashed.java | 36 +
.../metamodel/commons/TypesTest_filteredList.java | 71 +
.../metamodel/commons/matchers/IsisMatchers.java | 73 +
.../matchers/IsisMatchers_NonEmptyStringTest.java | 53 +
.../metamodel/consent/InteractionResultTest.java | 85 +
.../core/metamodel/facetapi/FacetAbstractTest.java | 76 +
.../facetapi/FeatureTypeTest_identifierFor.java | 85 +
.../facets/AbstractFacetFactoryJUnit4TestCase.java | 159 ++
.../metamodel/facets/AbstractFacetFactoryTest.java | 169 ++
.../core/metamodel/facets/AnnotationsTest.java | 71 +
.../Annotations_getAnnotations_on_Class_Test.java | 248 +++
.../Annotations_getAnnotations_on_Field_Test.java | 203 +++
.../Annotations_getAnnotations_on_Method_Test.java | 184 ++
...notations_getAnnotations_on_Parameter_Test.java | 200 +++
.../core/metamodel/facets/CollectionUtilsTest.java | 123 ++
...nEventHelperTest_newActionInteractionEvent.java | 87 +
...HelperTest_newCollectionDomainEvent_forAdd.java | 84 +
...perTest_newCollectionDomainEvent_forRemove.java | 84 +
...HelperTest_newPropertyDomainEvent_forClear.java | 76 +
...elperTest_newPropertyDomainEvent_forModify.java | 72 +
.../metamodel/facets/MethodFinderUtilsTest.java | 72 +
.../metamodel/facets/MethodRemoverForTesting.java | 81 +
.../metamodel/facets/ObjectAdapterUtilsTest.java | 84 +
.../apache/isis/core/metamodel/facets/Utils.java | 64 +
.../actions/ActionMethodsFacetFactoryTest.java | 539 ++++++
.../actions/IteratorFilteringFacetFactoryTest.java | 91 +
.../action/ActionAnnotationFacetFactoryTest.java | 118 ++
...nnotationFacetFactoryTest_ActionInvocation.java | 234 +++
.../ActionAnnotationFacetFactoryTest_Command.java | 313 ++++
.../ActionAnnotationFacetFactoryTest_Hidden.java | 72 +
...ctionAnnotationFacetFactoryTest_Invocation.java | 211 +++
...ctionAnnotationFacetFactoryTest_Publishing.java | 313 ++++
...ctionAnnotationFacetFactoryTest_RestrictTo.java | 109 ++
...ActionAnnotationFacetFactoryTest_Semantics.java | 111 ++
.../ActionAnnotationFacetFactoryTest_TypeOf.java | 177 ++
...icsFacetFallbackToNonIdempotentFactoryTest.java | 73 +
.../PrototypeFacetAnnotationFactoryTest.java | 77 +
...kmarkableAnnotationFacetFactoryTest_action.java | 63 +
.../HomePageAnnotationFacetFactoryTest.java | 66 +
...tionLayoutAnnotationFacetFactoryJunit4Test.java | 407 +++++
...nLayoutXmlLayoutAnnotationFacetFactoryTest.java | 197 +++
...etDerivedFromDomainServiceFacetFactoryTest.java | 222 +++
...etDerivedFromDomainServiceFacetFactoryTest.java | 223 +++
.../prototype/PrototypeFacetAbstractTest.java | 58 +
.../CollectionFieldMethodsFacetFactoryTest.java | 589 +++++++
.../collections/JavaCollectionFacetTest.java | 90 +
.../CollectionAnnotationFacetFactoryTest.java | 570 +++++++
...ollectionAnnotationFacetFactoryTest_typeOf.java | 137 ++
...bledAnnotationOnCollectionFacetFactoryTest.java | 82 +
...stedAnnotationOnCollectionFacetFactoryTest.java | 71 +
...etForCollectionLayoutAnnotationFactoryTest.java | 86 +
.../cssclassfa/CssClassFaFacetAbstractTest.java | 45 +
.../ViewModelSemanticCheckingFacetFactoryTest.java | 240 +++
...okmarkableAnnotationFacetFactoryTest_class.java | 63 +
.../callback/CreatedCallbackFacetFactoryTest.java | 67 +
.../callback/DeleteCallbackFacetFactoryTest.java | 88 +
.../callback/LoadCallbackFacetFactoryTest.java | 88 +
.../PersistAndSaveCallbackFacetFactoryTest.java | 109 ++
.../callback/PersistCallbackFacetFactoryTest.java | 88 +
.../RemoveAndDeleteCallbackFacetFactoryTest.java | 109 ++
.../callback/RemoveCallbackFacetFactoryTest.java | 88 +
.../callback/SaveCallbackFacetFactoryTest.java | 88 +
.../callback/UpdateCallbackFacetFactoryTest.java | 88 +
...CssClassFaFacetOnTypeAnnotationFactoryTest.java | 68 +
.../object/defaults/DefaultedFacetFactoryTest.java | 228 +++
.../ObjectDisabledMethodFacetFactoryTest.java | 72 +
...oicesFacetFromBoundedAnnotationFactoryTest.java | 60 +
.../DomainObjectAnnotationFacetFactoryTest.java | 861 ++++++++++
.../ObjectTypeAnnotationFacetFactoryTest.java | 65 +
.../DomainObjectLayoutFactoryTest.java | 670 ++++++++
.../DomainServiceFacetAnnotationFactoryTest.java | 66 +
.../DomainServiceLayoutFacetFactoryTest.java | 123 ++
.../facets/FacetsFacetAnnotationFactoryTest.java | 153 ++
.../hidden/ObjectHiddenMethodFacetFactoryTest.java | 85 +
.../cssclass/CssClassFacetMethodFactoryTest.java | 71 +
.../ident/cssclass/CssClassFacetMethodTest.java | 85 +
.../CssClassFacetMethodWithProblemTest.java | 84 +
.../ident/icon/IconFacetMethodFactoryTest.java | 71 +
.../object/ident/icon/IconFacetMethodTest.java | 84 +
.../ident/layout/LayoutFacetFactoryTest.java | 71 +
.../object/ident/layout/LayoutFacetMethodTest.java | 84 +
.../ident/title/TitleFacetViaMethodTest.java | 97 ++
.../title/TitleFacetViaMethodsFactoryTest.java | 112 ++
.../TitleAnnotationFacetFactoryTest.java | 262 +++
.../TitleFacetViaTitleAnnotationTest.java | 153 ++
.../object/layoutxml/GridFacetDefaultTest.java | 60 +
.../navparent/NavigableParentFacetMethodTest.java | 84 +
.../NavigableParentAnnotationFacetFactoryTest.java | 113 ++
.../annotation/NavigableParentTestSamples.java | 68 +
...SpecIdFacetDerivedFromClassNameFactoryTest.java | 63 +
.../parseable/ParseableFacetUsingParserTest.java | 131 ++
.../facets/object/parseable/ValueProxy.java | 23 +
.../RecreatableObjectFacetFactoryTest.java | 68 +
.../ObjectValidMethodFacetFactoryTest.java | 66 +
...eFacetAnnotationOrConfigurationFactoryTest.java | 504 ++++++
.../ordering/memberorder/DeweyOrderSetTest.java | 265 +++
.../MemberOrderAnnotationFacetFactoryTest.java | 143 ++
.../memberorder/MemberOrderComparatorTest.java | 181 ++
...cetForParameterLayoutAnnotationFactoryTest.java | 58 +
...cetForParameterLayoutAnnotationFactoryTest.java | 79 +
.../ParameterAnnotationFacetFactoryTest.java | 388 +++++
...lableAnnotationOnParameterFacetFactoryTest.java | 106 ++
...RegExAnnotationOnParameterFacetFactoryTest.java | 79 +
.../PropertyMethodsFacetFactoryTest.java | 671 ++++++++
...romptStyleFacetFromPropertyAnnotation_Test.java | 185 ++
...sabledAnnotationOnPropertyFacetFactoryTest.java | 102 ++
.../MandatoryAnnotationFacetFactoryTest.java | 71 +
...sistedAnnotationOnPropertyFacetFactoryTest.java | 71 +
.../PropertyAnnotationFacetFactoryTest.java | 868 ++++++++++
...llableAnnotationOnPropertyFacetFactoryTest.java | 118 ++
.../RegExAnnotationOnPropertyFacetFactoryTest.java | 90 +
...acetForPropertyLayoutAnnotationFactoryTest.java | 68 +
...acetForPropertyLayoutAnnotationFactoryTest.java | 95 ++
...ValidationDigitsAnnotationFacetFactoryTest.java | 79 +
.../DomainObjectWithMustSatisfyAnnotations.java | 48 +
.../DomainObjectWithoutMustSatisfyAnnotations.java | 48 +
.../SpecificationAlwaysSatisfied.java | 31 +
.../specification/SpecificationAndTests.java | 111 ++
.../specification/SpecificationNeverSatisfied.java | 31 +
.../specification/SpecificationNotTests.java | 62 +
.../specification/SpecificationOrTests.java | 110 ++
...cificationRequiresFirstLetterToBeUpperCase.java | 39 +
.../BigDecimalValueSemanticsProviderTest.java | 89 +
.../value/BigIntValueSemanticsProviderTest.java | 88 +
.../value/BlobValueSemanticsProviderTest.java | 65 +
.../value/BooleanValueSemanticsProviderTest.java | 113 ++
.../value/ByteValueSemanticsProviderTest.java | 86 +
.../value/CharacterValueSemanticsProviderTest.java | 79 +
.../value/ClobValueSemanticsProviderTest.java | 65 +
.../value/DoubleValueSemanticsProviderTest.java | 84 +
.../value/FloatValueSemanticsProviderTest.java | 93 +
.../ImageValueSemanticsProviderAbstractTest.java | 126 ++
.../value/IntValueSemanticsProviderTest.java | 80 +
.../JavaSqlDateValueSemanticsProviderTest.java | 91 +
.../JavaSqlTimeValueSemanticsProviderTest.java | 90 +
.../JavaUtilDateValueSemanticsProviderTest.java | 96 ++
.../value/LongValueSemanticsProviderTest.java | 91 +
.../value/PasswordValueSemanticsProviderTest.java | 49 +
.../value/ShortValueSemanticsProviderTest.java | 87 +
.../value/StringValueSemanticsProviderTest.java | 80 +
.../core/metamodel/facets/value/TestClock.java | 69 +
.../ValueSemanticsProviderAbstractTestCase.java | 165 ++
...odaLocalDateTimeValueSemanticsProviderTest.java | 81 +
...jectAssociationPredicatesTest_visibleWhere.java | 150 ++
.../interactions/InteractionUtils_isA_Test.java | 104 ++
.../ServiceInjectorDefaultTest_usingFields.java | 144 ++
...erviceInjectorDefaultTest_validateServices.java | 81 +
...InjectorDefaultTest_validateServices_happy.java | 89 +
.../services/ServiceInjectorLegacyTest.java | 166 ++
.../services/appfeat/ApplicationFeatureIdTest.java | 691 ++++++++
.../ApplicationFeatureRepositoryDefaultTest.java | 323 ++++
.../services/appfeat/ApplicationFeatureTest.java | 163 ++
.../appfeat/ApplicationFeatureTypeTest.java | 191 +++
...eptionRecognizerDocDefault_recognizes_Test.java | 57 +
.../core/metamodel/services/grid/BS3GridTest.java | 165 ++
.../isis/core/metamodel/services/grid/Foo.java | 22 +
.../metamodel/services/grid/Foo.layout.xml | 0
.../isis/core/metamodel/services/grid/Foo2.java | 22 +
.../services/grid/Foo2.layout.fallback.xml | 0
.../isis/core/metamodel/services/grid/Foo3.java | 22 +
.../services/grid/Foo3.layout.fallback.xml | 0
.../metamodel/services/grid/Foo3.layout.xml | 0
.../isis/core/metamodel/services/grid/Foo4.java | 22 +
...dLoaderServiceDefault_resourceNameFor_Test.java | 58 +
.../services/menubars/BS3MenuBarsTest.java | 62 +
.../metamodel/MetaModelServiceDefaultTest.java | 242 +++
.../spec/ObjectSpecIdTest_constructor.java | 43 +
.../spec/ObjectSpecIdTest_valueSemantics.java | 38 +
.../metamodel/specloader/ReflectorTestPojo.java | 52 +
.../specloader/SpecificationCacheDefaultTest.java | 120 ++
.../SpecificationLoaderTestAbstract.java | 185 ++
.../specloader/SpecificationLoaderTest_array.java | 65 +
.../SpecificationLoaderTest_collection.java | 67 +
.../specloader/SpecificationLoaderTest_value.java | 46 +
.../ClassSubstitutorTest_getClass.java | 69 +
.../IntrospectionState_comparable_Test.java | 87 +
.../specimpl/ObjectActionMixedInTest.java | 64 +
...ionParameterAbstractTest_getId_and_getName.java | 214 +++
.../specimpl/ObjectAssociationAbstractTest.java | 211 +++
...ObjectAssociationAbstractTest_alwaysHidden.java | 229 +++
.../specimpl/ObjectMemberAbstractTest.java | 43 +
.../testspec/ObjectSpecificationStub.java | 358 ++++
.../metamodel/MetaModelContext_configTest.java | 77 -
.../metamodel/MetaModelContext_forTesting.java | 256 ---
.../isis/metamodel/ServiceInjector_forTesting.java | 70 -
.../isis/metamodel/ServiceRegistry_forTesting.java | 154 --
.../oid/CollectionOidTest_valueSemantics.java | 47 -
.../adapter/oid/OidMarshallerTest_marshall.java | 51 -
.../oid/OidMarshallerTest_roundtripping.java | 60 -
.../adapter/oid/OidMarshallerTest_unmarshal.java | 154 --
.../isis/metamodel/adapter/oid/OidVersionTest.java | 71 -
...dDefaultTest_valueSemantics_whenPersistent.java | 45 -
...idDefaultTest_valueSemantics_whenTransient.java | 46 -
.../metamodel/adapter/oid/RootOidTest_create.java | 63 -
.../isis/metamodel/commons/IoUtils_CopyTest.java | 136 --
.../commons/JavaClassUtilsTest_getBuiltIn.java | 41 -
.../metamodel/commons/ListUtilsTest_adjust.java | 67 -
.../metamodel/commons/ListUtilsTest_insert.java | 84 -
.../commons/ListUtilsTest_mutableCopy.java | 89 -
.../isis/metamodel/commons/LocaleUtilsTest.java | 36 -
.../isis/metamodel/commons/NameUtilTest.java | 68 -
.../apache/isis/metamodel/commons/PrintLocale.java | 59 -
.../commons/StringUtilsTest_enumTitle.java | 41 -
.../commons/StringUtils_NaturalNameTest.java | 59 -
.../commons/StringUtils_NaturalizeTest.java | 49 -
.../commons/StringUtils_NormalizedTest.java | 65 -
.../StringUtils_RemoveLeadingWhiteSpace.java | 51 -
.../commons/StringUtils_SplitOnCommas.java | 80 -
.../commons/StringUtils_StripLeadingSlashTest.java | 49 -
.../commons/StringUtils_StripNewLinesTest.java | 59 -
.../commons/StringUtils_camelLowerFirst.java | 38 -
.../commons/StringUtils_toLineSeparated.java | 52 -
.../commons/StringUtils_toLowerDashed.java | 36 -
.../metamodel/commons/TypesTest_filteredList.java | 71 -
.../metamodel/commons/matchers/IsisMatchers.java | 73 -
.../matchers/IsisMatchers_NonEmptyStringTest.java | 53 -
.../metamodel/consent/InteractionResultTest.java | 85 -
.../isis/metamodel/facetapi/FacetAbstractTest.java | 76 -
.../facetapi/FeatureTypeTest_identifierFor.java | 85 -
.../facets/AbstractFacetFactoryJUnit4TestCase.java | 159 --
.../metamodel/facets/AbstractFacetFactoryTest.java | 169 --
.../isis/metamodel/facets/AnnotationsTest.java | 71 -
.../Annotations_getAnnotations_on_Class_Test.java | 248 ---
.../Annotations_getAnnotations_on_Field_Test.java | 203 ---
.../Annotations_getAnnotations_on_Method_Test.java | 184 --
...notations_getAnnotations_on_Parameter_Test.java | 200 ---
.../isis/metamodel/facets/CollectionUtilsTest.java | 123 --
...nEventHelperTest_newActionInteractionEvent.java | 87 -
...HelperTest_newCollectionDomainEvent_forAdd.java | 84 -
...perTest_newCollectionDomainEvent_forRemove.java | 84 -
...HelperTest_newPropertyDomainEvent_forClear.java | 76 -
...elperTest_newPropertyDomainEvent_forModify.java | 72 -
.../metamodel/facets/MethodFinderUtilsTest.java | 72 -
.../metamodel/facets/MethodRemoverForTesting.java | 81 -
.../metamodel/facets/ObjectAdapterUtilsTest.java | 84 -
.../org/apache/isis/metamodel/facets/Utils.java | 64 -
.../actions/ActionMethodsFacetFactoryTest.java | 538 ------
.../actions/IteratorFilteringFacetFactoryTest.java | 91 -
.../action/ActionAnnotationFacetFactoryTest.java | 118 --
...nnotationFacetFactoryTest_ActionInvocation.java | 234 ---
.../ActionAnnotationFacetFactoryTest_Command.java | 313 ----
.../ActionAnnotationFacetFactoryTest_Hidden.java | 72 -
...ctionAnnotationFacetFactoryTest_Invocation.java | 211 ---
...ctionAnnotationFacetFactoryTest_Publishing.java | 313 ----
...ctionAnnotationFacetFactoryTest_RestrictTo.java | 109 --
...ActionAnnotationFacetFactoryTest_Semantics.java | 111 --
.../ActionAnnotationFacetFactoryTest_TypeOf.java | 177 --
...icsFacetFallbackToNonIdempotentFactoryTest.java | 73 -
.../PrototypeFacetAnnotationFactoryTest.java | 77 -
...kmarkableAnnotationFacetFactoryTest_action.java | 63 -
.../HomePageAnnotationFacetFactoryTest.java | 66 -
...tionLayoutAnnotationFacetFactoryJunit4Test.java | 407 -----
...nLayoutXmlLayoutAnnotationFacetFactoryTest.java | 197 ---
...etDerivedFromDomainServiceFacetFactoryTest.java | 222 ---
...etDerivedFromDomainServiceFacetFactoryTest.java | 223 ---
.../prototype/PrototypeFacetAbstractTest.java | 58 -
.../CollectionFieldMethodsFacetFactoryTest.java | 589 -------
.../collections/JavaCollectionFacetTest.java | 90 -
.../CollectionAnnotationFacetFactoryTest.java | 572 -------
...ollectionAnnotationFacetFactoryTest_typeOf.java | 137 --
...bledAnnotationOnCollectionFacetFactoryTest.java | 82 -
...stedAnnotationOnCollectionFacetFactoryTest.java | 71 -
...etForCollectionLayoutAnnotationFactoryTest.java | 86 -
.../cssclassfa/CssClassFaFacetAbstractTest.java | 45 -
.../ViewModelSemanticCheckingFacetFactoryTest.java | 240 ---
...okmarkableAnnotationFacetFactoryTest_class.java | 63 -
.../callback/CreatedCallbackFacetFactoryTest.java | 67 -
.../callback/DeleteCallbackFacetFactoryTest.java | 88 -
.../callback/LoadCallbackFacetFactoryTest.java | 88 -
.../PersistAndSaveCallbackFacetFactoryTest.java | 109 --
.../callback/PersistCallbackFacetFactoryTest.java | 88 -
.../RemoveAndDeleteCallbackFacetFactoryTest.java | 109 --
.../callback/RemoveCallbackFacetFactoryTest.java | 88 -
.../callback/SaveCallbackFacetFactoryTest.java | 88 -
.../callback/UpdateCallbackFacetFactoryTest.java | 88 -
...CssClassFaFacetOnTypeAnnotationFactoryTest.java | 68 -
.../object/defaults/DefaultedFacetFactoryTest.java | 228 ---
.../ObjectDisabledMethodFacetFactoryTest.java | 72 -
...oicesFacetFromBoundedAnnotationFactoryTest.java | 60 -
.../DomainObjectAnnotationFacetFactoryTest.java | 861 ----------
.../ObjectTypeAnnotationFacetFactoryTest.java | 65 -
.../DomainObjectLayoutFactoryTest.java | 670 --------
.../DomainServiceFacetAnnotationFactoryTest.java | 66 -
.../DomainServiceLayoutFacetFactoryTest.java | 123 --
.../facets/FacetsFacetAnnotationFactoryTest.java | 153 --
.../hidden/ObjectHiddenMethodFacetFactoryTest.java | 85 -
.../cssclass/CssClassFacetMethodFactoryTest.java | 71 -
.../ident/cssclass/CssClassFacetMethodTest.java | 85 -
.../CssClassFacetMethodWithProblemTest.java | 84 -
.../ident/icon/IconFacetMethodFactoryTest.java | 71 -
.../object/ident/icon/IconFacetMethodTest.java | 84 -
.../ident/layout/LayoutFacetFactoryTest.java | 71 -
.../object/ident/layout/LayoutFacetMethodTest.java | 84 -
.../ident/title/TitleFacetViaMethodTest.java | 97 --
.../title/TitleFacetViaMethodsFactoryTest.java | 112 --
.../TitleAnnotationFacetFactoryTest.java | 263 ---
.../TitleFacetViaTitleAnnotationTest.java | 154 --
.../object/layoutxml/GridFacetDefaultTest.java | 60 -
.../navparent/NavigableParentFacetMethodTest.java | 84 -
.../NavigableParentAnnotationFacetFactoryTest.java | 113 --
.../annotation/NavigableParentTestSamples.java | 68 -
...SpecIdFacetDerivedFromClassNameFactoryTest.java | 67 -
.../parseable/ParseableFacetUsingParserTest.java | 131 --
.../facets/object/parseable/ValueProxy.java | 23 -
.../RecreatableObjectFacetFactoryTest.java | 68 -
.../ObjectValidMethodFacetFactoryTest.java | 66 -
...eFacetAnnotationOrConfigurationFactoryTest.java | 504 ------
.../ordering/memberorder/DeweyOrderSetTest.java | 265 ---
.../MemberOrderAnnotationFacetFactoryTest.java | 143 --
.../memberorder/MemberOrderComparatorTest.java | 181 --
...cetForParameterLayoutAnnotationFactoryTest.java | 58 -
...cetForParameterLayoutAnnotationFactoryTest.java | 79 -
.../ParameterAnnotationFacetFactoryTest.java | 388 -----
...lableAnnotationOnParameterFacetFactoryTest.java | 106 --
...RegExAnnotationOnParameterFacetFactoryTest.java | 79 -
.../PropertyMethodsFacetFactoryTest.java | 671 --------
...romptStyleFacetFromPropertyAnnotation_Test.java | 185 --
...sabledAnnotationOnPropertyFacetFactoryTest.java | 102 --
.../MandatoryAnnotationFacetFactoryTest.java | 71 -
...sistedAnnotationOnPropertyFacetFactoryTest.java | 71 -
.../PropertyAnnotationFacetFactoryTest.java | 869 ----------
...llableAnnotationOnPropertyFacetFactoryTest.java | 118 --
.../RegExAnnotationOnPropertyFacetFactoryTest.java | 90 -
...acetForPropertyLayoutAnnotationFactoryTest.java | 68 -
...acetForPropertyLayoutAnnotationFactoryTest.java | 95 --
...ValidationDigitsAnnotationFacetFactoryTest.java | 80 -
.../DomainObjectWithMustSatisfyAnnotations.java | 48 -
.../DomainObjectWithoutMustSatisfyAnnotations.java | 48 -
.../SpecificationAlwaysSatisfied.java | 31 -
.../specification/SpecificationAndTests.java | 111 --
.../specification/SpecificationNeverSatisfied.java | 31 -
.../specification/SpecificationNotTests.java | 62 -
.../specification/SpecificationOrTests.java | 110 --
...cificationRequiresFirstLetterToBeUpperCase.java | 39 -
.../BigDecimalValueSemanticsProviderTest.java | 89 -
.../value/BigIntValueSemanticsProviderTest.java | 88 -
.../value/BlobValueSemanticsProviderTest.java | 65 -
.../value/BooleanValueSemanticsProviderTest.java | 113 --
.../value/ByteValueSemanticsProviderTest.java | 86 -
.../value/CharacterValueSemanticsProviderTest.java | 79 -
.../value/ClobValueSemanticsProviderTest.java | 65 -
.../value/DoubleValueSemanticsProviderTest.java | 84 -
.../value/FloatValueSemanticsProviderTest.java | 93 -
.../ImageValueSemanticsProviderAbstractTest.java | 126 --
.../value/IntValueSemanticsProviderTest.java | 80 -
.../JavaSqlDateValueSemanticsProviderTest.java | 91 -
.../JavaSqlTimeValueSemanticsProviderTest.java | 90 -
.../JavaUtilDateValueSemanticsProviderTest.java | 96 --
.../value/LongValueSemanticsProviderTest.java | 91 -
.../value/PasswordValueSemanticsProviderTest.java | 49 -
.../value/ShortValueSemanticsProviderTest.java | 87 -
.../value/StringValueSemanticsProviderTest.java | 80 -
.../isis/metamodel/facets/value/TestClock.java | 69 -
.../ValueSemanticsProviderAbstractTestCase.java | 165 --
...odaLocalDateTimeValueSemanticsProviderTest.java | 81 -
...jectAssociationPredicatesTest_visibleWhere.java | 150 --
.../interactions/InteractionUtils_isA_Test.java | 104 --
.../ServiceInjectorDefaultTest_usingFields.java | 144 --
...erviceInjectorDefaultTest_validateServices.java | 81 -
...InjectorDefaultTest_validateServices_happy.java | 89 -
.../services/ServiceInjectorLegacyTest.java | 166 --
.../services/appfeat/ApplicationFeatureIdTest.java | 691 --------
.../ApplicationFeatureRepositoryDefaultTest.java | 323 ----
.../services/appfeat/ApplicationFeatureTest.java | 163 --
.../appfeat/ApplicationFeatureTypeTest.java | 191 ---
...eptionRecognizerDocDefault_recognizes_Test.java | 57 -
.../isis/metamodel/services/grid/BS3GridTest.java | 165 --
.../apache/isis/metamodel/services/grid/Foo.java | 22 -
.../apache/isis/metamodel/services/grid/Foo2.java | 22 -
.../apache/isis/metamodel/services/grid/Foo3.java | 22 -
.../apache/isis/metamodel/services/grid/Foo4.java | 22 -
...dLoaderServiceDefault_resourceNameFor_Test.java | 58 -
.../services/menubars/BS3MenuBarsTest.java | 62 -
.../metamodel/MetaModelServiceDefaultTest.java | 242 ---
.../spec/ObjectSpecIdTest_constructor.java | 43 -
.../spec/ObjectSpecIdTest_valueSemantics.java | 38 -
.../metamodel/specloader/ReflectorTestPojo.java | 52 -
.../specloader/SpecificationCacheDefaultTest.java | 120 --
.../SpecificationLoaderTestAbstract.java | 185 --
.../specloader/SpecificationLoaderTest_array.java | 65 -
.../SpecificationLoaderTest_collection.java | 67 -
.../specloader/SpecificationLoaderTest_value.java | 46 -
.../ClassSubstitutorTest_getClass.java | 69 -
.../IntrospectionState_comparable_Test.java | 91 -
.../specimpl/ObjectActionMixedInTest.java | 64 -
...ionParameterAbstractTest_getId_and_getName.java | 214 ---
.../specimpl/ObjectAssociationAbstractTest.java | 211 ---
...ObjectAssociationAbstractTest_alwaysHidden.java | 229 ---
.../specimpl/ObjectMemberAbstractTest.java | 43 -
.../testspec/ObjectSpecificationStub.java | 358 ----
.../dom/CustomerAsProxiedByDataNucleus.java | 2 +-
.../services/menubars/menubars.layout.xml | 0
core/persistence/jdo/applib/pom.xml | 95 --
.../applib/exceptions/NotPersistableException.java | 43 -
.../exceptions/UnsupportedFindException.java | 42 -
.../applib/fixturestate/FixturesInstalledFlag.java | 34 -
.../jdo/applib/fixturestate/package-info.java | 47 -
core/persistence/jdo/datanucleus-5/pom.xml | 150 --
.../datanucleus5/IsisModuleJdoDataNucleus5.java | 77 -
.../CreateSchemaObjectFromClassMetadata.java | 219 ---
.../datanucleus/DataNucleusContextUtil.java | 59 -
.../datanucleus/DataNucleusException.java | 43 -
.../datanucleus/DataNucleusLifeCycleHelper.java | 59 -
.../datanucleus/JDOStateManagerForIsis.java | 255 ---
.../datanucleus/metamodel/JdoPropertyUtils.java | 81 -
.../commands/AbstractDataNucleusObjectCommand.java | 41 -
.../commands/DataNucleusCreateObjectCommand.java | 72 -
.../commands/DataNucleusDeleteObjectCommand.java | 50 -
.../PersistenceQueryFindAllInstancesProcessor.java | 58 -
...sistenceQueryFindUsingApplibQueryProcessor.java | 159 --
.../queries/PersistenceQueryProcessor.java | 30 -
.../queries/PersistenceQueryProcessorAbstract.java | 79 -
.../datanucleus/persistence/queries/QueryUtil.java | 91 -
.../persistence/spi/JdoObjectIdSerializer.java | 207 ---
.../service/JdoPersistenceLifecycleService.java | 149 --
.../entities/JdoEntityTypeRegistry.java | 94 -
...eptionRecognizerCompositeForJdoObjectStore.java | 78 -
.../exceprecog/JdoNestedExceptionResolver.java | 45 -
.../datanucleus5/jdosupport/IsisJdoSupportDN5.java | 223 ---
.../mixins/Persistable_downloadJdoMetadata.java | 88 -
.../JdoStoreLifecycleListenerForIsis.java | 72 -
.../datanucleus5/metamodel/JdoMetamodelUtil.java | 63 -
.../metamodel/JdoProgrammingModelPlugin.java | 299 ----
...JdoDatastoreIdentityAnnotationFacetFactory.java | 59 -
.../JdoDatastoreIdentityFacet.java | 34 -
.../JdoDatastoreIdentityFacetAbstract.java | 54 -
.../JdoDatastoreIdentityFacetAnnotation.java | 32 -
.../JdoDatastoreIdentityFacetImpl.java | 32 -
.../JdoDiscriminatorAnnotationFacetFactory.java | 96 --
.../discriminator/JdoDiscriminatorFacet.java | 25 -
.../JdoDiscriminatorFacetDefault.java | 30 -
...nferredFromJdoDiscriminatorValueAnnotation.java | 35 -
...cIdFacetForJdoPersistenceCapableAnnotation.java | 51 -
...doPersistenceCapableAnnotationFacetFactory.java | 84 -
.../JdoPersistenceCapableFacet.java | 45 -
.../JdoPersistenceCapableFacetAbstract.java | 87 -
.../JdoPersistenceCapableFacetAnnotation.java | 36 -
.../JdoPersistenceCapableFacetImpl.java | 135 --
.../facets/object/query/JdoNamedQuery.java | 112 --
.../object/query/JdoQueriesFacetAnnotation.java | 36 -
.../query/JdoQueryAnnotationFacetFactory.java | 99 --
.../facets/object/query/JdoQueryFacet.java | 59 -
.../facets/object/query/JdoQueryFacetAbstract.java | 64 -
.../object/query/JdoQueryFacetAnnotation.java | 36 -
.../object/query/VisitorForClauseAbstract.java | 109 --
.../facets/object/query/VisitorForFromClause.java | 67 -
.../object/query/VisitorForVariablesClause.java | 68 -
.../version/JdoVersionAnnotationFacetFactory.java | 103 --
.../facets/object/version/JdoVersionFacet.java | 25 -
.../version/JdoVersionFacetFromAnnotation.java | 30 -
...DerivedFromJdoColumnAnnotationFacetFactory.java | 180 --
.../BigDecimalFacetDerivedFromJdoColumn.java | 59 -
.../prop/column/BigDecimalFacetFallback.java | 47 -
.../column/MandatoryFacetDerivedFromJdoColumn.java | 36 -
...ndatoryFacetInferredFromAbsenceOfJdoColumn.java | 35 -
...ndatoryFromJdoColumnAnnotationFacetFactory.java | 215 ---
...DerivedFromJdoColumnAnnotationFacetFactory.java | 155 --
.../column/MaxLengthFacetDerivedFromJdoColumn.java | 31 -
.../JdoNotPersistentAnnotationFacetFactory.java | 61 -
.../prop/notpersistent/JdoNotPersistentFacet.java | 35 -
.../JdoNotPersistentFacetAbstract.java | 37 -
.../JdoNotPersistentFacetAnnotation.java | 30 -
.../notpersistent/JdoNotPersistentFacetImpl.java | 30 -
...FacetDerivedFromJdoNotPersistentAnnotation.java | 31 -
...ledFacetDerivedFromJdoPrimaryKeyAnnotation.java | 35 -
.../JdoPrimaryKeyAnnotationFacetFactory.java | 61 -
.../facets/prop/primarykey/JdoPrimaryKeyFacet.java | 35 -
.../primarykey/JdoPrimaryKeyFacetAbstract.java | 37 -
.../primarykey/JdoPrimaryKeyFacetAnnotation.java | 30 -
.../prop/primarykey/JdoPrimaryKeyFacetImpl.java | 30 -
...nalFacetDerivedFromJdoPrimaryKeyAnnotation.java | 43 -
.../util/JdoPrimaryKeyPropertyPredicate.java | 48 -
.../metrics/MetricsServiceDefault.java | 78 -
.../objectadapter/ObjectAdapterContext.java | 256 ---
.../ObjectAdapterContext_DependencyInjection.java | 67 -
.../ObjectAdapterContext_Factories.java | 81 -
...ObjectAdapterContext_LifecycleEventSupport.java | 70 -
.../ObjectAdapterContext_NewIdentifier.java | 64 -
...ctAdapterContext_ObjectAdapterByIdProvider.java | 222 ---
...ObjectAdapterContext_ObjectAdapterProvider.java | 65 -
.../ObjectAdapterContext_ObjectCreation.java | 150 --
.../DataNucleusApplicationComponents5.java | 243 ---
.../persistence/IsisLifecycleListener.java | 194 ---
.../persistence/IsisPersistenceSessionJdo.java | 83 -
.../persistence/IsisPersistenceSessionJdoBase.java | 262 ---
.../IsisPlatformTransactionManagerForJdo.java | 159 --
.../persistence/IsisTransactionJdo.java | 469 -----
.../persistence/IsisTransactionManagerJdo.java | 334 ----
.../persistence/PersistenceSession5.java | 872 ----------
.../persistence/PersistenceSessionFactory5.java | 233 ---
.../persistence/command/PersistenceCommand.java | 28 -
.../command/PersistenceCommandAbstract.java | 39 -
.../persistence/query/PersistenceQuery.java | 46 -
.../query/PersistenceQueryAbstract.java | 101 --
.../persistence/query/PersistenceQueryFactory.java | 86 -
.../query/PersistenceQueryFindAllInstances.java | 63 -
...ersistenceQueryFindUsingApplibQueryDefault.java | 85 -
.../ObjectReflectorDefaultTest_object.java | 81 -
...onRecognizerCompositeForJdoObjectStoreTest.java | 89 -
...atastoreIdentityAnnotationFacetFactoryTest.java | 116 --
...JdoDiscriminatorAnnotationFacetFactoryTest.java | 117 --
...rsistenceCapableAnnotationFacetFactoryTest.java | 148 --
.../JdoVersionAnnotationFacetFactoryTest.java | 91 -
...AnnotationFacetFactoryTest_refineMetaModel.java | 275 ---
...vedFromJdoColumnAnnotationFacetFactoryTest.java | 114 --
...vedFromJdoColumnAnnotationFacetFactoryTest.java | 141 --
...JdoNotPersistentAnnotationFacetFactoryTest.java | 125 --
...venJdoPrimaryKeyAnnotationFacetFactoryTest.java | 137 --
.../adapterfactory/pojo/PojoAdapterTest.java | 81 -
.../transaction/PojoAdapterBuilder.java | 160 --
.../WrapperFactoryDefault_wrappedObject_Test.java | 464 -----
...actoryDefault_wrappedObject_transient_Test.java | 284 ----
.../runtime/system/ObjectMemberAbstractTest.java | 240 ---
.../doc/modules/ROOT/partials/component-nav.adoc | 1 -
core/pom.xml | 81 +-
core/runtime-services/pom.xml | 101 --
.../runtime/services/InitialisationException.java | 45 -
.../services/IsisModuleRuntimeServices.java | 95 --
.../isis/runtime/services/ServiceException.java | 43 -
.../auth/AuthenticationSessionProviderDefault.java | 75 -
.../background/BackgroundCommandExecution.java | 74 -
.../background/CommandExecutionAbstract.java | 58 -
.../bookmarks/BookmarkServiceInternalDefault.java | 250 ---
.../command/CommandDtoServiceInternalDefault.java | 179 --
.../command/CommandExecutorServiceDefault.java | 355 ----
.../services/command/CommandServiceDefault.java | 55 -
.../confmenu/ConfigurationViewServiceDefault.java | 149 --
.../services/email/EmailServiceDefault.java | 245 ---
.../isis/runtime/services/error/EmailTicket.java | 141 --
.../isis/runtime/services/error/SimpleTicket.java | 135 --
.../services/eventbus/EventBusServiceSpring.java | 47 -
.../services/factory/FactoryServiceDefault.java | 125 --
.../homepage/HomePageResolverServiceDefault.java | 214 ---
.../isis/runtime/services/i18n/po/Block.java | 133 --
.../runtime/services/i18n/po/ContextAndMsgId.java | 116 --
.../isis/runtime/services/i18n/po/PoAbstract.java | 45 -
.../isis/runtime/services/i18n/po/PoDisabled.java | 39 -
.../isis/runtime/services/i18n/po/PoReader.java | 263 ---
.../isis/runtime/services/i18n/po/PoWriter.java | 164 --
.../services/i18n/po/TranslationServicePo.java | 186 --
.../services/i18n/po/TranslationServicePoMenu.java | 134 --
.../apache/isis/runtime/services/i18n/po/Util.java | 35 -
.../ixn/InteractionDtoServiceInternalDefault.java | 143 --
.../menubars/MenuBarsLoaderServiceDefault.java | 129 --
.../menubars/bootstrap3/MenuBarsServiceBS3.java | 408 -----
.../menubars/bootstrap3/ServiceAndAction.java | 45 -
.../services/message/MessageServiceDefault.java | 123 --
.../services/publish/PublishedObjectsDefault.java | 222 ---
.../publish/PublisherDispatchServiceDefault.java | 185 --
.../repository/RepositoryServiceDefault.java | 259 ---
.../services/routing/RoutingServiceDefault.java | 55 -
.../sessmgmt/SessionManagementServiceDefault.java | 61 -
.../runtime/services/sudo/SudoServiceDefault.java | 105 --
.../userprof/UserProfileServiceDefault.java | 48 -
.../userreg/EmailNotificationServiceDefault.java | 167 --
.../runtime/services/wrapper/AsyncWrapDefault.java | 233 ---
.../services/wrapper/WrapperFactoryDefault.java | 247 ---
.../dispatchers/InteractionEventDispatcher.java | 28 -
.../InteractionEventDispatcherTypeSafe.java | 35 -
.../AbstractCollectionInvocationHandler.java | 98 --
.../handlers/CollectionInvocationHandler.java | 58 -
.../handlers/DelegatingInvocationHandler.java | 32 -
.../DelegatingInvocationHandlerDefault.java | 127 --
.../handlers/DomainObjectInvocationHandler.java | 895 ----------
.../wrapper/handlers/MapInvocationHandler.java | 48 -
.../wrapper/handlers/ProxyContextHandler.java | 86 -
.../wrapper/internal/util/MethodPrefixFinder.java | 97 --
.../services/wrapper/proxy/ProxyCreator.java | 93 -
.../services/xactn/TransactionServiceSpring.java | 179 --
.../services/xmlsnapshot/XmlSnapshotBuilder.java | 86 -
.../xmlsnapshot/XmlSnapshotServiceDefault.java | 98 --
.../runtime/services/ServiceInstantiatorTest.java | 30 -
.../changes/PreAndPostValues_shouldAudit_Test.java | 66 -
.../email/EmailServiceDefaultTest_actually.java | 61 -
.../email/EmailServiceDefaultTest_notEmpty.java | 45 -
.../runtime/services/i18n/po/PoReaderTest.java | 247 ---
.../services/i18n/po/PoWriterTest_escape.java | 44 -
.../wrapper/WrapperFactoryDefaultTest.java | 135 --
.../services/wrapper/dom/claims/Approver.java | 24 -
.../services/wrapper/dom/claims/Claimant.java | 26 -
.../services/wrapper/dom/employees/Employee.java | 114 --
.../wrapper/dom/employees/EmployeeRepository.java | 29 -
.../dom/employees/EmployeeRepositoryImpl.java | 35 -
core/runtime/pom.xml | 12 +-
.../isis/core/runtime/IsisCoreModuleRuntime.java | 54 +
.../isis/core/runtime/context/IsisContext.java | 95 ++
.../runtime/context/session/AppLifecycleEvent.java | 35 +
.../runtime/context/session/RuntimeContext.java | 49 +
.../context/session/RuntimeContextBase.java | 96 ++
.../context/session/RuntimeEventService.java | 73 +
.../session/RuntimeEventSupport_Spring.java | 44 +
.../context/session/SessionLifecycleEvent.java | 40 +
.../persistence/adapter/ObjectAdapterForBean.java | 72 +
.../runtime/persistence/adapter/PojoAdapter.java | 176 ++
.../persistence/session/PersistenceSession.java | 134 ++
.../session/PersistenceSessionFactory.java | 34 +
.../session/events/PersistenceEventService.java | 59 +
.../events/PersistenceEventService_Spring.java | 49 +
.../persistence/session/events/PostStoreEvent.java | 32 +
.../persistence/session/events/PreStoreEvent.java | 32 +
.../session/events/TimestampService.java | 63 +
.../transaction/AdapterAndProperty.java | 112 ++
.../transaction/AuditerDispatchService.java | 133 ++
.../transaction/ChangedObjectsService.java | 296 ++++
.../transaction/IsisTransactionAspectSupport.java | 55 +
.../transaction/IsisTransactionFlushException.java | 43 +
.../IsisTransactionManagerException.java | 43 +
.../transaction/IsisTransactionObject.java | 98 ++
.../transaction/IsisTransactionPlaceholder.java | 37 +
.../persistence/transaction/PreAndPostValues.java | 105 ++
.../events/TransactionAfterBeginEvent.java | 31 +
.../events/TransactionAfterCommitEvent.java | 30 +
.../events/TransactionAfterRollbackEvent.java | 30 +
.../events/TransactionBeforeBeginEvent.java | 31 +
.../events/TransactionBeforeCommitEvent.java | 30 +
.../events/TransactionBeforeRollbackEvent.java | 30 +
.../events/TransactionEventAbstract.java | 58 +
.../core/runtime/session/IsisRequestCycle.java | 99 ++
.../isis/core/runtime/session/IsisSession.java | 150 ++
.../core/runtime/session/IsisSessionFactory.java | 104 ++
.../runtime/session/IsisSessionFactoryDefault.java | 204 +++
.../runtime/session/SessionFactoryException.java | 41 +
.../session/init/InitialisationSession.java | 39 +
.../session/init/IsisLocaleInitializer.java | 56 +
.../session/init/IsisTimeZoneInitializer.java | 42 +
.../template/AbstractIsisSessionTemplate.java | 79 +
.../org/apache/isis/runtime/IsisModuleRuntime.java | 54 -
.../apache/isis/runtime/context/IsisContext.java | 95 --
.../runtime/context/session/AppLifecycleEvent.java | 35 -
.../runtime/context/session/RuntimeContext.java | 49 -
.../context/session/RuntimeContextBase.java | 96 --
.../context/session/RuntimeEventService.java | 73 -
.../session/RuntimeEventSupport_Spring.java | 44 -
.../context/session/SessionLifecycleEvent.java | 40 -
.../persistence/adapter/ObjectAdapterForBean.java | 72 -
.../runtime/persistence/adapter/PojoAdapter.java | 176 --
.../persistence/session/PersistenceSession.java | 134 --
.../session/PersistenceSessionFactory.java | 34 -
.../session/events/PersistenceEventService.java | 59 -
.../events/PersistenceEventService_Spring.java | 49 -
.../persistence/session/events/PostStoreEvent.java | 32 -
.../persistence/session/events/PreStoreEvent.java | 32 -
.../session/events/TimestampService.java | 63 -
.../transaction/AdapterAndProperty.java | 112 --
.../transaction/AuditerDispatchService.java | 133 --
.../transaction/ChangedObjectsService.java | 296 ----
.../transaction/IsisTransactionAspectSupport.java | 55 -
.../transaction/IsisTransactionFlushException.java | 43 -
.../IsisTransactionManagerException.java | 43 -
.../transaction/IsisTransactionObject.java | 98 --
.../transaction/IsisTransactionPlaceholder.java | 37 -
.../persistence/transaction/PreAndPostValues.java | 105 --
.../events/TransactionAfterBeginEvent.java | 31 -
.../events/TransactionAfterCommitEvent.java | 30 -
.../events/TransactionAfterRollbackEvent.java | 30 -
.../events/TransactionBeforeBeginEvent.java | 31 -
.../events/TransactionBeforeCommitEvent.java | 30 -
.../events/TransactionBeforeRollbackEvent.java | 30 -
.../events/TransactionEventAbstract.java | 58 -
.../isis/runtime/session/IsisRequestCycle.java | 99 --
.../apache/isis/runtime/session/IsisSession.java | 150 --
.../isis/runtime/session/IsisSessionFactory.java | 104 --
.../runtime/session/IsisSessionFactoryDefault.java | 204 ---
.../runtime/session/SessionFactoryException.java | 41 -
.../session/init/InitialisationSession.java | 39 -
.../session/init/IsisLocaleInitializer.java | 56 -
.../session/init/IsisTimeZoneInitializer.java | 42 -
.../template/AbstractIsisSessionTemplate.java | 79 -
.../adapterfactory/pojo/RuntimeTestPojo.java | 51 +
.../isis/core/runtime/system/Interface1.java | 24 +
.../core/runtime/system/JavaActionTestObject.java | 55 +
.../JavaObjectWithBasicProgramConventions.java | 269 +++
.../system/JavaObjectWithOneToOneAssociations.java | 47 +
.../core/runtime/system/JavaReferencedObject.java | 35 +
.../system/ObjectActionLayoutXmlDefaultTest.java | 96 ++
.../system/OneToManyAssociationDefaultTest.java | 202 +++
.../isis/core/runtime/system/RuntimeTestPojo.java | 51 +
.../isis/core/runtime/system/TestDomainObject.java | 24 +
.../isis/core/runtime/system/TestObject.java | 23 +
.../runtime/system/TestObjectAsAggregated.java | 29 +
.../core/runtime/system/TestObjectAsService.java | 37 +
.../runtime/system/TestObjectWithCollection.java | 108 ++
.../system/TypeExtractorMethodReturnTest.java | 75 +
.../system/TypeExtractorMethodsParametersTest.java | 80 +
.../fixture/budget/SomeServiceToInclude.java | 22 +
.../budgetassignment/SomeServiceNotToInclude.java | 22 +
.../adapterfactory/pojo/RuntimeTestPojo.java | 51 -
.../org/apache/isis/runtime/system/Interface1.java | 24 -
.../isis/runtime/system/JavaActionTestObject.java | 55 -
.../JavaObjectWithBasicProgramConventions.java | 269 ---
.../system/JavaObjectWithOneToOneAssociations.java | 47 -
.../isis/runtime/system/JavaReferencedObject.java | 35 -
.../system/ObjectActionLayoutXmlDefaultTest.java | 96 --
.../system/OneToManyAssociationDefaultTest.java | 202 ---
.../isis/runtime/system/RuntimeTestPojo.java | 51 -
.../isis/runtime/system/TestDomainObject.java | 24 -
.../org/apache/isis/runtime/system/TestObject.java | 23 -
.../runtime/system/TestObjectAsAggregated.java | 29 -
.../isis/runtime/system/TestObjectAsService.java | 37 -
.../runtime/system/TestObjectWithCollection.java | 108 --
.../system/TypeExtractorMethodReturnTest.java | 77 -
.../system/TypeExtractorMethodsParametersTest.java | 80 -
.../fixture/budget/SomeServiceToInclude.java | 22 -
.../budgetassignment/SomeServiceNotToInclude.java | 22 -
core/runtimeservices/pom.xml | 101 ++
.../src/main/doc/antora.yml | 0
.../ContentNegotiationService/accept-json.png | Bin
.../ContentNegotiationService/accept-xml.png | Bin
.../ContentNegotiationService/facade-choices.png | Bin
.../ContentNegotiationService/facade-choices.pptx | Bin
.../service-collaborations.png | Bin
.../service-collaborations.pptx | Bin
.../main/doc/modules/runtime-services}/nav.adoc | 0
.../doc/modules/runtime-services/pages/about.adoc | 0
.../runtime-services/pages/application-layer.adoc | 0
.../AuthenticationSessionProvider.adoc | 0
.../CommandDtoServiceInternal.adoc | 0
.../InteractionDtoServiceInternal.adoc | 0
.../runtime-services/pages/persistence-layer.adoc | 0
.../persistence-layer/AuditingServiceInternal.adoc | 0
.../ChangedObjectsServiceInternal.adoc | 0
.../PersistenceSessionServiceInternal.adoc | 0
.../PublishingServiceInternal.adoc | 0
.../runtime-services/pages/presentation-layer.adoc | 0
.../ContentNegotiationService.adoc | 0
.../presentation-layer/RepresentationService.adoc | 0
.../runtime-services/partials/module-nav.adoc | 0
.../runtimeservices/InitialisationException.java | 45 +
.../IsisModuleCoreRuntimeServices.java | 95 ++
.../core/runtimeservices/ServiceException.java | 43 +
.../auth/AuthenticationSessionProviderDefault.java | 75 +
.../background/BackgroundCommandExecution.java | 74 +
.../background/CommandExecutionAbstract.java | 58 +
.../bookmarks/BookmarkServiceInternalDefault.java | 250 +++
.../command/CommandDtoServiceInternalDefault.java | 179 ++
.../command/CommandExecutorServiceDefault.java | 355 ++++
.../command/CommandServiceDefault.java | 55 +
.../confmenu/ConfigurationViewServiceDefault.java | 149 ++
.../runtimeservices/email/EmailServiceDefault.java | 245 +++
.../core/runtimeservices/error/EmailTicket.java | 141 ++
.../core/runtimeservices/error/SimpleTicket.java | 135 ++
.../eventbus/EventBusServiceSpring.java | 47 +
.../factory/FactoryServiceDefault.java | 125 ++
.../homepage/HomePageResolverServiceDefault.java | 214 +++
.../isis/core/runtimeservices/i18n/po/Block.java | 133 ++
.../runtimeservices/i18n/po/ContextAndMsgId.java | 116 ++
.../core/runtimeservices/i18n/po/PoAbstract.java | 45 +
.../core/runtimeservices/i18n/po/PoDisabled.java | 39 +
.../core/runtimeservices/i18n/po/PoReader.java | 263 +++
.../core/runtimeservices/i18n/po/PoWriter.java | 164 ++
.../i18n/po/TranslationServicePo.java | 186 ++
.../i18n/po/TranslationServicePoMenu.java | 134 ++
.../isis/core/runtimeservices/i18n/po/Util.java | 35 +
.../ixn/InteractionDtoServiceInternalDefault.java | 142 ++
.../menubars/MenuBarsLoaderServiceDefault.java | 129 ++
.../menubars/bootstrap3/MenuBarsServiceBS3.java | 408 +++++
.../menubars/bootstrap3/ServiceAndAction.java | 45 +
.../message/MessageServiceDefault.java | 123 ++
.../publish/PublishedObjectsDefault.java | 222 +++
.../publish/PublisherDispatchServiceDefault.java | 185 ++
.../repository/RepositoryServiceDefault.java | 259 +++
.../routing/RoutingServiceDefault.java | 55 +
.../sessmgmt/SessionManagementServiceDefault.java | 61 +
.../runtimeservices/sudo/SudoServiceDefault.java | 105 ++
.../userprof/UserProfileServiceDefault.java | 48 +
.../userreg/EmailNotificationServiceDefault.java | 167 ++
.../userreg/EmailVerificationTemplate.html | 0
.../userreg/PasswordResetTemplate.html | 0
.../runtimeservices/wrapper/AsyncWrapDefault.java | 233 +++
.../wrapper/WrapperFactoryDefault.java | 247 +++
.../dispatchers/InteractionEventDispatcher.java | 28 +
.../InteractionEventDispatcherTypeSafe.java | 35 +
.../AbstractCollectionInvocationHandler.java | 98 ++
.../handlers/CollectionInvocationHandler.java | 58 +
.../handlers/DelegatingInvocationHandler.java | 32 +
.../DelegatingInvocationHandlerDefault.java | 127 ++
.../handlers/DomainObjectInvocationHandler.java | 895 ++++++++++
.../wrapper/handlers/MapInvocationHandler.java | 48 +
.../wrapper/handlers/ProxyContextHandler.java | 86 +
.../wrapper/internal/util/MethodPrefixFinder.java | 97 ++
.../wrapper/proxy/ProxyCreator.java | 93 +
.../xactn/TransactionServiceSpring.java | 179 ++
.../xmlsnapshot/XmlSnapshotBuilder.java | 86 +
.../xmlsnapshot/XmlSnapshotServiceDefault.java | 98 ++
.../runtimeservices/ServiceInstantiatorTest.java | 30 +
.../changes/PreAndPostValues_shouldAudit_Test.java | 66 +
.../email/EmailServiceDefaultTest_actually.java | 61 +
.../email/EmailServiceDefaultTest_notEmpty.java | 45 +
.../core/runtimeservices/i18n/po/PoReaderTest.java | 247 +++
.../i18n/po/PoWriterTest_escape.java | 44 +
.../wrapper/WrapperFactoryDefaultTest.java | 135 ++
.../wrapper/dom/claims/Approver.java | 24 +
.../wrapper/dom/claims/Claimant.java | 26 +
.../wrapper/dom/employees/Employee.java | 114 ++
.../wrapper/dom/employees/EmployeeRepository.java | 29 +
.../dom/employees/EmployeeRepositoryImpl.java | 35 +
core/schema/pom.xml | 169 --
.../org/apache/isis/schema/IsisModuleSchema.java | 33 -
.../jaxbadapters/JodaDateTimeStringAdapter.java | 61 -
.../jaxbadapters/JodaLocalDateStringAdapter.java | 63 -
.../JodaLocalDateTimeStringAdapter.java | 61 -
.../jaxbadapters/JodaLocalTimeStringAdapter.java | 61 -
core/security/api/pom.xml | 83 -
.../main/doc/modules/api/partials/module-nav.adoc | 2 -
.../isis/security/api/IsisModuleSecurityApi.java | 38 -
.../api/authentication/AuthenticationRequest.java | 61 -
.../AuthenticationRequestAbstract.java | 55 -
.../AuthenticationRequestPassword.java | 35 -
.../api/authentication/AuthenticationSession.java | 99 --
.../AuthenticationSessionAbstract.java | 170 --
.../AuthenticationSessionProvider.java | 28 -
.../security/api/authentication/MessageBroker.java | 105 --
.../AuthenticationRequestLogonFixture.java | 49 -
.../authentication/health/HealthAuthSession.java | 45 -
.../manager/AuthenticationManager.java | 173 --
.../manager/RegistrationDetails.java | 23 -
.../AuthenticationRequestSingleUser.java | 37 -
.../singleuser/SingleUserSession.java | 61 -
.../api/authentication/standard/Authenticator.java | 41 -
.../standard/AuthenticatorAbstract.java | 51 -
.../standard/NoAuthenticatorException.java | 46 -
.../standard/RandomCodeGenerator.java | 26 -
.../standard/RandomCodeGeneratorDefault.java | 54 -
.../api/authentication/standard/Registrar.java | 34 -
.../standard/RegistrationDetailsPassword.java | 31 -
.../api/authentication/standard/SimpleSession.java | 92 -
.../manager/AuthorizationManager.java | 123 --
.../standard/AuthorizationConstants.java | 34 -
.../api/authorization/standard/Authorizor.java | 68 -
.../isis/security/EncodabilityContractTest.java | 94 -
.../AuthenticationManager_authenticators_Test.java | 69 -
.../standard/AuthenticatorDefaultTest.java | 62 -
.../SimpleSessionEncodabilityNoRolesTest.java | 38 -
.../SimpleSessionEncodabilityTestAbstract.java | 40 -
.../SimpleSessionEncodabilityWithRolesTest.java | 38 -
...rdAuthenticationManager_AuthenticationTest.java | 111 --
core/security/bypass/pom.xml | 48 -
.../security/bypass/IsisModuleSecurityBypass.java | 45 -
.../bypass/authentication/AuthenticatorBypass.java | 51 -
.../bypass/authorization/AuthorizorBypass.java | 58 -
core/security/keycloak/pom.xml | 81 -
.../keycloak/IsisModuleSecurityKeycloak.java | 49 -
.../authentication/AuthenticatorKeycloak.java | 55 -
.../keycloak/authorization/AuthorizorKeycloak.java | 63 -
.../keycloak/webmodule/KeycloakFilter.java | 75 -
.../keycloak/webmodule/WebModuleKeycloak.java | 72 -
core/security/pom.xml | 82 +
core/security/shiro/pom.xml | 96 --
.../doc/modules/shiro/pages/about/jdbc-realm.adoc | 110 --
.../security/shiro/IsisModuleSecurityShiro.java | 49 -
.../shiro/authentication/AuthenticatorShiro.java | 227 ---
.../shiro/authorization/AuthorizorShiro.java | 125 --
.../shiro/authorization/IsisPermission.java | 137 --
.../shiro/context/ShiroSecurityContext.java | 51 -
.../PermissionToRoleMapperFromString.java | 37 -
.../isis/security/shiro/permrolemapper/Util.java | 61 -
.../security/shiro/webmodule/WebModuleShiro.java | 202 ---
...AuthenticatorOrAuthorizorTest_authenticate.java | 116 --
...ticatorOrAuthorizorTest_isVisibleInAnyRole.java | 114 --
.../PermissionToRoleMapperFromIniTest.java | 45 -
.../PermissionToRoleMapperFromStringTest.java | 45 -
core/security/{shiro => }/src/main/doc/antora.yml | 0
.../configure-isis-to-use-bypass.PNG | Bin
.../shiro => src/main/doc/modules/core}/nav.adoc | 0
.../main/doc/modules/core}/pages/about.adoc | 0
.../main/doc/modules/core/partials/module-nav.adoc | 2 +
.../isis/core/security/IsisModuleCoreSecurity.java | 38 +
.../authentication/AuthenticationRequest.java | 61 +
.../AuthenticationRequestAbstract.java | 55 +
.../AuthenticationRequestPassword.java | 35 +
.../authentication/AuthenticationSession.java | 99 ++
.../AuthenticationSessionAbstract.java | 170 ++
.../AuthenticationSessionProvider.java | 28 +
.../security/authentication/MessageBroker.java | 105 ++
.../AuthenticationRequestLogonFixture.java | 49 +
.../authentication/health/HealthAuthSession.java | 45 +
.../manager/AuthenticationManager.java | 173 ++
.../manager/RegistrationDetails.java | 23 +
.../AuthenticationRequestSingleUser.java | 37 +
.../singleuser/SingleUserSession.java | 61 +
.../authentication/standard/Authenticator.java | 41 +
.../standard/AuthenticatorAbstract.java | 51 +
.../standard/NoAuthenticatorException.java | 46 +
.../standard/RandomCodeGenerator.java | 26 +
.../standard/RandomCodeGeneratorDefault.java | 54 +
.../authentication/standard/Registrar.java | 34 +
.../standard/RegistrationDetailsPassword.java | 31 +
.../authentication/standard/SimpleSession.java | 92 +
.../manager/AuthorizationManager.java | 123 ++
.../standard/AuthorizationConstants.java | 32 +
.../authorization/standard/Authorizor.java | 68 +
.../isis/security/EncodabilityContractTest.java | 94 +
.../AuthenticationManager_authenticators_Test.java | 69 +
.../standard/AuthenticatorDefaultTest.java | 62 +
.../SimpleSessionEncodabilityNoRolesTest.java | 38 +
.../SimpleSessionEncodabilityTestAbstract.java | 40 +
.../SimpleSessionEncodabilityWithRolesTest.java | 38 +
...rdAuthenticationManager_AuthenticationTest.java | 111 ++
core/testsupport/integtestsupport/pom.xml | 197 ---
.../pages/integ-test-support/abstract-class.adoc | 77 -
.../ExceptionRecognizerTranslate.java | 75 -
.../IsisIntegrationTestAbstract.java | 133 --
.../isis/integtestsupport/ThrowableMatchers.java | 51 -
.../validate/ValidateDomainModel.java | 121 --
core/testsupport/unittestsupport/pom.xml | 218 ---
.../doc/modules/unit-test-support/pages/about.adoc | 9 -
.../unit-test-support/partials/module-nav.adoc | 1 -
.../AbstractApplyToAllContractTest.java | 95 --
...irectionalRelationshipContractTestAbstract.java | 804 ---------
.../apache/isis/unittestsupport/bidir/Child.java | 54 -
.../isis/unittestsupport/bidir/Instantiator.java | 31 -
.../unittestsupport/bidir/InstantiatorMap.java | 55 -
.../unittestsupport/bidir/InstantiatorSimple.java | 37 -
.../isis/unittestsupport/bidir/Instantiators.java | 26 -
.../apache/isis/unittestsupport/bidir/Parent.java | 93 -
.../ComparableContractTest_compareTo.java | 50 -
.../comparable/ComparableContractTester.java | 82 -
.../config/IsisConfigurationLegacy.java | 203 ---
.../unittestsupport/config/internal/_Config.java | 119 --
.../config/internal/_Config_Instance.java | 193 ---
.../config/internal/_Config_LifecycleResource.java | 98 --
.../config/internal/_Config_Parsers.java | 117 --
.../config/internal/_Config_trim.java | 49 -
.../apache/isis/unittestsupport/files/Files.java | 143 --
...rviceMethodMustBeFinalContractTestAbstract.java | 78 -
.../isis/unittestsupport/jaxb/JaxbMatchers.java | 128 --
.../jmocking/ImposteriserUsingCodegenPlugin.java | 92 -
.../unittestsupport/jmocking/Imposterisers.java | 34 -
.../jmocking/InjectIntoJMockAction.java | 63 -
.../isis/unittestsupport/jmocking/IsisActions.java | 60 -
.../unittestsupport/jmocking/JMockActions.java | 86 -
.../jmocking/JUnitRuleMockery2.java | 317 ----
.../unittestsupport/jmocking/MyMockomatic.java | 117 --
.../unittestsupport/jmocking/PostponedAction.java | 46 -
.../unittestsupport/soap/PublishedEndpoints.java | 57 -
.../isis/unittestsupport/soap/SoapEndpoint.java | 57 -
.../soap/SoapEndpointPublishingRule.java | 87 -
.../unittestsupport/soap/SoapEndpointSpec.java | 85 -
.../sortedsets/SortedSetsContractTestAbstract.java | 71 -
.../unittestsupport/streams/NullPrintStream.java | 115 --
.../isis/unittestsupport/utils/CollectUtils.java | 29 -
.../isis/unittestsupport/utils/IndentPrinter.java | 179 --
.../isis/unittestsupport/utils/ReflectUtils.java | 69 -
.../isis/unittestsupport/utils/StringUtils.java | 39 -
.../value/ValueTypeContractTestAbstract.java | 128 --
core/{schema => unittestsupport}/.gitignore | 0
core/unittestsupport/pom.xml | 217 +++
.../unittestsupport}/src/main/doc/antora.yml | 0
.../src/main/doc/modules/unittestsupport}/nav.adoc | 0
.../doc/modules/unittestsupport/pages/about.adoc | 9 +
.../pages/unit-test-support/contract-tests.adoc | 0
.../pages/unit-test-support/jmock-extensions.adoc | 0
.../unit-test-support/maven-configuration.adoc | 0
.../soap-fake-server-junit-rule.adoc | 0
.../unittestsupport/partials/module-nav.adoc | 1 +
.../AbstractApplyToAllContractTest.java | 95 ++
...irectionalRelationshipContractTestAbstract.java | 801 +++++++++
.../isis/core/unittestsupport/bidir/Child.java | 54 +
.../core/unittestsupport/bidir/Instantiator.java | 31 +
.../unittestsupport/bidir/InstantiatorMap.java | 55 +
.../unittestsupport/bidir/InstantiatorSimple.java | 37 +
.../core/unittestsupport/bidir/Instantiators.java | 26 +
.../isis/core/unittestsupport/bidir/Parent.java | 93 +
.../ComparableContractTest_compareTo.java | 50 +
.../comparable/ComparableContractTester.java | 82 +
.../config/IsisConfigurationLegacy.java | 203 +++
.../unittestsupport/config/internal/_Config.java | 119 ++
.../config/internal/_Config_Instance.java | 193 +++
.../config/internal/_Config_LifecycleResource.java | 98 ++
.../config/internal/_Config_Parsers.java | 117 ++
.../config/internal/_Config_trim.java | 49 +
.../isis/core/unittestsupport/files/Files.java | 143 ++
...rviceMethodMustBeFinalContractTestAbstract.java | 78 +
.../core/unittestsupport/jaxb/JaxbMatchers.java | 128 ++
.../jmocking/ImposteriserUsingCodegenPlugin.java | 92 +
.../unittestsupport/jmocking/Imposterisers.java | 34 +
.../jmocking/InjectIntoJMockAction.java | 63 +
.../core/unittestsupport/jmocking/IsisActions.java | 60 +
.../unittestsupport/jmocking/JMockActions.java | 86 +
.../jmocking/JUnitRuleMockery2.java | 317 ++++
.../unittestsupport/jmocking/MyMockomatic.java | 110 ++
.../unittestsupport/jmocking/PostponedAction.java | 46 +
.../unittestsupport/soap/PublishedEndpoints.java | 57 +
.../core/unittestsupport/soap/SoapEndpoint.java | 57 +
.../soap/SoapEndpointPublishingRule.java | 87 +
.../unittestsupport/soap/SoapEndpointSpec.java | 85 +
.../sortedsets/SortedSetsContractTestAbstract.java | 71 +
.../unittestsupport/streams/NullPrintStream.java | 115 ++
.../core/unittestsupport/utils/CollectUtils.java | 29 +
.../core/unittestsupport/utils/IndentPrinter.java | 179 ++
.../core/unittestsupport/utils/ReflectUtils.java | 69 +
.../core/unittestsupport/utils/StringUtils.java | 39 +
.../value/ValueTypeContractTestAbstract.java | 128 ++
core/viewers/restfulobjects/applib/pom.xml | 77 -
.../restfulobjects/applib/JsonRepresentation.java | 1798 --------------------
.../restfulobjects/applib/RestfulResponse.java | 370 ----
.../restfulobjects/applib/util/MediaTypes.java | 73 -
.../viewer/restfulobjects/applib/util/Parser.java | 387 -----
.../restfulobjects/applib/util/PathNode.java | 188 --
.../applib/util/UrlEncodingUtils.java | 81 -
.../viewer/restfulobjects/applib/JsonFixture.java | 44 -
.../JsonRepresentationTest_asInputStream.java | 56 -
.../restfulobjects/jaxrs-resteasy-4/pom.xml | 133 --
.../webmodule/WebModuleJaxrsResteasy4.java | 141 --
core/viewers/restfulobjects/rendering/pom.xml | 60 -
.../restfulobjects/rendering/IResourceContext.java | 99 --
.../IsisModuleRestfulObjectsRendering.java | 46 -
.../restfulobjects/rendering/LinkFollowSpecs.java | 127 --
.../viewer/restfulobjects/rendering/OidUtils.java | 68 -
.../rendering/ReprRendererAbstract.java | 215 ---
.../AbstractObjectMemberReprRenderer.java | 319 ----
.../domainobjects/ActionResultReprRenderer.java | 207 ---
.../domainobjects/CollectionSemantics.java | 46 -
.../domainobjects/DomainObjectLinkTo.java | 99 --
.../domainobjects/DomainObjectReprRenderer.java | 473 -----
.../domainobjects/DomainServiceLinkTo.java | 58 -
.../rendering/domainobjects/JsonValueEncoder.java | 255 ---
.../domainobjects/JsonValueEncoder_Converters.java | 681 --------
.../rendering/domainobjects/ListReprRenderer.java | 130 --
.../rendering/domainobjects/MemberType.java | 153 --
.../rendering/domainobjects/MutatorSpec.java | 51 -
.../domainobjects/ObjectActionReprRenderer.java | 239 ---
.../domainobjects/ObjectAdapterLinkTo.java | 41 -
.../rendering/domainobjects/ObjectAndAction.java | 30 -
.../domainobjects/ObjectAndActionInvocation.java | 106 --
.../domainobjects/ObjectAndCollection.java | 30 -
.../domainobjects/ObjectAndCollection2.java | 39 -
.../rendering/domainobjects/ObjectAndMember.java | 41 -
.../rendering/domainobjects/ObjectAndProperty.java | 30 -
.../domainobjects/ObjectAndProperty2.java | 40 -
.../ObjectCollectionReprRenderer.java | 194 ---
.../domainobjects/ObjectPropertyReprRenderer.java | 256 ---
.../domainobjects/ScalarValueReprRenderer.java | 87 -
.../AbstractTypeFeatureReprRenderer.java | 108 --
.../AbstractTypeMemberReprRenderer.java | 79 -
.../domaintypes/ActionDescriptionReprRenderer.java | 90 -
.../ActionParameterDescriptionReprRenderer.java | 104 --
.../CollectionDescriptionReprRenderer.java | 63 -
.../domaintypes/DomainTypeReprRenderer.java | 187 --
.../domaintypes/ObjectSpecAndSuperSpec.java | 41 -
.../rendering/domaintypes/ParentSpecAndAction.java | 30 -
.../domaintypes/ParentSpecAndActionParam.java | 30 -
.../domaintypes/ParentSpecAndCollection.java | 30 -
.../domaintypes/ParentSpecAndFeature.java | 42 -
.../domaintypes/ParentSpecAndProperty.java | 30 -
.../PropertyDescriptionReprRenderer.java | 73 -
.../domaintypes/TypeActionResultReprRenderer.java | 73 -
.../domaintypes/TypeListReprRenderer.java | 67 -
.../rendering/service/RepresentationService.java | 85 -
.../RepresentationServiceContentNegotiator.java | 162 --
.../acceptheader/AcceptHeaderServiceForRest.java | 103 --
.../service/conneg/ContentNegotiationService.java | 51 -
.../conneg/ContentNegotiationServiceAbstract.java | 160 --
...entNegotiationServiceForRestfulObjectsV1_0.java | 413 -----
.../ContentNegotiationServiceOrgApacheIsisV1.java | 426 -----
.../ContentNegotiationServiceXRoDomainType.java | 165 --
.../service/swagger/SwaggerServiceDefault.java | 61 -
.../service/swagger/SwaggerServiceMenu.java | 162 --
.../service/swagger/internal/ClassExcluder.java | 9 -
.../swagger/internal/ClassExcluderAbstract.java | 65 -
.../swagger/internal/ClassExcluderDefault.java | 33 -
.../service/swagger/internal/Generation.java | 863 ----------
.../swagger/internal/SwaggerSpecGenerator.java | 87 -
.../rendering/service/swagger/internal/Util.java | 173 --
.../internal/ValuePropertyFactoryDefault.java | 148 --
.../swagger/internal/ValuePropertyPlugin.java | 75 -
.../rendering/util/FollowSpecUtil.java | 39 -
.../rendering/util/JsonWriterUtil.java | 50 -
.../restfulobjects/rendering/util/MapUtils.java | 48 -
.../viewer/restfulobjects/rendering/util/Util.java | 99 --
.../JsonValueEncoderTest_appendValueAndFormat.java | 430 -----
.../JsonValueEncoderTest_asAdapter.java | 400 -----
.../JsonValueEncoderTest_asObject.java | 248 ---
.../doc/modules/ROOT/partials/component-nav.adoc | 5 -
core/viewers/restfulobjects/viewer/pom.xml | 83 -
.../viewer/IsisModuleRestfulObjectsViewer.java | 71 -
.../viewer/context/ResourceContext.java | 281 ---
.../viewer/mappers/ExceptionMapperAbstract.java | 162 --
.../mappers/ExceptionMapperForObjectNotFound.java | 37 -
.../restfulobjects/viewer/mappers/FailureUtil.java | 54 -
.../viewer/mappers/entity/ExceptionDetail.java | 91 -
.../resources/DomainObjectResourceServerside.java | 746 --------
.../viewer/resources/DomainResourceHelper.java | 252 ---
.../resources/DomainServiceResourceServerside.java | 281 ---
.../resources/DomainTypeResourceServerside.java | 342 ----
.../viewer/resources/HomePageReprRenderer.java | 195 ---
.../resources/HomePageResourceServerside.java | 90 -
.../viewer/resources/ImageResourceServerside.java | 64 -
.../viewer/resources/JsonParserHelper.java | 162 --
.../resources/MenuBarsResourceServerside.java | 118 --
.../viewer/resources/ObjectActionArgHelper.java | 147 --
.../resources/ObjectAdapterAccessHelper.java | 142 --
.../resources/ObjectAdapterUpdateHelper.java | 175 --
.../viewer/resources/ResourceAbstract.java | 174 --
.../viewer/resources/SwaggerSpecResource.java | 131 --
.../viewer/resources/UserReprRenderer.java | 90 -
.../viewer/resources/UserResourceServerside.java | 106 --
.../viewer/resources/VersionReprRenderer.java | 114 --
.../resources/VersionResourceServerside.java | 99 --
.../webmodule/IsisRestfulObjectsSessionFilter.java | 434 -----
.../auth/AuthenticationSessionStrategy.java | 56 -
.../AuthenticationSessionStrategyAbstract.java | 67 -
.../AuthenticationSessionStrategyBasicAuth.java | 110 --
.../auth/AuthenticationSessionStrategyDefault.java | 86 -
..._ensureCompatibleAcceptHeader_ContractTest.java | 217 ---
.../context/ResourceContext_getArg_Test.java | 157 --
...tsApplicationExceptionMapper_Test_Contract.java | 145 --
...ulObjectsSessionFilter_lookupPassThru_Test.java | 98 --
core/viewers/wicket/model/pom.xml | 88 -
.../viewer/wicket/model/IsisModuleWicketModel.java | 14 -
.../wicket/model/common/CommonContextUtils.java | 43 -
.../wicket/model/common/OnSelectionHandler.java | 38 -
.../wicket/model/isis/WicketViewerSettings.java | 92 -
.../viewer/wicket/model/links/LinkAndLabel.java | 188 --
.../wicket/model/links/ListOfLinksModel.java | 45 -
.../wicket/model/mementos/ActionMemento.java | 94 -
.../model/mementos/ActionParameterMemento.java | 100 --
.../wicket/model/mementos/CollectionMemento.java | 109 --
.../wicket/model/mementos/PageParameterNames.java | 135 --
.../wicket/model/mementos/PropertyMemento.java | 128 --
.../viewer/wicket/model/models/AboutModel.java | 49 -
.../wicket/model/models/ActionArgumentModel.java | 36 -
.../viewer/wicket/model/models/ActionModel.java | 720 --------
.../wicket/model/models/ActionPromptProvider.java | 51 -
.../wicket/model/models/BookmarkTreeNode.java | 266 ---
.../model/models/BookmarkTreeNodeComparator.java | 71 -
.../wicket/model/models/BookmarkableModel.java | 50 -
.../wicket/model/models/BookmarkedPagesModel.java | 143 --
.../wicket/model/models/EntityCollectionModel.java | 587 -------
.../viewer/wicket/model/models/EntityModel.java | 602 -------
.../model/models/EntityModelForReference.java | 114 --
.../model/models/HintPageParameterSerializer.java | 92 -
.../wicket/model/models/ImageResourceCache.java | 39 -
.../viewer/wicket/model/models/ModelAbstract.java | 56 -
.../wicket/model/models/ObjectAdapterModel.java | 45 -
.../viewer/wicket/model/models/ScalarModel.java | 1251 --------------
.../model/models/ScalarModelWithMultiPending.java | 95 --
.../model/models/ScalarModelWithPending.java | 90 -
.../wicket/model/models/ServiceActionsModel.java | 73 -
.../model/models/ToggledMementosProvider.java | 32 -
.../isis/viewer/wicket/model/models/Util.java | 47 -
.../viewer/wicket/model/models/ValueModel.java | 67 -
.../isis/viewer/wicket/model/models/VoidModel.java | 63 -
.../viewer/wicket/model/models/WelcomeModel.java | 49 -
.../wicket/model/models/WicketComponentUtils.java | 61 -
.../models/whereami/WhereAmIModelDefault.java | 90 -
.../viewer/wicket/model/util/ComponentHintKey.java | 147 --
.../wicket/model/models/EntityModel_hintsTest.java | 154 --
.../models/LowestCommonSuperclassClosureTest.java | 62 -
.../ScalarModel_isScalarSubtypingAnyOf_Test.java | 106 --
.../ROOT/pages/features/user-registration.adoc | 78 -
.../doc/modules/ROOT/partials/component-nav.adoc | 2 -
.../ROOT/partials/security/user-registration.adoc | 24 -
core/viewers/wicket/ui/pom.xml | 362 ----
.../wicket/ui/CollectionContentsAsFactory.java | 49 -
.../viewer/wicket/ui/ComponentFactoryAbstract.java | 125 --
.../isis/viewer/wicket/ui/ComponentType.java | 183 --
.../ActionResultResponseHandlingStrategy.java | 166 --
.../actionresponse/ActionResultResponseType.java | 221 ---
.../ui/app/registry/ComponentFactoryRegistrar.java | 108 --
.../ui/components/about/JarManifestModel.java | 215 ---
.../ui/components/actioninfo/ActionInfoPanel.java | 51 -
.../components/actionmenu/CssClassFaBehavior.java | 57 -
.../entityactions/AdditionalLinksPanel.java | 182 --
.../entityactions/EntityActionLinkFactory.java | 71 -
.../actionmenu/entityactions/LinkAndLabelUtil.java | 86 -
.../actionmenu/serviceactions/CssMenuItem.java | 494 ------
.../serviceactions/ServiceActionLinkFactory.java | 54 -
.../serviceactions/ServiceActionUtil.java | 279 ---
.../serviceactions/ServiceActionsPanel.java | 149 --
.../serviceactions/ServiceAndAction.java | 47 -
.../serviceactions/TertiaryActionsPanel.java | 143 --
.../actionprompt/ActionPromptHeaderPanel.java | 65 -
.../actions/ActionFormExecutorStrategy.java | 94 -
.../components/actions/ActionParametersForm.java | 206 ---
.../actions/ActionParametersFormPanel.java | 60 -
.../components/actions/ActionParametersPanel.java | 116 --
.../bookmarkedpages/BookmarkedPagesPanel.java | 225 ---
.../collection/AssociatedWithActionsHelper.java | 84 -
.../ui/components/collection/CollectionPanel.java | 215 ---
.../selector/CollectionSelectorHelper.java | 266 ---
.../selector/CollectionSelectorPanel.java | 233 ---
.../CollectionContentsAsAjaxTablePanel.java | 319 ----
.../CollectionContentsSortableDataProvider.java | 195 ---
.../ajaxtable/IsisAjaxFallbackDataTable.java | 231 ---
.../ajaxtable/IsisAjaxFallbackHeadersToolbar.java | 93 -
.../ajaxtable/IsisAjaxNavigationToolbar.java | 123 --
.../ajaxtable/IsisTotalRecordsToolbar.java | 107 --
.../ajaxtable/PrototypingMessageProvider.java | 58 -
.../ajaxtable/columns/ColumnAbstract.java | 78 -
.../columns/ObjectAdapterPropertyColumn.java | 123 --
.../columns/ObjectAdapterTitleColumn.java | 93 -
.../columns/ObjectAdapterToggleboxColumn.java | 128 --
.../icons/CollectionContentsAsIconsPanel.java | 63 -
.../CollectionContentsAsIconsPanelFactory.java | 66 -
.../summary/CollectionContentsAsSummary.java | 206 ---
.../CollectionContentsAsSummaryFactory.java | 95 --
.../entity/EntityComponentFactoryAbstract.java | 90 -
.../entity/collection/EntityCollectionPanel.java | 191 ---
.../components/entity/fieldset/PropertyGroup.java | 260 ---
.../entity/header/EntityHeaderPanel.java | 97 --
.../entity/icontitle/EntityIconAndTitlePanel.java | 239 ---
.../icontitle/EntityIconAndTitlePanelFactory.java | 80 -
.../selector/links/EntityLinksSelectorPanel.java | 381 -----
.../links/EntityLinksSelectorPanelFactory.java | 65 -
.../wicket/ui/components/footer/FooterPanel.java | 187 --
.../wicket/ui/components/layout/bs3/Util.java | 43 -
.../wicket/ui/components/layout/bs3/col/Col.java | 323 ----
.../components/layout/bs3/tabs/TabGroupPanel.java | 134 --
.../ui/components/property/PropertyEditPanel.java | 117 --
.../property/PropertyFormExecutorStrategy.java | 85 -
.../PropertyEditPromptHeaderPanel.java | 65 -
.../components/scalars/IsisConverterLocator.java | 126 --
.../ui/components/scalars/ScalarPanelAbstract.java | 387 -----
.../components/scalars/ScalarPanelAbstract2.java | 975 -----------
.../scalars/ScalarPanelSelect2Abstract.java | 264 ---
.../scalars/ScalarPanelTextFieldAbstract.java | 386 -----
.../ScalarPanelTextFieldDatePickerAbstract.java | 128 --
.../ScalarPanelTextFieldParseableAbstract.java | 68 -
.../ui/components/scalars/TextFieldValueModel.java | 75 -
.../datepicker/TextFieldWithDateTimePicker.java | 169 --
.../scalars/image/JavaAwtImagePanel.java | 78 -
.../scalars/image/JavaAwtImagePanelFactory.java | 54 -
.../isisapplib/IsisBlobOrClobPanelAbstract.java | 434 -----
.../components/scalars/markup/MarkupComponent.java | 81 -
.../components/scalars/primitive/BooleanPanel.java | 262 ---
.../scalars/reference/EntityLinkSelect2Panel.java | 73 -
.../scalars/reference/ReferencePanel.java | 461 -----
.../scalars/reference/ReferencePanelFactory.java | 58 -
.../scalars/string/MultiLineStringPanel.java | 113 --
.../scalars/string/StringPanelFactory.java | 45 -
.../ui/components/scalars/uuid/UuidConverter.java | 63 -
.../scalars/value/ValuePanelFactory.java | 63 -
.../valuechoices/ValueChoicesSelect2Panel.java | 191 ---
.../StandaloneCollectionPanel.java | 122 --
.../components/tree/IsisToWicketTreeAdapter.java | 530 ------
.../ui/components/unknown/UnknownModelPanel.java | 70 -
.../wicket/ui/components/welcome/WelcomePanel.java | 54 -
.../ui/components/welcome/WelcomePanelFactory.java | 61 -
.../widgets/breadcrumbs/BreadcrumbModel.java | 190 ---
.../widgets/breadcrumbs/BreadcrumbPanel.java | 158 --
.../widgets/buttons/ContainedButtonPanel.java | 94 -
.../entitysimplelink/EntityLinkSimplePanel.java | 97 --
.../EntityLinkSimplePanelFactory.java | 54 -
.../ui/components/widgets/favicon/Favicon.java | 65 -
.../widgets/linkandlabel/ActionLink.java | 284 ----
.../widgets/linkandlabel/ActionLinkFactory.java | 38 -
.../linkandlabel/ActionLinkFactoryAbstract.java | 319 ----
.../ui/components/widgets/navbar/BrandLogo.java | 72 -
.../ui/components/widgets/navbar/BrandName.java | 68 -
.../ui/components/widgets/select2/ChoiceExt.java | 40 -
.../ui/components/widgets/select2/Select2.java | 176 --
.../select2/Select2BootstrapCssReference.java | 48 -
.../widgets/select2/Select2ChoiceExt.java | 58 -
.../widgets/select2/Select2JsReference.java | 48 -
.../widgets/select2/Select2MultiChoiceExt.java | 67 -
.../select2/providers/EmptyChoiceProvider.java | 51 -
.../ObjectAdapterMementoProviderAbstract.java | 173 --
.../ObjectAdapterMementoProviderForChoices.java | 48 -
...tAdapterMementoProviderForReferenceChoices.java | 51 -
...entoProviderForReferenceObjectAutoComplete.java | 51 -
...derForReferenceParamOrPropertyAutoComplete.java | 75 -
...bjectAdapterMementoProviderForValueChoices.java | 66 -
.../themepicker/IsisWicketThemeSupport.java | 64 -
.../themepicker/IsisWicketThemeSupportDefault.java | 136 --
.../widgets/themepicker/ThemeChooser.java | 162 --
.../themepicker/ThemeProviderComposite.java | 114 --
.../widgets/zclip/ZeroClipboardPanel.java | 126 --
.../viewer/wicket/ui/errors/ExceptionModel.java | 193 ---
.../viewer/wicket/ui/errors/JGrowlBehaviour.java | 86 -
.../isis/viewer/wicket/ui/errors/JGrowlUtil.java | 90 -
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 524 ------
.../isis/viewer/wicket/ui/pages/WebPageBase.java | 77 -
.../ui/pages/accmngt/EmailAvailableValidator.java | 78 -
.../pages/accmngt/UsernameAvailableValidator.java | 68 -
.../ui/pages/accmngt/register/RegisterPanel.java | 210 ---
.../accmngt/signup/RegistrationFormPanel.java | 128 --
.../ui/pages/actionprompt/ActionPromptPage.java | 80 -
.../viewer/wicket/ui/pages/entity/EntityPage.java | 240 ---
.../viewer/wicket/ui/pages/error/ErrorPage.java | 91 -
.../isis/viewer/wicket/ui/pages/home/HomePage.java | 90 -
.../wicket/ui/pages/login/IsisSignInPanel.java | 170 --
.../wicket/ui/pages/mmverror/MmvErrorPage.java | 114 --
.../isis/viewer/wicket/ui/panels/FormAbstract.java | 89 -
.../wicket/ui/panels/FormExecutorDefault.java | 547 ------
.../wicket/ui/panels/FormExecutorStrategy.java | 41 -
.../isis/viewer/wicket/ui/panels/PanelBase.java | 162 --
.../isis/viewer/wicket/ui/panels/PanelUtil.java | 116 --
.../wicket/ui/panels/PromptFormAbstract.java | 378 ----
.../isis/viewer/wicket/ui/util/Components.java | 118 --
.../viewer/wicket/ui/util/CssClassAppender.java | 76 -
.../viewer/wicket/ui/util/CssClassRemover.java | 51 -
.../isis/viewer/wicket/ui/util/CssIdAppender.java | 70 -
.../isis/viewer/wicket/ui/util/Tooltips.java | 84 -
.../viewer/wicket/ui/validation/ValidatorBase.java | 42 -
.../ui/ComponentFactoryAbstractTest_init.java | 128 --
...ollectionContentsSelectorDropdownPanelTest.java | 79 -
.../jdkdates/DateConverterForJavaSqlDateTest.java | 77 -
.../jdkdates/DateConverterForJavaUtilDateTest.java | 101 --
.../jodatime/DateConverterForJodaDateTimeTest.java | 97 --
.../DateConverterForJodaLocalDateTest.java | 73 -
.../DateConverterForJodaLocalDateTimeTest.java | 96 --
.../DateConverterForJdk8LocalDateTest.java | 75 -
.../DateConverterForJdk8LocalDateTimeTest.java | 98 --
.../DateConverterForJdk8OffsetDateTimeTest.java | 108 --
...tAdapterMementoProviderForValueChoicesTest.java | 116 --
core/viewers/wicket/viewer/pom.xml | 185 --
.../integration/AnonymousWebSessionForIsis.java | 47 -
.../AuthenticatedWebSessionForIsis.java | 284 ----
.../integration/ConverterForObjectAdapter.java | 85 -
.../ConverterForObjectAdapterMemento.java | 79 -
.../viewer/integration/LocalizerForIsis.java | 149 --
.../viewer/integration/WebRequestCycleForIsis.java | 404 -----
.../ComponentFactoryRegistrarDefault.java | 306 ----
.../ComponentFactoryRegistryDefault.java | 200 ---
.../registries/pages/PageClassRegistryDefault.java | 93 -
.../viewer/services/DeepLinkServiceWicket.java | 76 -
.../services/HintStoreUsingWicketSession.java | 112 --
.../services/ImageResourceCacheClassPath.java | 301 ----
.../services/TranslationsResolverWicket.java | 111 --
.../services/WicketViewerSettingsDefault.java | 114 --
.../viewer/services/mementos/CollectionData.java | 55 -
.../wicket/viewer/services/mementos/Data.java | 47 -
.../viewer/services/mementos/ObjectData.java | 77 -
.../viewer/services/mementos/ObjectMarshaller.java | 153 --
.../services/mementos/ObjectMementoLegacy.java | 648 -------
.../mementos/ObjectMementoServiceWicket.java | 165 --
.../services/mementos/ObjectUnmarshaller.java | 298 ----
.../viewer/services/mementos/StandaloneData.java | 70 -
.../wicket/viewer/webmodule/WebModuleWicket.java | 114 --
.../viewer/wicketapp/IsisWicketApplication.java | 618 -------
.../IsisWicketApplication_Experimental.java | 107 --
.../IsisWicketApplication_newPageFactory.java | 95 --
...uthenticatedWebSessionForIsis_Authenticate.java | 148 --
...thenticatedWebSessionForIsis_Instantiation.java | 62 -
.../AuthenticatedWebSessionForIsis_SignIn.java | 121 --
...uthenticatedWebSessionForIsis_TestAbstract.java | 93 -
.../wicketapp/IsisWicketApplication_Defaults.java | 79 -
.../wicketapp/IsisWicketApplication_Pages.java | 97 --
core/webapp/pom.xml | 10 +-
.../isis/core/webapp/IsisModuleCoreWebapp.java | 48 +
.../webapp/context/IsisWebAppCommonContext.java | 147 ++
.../core/webapp/context/memento/ObjectMemento.java | 83 +
.../context/memento/ObjectMementoCollection.java | 63 +
.../context/memento/ObjectMementoService.java | 43 +
.../diagnostics/IsisLogOnExceptionFilter.java | 76 +
.../HealthIndicatorUsingHealthCheckService.java | 47 +
.../apache/isis/core/webapp/modules/WebModule.java | 103 ++
.../core/webapp/modules/WebModuleAbstract.java | 91 +
.../isis/core/webapp/modules/WebModuleContext.java | 119 ++
.../logonlog/WebModuleLogOnExceptionLogger.java | 80 +
.../TemplateResourceCachingFilter.java | 213 +++
.../templresources/TemplateResourceServlet.java | 162 ++
...plateResourceServlet_HtmlTemplateVariables.java | 64 +
.../templresources/WebModuleTemplateResources.java | 86 +
.../core/webapp/routing/ForwardingServlet.java | 51 +
.../isis/core/webapp/routing/RedirectFilter.java | 61 +
.../isis/core/webapp/routing/RedirectServlet.java | 48 +
.../core/webapp/routing/RedirectToDocsFilter.java | 110 ++
.../webappctx/IsisWebAppContextInitializer.java | 133 ++
.../wormhole/AuthenticationSessionWormhole.java | 33 +
.../org/apache/isis/webapp/IsisModuleWebapp.java | 48 -
.../webapp/context/IsisWebAppCommonContext.java | 147 --
.../isis/webapp/context/memento/ObjectMemento.java | 83 -
.../context/memento/ObjectMementoCollection.java | 63 -
.../context/memento/ObjectMementoService.java | 43 -
.../diagnostics/IsisLogOnExceptionFilter.java | 76 -
.../HealthIndicatorUsingHealthCheckService.java | 47 -
.../org/apache/isis/webapp/modules/WebModule.java | 101 --
.../isis/webapp/modules/WebModuleAbstract.java | 91 -
.../isis/webapp/modules/WebModuleContext.java | 119 --
.../logonlog/WebModuleLogOnExceptionLogger.java | 80 -
.../TemplateResourceCachingFilter.java | 213 ---
.../templresources/TemplateResourceServlet.java | 162 --
...plateResourceServlet_HtmlTemplateVariables.java | 64 -
.../templresources/WebModuleTemplateResources.java | 86 -
.../isis/webapp/routing/ForwardingServlet.java | 51 -
.../apache/isis/webapp/routing/RedirectFilter.java | 61 -
.../isis/webapp/routing/RedirectServlet.java | 48 -
.../isis/webapp/routing/RedirectToDocsFilter.java | 110 --
.../webappctx/IsisWebAppContextInitializer.java | 132 --
.../wormhole/AuthenticationSessionWormhole.java | 33 -
core/webboot-springboot/pom.xml | 94 -
.../webboot/springboot/IsisModuleSpringBoot.java | 51 -
core/webspringboot/pom.xml | 94 +
.../src/main/doc/antora.yml | 0
.../main/doc/modules/webboot-springboot}/nav.adoc | 0
.../modules/webboot-springboot/pages/about.adoc | 0
.../webboot-springboot/partials/module-nav.adoc | 0
.../webspringboot/IsisModuleCoreWebSpringBoot.java | 51 +
examples/demo/pom.xml | 4 +-
.../demoapp/dom/actions/async/AsyncActionDemo.java | 8 +-
.../java/demoapp/dom/actions/async/DemoTask.java | 4 +-
.../error/service/DemoErrorReportingService.java | 4 +-
.../main/java/demoapp/dom/types/blob/BlobDemo.java | 4 +-
.../dom/types/primitive/PrimitivesDemo.java | 2 +-
.../demo/src/main/java/demoapp/utils/DemoStub.java | 2 +-
.../demoapp/utils/LibraryPreloadingService.java | 8 +-
.../demo/src/main/java/demoapp/webapp/DemoApp.java | 18 +-
examples/demo/src/main/resources/application.yml | 2 +-
examples/smoketests/pom.xml | 12 +-
.../testdomain/conf/Configuration_headless.java | 6 +-
.../testdomain/conf/Configuration_usingJdo.java | 10 +-
.../conf/Configuration_usingJdoAndShiro.java | 10 +-
.../org/apache/isis/testdomain/jdo/BookDto.java | 4 +-
.../isis/testdomain/jdo/InventoryResource.java | 2 +-
.../isis/testdomain/jdo/JdoTestDomainPersona.java | 8 +-
.../isis/testdomain/rest/RestEndpointService.java | 4 +-
.../testdomain/auditing/AuditerServiceTest.java | 4 +-
.../bootstrapping/AutoConfigurationTest.java | 12 +-
.../bootstrapping/JdoBootstrappingTest.java | 2 +-
.../JdoBootstrappingTest_usingFixtures.java | 4 +-
.../SpringServiceInjectOrderTest.java | 6 +-
.../SpringServiceProvisioningTest.java | 16 +-
.../commandexecution/WrapperAsyncTest.java | 4 +-
.../commandexecution/WrapperSyncTest.java | 4 +-
.../org/apache/isis/testdomain/config/FooTest.java | 2 +-
.../isis/testdomain/config/IsisConfigBeanTest.java | 8 +-
.../config/IsisConfigBeanTest_usingHeadless.java | 4 +-
.../domainmodel/AnnotationSyntesizerTest.java | 4 +-
.../DomainModelTest_usingBadDomain.java | 14 +-
...nModelTest_usingBadDomain_noActionEnforced.java | 14 +-
.../DomainModelTest_usingGoodDomain.java | 10 +-
.../domainmodel/SpecloaderPerformanceTest.java | 10 +-
.../eventhandling/GenericEventPublishingTest.java | 2 +-
.../eventhandling/SpringEventPublishingTest.java | 2 +-
.../testdomain/ldap/LdapEmbeddedServerTest.java | 2 +-
.../isis/testdomain/logging/LoggerSetupTest.java | 2 +-
.../publishing/PublisherServiceTest.java | 6 +-
.../isis/testdomain/rest/RestServiceTest.java | 2 +-
.../isis/testdomain/shiro/AbstractShiroTest.java | 2 +-
.../isis/testdomain/shiro/ShiroLdapTest.java | 2 +-
.../isis/testdomain/shiro/ShiroSecmanLdapTest.java | 2 +-
.../shiro/ShiroSecmanLdap_restfulStressTest.java | 4 +-
.../isis/testdomain/shiro/ShiroSecmanTest.java | 2 +-
.../testdomain/timestamping/TimestampingTest.java | 2 +-
.../transactions/TransactionRollbackTest.java | 6 +-
...TransactionRollbackTest_usingTransactional.java | 4 +-
.../bootstrapping/builtin-domain-services.list | 20 +-
.../bootstrapping/builtin-requestscoped.list | 4 +-
.../jdo/flywayjdo/src/main/doc/antora.yml | 2 +-
.../src/main/doc/modules/flywayjdo/nav.adoc | 2 +-
.../doc/modules/flywayjdo/partials/module-nav.adoc | 2 +-
extensions/pom.xml | 20 +-
.../security/secman/api/src/main/doc/antora.yml | 2 -
.../secman/api/src/main/doc/modules/api/nav.adoc | 1 -
.../main/doc/modules/api/partials/module-nav.adoc | 1 -
.../secman/api/SecurityModuleConfig.java | 2 +-
.../api/permission/ApplicationPermission.java | 2 +-
.../api/permission/ApplicationPermissionMode.java | 4 +-
.../ApplicationPermissionRepository.java | 2 +-
.../api/permission/ApplicationPermissionRule.java | 4 +-
.../api/permission/ApplicationPermissionValue.java | 2 +-
.../permission/ApplicationPermissionValueSet.java | 6 +-
.../permission/PermissionsEvaluationService.java | 2 +-
.../PermissionsEvaluationServiceAbstract.java | 4 +-
...PermissionsEvaluationServiceVetoBeatsAllow.java | 2 +-
.../extensions/secman/api/user/AccountType.java | 2 +-
.../secman/api/user/ApplicationUserStatus.java | 2 +-
.../security/secman/encryption-jbcrypt/pom.xml | 2 +-
.../encryption-jbcrypt/src/main/doc/antora.yml | 2 -
.../main/doc/modules/encryption-jbcrypt/nav.adoc | 1 -
.../encryption-jbcrypt/partials/module-nav.adoc | 1 -
extensions/security/secman/model/pom.xml | 2 +-
.../security/secman/model/src/main/doc/antora.yml | 2 -
.../model/src/main/doc/modules/model/nav.adoc | 1 -
.../doc/modules/model/partials/module-nav.adoc | 1 -
.../secman/model/app/feature/ApplicationClass.java | 2 +-
.../model/app/feature/ApplicationClassAction.java | 2 +-
.../app/feature/ApplicationClassCollection.java | 2 +-
.../model/app/feature/ApplicationClassMember.java | 2 +-
.../app/feature/ApplicationClassProperty.java | 2 +-
.../app/feature/ApplicationFeatureViewModel.java | 12 +-
.../app/feature/ApplicationFeatureViewModels.java | 6 +-
.../model/app/feature/ApplicationPackage.java | 4 +-
.../app/feature/ApplicationPermission_feature.java | 4 +-
.../user/ApplicationUser_filterPermissions.java | 8 +-
.../app/user/ApplicationUser_permissions.java | 6 +-
.../model/app/user/UserPermissionViewModel.java | 12 +-
.../model/facets/TenantedAuthorizationFacet.java | 6 +-
.../facets/TenantedAuthorizationFacetDefault.java | 10 +-
.../facets/TenantedAuthorizationFacetFactory.java | 10 +-
extensions/security/secman/persistence-jdo/pom.xml | 4 +-
.../secman/persistence-jdo/src/main/doc/antora.yml | 2 -
.../src/main/doc/modules/persistence-jdo/nav.adoc | 1 -
.../persistence-jdo/partials/module-nav.adoc | 1 -
.../jdo/dom/permission/ApplicationPermission.java | 8 +-
.../ApplicationPermissionRepository.java | 18 +-
.../secman/jdo/dom/role/ApplicationRole.java | 6 +-
.../jdo/dom/role/ApplicationRoleRepository.java | 2 +-
.../secman/jdo/dom/tenancy/ApplicationTenancy.java | 2 +-
.../dom/tenancy/ApplicationTenancyRepository.java | 2 +-
.../secman/jdo/dom/user/ApplicationUser.java | 8 +-
.../jdo/dom/user/ApplicationUserRepository.java | 2 +-
.../secman/jdo/seed/SeedSecurityModuleService.java | 6 +-
.../jdo/seed/SeedUsersAndRolesFixtureScript.java | 2 +-
.../AbstractRoleAndPermissionsFixtureScript.java | 6 +-
.../seed/scripts/AbstractTenancyFixtureScript.java | 2 +-
.../scripts/AbstractUserAndRolesFixtureScript.java | 6 +-
.../secman/jdo/seed/scripts/GlobalTenancy.java | 2 +-
...xtFixturesFixtureResultsRoleAndPermissions.java | 2 +-
.../IsisModuleSecurityAdminRoleAndPermissions.java | 2 +-
...sisModuleSecurityFixtureRoleAndPermissions.java | 2 +-
extensions/security/secman/pom.xml | 4 +-
extensions/security/secman/shiro-realm/pom.xml | 2 +-
.../secman/shiro-realm/src/main/doc/antora.yml | 2 -
.../src/main/doc/modules/realm-shiro/nav.adoc | 1 -
.../main/doc/modules/realm-shiro/pages/about.adoc | 30 -
.../modules/realm-shiro/partials/module-nav.adoc | 1 -
.../secman/shiro/AuthInfoForApplicationUser.java | 2 +-
.../shiro/IsisModuleExtSecmanShiroRealm.java | 6 +-
.../secman/shiro/PermissionForMember.java | 2 +-
...lCollectionForApplicationUserOnSingleRealm.java | 2 +-
.../secman/shiro/PrincipalForApplicationUser.java | 2 +-
extensions/security/secman/src/main/doc/antora.yml | 6 +-
.../secman/src/main/doc/modules/ROOT/nav.adoc | 1 -
.../doc/modules/ROOT/partials/component-nav.adoc | 7 -
.../main/doc/modules/ROOT/partials/module-nav.adoc | 0
...s-security-module-realm-with-delegate-realm.PNG | Bin
...iro-to-use-isisaddons-security-module-realm.PNG | Bin
.../secman/src/main/doc/modules/secman}/nav.adoc | 0
.../doc/modules/{ROOT => secman}/pages/about.adoc | 0
.../main/doc/modules/secman/pages/api.adoc} | 0
.../modules/secman/pages/jbcrypt-encryption.adoc} | 0
.../doc/modules/secman/pages/jdo-persistence.adoc} | 0
.../main/doc/modules/secman/pages/model.adoc} | 0
.../main/doc/modules/secman/pages/shiro-realm.adoc | 30 +
.../doc/modules/secman/partials/module-nav.adoc | 6 +
extensions/security/shiro-realm-ldap/impl/pom.xml | 17 +-
.../extensions/IsisModuleExtShiroRealmLdap.java | 35 -
.../realm/IsisLdapContextFactory.java | 58 -
.../shirorealmldap/realm/IsisLdapRealm.java | 500 ------
.../realm/impl/IsisLdapContextFactory.java | 58 +
.../shirorealmldap/realm/impl/IsisLdapRealm.java | 500 ++++++
.../impl/IsisModuleExtShiroRealmLdapImpl.java | 35 +
extensions/security/shiro-realm-ldap/pom.xml | 42 +
.../shiro-realm-ldap/src/main/doc/antora.yml | 2 +-
.../shiro-realm-ldap/partials/module-nav.adoc | 2 +-
extensions/vro/cors/impl/pom.xml | 16 +-
.../isis/extensions/cors/IsisModuleExtCors.java | 33 -
.../cors/impl/IsisModuleExtCorsImpl.java | 33 +
.../cors/impl/webmodule/WebModuleCors.java | 104 ++
.../extensions/cors/webmodule/WebModuleCors.java | 104 --
extensions/vro/cors/pom.xml | 36 +
extensions/vro/cors/src/main/doc/antora.yml | 2 +-
.../vro/cors/src/main/doc/modules/cors/nav.adoc | 2 +-
.../main/doc/modules/cors/partials/module-nav.adoc | 2 +-
.../vw/exceldownload/src/main/doc/antora.yml | 2 +-
.../ui/components/ExcelFileModel.java | 8 +-
extensions/vw/pdfjs/fixture/pom.xml | 229 ---
.../vw/pdfjs/{fixture => fixtures}/.gitignore | 0
.../pdfjs/fixtures}/logging-dn-enhance.properties | 0
extensions/vw/pdfjs/fixtures/pom.xml | 229 +++
.../src/main/java/META-INF/persistence.xml | 0
.../wicket/pdfjs/fixture/PdfjsFixturesModule.java | 0
.../demomodule/dom/PdfJsDemoObjectWithBlob.java | 0
.../dom/PdfJsDemoObjectWithBlobMenu.java | 0
...fJsDemoObjectWithBlob_createUpTo5_fakeData.java | 0
.../PdfJsDemoObjectWithBlob_tearDown.java | 0
extensions/vw/pdfjs/metamodel/pom.xml | 2 +-
.../pdfjs/metamodel/facet/PdfJsViewerFacet.java | 2 +-
.../metamodel/facet/PdfJsViewerFacetAbstract.java | 6 +-
.../facet/PdfJsViewerFacetFromAnnotation.java | 2 +-
.../PdfJsViewerFacetFromAnnotationFactory.java | 12 +-
extensions/vw/pdfjs/pom.xml | 3 +
extensions/vw/pdfjs/src/main/doc/antora.yml | 2 +-
.../doc/modules/pdfjs/partials/module-nav.adoc | 2 +-
.../pdfjs/ui/components/PdfJsViewerPanel.java | 2 +-
.../PdfJsViewerPanelComponentFactory.java | 2 +-
.../examples/facets/jsr303/Jsr303FacetFactory.java | 12 +-
.../facets/jsr303/Jsr303ProgModelFacets.java | 8 +-
.../jsr303/Jsr303PropertyValidationFacet.java | 18 +-
.../examples/facets/jsr303/CustomPattern.java | 2 +-
.../facets/jsr303/CustomPatternValidator.java | 2 +-
.../examples/facets/jsr303/CustomPatterns.java | 2 +-
.../facets/jsr303/DomainObjectVanilla.java | 2 +-
.../jsr303/DomainObjectWithBuiltInValidation.java | 2 +-
.../jsr303/DomainObjectWithCustomValidation.java | 2 +-
.../facets/jsr303/Jsr303FacetFacetHolder.java | 6 +-
.../jsr303/Jsr303FacetFactoryFeatureTypes.java | 6 +-
.../jsr303/Jsr303FacetFactoryInstantiation.java | 4 +-
.../jsr303/Jsr303FacetFactoryProcessObject.java | 8 +-
.../jsr303/Jsr303FacetFactoryProcessProperty.java | 12 +-
.../facets/jsr303/Jsr303FacetInstantiation.java | 6 +-
.../jsr303/Jsr303FacetValidatingInteraction.java | 10 +-
incubator/extensions/core/microprofile/pom.xml | 2 +-
.../jee_support/IsisCDIBeanScanInterceptor.java | 113 ++
.../jee_support/IsisCDIBeanScanInterceptor.java | 113 --
.../services/javax.enterprise.inject.spi.Extension | 2 +-
incubator/extensions/core/model/pom.xml | 4 +-
.../SupportingMethodValidatorRefinerFactory.java | 20 +-
.../services/IncubatorMetaModelPlugin.java | 4 +-
incubator/pom.xml | 10 +-
legacy/extensions/core/applib/pom.xml | 4 +-
.../isis/legacy/applib/DomainObjectContainer.java | 4 +-
.../org/apache/isis/legacy/applib/value/Color.java | 2 +-
.../org/apache/isis/legacy/applib/value/Money.java | 2 +-
.../isis/legacy/applib/value/Percentage.java | 2 +-
legacy/extensions/core/commons/pom.xml | 4 +-
.../internal/threadpool/ThreadPoolSupport.java | 12 +-
.../internal/threadpool/ThreadPoolSupportTest.java | 2 +-
legacy/extensions/core/metamodel/pom.xml | 6 +-
.../facets/value/color/ColorValueFacet.java | 4 +-
...lorValueFacetUsingSemanticsProviderFactory.java | 4 +-
.../value/color/ColorValueSemanticsProvider.java | 10 +-
.../facets/value/money/MoneyValueFacet.java | 4 +-
...neyValueFacetUsingSemanticsProviderFactory.java | 4 +-
.../value/money/MoneyValueSemanticsProvider.java | 14 +-
...ageValueFacetUsingSemanticsProviderFactory.java | 4 +-
.../PercentageValueSemanticsProvider.java | 14 +-
.../value/ColorValueSemanticsProviderTest.java | 8 +-
.../value/MoneyValueSemanticsProviderTest.java | 10 +-
.../PercentageValueSemanticsProviderTest.java | 10 +-
.../PolishMoneyValueSemanticsProviderTest.java | 10 +-
legacy/extensions/core/runtime/pom.xml | 4 +-
.../runtime/system/persistence/ObjectFactory.java | 2 +-
.../runtime/viewer/web/WebAppSpecification.java | 2 +-
legacy/mappings/restclient/pom.xml | 16 +-
.../isis/legacy/restclient/RestfulClient.java | 2 +-
.../lib/RestfulHttpMethodTest_setUp.java | 6 +-
legacy/pom.xml | 10 +-
legacy/testing/mavenplugin/pom.xml | 10 +-
.../IsisMavenPlugin_SpringContextConfig.java | 2 +-
.../IsisMavenPlugin_SpringContextLauncher.java | 4 +-
mappings/jaxrsclient/api/pom.xml | 40 +
.../api/IsisModuleExtJaxRsClientApi.java | 28 +
mappings/jaxrsclient/impl/pom.xml | 38 -
.../jaxrsclient/dom/IsisModuleExtJaxRsClient.java | 28 -
mappings/jaxrsclient/pom.xml | 32 +
.../impl => jaxrsclient}/src/main/doc/antora.yml | 0
.../src/main/doc/modules/jaxrsclient}/nav.adoc | 0
.../main/doc/modules/jaxrsclient/pages/about.adoc | 0
.../modules/jaxrsclient/partials/module-nav.adoc | 0
.../impl => minio}/src/main/doc/antora.yml | 0
.../minio/src/main/doc/modules/minio}/nav.adoc | 0
.../src/main/doc/modules/minio/pages/about.adoc | 0
.../doc/modules/minio/partials/module-nav.adoc | 0
mappings/pom.xml | 21 +-
mappings/restclient/api/pom.xml | 54 +
.../api}/src/main/doc/antora.yml | 0
.../src/main/doc/modules/restclient/nav.adoc | 0
.../main/doc/modules/restclient/pages/about.adoc | 0
.../modules/restclient/partials/module-nav.adoc | 0
.../restclient/ActionParameterListBuilder.java | 0
.../restclient/IsisModuleExtRestClient.java | 0
.../isis/extensions/restclient/ResponseDigest.java | 203 +++
.../isis/extensions/restclient/RestfulClient.java | 262 +++
.../extensions/restclient/RestfulClientConfig.java | 0
.../restclient/RestfulClientException.java | 0
.../isis/extensions/restclient/ScalarValueDto.java | 0
.../restclient/auth/BasicAuthFilter.java | 98 ++
.../restclient/log/RestfulLoggingFilter.java | 132 ++
mappings/restclient/impl/pom.xml | 42 -
.../isis/extensions/restclient/ResponseDigest.java | 203 ---
.../isis/extensions/restclient/RestfulClient.java | 262 ---
.../restclient/auth/BasicAuthFilter.java | 97 --
.../restclient/log/RestfulLoggingFilter.java | 132 --
mappings/restclient/pom.xml | 32 +
.../impl => slack}/src/main/doc/antora.yml | 0
.../slack/src/main/doc/modules/slack}/nav.adoc | 0
.../src/main/doc/modules/slack/pages/about.adoc | 0
.../doc/modules/slack/partials/module-nav.adoc | 0
mavendeps/pom.xml | 10 +-
mavendeps/testing/pom.xml | 6 +-
mavendeps/webapp/pom.xml | 4 +-
persistence/jdo/applib/pom.xml | 98 ++
.../jdo/applib/IsisModuleJdoApplib.java | 0
.../applib/exceptions/NotPersistableException.java | 43 +
.../exceptions/UnsupportedFindException.java | 42 +
.../applib/fixturestate/FixturesInstalledFlag.java | 34 +
.../fixturestate/FixturesInstalledState.java | 0
.../fixturestate/FixturesInstalledStateHolder.java | 0
.../jdo/applib/fixturestate/package-info.java | 47 +
.../jdo/applib/services/IsisJdoSupport.java | 0
.../jdo/applib/services/IsisJdoSupport_v3_2.java | 0
persistence/jdo/datanucleus-5/pom.xml | 149 ++
.../datanucleus5/IsisModuleJdoDataNucleus5.java | 77 +
.../CreateSchemaObjectFromClassMetadata.java | 219 +++
.../datanucleus/DataNucleusContextUtil.java | 59 +
.../datanucleus/DataNucleusException.java | 43 +
.../datanucleus/DataNucleusLifeCycleHelper.java | 59 +
.../datanucleus/DataNucleusPropertiesAware.java | 0
.../datanucleus/DataNucleusSettings.java | 0
.../datanucleus/JDOStateManagerForIsis.java | 255 +++
.../datanucleus/JdoRuntimeException.java | 0
.../datanucleus/metamodel/JdoPropertyUtils.java | 81 +
.../commands/AbstractDataNucleusObjectCommand.java | 41 +
.../commands/DataNucleusCreateObjectCommand.java | 72 +
.../commands/DataNucleusDeleteObjectCommand.java | 50 +
.../PersistenceQueryFindAllInstancesProcessor.java | 58 +
...sistenceQueryFindUsingApplibQueryProcessor.java | 159 ++
.../queries/PersistenceQueryProcessor.java | 30 +
.../queries/PersistenceQueryProcessorAbstract.java | 79 +
.../datanucleus/persistence/queries/QueryUtil.java | 91 +
.../persistence/spi/JdoObjectIdSerializer.java | 207 +++
.../service/JdoPersistenceLifecycleService.java | 149 ++
.../service/eventbus/EventBusServiceJdo.java | 0
.../typeconverters/IsisMarkupConverter.java | 0
.../typeconverters/IsisPasswordConverter.java | 0
.../valuemappings/ByteArrayBlobRdbmsMapping.java | 0
.../datanucleus/valuetypes/IsisBlobMapping.java | 0
.../datanucleus/valuetypes/IsisClobMapping.java | 0
.../entities/JdoEntityTypeRegistry.java | 94 +
...eptionRecognizerCompositeForJdoObjectStore.java | 78 +
...xceptionRecognizerForJDODataStoreException.java | 0
...traintViolationForeignKeyNoActionException.java | 0
...ionRecognizerForJDOObjectNotFoundException.java | 0
...yConstraintViolationUniqueOrIndexException.java | 0
.../exceprecog/JdoNestedExceptionResolver.java | 45 +
.../datanucleus5/jdosupport/IsisJdoSupportDN5.java | 223 +++
.../mixins/Persistable_datanucleusIdLong.java | 0
.../mixins/Persistable_datanucleusVersionLong.java | 0
.../Persistable_datanucleusVersionTimestamp.java | 0
.../mixins/Persistable_downloadJdoMetadata.java | 88 +
.../JdoStoreLifecycleListenerForIsis.java | 72 +
.../datanucleus5/metamodel/JdoMetamodelUtil.java | 63 +
.../metamodel/JdoProgrammingModelPlugin.java | 299 ++++
...JdoDatastoreIdentityAnnotationFacetFactory.java | 59 +
.../JdoDatastoreIdentityFacet.java | 34 +
.../JdoDatastoreIdentityFacetAbstract.java | 54 +
.../JdoDatastoreIdentityFacetAnnotation.java | 32 +
.../JdoDatastoreIdentityFacetImpl.java | 32 +
.../object/datastoreidentity/package-info.java | 0
.../JdoDiscriminatorAnnotationFacetFactory.java | 96 ++
.../discriminator/JdoDiscriminatorFacet.java | 25 +
.../JdoDiscriminatorFacetDefault.java | 30 +
...nferredFromJdoDiscriminatorValueAnnotation.java | 35 +
.../facets/object/discriminator/package-info.java | 0
...cIdFacetForJdoPersistenceCapableAnnotation.java | 51 +
...doPersistenceCapableAnnotationFacetFactory.java | 84 +
.../JdoPersistenceCapableFacet.java | 45 +
.../JdoPersistenceCapableFacetAbstract.java | 87 +
.../JdoPersistenceCapableFacetAnnotation.java | 36 +
.../JdoPersistenceCapableFacetImpl.java | 135 ++
.../object/persistencecapable/package-info.java | 0
.../facets/object/query/JdoNamedQuery.java | 112 ++
.../object/query/JdoQueriesFacetAnnotation.java | 36 +
.../query/JdoQueryAnnotationFacetFactory.java | 99 ++
.../facets/object/query/JdoQueryFacet.java | 59 +
.../facets/object/query/JdoQueryFacetAbstract.java | 64 +
.../object/query/JdoQueryFacetAnnotation.java | 36 +
.../object/query/VisitorForClauseAbstract.java | 109 ++
.../facets/object/query/VisitorForFromClause.java | 67 +
.../object/query/VisitorForVariablesClause.java | 68 +
.../version/JdoVersionAnnotationFacetFactory.java | 103 ++
.../facets/object/version/JdoVersionFacet.java | 25 +
.../version/JdoVersionFacetFromAnnotation.java | 30 +
.../facets/object/version/package-info.java | 0
...DerivedFromJdoColumnAnnotationFacetFactory.java | 180 ++
.../BigDecimalFacetDerivedFromJdoColumn.java | 59 +
.../prop/column/BigDecimalFacetFallback.java | 47 +
.../column/MandatoryFacetDerivedFromJdoColumn.java | 36 +
...ndatoryFacetInferredFromAbsenceOfJdoColumn.java | 35 +
...ndatoryFromJdoColumnAnnotationFacetFactory.java | 215 +++
...DerivedFromJdoColumnAnnotationFacetFactory.java | 155 ++
.../column/MaxLengthFacetDerivedFromJdoColumn.java | 31 +
.../JdoNotPersistentAnnotationFacetFactory.java | 61 +
.../prop/notpersistent/JdoNotPersistentFacet.java | 35 +
.../JdoNotPersistentFacetAbstract.java | 37 +
.../JdoNotPersistentFacetAnnotation.java | 30 +
.../notpersistent/JdoNotPersistentFacetImpl.java | 30 +
...FacetDerivedFromJdoNotPersistentAnnotation.java | 31 +
...ledFacetDerivedFromJdoPrimaryKeyAnnotation.java | 35 +
.../JdoPrimaryKeyAnnotationFacetFactory.java | 61 +
.../facets/prop/primarykey/JdoPrimaryKeyFacet.java | 35 +
.../primarykey/JdoPrimaryKeyFacetAbstract.java | 37 +
.../primarykey/JdoPrimaryKeyFacetAnnotation.java | 30 +
.../prop/primarykey/JdoPrimaryKeyFacetImpl.java | 30 +
...nalFacetDerivedFromJdoPrimaryKeyAnnotation.java | 43 +
.../facets/prop/primarykey/package-info.java | 0
.../util/JdoPrimaryKeyPropertyPredicate.java | 48 +
.../metrics/MetricsServiceDefault.java | 78 +
.../objectadapter/ObjectAdapterContext.java | 256 +++
.../ObjectAdapterContext_DependencyInjection.java | 67 +
.../ObjectAdapterContext_Factories.java | 81 +
...ObjectAdapterContext_LifecycleEventSupport.java | 70 +
.../ObjectAdapterContext_NewIdentifier.java | 64 +
...ctAdapterContext_ObjectAdapterByIdProvider.java | 222 +++
...ObjectAdapterContext_ObjectAdapterProvider.java | 65 +
.../ObjectAdapterContext_ObjectCreation.java | 150 ++
.../persistence/DNStoreManagerType.java | 0
.../DataNucleusApplicationComponents5.java | 243 +++
.../persistence/IsisLifecycleListener.java | 194 +++
.../persistence/IsisPersistenceSessionJdo.java | 83 +
.../persistence/IsisPersistenceSessionJdoBase.java | 262 +++
.../IsisPlatformTransactionManagerForJdo.java | 159 ++
.../persistence/IsisTransactionJdo.java | 468 +++++
.../persistence/IsisTransactionManagerJdo.java | 334 ++++
.../persistence/PersistenceSession5.java | 872 ++++++++++
.../persistence/PersistenceSessionFactory5.java | 233 +++
.../jdo/datanucleus5/persistence/Utils.java | 0
.../persistence/command/CreateObjectCommand.java | 0
.../persistence/command/DestroyObjectCommand.java | 0
.../persistence/command/PersistenceCommand.java | 28 +
.../command/PersistenceCommandAbstract.java | 39 +
.../persistence/query/PersistenceQuery.java | 46 +
.../query/PersistenceQueryAbstract.java | 101 ++
.../persistence/query/PersistenceQueryFactory.java | 86 +
.../query/PersistenceQueryFindAllInstances.java | 63 +
...ersistenceQueryFindUsingApplibQueryDefault.java | 85 +
.../src/main/resources/META-INF/MANIFEST.MF | 0
.../datanucleus-5/src/main/resources/plugin.xml | 0
.../ObjectReflectorDefaultTest_object.java | 81 +
.../adapterfactory/pojo/PojoAdapterTest.java | 81 +
.../transaction/PojoAdapterBuilder.java | 160 ++
.../runtime/system/ObjectMemberAbstractTest.java | 239 +++
.../WrapperFactoryDefault_wrappedObject_Test.java | 464 +++++
...actoryDefault_wrappedObject_transient_Test.java | 284 ++++
...onRecognizerCompositeForJdoObjectStoreTest.java | 89 +
...LIntegrityConstraintViolationExceptionTest.java | 0
...atastoreIdentityAnnotationFacetFactoryTest.java | 116 ++
...JdoDiscriminatorAnnotationFacetFactoryTest.java | 117 ++
...rsistenceCapableAnnotationFacetFactoryTest.java | 148 ++
.../query/JdoQueryAnnotationFacetFactoryTest.java | 0
.../JdoVersionAnnotationFacetFactoryTest.java | 91 +
...AnnotationFacetFactoryTest_refineMetaModel.java | 275 +++
...vedFromJdoColumnAnnotationFacetFactoryTest.java | 114 ++
...vedFromJdoColumnAnnotationFacetFactoryTest.java | 141 ++
...impleObjectWithBigDecimalColumnAnnotations.java | 0
...impleObjectWithColumnAllowsNullAnnotations.java | 0
...JdoNotPersistentAnnotationFacetFactoryTest.java | 125 ++
.../SimpleObjectWithNotPersistentColumn.java | 0
...venJdoPrimaryKeyAnnotationFacetFactoryTest.java | 137 ++
.../primarykey/SimpleObjectWithPrimaryKey.java | 0
persistence/jdo/pom.xml | 38 +
.../jdo/src/main/doc/antora.yml | 0
.../images/hints-n-tips/diagnosing-n-plus-1.png | Bin
.../party-agreementrole-agreement.png | Bin
.../jdo/src/main/doc/modules/ROOT/nav.adoc | 0
.../jdo/src/main/doc/modules/ROOT/pages/about.adoc | 0
.../main/doc/modules/ROOT/pages/configuring.adoc | 0
.../modules/ROOT/pages/configuring/bulk-load.adoc | 0
.../disabling-persistence-by-reachability.adoc | 0
.../ROOT/pages/configuring/persistence-xml.adoc | 0
.../modules/ROOT/pages/configuring/properties.adoc | 0
.../pages/configuring/using-jndi-data-source.adoc | 0
.../main/doc/modules/ROOT/pages/db-schemas.adoc | 0
.../doc/modules/ROOT/pages/hints-and-tips.adoc | 0
.../pages/hints-and-tips/diagnosing-n-plus-1.adoc | 0
.../modules/ROOT/pages/hints-and-tips/java8.adoc | 0
.../pages/hints-and-tips/jdoql-and-timestamps.adoc | 0
.../hints-and-tips/overriding-jdo-annotations.adoc | 0
.../subtype-entity-not-fully-populated.adoc | 0
.../typesafe-queries-and-fetchgroups.adoc | 0
.../main/doc/modules/ROOT/pages/jdo-mappings.adoc | 0
.../mandatory-properties-in-subtypes.adoc | 0
.../ROOT/pages/jdo-mappings/mapping-to-a-view.adoc | 0
.../one-to-m-bidirectional-relationships.adoc | 0
.../doc/modules/ROOT/partials/component-nav.adoc | 4 +
.../main/doc/modules/ROOT/partials/module-nav.adoc | 0
security/bypass/pom.xml | 48 +
.../bypass}/src/main/doc/antora.yml | 0
.../configure-isis-to-use-bypass.PNG | Bin
.../bypass/src/main/doc/modules/bypass/nav.adoc | 0
.../src/main/doc/modules/bypass/pages/about.adoc | 0
.../doc/modules/bypass/partials/module-nav.adoc | 0
.../security/bypass/IsisModuleSecurityBypass.java | 45 +
.../bypass/authentication/AuthenticatorBypass.java | 51 +
.../bypass/authorization/AuthorizorBypass.java | 58 +
{core/security/shiro => security/keycloak}/NOTICE | 0
security/keycloak/pom.xml | 81 +
.../keycloak}/src/main/doc/antora.yml | 0
.../src/main/doc/modules/keycloak}/nav.adoc | 0
.../src/main/doc/modules/keycloak/pages/about.adoc | 0
.../doc/modules/keycloak/partials/module-nav.adoc | 0
.../keycloak/IsisModuleSecurityKeycloak.java | 49 +
.../authentication/AuthenticatorKeycloak.java | 55 +
.../keycloak/authorization/AuthorizorKeycloak.java | 63 +
.../keycloak/webmodule/KeycloakFilter.java | 75 +
.../keycloak/webmodule/WebModuleKeycloak.java | 72 +
{core/security/keycloak => security/shiro}/NOTICE | 0
security/shiro/pom.xml | 96 ++
.../api => security/shiro}/src/main/doc/antora.yml | 0
.../configuration/configure-isis-to-use-shiro.png | Bin
.../ini/configure-shiro-to-use-ini-realm.png | Bin
.../configure-shiro-to-use-custom-jdbc-realm.png | Bin
.../ldap/activeds-ldap-groups.png | Bin
.../ldap/activeds-ldap-mojo-partition.png | Bin
.../ldap/activeds-ldap-mojo-root-dse.png | Bin
.../ldap/activeds-ldap-sasl-authentication.png | Bin
.../configuring-shiro/ldap/activeds-ldap-users.png | Bin
.../configure-shiro-to-use-isis-ldap-realm.png | Bin
.../shiro/src/main/doc/modules/shiro}/nav.adoc | 0
.../src/main/doc/modules/shiro/pages/about.adoc | 0
.../pages/about/configuring-isis-to-use-shiro.adoc | 0
.../pages/about/enhanced-wildcard-permission.adoc | 0
.../doc/modules/shiro/pages/about/ini-realm.adoc | 0
.../doc/modules/shiro/pages/about/jdbc-realm.adoc | 110 ++
.../doc/modules/shiro/pages/about/ldap-realm.adoc | 0
.../main/doc/modules/shiro/pages/about/run-as.adoc | 0
.../modules/shiro/pages/about/shiro-caching.adoc | 0
.../doc/modules/shiro/partials/module-nav.adoc | 0
.../security/shiro/IsisModuleSecurityShiro.java | 49 +
.../shiro/authentication/AuthenticatorShiro.java | 227 +++
.../shiro/authorization/AuthorizorShiro.java | 125 ++
.../shiro/authorization/IsisPermission.java | 137 ++
.../authorization/IsisPermissionResolver.java | 0
.../shiro/context/ShiroSecurityContext.java | 51 +
.../permrolemapper/PermissionToRoleMapper.java | 0
.../PermissionToRoleMapperFromIni.java | 0
.../PermissionToRoleMapperFromString.java | 37 +
.../isis/security/shiro/permrolemapper/Util.java | 61 +
.../security/shiro/webmodule/WebModuleShiro.java | 202 +++
.../shiro/IsisPermissionTest_setParts.java | 0
.../shiro/IsisPermissionTest_typicalUsage.java | 0
...AuthenticatorOrAuthorizorTest_authenticate.java | 116 ++
...ticatorOrAuthorizorTest_isVisibleInAnyRole.java | 114 ++
.../authorization/IsisPermissionTest_equals.java | 0
.../PermissionToRoleMapperFromIniTest.java | 45 +
.../PermissionToRoleMapperFromStringTest.java | 45 +
.../shiro/permrolemapper/UtilTest_parse.java | 0
.../isis/security/shiro/permrolemapper/my.ini | 0
.../shiro/src/test/resources/shiro.ini | 0
.../main/doc/modules/simpleapp/pages/about.adoc | 2 +-
subdomains/base/applib/pom.xml | 63 +
.../isis/subdomains/base/applib/Chained.java | 36 +
.../apache/isis/subdomains/base/applib/Dflt.java | 20 +
.../base/applib/IsisModuleSubBaseApplib.java | 7 +
.../isis/subdomains/base/applib/PowerType.java | 13 +
.../apache/isis/subdomains/base/applib/Titled.java | 7 +
.../isis/subdomains/base/applib/TitledEnum.java | 11 +
.../base/applib/services/BaseServicesModule.java | 9 +
.../applib/services/calendar/CalendarService.java | 68 +
.../base/applib/types/DescriptionType.java | 16 +
.../subdomains/base/applib/types/FqcnType.java | 15 +
.../subdomains/base/applib/types/MoneyType.java | 15 +
.../subdomains/base/applib/types/NameType.java | 15 +
.../subdomains/base/applib/types/NotesType.java | 15 +
.../base/applib/types/ObjectIdentifierType.java | 15 +
.../base/applib/types/PercentageType.java | 15 +
.../base/applib/types/ProperNameType.java | 15 +
.../base/applib/types/ReferenceType.java | 18 +
.../subdomains/base/applib/types/TitleType.java | 15 +
.../base/applib/types/UrlTemplateType.java | 15 +
.../subdomains/base/applib/types/UserNameType.java | 15 +
.../isis/subdomains/base/applib/types/XxxType.java | 13 +
.../subdomains/base/applib/utils/ClassUtils.java | 21 +
.../base/applib/utils/JodaPeriodUtils.java | 69 +
.../subdomains/base/applib/utils/MathUtils.java | 61 +
.../subdomains/base/applib/utils/MessageUtils.java | 24 +
.../subdomains/base/applib/utils/StringUtils.java | 66 +
.../subdomains/base/applib/utils/TitleBuilder.java | 95 ++
.../base/applib/valuetypes/AbstractInterval.java | 247 +++
.../base/applib/valuetypes/LocalDateInterval.java | 130 ++
.../isis/subdomains/base/applib/valuetypes/VT.java | 133 ++
.../base/applib/with/WithCodeComparable.java | 7 +
.../base/applib/with/WithCodeGetter.java | 31 +
.../base/applib/with/WithCodeUnique.java | 5 +
.../applib/with/WithDescriptionComparable.java | 8 +
.../base/applib/with/WithDescriptionGetter.java | 32 +
.../base/applib/with/WithDescriptionUnique.java | 5 +
.../subdomains/base/applib/with/WithInterval.java | 136 ++
.../base/applib/with/WithIntervalContiguous.java | 272 +++
.../base/applib/with/WithIntervalMutable.java | 69 +
.../base/applib/with/WithNameComparable.java | 8 +
.../base/applib/with/WithNameGetter.java | 32 +
.../base/applib/with/WithNameUnique.java | 5 +
.../base/applib/with/WithReferenceComparable.java | 8 +
.../base/applib/with/WithReferenceGetter.java | 33 +
.../base/applib/with/WithReferenceUnique.java | 5 +
.../subdomains/base/applib/with/WithSequence.java | 9 +
.../subdomains/base/applib/with/WithStartDate.java | 14 +
.../base/applib/with/WithTitleComparable.java | 7 +
.../base/applib/with/WithTitleGetter.java | 32 +
.../base/applib/with/WithTitleUnique.java | 5 +
.../TitledEnumContractTestAbstract_title.java | 16 +
.../base/applib/TitledEnumContractTester.java | 18 +
.../base/applib/matchers/IsisMatchers.java | 335 ++++
.../CalendarServiceTest_beginningOfMonth.java | 61 +
.../CalendarServiceTest_beginningOfQuarter.java | 72 +
.../applib/testing/PrivateConstructorTester.java | 18 +
.../TitledEnumContractTestAbstract_title.java | 33 +
.../applib/titled/TitledEnumContractTester.java | 32 +
.../base/applib/utils/ClassUtilsTest.java | 57 +
.../base/applib/utils/JodaPeriodUtilsTest.java | 51 +
.../base/applib/utils/MathUtilsTest.java | 61 +
.../base/applib/utils/MessageUtils_Test.java | 57 +
.../base/applib/utils/StringUtilsTest.java | 137 ++
.../base/applib/utils/TitleBuilderTest.java | 31 +
.../applib/valuetypes/LocalDateIntervalTest.java | 225 +++
...arableByCodeContractTestAbstract_compareTo.java | 48 +
.../with/ComparableByCodeContractTester.java | 63 +
...yDescriptionContractTestAbstract_compareTo.java | 48 +
.../ComparableByDescriptionContractTester.java | 63 +
...arableByNameContractTestAbstract_compareTo.java | 48 +
.../with/ComparableByNameContractTester.java | 64 +
...eByReferenceContractTestAbstract_compareTo.java | 47 +
.../with/ComparableByReferenceContractTester.java | 64 +
...rableByTitleContractTestAbstract_compareTo.java | 47 +
.../with/ComparableByTitleContractTester.java | 64 +
.../with/InstantiatorForComparableByCode.java | 24 +
.../InstantiatorForComparableByDescription.java | 26 +
.../with/InstantiatorForComparableByName.java | 25 +
.../with/InstantiatorForComparableByReference.java | 26 +
.../applib/with/InstantiatorForWithStartDate.java | 26 +
...lperClassesContractTest_privateConstructor.java | 21 +
.../WithFieldUniqueContractTestAllAbstract.java | 81 +
...valMutableContractTestAbstract_changeDates.java | 66 +
subdomains/base/impl/pom.xml | 69 -
.../apache/isis/extensions/base/dom/Chained.java | 36 -
.../org/apache/isis/extensions/base/dom/Dflt.java | 20 -
.../extensions/base/dom/IsisModuleExtBase.java | 7 -
.../apache/isis/extensions/base/dom/PowerType.java | 13 -
.../apache/isis/extensions/base/dom/Titled.java | 7 -
.../isis/extensions/base/dom/TitledEnum.java | 11 -
.../base/dom/services/BaseServicesModule.java | 9 -
.../dom/services/calendar/CalendarService.java | 68 -
.../extensions/base/dom/types/DescriptionType.java | 16 -
.../isis/extensions/base/dom/types/FqcnType.java | 15 -
.../isis/extensions/base/dom/types/MoneyType.java | 15 -
.../isis/extensions/base/dom/types/NameType.java | 15 -
.../isis/extensions/base/dom/types/NotesType.java | 15 -
.../base/dom/types/ObjectIdentifierType.java | 15 -
.../extensions/base/dom/types/PercentageType.java | 15 -
.../extensions/base/dom/types/ProperNameType.java | 15 -
.../extensions/base/dom/types/ReferenceType.java | 18 -
.../isis/extensions/base/dom/types/TitleType.java | 15 -
.../extensions/base/dom/types/UrlTemplateType.java | 15 -
.../extensions/base/dom/types/UserNameType.java | 15 -
.../isis/extensions/base/dom/types/XxxType.java | 13 -
.../isis/extensions/base/dom/utils/ClassUtils.java | 21 -
.../extensions/base/dom/utils/JodaPeriodUtils.java | 69 -
.../isis/extensions/base/dom/utils/MathUtils.java | 61 -
.../extensions/base/dom/utils/MessageUtils.java | 24 -
.../extensions/base/dom/utils/StringUtils.java | 66 -
.../extensions/base/dom/utils/TitleBuilder.java | 95 --
.../base/dom/valuetypes/AbstractInterval.java | 247 ---
.../base/dom/valuetypes/LocalDateInterval.java | 130 --
.../isis/extensions/base/dom/valuetypes/VT.java | 133 --
.../base/dom/with/WithCodeComparable.java | 7 -
.../extensions/base/dom/with/WithCodeGetter.java | 31 -
.../extensions/base/dom/with/WithCodeUnique.java | 5 -
.../base/dom/with/WithDescriptionComparable.java | 8 -
.../base/dom/with/WithDescriptionGetter.java | 32 -
.../base/dom/with/WithDescriptionUnique.java | 5 -
.../extensions/base/dom/with/WithInterval.java | 136 --
.../base/dom/with/WithIntervalContiguous.java | 272 ---
.../base/dom/with/WithIntervalMutable.java | 69 -
.../base/dom/with/WithNameComparable.java | 8 -
.../extensions/base/dom/with/WithNameGetter.java | 32 -
.../extensions/base/dom/with/WithNameUnique.java | 5 -
.../base/dom/with/WithReferenceComparable.java | 8 -
.../base/dom/with/WithReferenceGetter.java | 33 -
.../base/dom/with/WithReferenceUnique.java | 5 -
.../extensions/base/dom/with/WithSequence.java | 9 -
.../extensions/base/dom/with/WithStartDate.java | 14 -
.../base/dom/with/WithTitleComparable.java | 7 -
.../extensions/base/dom/with/WithTitleGetter.java | 32 -
.../extensions/base/dom/with/WithTitleUnique.java | 5 -
.../dom/TitledEnumContractTestAbstract_title.java | 16 -
.../base/dom/TitledEnumContractTester.java | 18 -
.../extensions/base/dom/matchers/IsisMatchers.java | 335 ----
.../CalendarServiceTest_beginningOfMonth.java | 61 -
.../CalendarServiceTest_beginningOfQuarter.java | 72 -
.../base/dom/testing/PrivateConstructorTester.java | 18 -
.../TitledEnumContractTestAbstract_title.java | 33 -
.../base/dom/titled/TitledEnumContractTester.java | 32 -
.../extensions/base/dom/utils/ClassUtilsTest.java | 57 -
.../base/dom/utils/JodaPeriodUtilsTest.java | 51 -
.../extensions/base/dom/utils/MathUtilsTest.java | 61 -
.../base/dom/utils/MessageUtils_Test.java | 57 -
.../extensions/base/dom/utils/StringUtilsTest.java | 137 --
.../base/dom/utils/TitleBuilderTest.java | 31 -
.../base/dom/valuetypes/LocalDateIntervalTest.java | 227 ---
...arableByCodeContractTestAbstract_compareTo.java | 48 -
.../dom/with/ComparableByCodeContractTester.java | 63 -
...yDescriptionContractTestAbstract_compareTo.java | 48 -
.../ComparableByDescriptionContractTester.java | 63 -
...arableByNameContractTestAbstract_compareTo.java | 48 -
.../dom/with/ComparableByNameContractTester.java | 64 -
...eByReferenceContractTestAbstract_compareTo.java | 47 -
.../with/ComparableByReferenceContractTester.java | 64 -
...rableByTitleContractTestAbstract_compareTo.java | 49 -
.../dom/with/ComparableByTitleContractTester.java | 64 -
.../dom/with/InstantiatorForComparableByCode.java | 24 -
.../InstantiatorForComparableByDescription.java | 26 -
.../dom/with/InstantiatorForComparableByName.java | 25 -
.../with/InstantiatorForComparableByReference.java | 26 -
.../dom/with/InstantiatorForWithStartDate.java | 26 -
...lperClassesContractTest_privateConstructor.java | 21 -
.../WithFieldUniqueContractTestAllAbstract.java | 81 -
...valMutableContractTestAbstract_changeDates.java | 66 -
...arableByCodeContractTestAbstract_compareTo.java | 26 -
.../dom/with/ComparableByCodeContractTester.java | 16 -
...yDescriptionContractTestAbstract_compareTo.java | 26 -
.../ComparableByDescriptionContractTester.java | 17 -
...arableByNameContractTestAbstract_compareTo.java | 26 -
.../dom/with/ComparableByNameContractTester.java | 17 -
...eByReferenceContractTestAbstract_compareTo.java | 26 -
.../with/ComparableByReferenceContractTester.java | 17 -
...rableByTitleContractTestAbstract_compareTo.java | 26 -
.../dom/with/ComparableByTitleContractTester.java | 17 -
.../dom/with/InstantiatorForComparableByCode.java | 16 -
.../InstantiatorForComparableByDescription.java | 17 -
.../dom/with/InstantiatorForComparableByName.java | 16 -
.../with/InstantiatorForComparableByReference.java | 17 -
.../dom/with/InstantiatorForWithStartDate.java | 16 -
.../WithFieldUniqueContractTestAllAbstract.java | 18 -
...valMutableContractTestAbstract_changeDates.java | 13 -
subdomains/base/pom.xml | 24 +
.../{zip/impl => base}/src/main/doc/antora.yml | 0
.../src/main/doc/modules/base}/nav.adoc | 0
.../src/main/doc/modules/base/pages/about.adoc | 0
.../main/doc/modules/base/partials/module-nav.adoc | 0
subdomains/docx/applib/pom.xml | 44 +
.../docx/applib/IsisModuleSubDocxApplib.java | 27 +
subdomains/docx/impl/pom.xml | 37 -
.../extensions/docx/dom/IsisModuleExtDocx.java | 28 -
subdomains/docx/pom.xml | 33 +
.../impl => docx}/src/main/doc/antora.yml | 0
.../src/main/doc/modules/docx}/nav.adoc | 0
.../src/main/doc/modules/docx/pages/about.adoc | 0
.../main/doc/modules/docx/partials/module-nav.adoc | 0
subdomains/excel/applib/pom.xml | 82 +
.../excel/applib/IsisModuleSubExcelApplib.java | 9 +
.../excel/applib/dom/AggregationType.java | 6 +
.../excel/applib/dom/ExcelMetaDataEnabled.java | 10 +
.../subdomains/excel/applib/dom/ExcelService.java | 222 +++
.../subdomains/excel/applib/dom/HyperLink.java | 9 +
.../subdomains/excel/applib/dom/PivotColumn.java | 9 +
.../excel/applib/dom/PivotDecoration.java | 9 +
.../isis/subdomains/excel/applib/dom/PivotRow.java | 8 +
.../subdomains/excel/applib/dom/PivotValue.java | 10 +
.../subdomains/excel/applib/dom/RowHandler.java | 7 +
.../excel/applib/dom/WorksheetContent.java | 24 +
.../subdomains/excel/applib/dom/WorksheetSpec.java | 127 ++
.../excel/applib/dom/util/AnnotationList.java | 26 +
.../excel/applib/dom/util/AnnotationTriplet.java | 32 +
.../excel/applib/dom/util/CellMarshaller.java | 483 ++++++
.../excel/applib/dom/util/ExcelConverter.java | 601 +++++++
.../applib/dom/util/ExcelFileBlobConverter.java | 61 +
.../excel/applib/dom/util/ExcelServiceImpl.java | 230 +++
.../subdomains/excel/applib/dom/util/Mode.java | 15 +
.../excel/applib/dom/util/PivotUtils.java | 141 ++
.../excel/applib/dom/util/SheetPivoter.java | 603 +++++++
.../excel/applib/dom/util/AnnotationListTest.java | 34 +
.../applib/dom/util/AnnotationTripletTest.java | 48 +
.../excel/applib/dom/util/PivotUtilsTest.java | 287 ++++
.../excel/applib/dom/util/SheetPivoterTest.java | 525 ++++++
subdomains/excel/fixture/pom.xml | 15 +-
.../excel/fixtures/ExcelFixturesModule.java | 24 -
.../contributions/ExcelDemoToDoItem_export.java | 40 -
.../contributions/ExcelDemoToDoItem_export2.java | 47 -
.../BulkUpdateLineItemForDemoToDoItem.java | 144 --
.../BulkUpdateManagerForDemoToDoItem.java | 178 --
.../bulkupdate/BulkUpdateMenuForDemoToDoItem.java | 41 -
.../pivot/ExcelPivotByCategoryAndSubcategory.java | 44 -
.../ExcelPivotByCategoryAndSubcategoryMenu.java | 48 -
.../demotodoitem/DemoToDoItemRowHandler.java | 81 -
.../demotodoitem/DemoToDoItemRowHandler2.java | 64 -
.../ExcelUploadRowHandler4ToDoItem.java | 78 -
.../ExcelUploadServiceForDemoToDoItem.java | 44 -
.../DemoFixture_extending_ExcelFixture2.java | 47 -
.../DemoToDoItem_create_usingExcelFixture.java | 72 -
.../DemoToDoItem_recreate_usingExcelFixture.java | 37 -
.../fixtures/demoapp/todomodule/dom/Category.java | 27 -
.../todomodule/dom/DependenciesComparator.java | 20 -
.../demoapp/todomodule/dom/ExcelDemoToDoItem.java | 436 -----
.../todomodule/dom/ExcelDemoToDoItemMenu.java | 192 ---
.../demoapp/todomodule/dom/Subcategory.java | 32 -
.../ExcelDemoToDoItem_recreate5_for.java | 97 --
.../ExcelDemoToDoItem_recreate5_forSven.java | 9 -
.../fixturescripts/ExcelDemoToDoItem_tearDown.java | 13 -
.../ExcelDemoToDoItem_tearDown2.java | 40 -
.../excel/fixtures/IsisModuleSubExcelFixtures.java | 24 +
.../contributions/ExcelDemoToDoItem_export.java | 40 +
.../contributions/ExcelDemoToDoItem_export2.java | 47 +
.../BulkUpdateLineItemForDemoToDoItem.java | 155 ++
.../BulkUpdateLineItemForDemoToDoItem.layout.xml | 0
.../BulkUpdateManagerForDemoToDoItem.java | 184 ++
.../BulkUpdateManagerForDemoToDoItem.layout.xml | 0
.../bulkupdate/BulkUpdateMenuForDemoToDoItem.java | 48 +
.../pivot/ExcelPivotByCategoryAndSubcategory.java | 44 +
.../ExcelPivotByCategoryAndSubcategoryMenu.java | 53 +
.../demotodoitem/DemoToDoItemRowHandler.java | 81 +
.../demotodoitem/DemoToDoItemRowHandler2.java | 64 +
.../ExcelUploadRowHandler4ToDoItem.java | 78 +
.../ExcelUploadServiceForDemoToDoItem.java | 50 +
.../DemoFixture_extending_ExcelFixture2.java | 47 +
.../DemoToDoItem_create_usingExcelFixture.java | 72 +
.../DemoToDoItem_recreate_usingExcelFixture.java | 37 +
.../demomodule/fixturescripts/MoreToDoItems.xlsx | Bin
.../demomodule/fixturescripts/ToDoItems.xlsx | Bin
.../fixtures/demoapp/todomodule/dom/Category.java | 27 +
.../todomodule/dom/DependenciesComparator.java | 20 +
.../todomodule/dom/ExcelDemoToDoItem-done.png | Bin
.../todomodule/dom/ExcelDemoToDoItem-todo.png | Bin
.../demoapp/todomodule/dom/ExcelDemoToDoItem.java | 436 +++++
.../todomodule/dom/ExcelDemoToDoItem.layout.xml | 0
.../demoapp/todomodule/dom/ExcelDemoToDoItem.png | Bin
.../todomodule/dom/ExcelDemoToDoItemMenu.java | 192 +++
.../demoapp/todomodule/dom/Subcategory.java | 32 +
.../ExcelDemoToDoItem_recreate5_for.java | 97 ++
.../ExcelDemoToDoItem_recreate5_forSven.java | 9 +
.../fixturescripts/ExcelDemoToDoItem_tearDown.java | 13 +
.../ExcelDemoToDoItem_tearDown2.java | 40 +
subdomains/excel/impl/pom.xml | 88 -
.../isis/extensions/excel/IsisModuleExtExcel.java | 9 -
.../isis/extensions/excel/dom/AggregationType.java | 6 -
.../isis/extensions/excel/dom/ExcelFixture.java | 220 ---
.../isis/extensions/excel/dom/ExcelFixture2.java | 173 --
.../excel/dom/ExcelFixtureRowHandler.java | 12 -
.../excel/dom/ExcelFixtureWorkbookHandler.java | 12 -
.../extensions/excel/dom/ExcelMetaDataEnabled.java | 10 -
.../isis/extensions/excel/dom/ExcelService.java | 222 ---
.../excel/dom/FixtureAwareRowHandler.java | 11 -
.../isis/extensions/excel/dom/HyperLink.java | 9 -
.../isis/extensions/excel/dom/PivotColumn.java | 9 -
.../isis/extensions/excel/dom/PivotDecoration.java | 9 -
.../apache/isis/extensions/excel/dom/PivotRow.java | 8 -
.../isis/extensions/excel/dom/PivotValue.java | 10 -
.../isis/extensions/excel/dom/RowHandler.java | 7 -
.../extensions/excel/dom/WorksheetContent.java | 24 -
.../isis/extensions/excel/dom/WorksheetSpec.java | 127 --
.../extensions/excel/dom/util/AnnotationList.java | 26 -
.../excel/dom/util/AnnotationTriplet.java | 32 -
.../extensions/excel/dom/util/CellMarshaller.java | 483 ------
.../extensions/excel/dom/util/ExcelConverter.java | 601 -------
.../excel/dom/util/ExcelFileBlobConverter.java | 61 -
.../excel/dom/util/ExcelServiceImpl.java | 230 ---
.../isis/extensions/excel/dom/util/Mode.java | 15 -
.../isis/extensions/excel/dom/util/PivotUtils.java | 141 --
.../extensions/excel/dom/util/SheetPivoter.java | 603 -------
.../excel/dom/util/AnnotationListTest.java | 34 -
.../excel/dom/util/AnnotationTripletTest.java | 48 -
.../extensions/excel/dom/util/PivotUtilsTest.java | 287 ----
.../excel/dom/util/SheetPivoterTest.java | 525 ------
subdomains/excel/integtests/pom.xml | 18 +-
.../integtests/ExcelModuleIntegTestAbstract.java | 48 -
.../ExcelModuleDemoMetaDataEnabled_IntegTest.java | 65 -
...uleDemoToDoItemBulkUpdateManager_IntegTest.java | 110 --
.../ExcelModuleDemoUploadService_IntegTest.java | 49 -
.../integtests/ExcelModuleIntegTestAbstract.java | 49 +
.../ExcelModuleDemoMetaDataEnabled_IntegTest.java | 65 +
...uleDemoToDoItemBulkUpdateManager_IntegTest.java | 110 ++
.../ExcelModuleDemoUploadService_IntegTest.java | 49 +
.../tests/ToDoItemsWithMultipleSheets.xlsx | Bin
.../excel/integtests/tests/toDoItems-expected.xlsx | Bin
.../excel/integtests/tests/toDoItems-updated.xlsx | Bin
subdomains/excel/integtests/translations.pot | 16 +-
subdomains/excel/pom.xml | 39 +
.../{spring/impl => excel}/src/main/doc/antora.yml | 0
.../{impl => }/src/main/doc/modules/excel/nav.adoc | 0
.../src/main/doc/modules/excel/pages/about.adoc | 0
.../doc/modules/excel/partials/module-nav.adoc | 0
subdomains/excel/testing/pom.xml | 44 +
.../subdomains/excel/testing/ExcelFixture.java | 221 +++
.../subdomains/excel/testing/ExcelFixture2.java | 175 ++
.../excel/testing/ExcelFixtureRowHandler.java | 12 +
.../excel/testing/ExcelFixtureWorkbookHandler.java | 12 +
.../excel/testing/FixtureAwareRowHandler.java | 12 +
.../excel/testing/IsisModuleSubExcelTesting.java | 9 +
subdomains/freemarker/applib/pom.xml | 38 +
.../applib/IsisModuleSubFreemarkerApplib.java | 28 +
subdomains/freemarker/impl/pom.xml | 37 -
.../freemarker/dom/IsisModuleExtFreemarker.java | 28 -
subdomains/freemarker/pom.xml | 34 +
.../impl => freemarker}/src/main/doc/antora.yml | 0
.../src/main/doc/modules/freemarker}/nav.adoc | 0
.../main/doc/modules/freemarker/pages/about.adoc | 0
.../modules/freemarker/partials/module-nav.adoc | 0
subdomains/ognl/applib/pom.xml | 39 +
.../ognl/applib/IsisModuleSubOgnlApplib.java | 28 +
subdomains/ognl/impl/pom.xml | 37 -
.../extensions/ognl/dom/IsisModuleExtOgnl.java | 28 -
subdomains/ognl/pom.xml | 33 +
subdomains/ognl/{impl => }/src/main/doc/antora.yml | 0
.../src/main/doc/modules/ognl}/nav.adoc | 0
.../src/main/doc/modules/ognl/pages/about.adoc | 0
.../main/doc/modules/ognl/partials/module-nav.adoc | 0
subdomains/pdfbox/applib/pom.xml | 39 +
.../pdfbox/applib/IsisModuleSubPdfBoxApplib.java | 28 +
subdomains/pdfbox/impl/pom.xml | 37 -
.../extensions/pdfbox/dom/IsisModuleExtPdfBox.java | 28 -
subdomains/pdfbox/pom.xml | 33 +
.../impl => pdfbox}/src/main/doc/antora.yml | 0
.../pdfbox/src/main/doc/modules/pdfbox}/nav.adoc | 0
.../src/main/doc/modules/pdfbox/pages/about.adoc | 0
.../doc/modules/pdfbox/partials/module-nav.adoc | 0
subdomains/pom.xml | 71 +-
subdomains/spring/applib/pom.xml | 46 +
.../spring/applib/IsisModuleSubSpringApplib.java | 32 +
.../spring/applib/service/BeanDescriptor.java | 67 +
.../spring/applib/service/ContextBeans.java | 49 +
.../spring/applib/service/SpringBeansService.java | 70 +
subdomains/spring/impl/pom.xml | 43 -
.../extensions/spring/IsisModuleExtSpring.java | 32 -
.../extensions/spring/service/BeanDescriptor.java | 67 -
.../extensions/spring/service/ContextBeans.java | 49 -
.../spring/service/SpringBeansService.java | 70 -
subdomains/spring/pom.xml | 33 +
.../{excel/impl => spring}/src/main/doc/antora.yml | 0
.../src/main/doc/modules/spring/nav.adoc | 0
.../src/main/doc/modules/spring/pages/about.adoc | 0
.../doc/modules/spring/partials/module-nav.adoc | 0
subdomains/xdocreport/applib/pom.xml | 82 +
.../applib/IsisModuleSubXDocReportApplib.java | 28 +
.../xdocreport/applib/service/OutputType.java | 6 +
.../xdocreport/applib/service/XDocReportModel.java | 27 +
.../applib/service/XDocReportService.java | 95 ++
.../applib/service/XDocReportServiceTest.java | 57 +
.../applib/service/example/Generate0Fields.java | 34 +
.../applib/service/example/Generate1Docx.java | 61 +
.../applib/service/example/Generate2Pdf.java | 33 +
.../applib/service/example/models/Developer.java | 12 +
.../applib/service/example/models/Project.java | 10 +
.../example/models/ProjectDevelopersModel.java | 25 +
.../example/template/Project-template.docx | Bin
.../service}/example/template/project.fields.xml | 0
subdomains/xdocreport/impl/pom.xml | 88 -
.../xdocreport/dom/IsisModuleExtXDocReport.java | 28 -
.../extensions/xdocreport/dom/impl/OutputType.java | 6 -
.../xdocreport/dom/impl/XDocReportModel.java | 27 -
.../xdocreport/dom/impl/XDocReportService.java | 95 --
.../dom/impl/example/Generate0Fields.java | 34 -
.../xdocreport/dom/impl/example/Generate1Docx.java | 61 -
.../xdocreport/dom/impl/example/Generate2Pdf.java | 33 -
.../dom/impl/example/models/Developer.java | 12 -
.../dom/impl/example/models/Project.java | 10 -
.../example/models/ProjectDevelopersModel.java | 25 -
.../dom/impl/service/XDocReportServiceTest.java | 59 -
subdomains/xdocreport/pom.xml | 33 +
.../impl => xdocreport}/src/main/doc/antora.yml | 0
.../src/main/doc/modules/xdocreport}/nav.adoc | 0
.../main/doc/modules/xdocreport/pages/about.adoc | 0
.../modules/xdocreport/partials/module-nav.adoc | 0
subdomains/zip/applib/pom.xml | 51 +
.../isis/extensions/zip/dom/IsisModuleExtZip.java | 0
.../isis/extensions/zip/dom/impl/ZipService.java | 0
subdomains/zip/impl/pom.xml | 60 -
subdomains/zip/pom.xml | 36 +
.../{base/impl => zip}/src/main/doc/antora.yml | 0
.../zip/src/main/doc/modules/zip}/nav.adoc | 0
.../src/main/doc/modules/zip/pages/about.adoc | 0
.../main/doc/modules/zip/partials/module-nav.adoc | 0
testing/fakedata/applib/pom.xml | 94 +
.../applib/IsisModuleTstFakeDataApplib.java | 10 +
.../services/AbstractRandomValueGenerator.java | 11 +
.../fakedata/applib/services/Addresses.java | 65 +
.../fakedata/applib/services/BigDecimals.java | 28 +
.../fakedata/applib/services/BigIntegers.java | 18 +
.../testing/fakedata/applib/services/Books.java | 19 +
.../testing/fakedata/applib/services/Booleans.java | 30 +
.../testing/fakedata/applib/services/Bytes.java | 25 +
.../testing/fakedata/applib/services/Chars.java | 39 +
.../fakedata/applib/services/Collections.java | 273 +++
.../testing/fakedata/applib/services/Comms.java | 27 +
.../fakedata/applib/services/CreditCards.java | 26 +
.../testing/fakedata/applib/services/Doubles.java | 23 +
.../testing/fakedata/applib/services/Enums.java | 16 +
.../fakedata/applib/services/FakeDataService.java | 283 +++
.../testing/fakedata/applib/services/Floats.java | 17 +
.../testing/fakedata/applib/services/Integers.java | 27 +
.../fakedata/applib/services/IsisBlobs.java | 83 +
.../fakedata/applib/services/IsisClobs.java | 108 ++
.../fakedata/applib/services/IsisMoneys.java | 16 +
.../fakedata/applib/services/IsisPasswords.java | 16 +
.../fakedata/applib/services/J8DateTimes.java | 36 +
.../fakedata/applib/services/J8LocalDates.java | 36 +
.../fakedata/applib/services/J8Periods.java | 43 +
.../fakedata/applib/services/JavaSqlDates.java | 25 +
.../applib/services/JavaSqlTimestamps.java | 19 +
.../fakedata/applib/services/JavaUtilDates.java | 21 +
.../testing/fakedata/applib/services/Longs.java | 17 +
.../testing/fakedata/applib/services/Lorem.java | 41 +
.../testing/fakedata/applib/services/Names.java | 37 +
.../testing/fakedata/applib/services/Shorts.java | 25 +
.../testing/fakedata/applib/services/Strings.java | 33 +
.../testing/fakedata/applib/services/Urls.java | 25 +
.../testing/fakedata/applib/services/Uuids.java | 14 +
.../services/blobs/Pawson-Naked-Objects-thesis.pdf | Bin
.../applib}/services/blobs/image01-150x150.jpg | Bin
.../applib}/services/blobs/image01-2048x1536.jpg | Bin
.../applib}/services/blobs/image01-240x180.jpg | Bin
.../applib}/services/blobs/image01-4000x3000.jpg | Bin
.../applib}/services/blobs/image01-640x480.jpg | Bin
.../applib}/services/blobs/image02-150x150.jpg | Bin
.../applib}/services/blobs/image02-2048x1536.jpg | Bin
.../applib}/services/blobs/image02-240x180.jpg | Bin
.../applib}/services/blobs/image02-4000x3000.jpg | Bin
.../applib}/services/blobs/image02-640x480.jpg | Bin
.../applib}/services/blobs/rick-mugridge-paper.pdf | Bin
.../applib}/services/clobs/RTF-Spec-1.7.rtf | 0
.../fakedata/applib}/services/clobs/a_and_c.xml | 0
.../fakedata/applib}/services/clobs/all_well.xml | 0
.../fakedata/applib}/services/clobs/as_you.xml | 0
.../fakedata/applib}/services/clobs/com_err.xml | 0
.../fakedata/applib}/services/clobs/config.rtf | 0
.../fakedata/applib}/services/clobs/coriolan.xml | 0
.../fakedata/applib}/services/clobs/cymbelin.xml | 0
.../fakedata/applib}/services/clobs/dream.xml | 0
.../fakedata/applib}/services/clobs/dsssl.dtd | 0
.../fakedata/applib}/services/clobs/fot.dtd | 0
.../fakedata/applib}/services/clobs/hamlet.xml | 0
.../fakedata/applib}/services/clobs/hen_iv_1.xml | 0
.../fakedata/applib}/services/clobs/hen_iv_2.xml | 0
.../fakedata/applib}/services/clobs/hen_v.xml | 0
.../fakedata/applib}/services/clobs/hen_vi_1.xml | 0
.../fakedata/applib}/services/clobs/hen_vi_2.xml | 0
.../fakedata/applib}/services/clobs/hen_vi_3.xml | 0
.../fakedata/applib}/services/clobs/hen_viii.xml | 0
.../fakedata/applib}/services/clobs/j_caesar.xml | 0
.../fakedata/applib}/services/clobs/john.xml | 0
.../fakedata/applib}/services/clobs/lear.xml | 0
.../fakedata/applib}/services/clobs/lll.xml | 0
.../fakedata/applib}/services/clobs/m_for_m.xml | 0
.../fakedata/applib}/services/clobs/m_wives.xml | 0
.../fakedata/applib}/services/clobs/macbeth.xml | 0
.../fakedata/applib}/services/clobs/merchant.xml | 0
.../fakedata/applib}/services/clobs/much_ado.xml | 0
.../fakedata/applib}/services/clobs/othello.xml | 0
.../fakedata/applib}/services/clobs/pericles.xml | 0
.../fakedata/applib}/services/clobs/play.dtd | 0
.../fakedata/applib}/services/clobs/r_and_j.xml | 0
.../fakedata/applib}/services/clobs/rich_ii.xml | 0
.../fakedata/applib}/services/clobs/rich_iii.xml | 0
.../fakedata/applib}/services/clobs/sample.rtf | 0
.../fakedata/applib}/services/clobs/shaksper.htm | 0
.../applib}/services/clobs/style-sheet.dtd | 0
.../fakedata/applib}/services/clobs/t_night.xml | 0
.../fakedata/applib}/services/clobs/taming.xml | 0
.../fakedata/applib}/services/clobs/tempest.xml | 0
.../fakedata/applib}/services/clobs/testrtf.rtf | 0
.../fakedata/applib}/services/clobs/timon.xml | 0
.../fakedata/applib}/services/clobs/titus.xml | 0
.../fakedata/applib}/services/clobs/troilus.xml | 0
.../fakedata/applib}/services/clobs/two_gent.xml | 0
.../testing/fakedata/applib}/services/clobs/vs | 0
.../testing/fakedata/applib}/services/clobs/vx | 0
.../fakedata/applib}/services/clobs/win_tale.xml | 0
.../fakedata/applib}/services/clobs/xml.dcl | 0
.../fakedata/applib}/services/clobs/xml.soc | 0
.../applib/services/FakeDataServiceTest.java | 346 ++++
testing/fakedata/fixture/pom.xml | 91 -
.../fixture/src/main/java/META-INF/persistence.xml | 8 -
.../fixture/IsisModuleExtFakeDataFixtures.java | 24 -
.../fixture/demoapp/demomodule/dom/EnumOf3.java | 7 -
.../demomodule/dom/FakeDataDemoObjectWithAll.java | 678 --------
.../dom/FakeDataDemoObjectWithAllMenu.java | 61 -
.../FakeDataDemoObjectWithAll_create3.java | 45 -
.../FakeDataDemoObjectWithAll_tearDown.java | 14 -
...eDataDemoObjectWithAll_create_withFakeData.java | 78 -
...eDataDemoObjectWithAll_update_withFakeData.java | 196 ---
testing/fakedata/{fixture => fixtures}/.gitignore | 0
.../fixtures}/logging-dn-enhance.properties | 0
testing/fakedata/fixtures/pom.xml | 89 +
.../src/main/java/META-INF/persistence.xml | 8 +
.../fixtures/IsisModuleTstFakeDataFixtures.java | 23 +
.../fixtures/demoapp/demomodule/dom/EnumOf3.java | 7 +
.../demomodule/dom/FakeDataDemoObjectWithAll.java | 678 ++++++++
.../demomodule/dom/FakeDataDemoObjectWithAll.png | Bin
.../dom/FakeDataDemoObjectWithAllMenu.java | 61 +
.../FakeDataDemoObjectWithAll_create3.java | 45 +
.../FakeDataDemoObjectWithAll_tearDown.java | 13 +
...eDataDemoObjectWithAll_create_withFakeData.java | 77 +
...eDataDemoObjectWithAll_update_withFakeData.java | 195 +++
testing/fakedata/impl/pom.xml | 94 -
.../fakedata/dom/IsisModuleExtFakeData.java | 10 -
.../dom/services/AbstractRandomValueGenerator.java | 11 -
.../fakedata/dom/services/Addresses.java | 65 -
.../fakedata/dom/services/BigDecimals.java | 28 -
.../fakedata/dom/services/BigIntegers.java | 18 -
.../extensions/fakedata/dom/services/Books.java | 19 -
.../extensions/fakedata/dom/services/Booleans.java | 30 -
.../extensions/fakedata/dom/services/Bytes.java | 25 -
.../extensions/fakedata/dom/services/Chars.java | 39 -
.../fakedata/dom/services/Collections.java | 273 ---
.../extensions/fakedata/dom/services/Comms.java | 27 -
.../fakedata/dom/services/CreditCards.java | 26 -
.../extensions/fakedata/dom/services/Doubles.java | 23 -
.../extensions/fakedata/dom/services/Enums.java | 16 -
.../fakedata/dom/services/FakeDataService.java | 283 ---
.../extensions/fakedata/dom/services/Floats.java | 17 -
.../extensions/fakedata/dom/services/Integers.java | 27 -
.../fakedata/dom/services/IsisBlobs.java | 83 -
.../fakedata/dom/services/IsisClobs.java | 108 --
.../fakedata/dom/services/IsisMoneys.java | 16 -
.../fakedata/dom/services/IsisPasswords.java | 16 -
.../fakedata/dom/services/J8DateTimes.java | 36 -
.../fakedata/dom/services/J8LocalDates.java | 36 -
.../fakedata/dom/services/J8Periods.java | 43 -
.../fakedata/dom/services/JavaSqlDates.java | 25 -
.../fakedata/dom/services/JavaSqlTimestamps.java | 19 -
.../fakedata/dom/services/JavaUtilDates.java | 21 -
.../extensions/fakedata/dom/services/Longs.java | 17 -
.../extensions/fakedata/dom/services/Lorem.java | 41 -
.../extensions/fakedata/dom/services/Names.java | 37 -
.../extensions/fakedata/dom/services/Shorts.java | 25 -
.../extensions/fakedata/dom/services/Strings.java | 33 -
.../extensions/fakedata/dom/services/Urls.java | 25 -
.../extensions/fakedata/dom/services/Uuids.java | 14 -
.../fakedata/dom/services/FakeDataServiceTest.java | 346 ----
testing/fakedata/integtests/pom.xml | 17 +-
.../FakeDataModuleIntegTestAbstract.java | 45 -
.../integtests/tests/Bootstrap_IntegTest.java | 35 -
.../fakedata/integtests/tests/Smoke_IntegTest.java | 909 ----------
.../FakeDataModuleIntegTestAbstract.java | 45 +
.../integtests/tests/Bootstrap_IntegTest.java | 35 +
.../fakedata/integtests/tests/Smoke_IntegTest.java | 909 ++++++++++
testing/fakedata/pom.xml | 27 +
.../fakedata/{impl => }/src/main/doc/antora.yml | 0
.../src/main/doc/modules/fakedata/nav.adoc | 0
.../src/main/doc/modules/fakedata/pages/about.adoc | 0
.../doc/modules/fakedata/partials/module-nav.adoc | 0
testing/fixtures/applib/pom.xml | 91 +
.../IsisIntegrationTestAbstractWithFixtures.java | 92 +
.../applib/IsisModuleTstFixturesApplib.java | 47 +
.../api/FixtureScriptWithExecutionStrategy.java | 33 +
.../applib/api/PersonaWithBuilderScript.java | 28 +
.../fixtures/applib/api/PersonaWithFinder.java | 28 +
.../testing/fixtures/applib/api/WithPrereqs.java | 35 +
.../testing/fixtures/applib/api/package-info.java | 26 +
.../applib/events/FixturesInstalledEvent.java | 30 +
.../applib/events/FixturesInstallingEvent.java | 30 +
.../fixturescripts/BuilderScriptAbstract.java | 112 ++
.../fixturescripts/BuilderScriptWithResult.java | 44 +
.../fixturescripts/BuilderScriptWithoutResult.java | 34 +
.../applib/fixturescripts/ExecutionParameters.java | 327 ++++
.../fixturescripts/ExecutionParametersService.java | 52 +
.../applib/fixturescripts/FixtureResult.java | 95 ++
.../fixturescripts/FixtureResult.layout.xml | 0
.../applib/fixturescripts/FixtureResultList.java | 141 ++
.../applib/fixturescripts/FixtureScript.java | 846 +++++++++
.../applib/fixturescripts/FixtureScripts.java | 534 ++++++
.../fixturespec/FixtureScriptsSpecification.java | 141 ++
.../FixtureScriptsSpecificationProvider.java | 28 +
.../fixtures/applib/fixturespec/package-info.java | 25 +
.../fixtures/applib/legacy/FixtureClock.java | 214 +++
.../applib/legacy/TickingFixtureClock.java | 183 ++
.../fixtures/applib/legacy/clock/ClockFixture.java | 126 ++
.../applib/legacy/clock/TickingClockFixture.java | 140 ++
.../fixtures/applib/legacy/package-info.java | 45 +
.../QueryResultsCacheControlDefault.java | 62 +
.../applib/legacy/setup/PersonaEnumPersistAll.java | 92 +
.../legacy/teardown/TeardownFixtureAbstract.java | 186 ++
.../legacy/teardown/TeardownFixtureAbstract2.java | 23 +
.../applib/modules/ModuleWithFixtures.java | 66 +
.../applib/modules/ModuleWithFixturesService.java | 173 ++
.../applib/services/FixturesLifecycleService.java | 74 +
.../fixtures/applib/src/main/resources}/prism.css | 0
.../applib/src/main/resources}/prism1.14.js | 0
.../fixturescripts/ExecutionContextTest.java | 127 ++
.../ExecutionParameters_AsKeyValueMap_Test.java | 76 +
.../fixturescripts/ExecutionParameters_Test.java | 272 +++
.../legacy/FixtureClockInstantiationTest.java | 59 +
testing/fixtures/pom.xml | 74 +-
.../fixtures/FixturesLifecycleService.java | 74 -
.../IsisIntegrationTestAbstractWithFixtures.java | 92 -
.../extensions/fixtures/IsisModuleExtFixtures.java | 46 -
.../api/FixtureScriptWithExecutionStrategy.java | 33 -
.../fixtures/api/PersonaWithBuilderScript.java | 28 -
.../extensions/fixtures/api/PersonaWithFinder.java | 28 -
.../isis/extensions/fixtures/api/WithPrereqs.java | 35 -
.../isis/extensions/fixtures/api/package-info.java | 26 -
.../fixtures/events/FixturesInstalledEvent.java | 30 -
.../fixtures/events/FixturesInstallingEvent.java | 30 -
.../fixturescripts/BuilderScriptAbstract.java | 112 --
.../fixturescripts/BuilderScriptWithResult.java | 44 -
.../fixturescripts/BuilderScriptWithoutResult.java | 34 -
.../fixturescripts/ExecutionParameters.java | 327 ----
.../fixturescripts/ExecutionParametersService.java | 52 -
.../fixtures/fixturescripts/FixtureResult.java | 95 --
.../fixtures/fixturescripts/FixtureResultList.java | 141 --
.../fixtures/fixturescripts/FixtureScript.java | 846 ---------
.../fixtures/fixturescripts/FixtureScripts.java | 534 ------
.../fixturespec/FixtureScriptsSpecification.java | 141 --
.../FixtureScriptsSpecificationProvider.java | 28 -
.../fixtures/fixturespec/package-info.java | 25 -
.../extensions/fixtures/legacy/FixtureClock.java | 214 ---
.../fixtures/legacy/TickingFixtureClock.java | 183 --
.../fixtures/legacy/clock/ClockFixture.java | 126 --
.../fixtures/legacy/clock/TickingClockFixture.java | 140 --
.../extensions/fixtures/legacy/package-info.java | 45 -
.../QueryResultsCacheControlDefault.java | 62 -
.../legacy/setup/PersonaEnumPersistAll.java | 92 -
.../legacy/teardown/TeardownFixtureAbstract.java | 186 --
.../legacy/teardown/TeardownFixtureAbstract2.java | 23 -
.../fixtures/modules/ModuleWithFixtures.java | 66 -
.../modules/ModuleWithFixturesService.java | 173 --
.../fixturescripts/ExecutionContextTest.java | 127 --
.../ExecutionParameters_AsKeyValueMap_Test.java | 76 -
.../fixturescripts/ExecutionParameters_Test.java | 272 ---
.../legacy/FixtureClockInstantiationTest.java | 58 -
testing/h2console/pom.xml | 2 +-
testing/h2console/ui/pom.xml | 4 +-
.../h2console/ui/IsisModuleTestingH2ConsoleUi.java | 4 +-
.../h2console/ui/webmodule/WebModuleH2Console.java | 14 +-
testing/hsqldbmgr/pom.xml | 2 +-
testing/hsqldbmgr/ui/pom.xml | 4 +-
.../hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java | 4 +-
.../hsqldbmgr/dom/services/HsqlDbManagerMenu.java | 6 +-
testing/integtestsupport/applib/pom.xml | 192 +++
.../applib/ExceptionRecognizerTranslate.java | 75 +
.../applib/IsisIntegrationTestAbstract.java | 133 ++
.../integtestsupport/applib/ThrowableMatchers.java | 51 +
.../applib/validate/ValidateDomainModel.java | 121 ++
testing/integtestsupport/pom.xml | 36 +
.../integtestsupport}/src/main/doc/antora.yml | 0
.../integ-test-support/images/integ-tests.png | Bin
.../integ-test-support/images/integ-tests.pptx | Bin
.../integ-test-support/images/wrapper-factory.png | Bin
.../main/doc/modules/integ-test-support}/nav.adoc | 0
.../modules/integ-test-support/pages/about.adoc | 0
.../pages/integ-test-support/abstract-class.adoc | 77 +
.../pages/integ-test-support/bootstrapping.adoc | 0
.../configuration-properties.adoc | 0
.../integ-test-support/maven-configuration.adoc | 0
.../pages/integ-test-support/typical-usage.adoc | 0
.../pages/integ-test-support/wrapper-factory.adoc | 0
.../integ-test-support/partials/module-nav.adoc | 0
testing/pom.xml | 40 +-
testing/specsupport/applib/pom.xml | 103 ++
.../applib/IsisModuleTstSpecSupportAplib.java | 4 +
.../integration/ObjectFactoryForIntegration.java | 82 +
.../isis/testing/specsupport/applib/specs/V.java | 342 ++++
testing/specsupport/pom.xml | 85 +-
.../specsupport/IsisModuleExtSpecSupport.java | 4 -
.../integration/ObjectFactoryForIntegration.java | 82 -
.../isis/extensions/specsupport/specs/V.java | 342 ----
testing/unittestsupport/applib/pom.xml | 38 +
.../applib/IsisModuleTstUnitTestSupportApplib.java | 7 +
.../applib/bean/AbstractBeanPropertiesTest.java | 33 +
.../bean/FixtureDatumFactoriesForAnyPojo.java | 20 +
.../bean/FixtureDatumFactoriesForApplib.java | 24 +
.../applib/bean/FixtureDatumFactoriesForJoda.java | 41 +
.../unittestsupport/applib/bean/PojoTester.java | 513 ++++++
.../applib/dom/assertions/Asserting.java | 21 +
.../applib/dom/matchers/IsisMatchers.java | 293 ++++
.../dom/privatecons/PrivateConstructorTester.java | 18 +
.../applib/dom/reflect/ReflectUtils.java | 32 +
.../applib/dom/repo/FinderInteraction.java | 40 +
.../unittestsupport/applib/dom/valuetypes/VT.java | 130 ++
.../applib/bean/PojoTesterTest_interference.java | 62 +
testing/unittestsupport/impl/pom.xml | 45 -
.../unit-test-support-ext/partials/module-nav.adoc | 3 -
.../dom/IsisModuleExtUnitTestSupport.java | 7 -
.../unittestsupport/dom/assertions/Asserting.java | 21 -
.../dom/bean/AbstractBeanPropertiesTest.java | 33 -
.../dom/bean/FixtureDatumFactoriesForAnyPojo.java | 20 -
.../dom/bean/FixtureDatumFactoriesForApplib.java | 24 -
.../dom/bean/FixtureDatumFactoriesForJoda.java | 41 -
.../unittestsupport/dom/bean/PojoTester.java | 513 ------
.../unittestsupport/dom/matchers/IsisMatchers.java | 293 ----
.../dom/privatecons/PrivateConstructorTester.java | 18 -
.../unittestsupport/dom/reflect/ReflectUtils.java | 32 -
.../dom/repo/FinderInteraction.java | 40 -
.../unittestsupport/dom/valuetypes/VT.java | 130 --
.../dom/bean/PojoTesterTest_interference.java | 62 -
testing/unittestsupport/pom.xml | 24 +
.../unittestsupport}/src/main/doc/antora.yml | 0
.../doc/modules/unit-test-support-ext}/nav.adoc | 0
.../modules/unit-test-support-ext/pages/about.adoc | 0
.../unit-test-support-ext/partials/module-nav.adoc | 3 +
valuetypes/asciidoc/applib/pom.xml | 46 +
.../applib/IsisModuleValAsciidocApplib.java | 25 +
.../valuetypes/asciidoc/applib/value/AsciiDoc.java | 47 +
.../asciidoc/applib/value/Converter.java | 77 +
valuetypes/asciidoc/pom.xml | 102 +-
.../applib/IsisModuleExtAsciidocApplib.java | 25 -
.../extensions/asciidoc/applib/value/AsciiDoc.java | 48 -
.../asciidoc/ui/IsisModuleExtAsciidocUi.java | 34 -
.../asciidoc/ui/components/AsciiDocComponent.java | 65 -
.../AsciiDocPanelFactoriesForWicket.java | 81 -
.../asciidoc/ui/converter/AsciiDocConverter.java | 77 -
valuetypes/asciidoc/ui/pom.xml | 123 ++
.../asciidoc/ui/IsisModuleValAsciidocUi.java | 34 +
.../asciidoc/ui/components/AsciiDocComponent.java | 65 +
.../AsciiDocPanelFactoriesForWicket.java | 81 +
.../asciidoc/ui/components/css/prism.css | 0
.../asciidoc/ui/components/js/prism1.14.js | 0
valuetypes/markdown/applib/pom.xml | 48 +
.../applib/IsisModuleValMarkdownApplib.java | 7 +
.../markdown/applib/value/Converter.java | 91 +
.../valuetypes/markdown/applib/value/Markdown.java | 47 +
valuetypes/markdown/pom.xml | 68 +-
.../applib/IsisModuleExtMarkdownApplib.java | 7 -
.../extensions/markdown/applib/value/Markdown.java | 48 -
.../markdown/ui/IsisModuleExtMarkdownUi.java | 16 -
.../markdown/ui/components/MarkdownComponent.java | 67 -
.../MarkdownPanelFactoriesForWicket.java | 77 -
.../markdown/ui/converter/MarkdownConverter.java | 91 -
valuetypes/markdown/ui/pom.xml | 68 +
.../markdown/ui/IsisModuleValMarkdownUi.java | 16 +
.../markdown/ui/components/MarkdownComponent.java | 67 +
.../MarkdownPanelFactoriesForWicket.java | 77 +
.../markdown/ui/components/css}/prism.css | 0
.../markdown/ui/components/js}/prism1.14.js | 0
valuetypes/pom.xml | 38 +-
valuetypes/sse/applib/pom.xml | 54 +
.../sse/applib/IsisModuleValSseApplib.java | 28 +
.../sse/applib/annotations/ServerSentEvents.java | 32 +
.../sse/applib/annotations/SseSource.java | 70 +
.../valuetypes/sse/applib/service/SseChannel.java | 49 +
.../valuetypes/sse/applib/service/SseService.java | 44 +
.../sse/applib/value/ListeningMarkup.java | 28 +
valuetypes/sse/metamodel/pom.xml | 45 +
.../sse/metamodel/IsisModuleValSseMetaModel.java | 37 +
.../facets/SseAnnotationFacetFactory.java | 66 +
.../sse/metamodel/facets/SseObserveFacet.java | 39 +
.../metamodel/facets/SseObserveFacetAbstract.java | 61 +
...eObserveFacetForServerSentEventsAnnotation.java | 55 +
valuetypes/sse/pom.xml | 41 +-
.../isis/extensions/sse/IsisModuleExtSse.java | 41 -
.../isis/extensions/sse/SseMetaModelPlugin.java | 38 -
.../isis/extensions/sse/api/ServerSentEvents.java | 32 -
.../apache/isis/extensions/sse/api/SseChannel.java | 47 -
.../apache/isis/extensions/sse/api/SseService.java | 42 -
.../apache/isis/extensions/sse/api/SseSource.java | 68 -
.../sse/facets/SseAnnotationFacetFactory.java | 51 -
.../extensions/sse/facets/SseObserveFacet.java | 39 -
.../sse/facets/SseObserveFacetAbstract.java | 61 -
...eObserveFacetForServerSentEventsAnnotation.java | 55 -
.../extensions/sse/markup/ListeningMarkup.java | 28 -
.../sse/markup/ListeningMarkupComponent.java | 61 -
.../markup/ListeningMarkupComponent_observing.java | 77 -
.../ListeningMarkupPanelFactoriesForWicket.java | 96 --
.../extensions/sse/services/SseServiceDefault.java | 277 ---
.../sse/webmodule/ServerSentEventsServlet.java | 165 --
.../sse/webmodule/WebModuleServerSentEvents.java | 73 -
valuetypes/sse/ui/pom.xml | 57 +
.../isis/valuetypes/sse/ui/IsisModuleValSseUi.java | 44 +
.../sse/ui/markup/ListeningMarkupComponent.java | 61 +
.../markup/ListeningMarkupComponent_observing.java | 77 +
.../ListeningMarkupPanelFactoriesForWicket.java | 97 ++
.../sse/ui}/markup/js/ObservingComponent.js | 0
.../sse/ui/services/SseServiceDefault.java | 277 +++
.../sse/ui/webmodule/ServerSentEventsServlet.java | 165 ++
.../ui/webmodule/WebModuleServerSentEvents.java | 73 +
viewers/restfulobjects/applib/pom.xml | 75 +
.../applib/IsisModuleRestfulObjectsApplib.java | 0
.../restfulobjects/applib/JsonRepresentation.java | 1798 ++++++++++++++++++++
.../restfulobjects/applib/LinkRepresentation.java | 0
.../isis/viewer/restfulobjects/applib/Rel.java | 0
.../restfulobjects/applib/RelDefinition.java | 0
.../restfulobjects/applib/RepresentationType.java | 0
.../restfulobjects/applib/RestfulHttpMethod.java | 0
.../restfulobjects/applib/RestfulMediaType.java | 0
.../restfulobjects/applib/RestfulRequest.java | 0
.../restfulobjects/applib/RestfulResponse.java | 370 ++++
.../applib/boot/BootstrapResource.java | 0
.../AbstractObjectMemberRepresentation.java | 0
.../domainobjects/ActionResultRepresentation.java | 0
.../DomainObjectMemberRepresentation.java | 0
.../domainobjects/DomainObjectRepresentation.java | 0
.../applib/domainobjects/DomainObjectResource.java | 0
.../applib/domainobjects/DomainRepresentation.java | 0
.../domainobjects/DomainServiceResource.java | 0
.../applib/domainobjects/ListRepresentation.java | 0
.../domainobjects/ObjectActionRepresentation.java | 0
.../ObjectCollectionRepresentation.java | 0
.../ObjectPropertyRepresentation.java | 0
.../domainobjects/ScalarValueRepresentation.java | 0
.../AbstractTypeMemberRepresentation.java | 0
.../ActionDescriptionRepresentation.java | 0
.../ActionParameterDescriptionRepresentation.java | 0
.../CollectionDescriptionRepresentation.java | 0
.../domaintypes/DomainTypeRepresentation.java | 0
.../applib/domaintypes/DomainTypeResource.java | 0
.../PropertyDescriptionRepresentation.java | 0
.../TypeActionResultRepresentation.java | 0
.../applib/domaintypes/TypeListRepresentation.java | 0
.../applib/errors/ErrorRepresentation.java | 0
.../applib/health/HealthRepresentation.java | 0
.../applib/health/HealthResource.java | 0
.../applib/homepage/HomePageRepresentation.java | 0
.../applib/homepage/HomePageResource.java | 0
.../applib/menubars/MenuBarsResource.java | 0
.../applib/user/UserRepresentation.java | 0
.../restfulobjects/applib/user/UserResource.java | 0
.../restfulobjects/applib/util/JsonMapper.java | 0
.../restfulobjects/applib/util/JsonNodeUtils.java | 0
.../restfulobjects/applib/util/MediaTypes.java | 73 +
.../viewer/restfulobjects/applib/util/Parser.java | 387 +++++
.../restfulobjects/applib/util/PathNode.java | 188 ++
.../applib/util/UrlEncodingUtils.java | 81 +
.../applib/version/VersionRepresentation.java | 0
.../applib/version/VersionResource.java | 0
...r.restfulobjects.applib.client.UriBuilderPlugin | 0
.../viewer/restfulobjects/applib/JsonFixture.java | 44 +
...resentationTest_arrayGet_arraySetElementAt.java | 0
.../JsonRepresentationTest_asInputStream.java | 56 +
.../applib/JsonRepresentationTest_getArray.java | 0
.../JsonRepresentationTest_getBigDecimal.java | 0
.../JsonRepresentationTest_getBigInteger.java | 0
.../applib/JsonRepresentationTest_getBoolean.java | 0
.../applib/JsonRepresentationTest_getDouble.java | 0
.../applib/JsonRepresentationTest_getInt.java | 0
.../JsonRepresentationTest_getLink_isLink.java | 0
.../applib/JsonRepresentationTest_getLong.java | 0
.../JsonRepresentationTest_getNull_isNull.java | 0
.../JsonRepresentationTest_getRepresentation.java | 0
.../JsonRepresentationTest_getString_isString.java | 0
...onRepresentationTest_isArray_isMap_isValue.java | 0
.../applib/JsonRepresentationTest_mapHas.java | 0
.../applib/JsonRepresentationTest_newArray.java | 0
.../applib/JsonRepresentationTest_newObject.java | 0
.../applib/JsonRepresentationTest_putXxx.java | 0
.../applib/JsonRepresentationTest_size.java | 0
...JsonRepresentationTest_streamArrayElements.java | 0
.../JsonRepresentationTest_streamMapEntries.java | 0
.../applib/JsonRepresentationTest_urlEncoding.java | 0
.../applib/LinkRepresentationTest_equals.java | 0
.../restfulobjects/applib/Rel_getName_Test.java | 0
...entationTypeTest_getMediaType_ContractTest.java | 0
...epresentationTypeTest_getName_ContractTest.java | 0
...RepresentationTypeTest_lookup_ContractTest.java | 0
...RepresentationTypeTest_parser_ContractTest.java | 0
.../RestfulRequest_DomainModelTest_parser.java | 0
...equestParameterTest_valueOf_xrodomainmodel.java | 0
...equestParameterTest_valueOf_xrofollowlinks.java | 0
.../client/RestfulResponse_HeaderTest_Warning.java | 0
.../client/RestfulResponse_HttpStatusCodeTest.java | 0
...mainObjectRepresentationTest_getCollection.java | 0
...ainObjectRepresentationTest_getCollections.java | 0
...mainObjectRepresentationTest_getProperties.java | 0
...DomainObjectRepresentationTest_getProperty.java | 0
.../restfulobjects/applib/util/Parser_Test.java | 0
.../util/Parser_forCacheControl_ContractTest.java | 0
.../Parser_forJaxRsMediaType_ContractTest.java | 0
.../applib/util/PathNodeTest_equalsHashcode.java | 0
.../applib/util/PathNodeTest_parse.java | 0
.../applib/util/PathNodeTest_split.java | 0
.../applib/domainObjectRepresentation.json | 0
.../viewer/restfulobjects/applib/emptyList.json | 0
.../viewer/restfulobjects/applib/emptyMap.json | 0
.../isis/viewer/restfulobjects/applib/list.json | 0
.../restfulobjects/applib/listOfStrings.json | 0
.../isis/viewer/restfulobjects/applib/map.json | 0
.../viewer/restfulobjects/applib/servicesList.json | 0
.../restfulobjects/jaxrs-resteasy-4}/.gitignore | 0
viewers/restfulobjects/jaxrs-resteasy-4/pom.xml | 132 ++
.../jaxrs-resteasy-4/src/main/doc/antora.yml | 0
.../modules/jaxrs-resteasy-4/attachments/.gitkeep | 0
.../modules/jaxrs-resteasy-4/examples/.gitignore | 0
.../doc/modules/jaxrs-resteasy-4}/images/.gitkeep | 0
.../src/main/doc/modules/jaxrs-resteasy-4/nav.adoc | 0
.../doc/modules/jaxrs-resteasy-4/pages/about.adoc | 0
.../jaxrs-resteasy-4/partials/module-nav.adoc | 0
.../IsisModuleRestfulObjectsJaxrsResteasy4.java | 0
.../conneg/RestfulObjectsJaxbWriterForXml.java | 0
.../webmodule/WebModuleJaxrsResteasy4.java | 141 ++
.../Parser_forCacheControl_Test.java | 0
.../Parser_forJaxRsMediaType_Test.java | 0
.../RepresentationTypeTest_getMediaType.java | 0
.../RepresentationTypeTest_getName.java | 0
.../RepresentationTypeTest_lookup.java | 0
.../RepresentationTypeTest_parser.java | 0
...eContext_ensureCompatibleAcceptHeader_Test.java | 0
...tfulObjectsApplicationExceptionMapper_Test.java | 0
viewers/restfulobjects/pom.xml | 42 +
viewers/restfulobjects/rendering/pom.xml | 59 +
.../viewer/restfulobjects/rendering/Caching.java | 0
.../rendering/ExceptionWithBody.java | 0
.../rendering/ExceptionWithHttpStatusCode.java | 0
.../restfulobjects/rendering/IResourceContext.java | 99 ++
.../IsisModuleRestfulObjectsRendering.java | 46 +
.../restfulobjects/rendering/LinkBuilder.java | 0
.../restfulobjects/rendering/LinkFollowSpecs.java | 127 ++
.../viewer/restfulobjects/rendering/OidUtils.java | 68 +
.../restfulobjects/rendering/RendererFactory.java | 0
.../restfulobjects/rendering/ReprRenderer.java | 0
.../rendering/ReprRendererAbstract.java | 215 +++
.../rendering/ReprRendererException.java | 0
.../viewer/restfulobjects/rendering/Responses.java | 0
.../RestfulObjectsApplicationException.java | 0
.../restfulobjects/rendering/UrlDecoderUtils.java | 0
.../AbstractObjectMemberReprRenderer.java | 320 ++++
.../domainobjects/ActionResultReprRenderer.java | 206 +++
.../rendering/domainobjects/BodyArgs.java | 0
.../domainobjects/CollectionSemantics.java | 46 +
.../domainobjects/DomainObjectLinkTo.java | 99 ++
.../domainobjects/DomainObjectReprRenderer.java | 473 +++++
.../domainobjects/DomainServiceLinkTo.java | 58 +
.../rendering/domainobjects/InvokeKeys.java | 0
.../rendering/domainobjects/JsonValueEncoder.java | 255 +++
.../domainobjects/JsonValueEncoder_Converters.java | 681 ++++++++
.../rendering/domainobjects/ListReprRenderer.java | 130 ++
.../rendering/domainobjects/MemberReprMode.java | 0
.../rendering/domainobjects/MemberType.java | 153 ++
.../rendering/domainobjects/MutatorSpec.java | 51 +
.../domainobjects/ObjectActionReprRenderer.java | 239 +++
.../domainobjects/ObjectAdapterLinkTo.java | 41 +
.../rendering/domainobjects/ObjectAndAction.java | 30 +
.../domainobjects/ObjectAndActionInvocation.java | 106 ++
.../domainobjects/ObjectAndCollection.java | 30 +
.../domainobjects/ObjectAndCollection2.java | 39 +
.../rendering/domainobjects/ObjectAndMember.java | 41 +
.../rendering/domainobjects/ObjectAndProperty.java | 30 +
.../domainobjects/ObjectAndProperty2.java | 40 +
.../ObjectCollectionReprRenderer.java | 194 +++
.../domainobjects/ObjectPropertyReprRenderer.java | 256 +++
.../domainobjects/ScalarValueReprRenderer.java | 87 +
.../AbstractTypeFeatureReprRenderer.java | 108 ++
.../AbstractTypeMemberReprRenderer.java | 79 +
.../domaintypes/ActionDescriptionReprRenderer.java | 90 +
.../ActionParameterDescriptionReprRenderer.java | 104 ++
.../CollectionDescriptionReprRenderer.java | 63 +
.../domaintypes/DomainTypeReprRenderer.java | 187 ++
.../domaintypes/ObjectSpecAndSuperSpec.java | 41 +
.../rendering/domaintypes/ParentSpecAndAction.java | 30 +
.../domaintypes/ParentSpecAndActionParam.java | 30 +
.../domaintypes/ParentSpecAndCollection.java | 30 +
.../domaintypes/ParentSpecAndFeature.java | 42 +
.../domaintypes/ParentSpecAndProperty.java | 30 +
.../PropertyDescriptionReprRenderer.java | 73 +
.../domaintypes/TypeActionResultReprRenderer.java | 73 +
.../domaintypes/TypeListReprRenderer.java | 67 +
.../rendering/service/RepresentationService.java | 85 +
.../RepresentationServiceContentNegotiator.java | 162 ++
.../acceptheader/AcceptHeaderServiceForRest.java | 103 ++
.../service/conneg/ContentNegotiationService.java | 51 +
.../conneg/ContentNegotiationServiceAbstract.java | 160 ++
...entNegotiationServiceForRestfulObjectsV1_0.java | 413 +++++
.../ContentNegotiationServiceOrgApacheIsisV1.java | 426 +++++
.../ContentNegotiationServiceXRoDomainType.java | 165 ++
.../service/swagger/SwaggerServiceDefault.java | 61 +
.../service/swagger/SwaggerServiceMenu.java | 162 ++
.../service/swagger/internal/Caching.java | 0
.../service/swagger/internal/ClassExcluder.java | 9 +
.../swagger/internal/ClassExcluderAbstract.java | 65 +
.../swagger/internal/ClassExcluderDefault.java | 33 +
.../service/swagger/internal/Generation.java | 863 ++++++++++
.../swagger/internal/SwaggerSpecGenerator.java | 87 +
.../rendering/service/swagger/internal/Tagger.java | 0
.../service/swagger/internal/TaggerDefault.java | 0
.../rendering/service/swagger/internal/Util.java | 173 ++
.../swagger/internal/ValuePropertyFactory.java | 0
.../internal/ValuePropertyFactoryDefault.java | 148 ++
.../swagger/internal/ValuePropertyPlugin.java | 75 +
.../rendering/util/FollowSpecUtil.java | 39 +
.../rendering/util/JsonWriterUtil.java | 50 +
.../restfulobjects/rendering/util/ListUtils.java | 0
.../restfulobjects/rendering/util/MapUtils.java | 48 +
.../viewer/restfulobjects/rendering/util/Util.java | 99 ++
.../rendering/LinkFollowSpecsTest_follow.java | 0
.../JsonValueEncoderTest_appendValueAndFormat.java | 430 +++++
.../JsonValueEncoderTest_asAdapter.java | 400 +++++
.../JsonValueEncoderTest_asObject.java | 248 +++
.../service/swagger/internal/GenerationTest.java | 0
.../service/swagger/internal/TaggerTest.java | 0
.../rendering/util/MapUtilsTest.java | 0
.../restfulobjects/src/main/doc/antora.yml | 0
.../ro-spec-resources-and-representations.png | Bin
.../ROOT/images/rgfis}/service-collaborations.png | Bin
.../src/main/doc/modules/ROOT/nav.adoc | 0
.../src/main/doc/modules/ROOT/pages/about.adoc | 0
.../main/doc/modules/ROOT/pages/architecture.adoc | 0
.../ROOT/pages/configuration-properties.adoc | 0
.../main/doc/modules/ROOT/pages/health-check.adoc | 0
.../doc/modules/ROOT/pages/hints-and-tips.adoc | 0
.../ROOT/pages/hints-and-tips/angular-tips.adoc | 0
.../ROOT/pages/hints-and-tips/pretty-printing.adoc | 0
.../hints-and-tips/restful-image-property.adoc | 0
.../ROOT/pages/hints-and-tips/troubleshooting.adoc | 0
.../hints-and-tips/using-chrome-devtools.adoc | 0
.../hints-and-tips/view-model-as-parameter.adoc | 0
.../doc/modules/ROOT/pages/layout-resources.adoc | 0
.../src/main/doc/modules/ROOT/pages/ro-spec.adoc | 0
.../src/main/doc/modules/ROOT/pages/security.adoc | 0
.../ROOT/pages/simplified-representations.adoc | 0
.../action-invocation.adoc | 0
.../apache-isis-profile.adoc | 0
.../configuration-properties.adoc | 0
.../simplified-representations/domain-object.adoc | 0
.../object-collection.adoc | 0
.../other-representations.adoc | 0
.../doc/modules/ROOT/partials/component-nav.adoc | 5 +
.../main/doc/modules/ROOT/partials/module-nav.adoc | 0
.../ROOT/partials/security/user-registration.adoc | 0
.../modules/ROOT/partials/security/web-xml.adoc | 0
viewers/restfulobjects/viewer/pom.xml | 82 +
.../viewer/IsisModuleRestfulObjectsViewer.java | 71 +
.../viewer/context/ResourceContext.java | 280 +++
.../viewer/jaxrsapp/RestfulObjectsSpec.java | 0
.../viewer/mappers/ExceptionMapperAbstract.java | 162 ++
.../mappers/ExceptionMapperForObjectNotFound.java | 37 +
...xceptionMapperForRestfulObjectsApplication.java | 0
.../ExceptionMapperForRuntimeException.java | 0
.../restfulobjects/viewer/mappers/FailureUtil.java | 54 +
.../viewer/mappers/entity/ExceptionDetail.java | 91 +
.../viewer/mappers/entity/ExceptionPojo.java | 0
.../resources/DomainObjectResourceServerside.java | 746 ++++++++
.../viewer/resources/DomainResourceHelper.java | 252 +++
.../resources/DomainServiceResourceServerside.java | 281 +++
.../resources/DomainServicesListReprRenderer.java | 0
.../resources/DomainTypeResourceServerside.java | 342 ++++
.../viewer/resources/HomePageReprRenderer.java | 195 +++
.../resources/HomePageResourceServerside.java | 90 +
.../viewer/resources/ImageResourceServerside.java | 64 +
.../viewer/resources/JsonParserHelper.java | 162 ++
.../resources/MenuBarsResourceServerside.java | 119 ++
.../viewer/resources/ObjectActionArgHelper.java | 146 ++
.../resources/ObjectAdapterAccessHelper.java | 142 ++
.../resources/ObjectAdapterUpdateHelper.java | 175 ++
.../viewer/resources/ResourceAbstract.java | 174 ++
.../viewer/resources/SwaggerSpecResource.java | 131 ++
.../viewer/resources/UserReprRenderer.java | 90 +
.../viewer/resources/UserResourceServerside.java | 106 ++
.../viewer/resources/VersionReprRenderer.java | 114 ++
.../resources/VersionResourceServerside.java | 99 ++
.../serialization/SerializationStrategy.java | 0
.../restfulobjects/viewer/util/UrlParserUtils.java | 0
.../webmodule/IsisRestfulObjectsSessionFilter.java | 434 +++++
.../IsisTransactionFilterForRestfulObjects.java | 0
.../auth/AuthenticationSessionStrategy.java | 56 +
.../AuthenticationSessionStrategyAbstract.java | 67 +
.../AuthenticationSessionStrategyBasicAuth.java | 110 ++
.../auth/AuthenticationSessionStrategyDefault.java | 86 +
.../main/resources/static/swagger-ui/00-README.md | 0
.../resources/static/swagger-ui/favicon-16x16.png | Bin
.../resources/static/swagger-ui/favicon-32x32.png | Bin
.../static/swagger-ui/index-ORIG-3.24.3.html | 0
.../static/swagger-ui/oauth2-redirect.html | 0
.../static/swagger-ui/swagger-ui-bundle.js | 0
.../static/swagger-ui/swagger-ui-bundle.js.map | 0
.../swagger-ui/swagger-ui-standalone-preset.js | 0
.../swagger-ui/swagger-ui-standalone-preset.js.map | 0
.../resources/static/swagger-ui/swagger-ui.css | 0
.../resources/static/swagger-ui/swagger-ui.css.map | 0
.../main/resources/static/swagger-ui/swagger-ui.js | 0
.../resources/static/swagger-ui/swagger-ui.js.map | 0
.../src/main/resources/swagger-ui/index.thtml | 0
..._ensureCompatibleAcceptHeader_ContractTest.java | 217 +++
.../context/ResourceContext_getArg_Test.java | 157 ++
.../context/ResourceContext_stripQuotes_Test.java | 0
...tsApplicationExceptionMapper_Test_Contract.java | 145 ++
.../DomainResourceHelper_readBodyAsMap_Test.java | 0
.../viewer/resources/JsonParserHelper_Test.java | 0
.../viewer/util/UrlParserUtils_Test.java | 0
...ulObjectsSessionFilter_lookupPassThru_Test.java | 98 ++
viewers/wicket/model/pom.xml | 87 +
.../viewer/wicket/model/IsisModuleWicketModel.java | 14 +
.../wicket/model/common/CommonContextUtils.java | 43 +
.../wicket/model/common/OnSelectionHandler.java | 38 +
.../wicket/model/common/PageParametersUtils.java | 0
.../wicket/model/hints/HasUiHintDisambiguator.java | 0
.../model/hints/IsisActionCompletedEvent.java | 0
.../wicket/model/hints/IsisEnvelopeEvent.java | 0
.../wicket/model/hints/IsisEventAbstract.java | 0
.../model/hints/IsisEventLetterAbstract.java | 0
.../hints/IsisPropertyEditCompletedEvent.java | 0
.../wicket/model/hints/IsisSelectorEvent.java | 0
.../viewer/wicket/model/hints/UiHintContainer.java | 0
.../wicket/model/isis/WicketViewerSettings.java | 92 +
.../model/isis/WicketViewerSettingsAccessor.java | 0
.../viewer/wicket/model/links/LinkAndLabel.java | 188 ++
.../viewer/wicket/model/links/LinksProvider.java | 0
.../wicket/model/links/ListOfLinksModel.java | 45 +
.../wicket/model/mementos/ActionMemento.java | 94 +
.../model/mementos/ActionParameterMemento.java | 100 ++
.../wicket/model/mementos/CollectionMemento.java | 109 ++
.../mementos/ObjectAdapterMemento_Legacy.java | 0
.../wicket/model/mementos/PageParameterNames.java | 135 ++
.../wicket/model/mementos/PropertyMemento.java | 128 ++
.../viewer/wicket/model/models/AboutModel.java | 49 +
.../wicket/model/models/ActionArgumentModel.java | 35 +
.../viewer/wicket/model/models/ActionModel.java | 720 ++++++++
.../viewer/wicket/model/models/ActionPrompt.java | 0
.../wicket/model/models/ActionPromptProvider.java | 51 +
.../model/models/ActionPromptWithExtraContent.java | 0
.../wicket/model/models/BookmarkTreeNode.java | 266 +++
.../model/models/BookmarkTreeNodeComparator.java | 71 +
.../wicket/model/models/BookmarkableModel.java | 50 +
.../wicket/model/models/BookmarkedPagesModel.java | 143 ++
.../wicket/model/models/EntityCollectionModel.java | 587 +++++++
.../viewer/wicket/model/models/EntityModel.java | 602 +++++++
.../model/models/EntityModelForReference.java | 114 ++
.../viewer/wicket/model/models/FormExecutor.java | 0
.../wicket/model/models/FormExecutorContext.java | 0
.../model/models/HintPageParameterSerializer.java | 92 +
.../wicket/model/models/ImageResourceCache.java | 39 +
.../wicket/model/models/InlinePromptContext.java | 0
.../viewer/wicket/model/models/ModelAbstract.java | 56 +
.../wicket/model/models/ObjectAdapterModel.java | 45 +
.../isis/viewer/wicket/model/models/PageType.java | 0
.../model/models/ParentEntityModelProvider.java | 0
.../viewer/wicket/model/models/ScalarModel.java | 1251 ++++++++++++++
.../model/models/ScalarModelWithMultiPending.java | 95 ++
.../model/models/ScalarModelWithPending.java | 90 +
.../wicket/model/models/ServiceActionsModel.java | 73 +
.../model/models/ToggledMementosProvider.java | 32 +
.../isis/viewer/wicket/model/models/Util.java | 47 +
.../viewer/wicket/model/models/ValueModel.java | 67 +
.../isis/viewer/wicket/model/models/VoidModel.java | 63 +
.../viewer/wicket/model/models/WelcomeModel.java | 49 +
.../wicket/model/models/WicketComponentUtils.java | 61 +
.../model/models/whereami/WhereAmIModel.java | 0
.../models/whereami/WhereAmIModelDefault.java | 90 +
.../viewer/wicket/model/util/ComponentHintKey.java | 147 ++
.../wicket/model/models/ActionModelTest.java | 0
.../wicket/model/models/EntityModel_hintsTest.java | 154 ++
.../models/LowestCommonSuperclassClosureTest.java | 62 +
.../ScalarModel_isScalarSubtypingAnyOf_Test.java | 106 ++
viewers/wicket/pom.xml | 42 +
.../wicket/src/main/doc/antora.yml | 0
.../modules/ROOT/images/about-page/about-page.png | Bin
.../ROOT/images/application-menu/dividers.png | Bin
.../ROOT/images/application-menu/layout-menus.pdn | Bin
.../ROOT/images/application-menu/layout-menus.png | Bin
.../ROOT/images/application-menu/tertiary.png | Bin
.../blob-attachments/010-attachment-field-940.png | Bin
.../blob-attachments/010-attachment-field.png | Bin
.../blob-attachments/020-edit-choose-file-940.png | Bin
.../blob-attachments/020-edit-choose-file.png | Bin
.../030-choose-file-using-browser-520.png | Bin
.../030-choose-file-using-browser.png | Bin
.../040-edit-chosen-file-indicated-940.png | Bin
.../040-edit-chosen-file-indicated.png | Bin
.../050-ok-if-image-then-rendered-940.png | Bin
.../050-ok-if-image-then-rendered.png | Bin
.../images/blob-attachments/060-download-940.png | Bin
.../ROOT/images/blob-attachments/060-download.png | Bin
.../images/blob-attachments/070-edit-clear-940.png | Bin
.../images/blob-attachments/070-edit-clear.png | Bin
.../ROOT/images/bookmarked-pages/panel-940.png | Bin
.../images/bookmarked-pages/panel-estatio-940.png | Bin
.../ROOT/images/bookmarked-pages/panel-estatio.png | Bin
.../modules/ROOT/images/bookmarked-pages/panel.png | Bin
.../ROOT/images/brand-logo/brand-logo-signin.png | Bin
.../modules/ROOT/images/brand-logo/brand-logo.png | Bin
.../images/copy-link/010-copy-link-button-940.png | Bin
.../ROOT/images/copy-link/010-copy-link-button.png | Bin
.../images/copy-link/020-copy-link-dialog-940.png | Bin
.../ROOT/images/copy-link/020-copy-link-dialog.png | Bin
.../ROOT/images/copy-link/030-hints-940.png | Bin
.../modules/ROOT/images/copy-link/030-hints.png | Bin
.../copy-link/040-copy-link-with-hints-940.png | Bin
.../images/copy-link/040-copy-link-with-hints.png | Bin
.../ROOT/images/copy-link/050-title-url-940.png | Bin
.../ROOT/images/copy-link/050-title-url.png | Bin
.../doc/modules/ROOT/images/dialog-mode/modal.png | Bin
.../modules/ROOT/images/dialog-mode/sidebar.png | Bin
.../ROOT/images/embedded-view/no-footer.png | Bin
.../images/embedded-view/no-header-no-footer.png | Bin
.../ROOT/images/embedded-view/no-header.png | Bin
.../modules/ROOT/images/embedded-view/regular.png | Bin
.../images/features/recent-pages/recent-pages.png | Bin
.../object-titles-and-icons/cust-order-product.png | Bin
.../images/layout-dynamic-xml/ToDoAppDashboard.png | Bin
.../ROOT/images/layout-dynamic-xml/ToDoItem.png | Bin
.../modules/ROOT/images/layouts/customer-order.png | Bin
.../ROOT/images/layouts/estatio-Invoice.png | Bin
.../modules/ROOT/images/layouts/estatio-Lease.png | Bin
.../ROOT/images/layouts/estatio-LeaseItem.png | Bin
.../ROOT/images/layouts/todoapp-ToDoItem.png | Bin
.../modules/ROOT/images/menubars/010-download.png | Bin
.../modules/ROOT/images/menubars/020-download.png | Bin
.../ROOT/images/reference-layout/4-0-8-0.png | Bin
.../ROOT/images/reference-layout/4-4-4-12.png | Bin
.../ROOT/images/reference-layout/6-6-0-12.png | Bin
.../reference-layout/isis-layout-show-facets.css | 0
.../ROOT/images/reference-layout/isis-layout.css | 0
.../images/reference-layout/layout-4-0-8-0.html | 0
.../images/reference-layout/layout-4-4-4-12.html | 0
.../images/reference-layout/layout-6-6-0-12.html | 0
.../login-page-default.png | Bin
.../login-page-suppress-password-reset.png | Bin
.../suppress-remember-me}/login-page-default.png | Bin
.../login-page-suppress-remember-me.png | Bin
.../suppress-sign-up}/login-page-default.png | Bin
.../login-page-suppress-sign-up.png | Bin
.../ROOT/images/theme-chooser/example-1.png | Bin
.../ROOT/images/theme-chooser/example-2.png | Bin
.../user-registration}/login-page-default.png | Bin
.../sign-up-after-registration.png | Bin
.../sign-up-email-with-verification-link.png | Bin
.../sign-up-login-page-after-sign-up.png | Bin
.../ROOT/images/user-registration/sign-up-page.png | Bin
.../sign-up-registration-page.png | Bin
.../ROOT/images/where-am-i/hello_grey_bg.png | Bin
.../wicket/src/main/doc/modules/ROOT/nav.adoc | 0
.../src/main/doc/modules/ROOT/pages/about.adoc | 0
.../ROOT/pages/configuration-properties.adoc | 0
.../main/doc/modules/ROOT/pages/customisation.adoc | 0
.../ROOT/pages/customisation/about-page.adoc | 0
.../ROOT/pages/customisation/auto-refresh.adoc | 0
.../ROOT/pages/customisation/brand-logo.adoc | 0
.../customisation/cheap-n-cheerful-theme.adoc | 0
.../pages/customisation/custom-javascript.adoc | 0
.../pages/customisation/request-parameters.adoc | 0
.../pages/customisation/top-level-index-page.adoc | 0
.../pages/customisation/tweaking-css-classes.adoc | 0
.../customisation/using-different-css-file.adoc | 0
.../ROOT/pages/customisation/welcome-page.adoc | 0
.../src/main/doc/modules/ROOT/pages/extending.adoc | 0
.../pages/extending/custom-bootstrap-theme.adoc | 0
.../modules/ROOT/pages/extending/custom-pages.adoc | 0
.../login-via-query-args-prototyping.adoc | 0
.../pages/extending/replacing-page-elements.adoc | 0
.../src/main/doc/modules/ROOT/pages/features.adoc | 0
.../ROOT/pages/features/blob-attachments.adoc | 0
.../ROOT/pages/features/bookmarked-pages.adoc | 0
.../ROOT/pages/features/hints-and-copy-url.adoc | 0
.../modules/ROOT/pages/features/recent-pages.adoc | 0
.../pages/features/sidebar-vs-modal-dialogs.adoc | 0
.../ROOT/pages/features/titles-in-tables.adoc | 0
.../ROOT/pages/features/user-registration.adoc | 78 +
.../modules/ROOT/pages/features/where-am-i.adoc | 0
.../doc/modules/ROOT/pages/hints-and-tips.adoc | 0
.../hints-and-tips/highlight-current-row.adoc | 0
.../i18n-label-in-wicket-viewer.adoc | 0
.../ROOT/pages/hints-and-tips/per-user-themes.adoc | 0
.../ROOT/pages/hints-and-tips/svg-support.adoc | 0
.../doc/modules/ROOT/pages/incode-platform.adoc | 0
.../src/main/doc/modules/ROOT/pages/layout.adoc | 0
.../ROOT/pages/layout/annotation-based.adoc | 0
.../doc/modules/ROOT/pages/layout/file-based.adoc | 0
.../modules/ROOT/pages/layout/table-columns.adoc | 0
.../doc/modules/ROOT/pages/menubars-layout.adoc | 0
.../pages/menubars-layout/annotation-based.adoc | 0
.../ROOT/pages/menubars-layout/file-based.adoc | 0
.../src/main/doc/modules/ROOT/pages/security.adoc | 0
.../doc/modules/ROOT/partials/component-nav.adoc | 6 +
.../main/doc/modules/ROOT/partials/module-nav.adoc | 0
.../doc/modules/ROOT/partials/security/pages.adoc | 0
.../ROOT/partials/security/user-registration.adoc | 24 +
viewers/wicket/ui/pom.xml | 361 ++++
.../wicket/ui/src/main/java/images/Images.java | 0
.../wicket/ui/CollectionContentsAsFactory.java | 51 +
.../isis/viewer/wicket/ui/ComponentFactory.java | 0
.../viewer/wicket/ui/ComponentFactoryAbstract.java | 125 ++
.../isis/viewer/wicket/ui/ComponentType.java | 183 ++
.../wicket/ui/HeaderContributorProvider.java | 0
.../isis/viewer/wicket/ui/IsisModuleWicketUi.java | 0
.../ui/actionresponse/ActionResultResponse.java | 0
.../ActionResultResponseHandlingStrategy.java | 166 ++
.../actionresponse/ActionResultResponseType.java | 221 +++
.../ui/app/registry/ComponentFactoryRegistrar.java | 108 ++
.../ui/app/registry/ComponentFactoryRegistry.java | 0
.../registry/ComponentFactoryRegistryAccessor.java | 0
.../wicket/ui/components/about/AboutPanel.html | 0
.../wicket/ui/components/about/AboutPanel.java | 0
.../ui/components/about/AboutPanelFactory.java | 0
.../ui/components/about/JarManifestAttributes.java | 0
.../ui/components/about/JarManifestListView.java | 0
.../ui/components/about/JarManifestModel.java | 215 +++
.../ui/components/about/JarManifestPanel.css | 0
.../ui/components/about/JarManifestPanel.html | 0
.../ui/components/about/JarManifestPanel.java | 0
.../wicket/ui/components/about/div-toggle.js | 0
.../ui/components/actioninfo/ActionInfoPanel.html | 0
.../ui/components/actioninfo/ActionInfoPanel.java | 51 +
.../actioninfo/ActionInfoPanelFactory.java | 0
.../ui/components/actionlink/ActionLinkPanel.html | 0
.../ui/components/actionlink/ActionLinkPanel.java | 0
.../actionlink/ActionLinkPanelFactory.java | 0
.../components/actionmenu/CssClassFaBehavior.java | 57 +
.../AdditionalLinksAsDropDownPanel.html | 0
.../AdditionalLinksAsDropDownPanel.java | 0
.../AdditionalLinksAsListInlinePanel.html | 0
.../AdditionalLinksAsListInlinePanel.java | 0
.../entityactions/AdditionalLinksPanel.java | 182 ++
.../entityactions/EntityActionLinkFactory.java | 71 +
.../actionmenu/entityactions/LinkAndLabelUtil.java | 86 +
.../actionmenu/serviceactions/CssMenuItem.java | 494 ++++++
.../serviceactions/CssMenuItemPanelAbstract.java | 0
.../serviceactions/CssSubMenuItemsPanel.html | 0
.../serviceactions/CssSubMenuItemsPanel.java | 0
.../serviceactions/ServiceActionLinkFactory.java | 54 +
.../serviceactions/ServiceActionUtil.java | 279 +++
.../serviceactions/ServiceActionsPanel.css | 0
.../serviceactions/ServiceActionsPanel.html | 0
.../serviceactions/ServiceActionsPanel.java | 149 ++
.../serviceactions/ServiceActionsPanelFactory.java | 0
.../serviceactions/ServiceAndAction.java | 47 +
.../serviceactions/TertiaryActionsPanel.css | 0
.../serviceactions/TertiaryActionsPanel.html | 0
.../serviceactions/TertiaryActionsPanel.java | 143 ++
.../serviceactions/TertiaryMenuPanelFactory.java | 0
.../actionprompt/ActionPromptHeaderPanel.html | 0
.../actionprompt/ActionPromptHeaderPanel.java | 65 +
.../actionprompt/ActionPromptModalWindow.html | 0
.../actionprompt/ActionPromptModalWindow.java | 0
.../actionpromptsb/ActionPromptSidebar.html | 0
.../actionpromptsb/ActionPromptSidebar.java | 0
.../actions/ActionFormExecutorStrategy.java | 94 +
.../components/actions/ActionParametersForm.java | 205 +++
.../actions/ActionParametersFormPanel.html | 0
.../actions/ActionParametersFormPanel.java | 60 +
.../actions/ActionParametersFormPanel.properties | 0
.../actions/ActionParametersFormPanelFactory.java | 0
.../components/actions/ActionParametersPanel.html | 0
.../components/actions/ActionParametersPanel.java | 115 ++
.../actions/ActionParametersPanelFactory.java | 0
.../bookmarkedpages/BookmarkedPagesPanel.css | 0
.../bookmarkedpages/BookmarkedPagesPanel.html | 0
.../bookmarkedpages/BookmarkedPagesPanel.java | 225 +++
.../BookmarkedPagesPanelFactory.java | 0
.../bookmarkedpages/images/clear_bookmarks.png | Bin
.../ui/components/bookmarkedpages/slide-panel.js | 0
.../collection/AssociatedWithActionsHelper.java | 84 +
.../ui/components/collection/CollectionPanel.html | 0
.../ui/components/collection/CollectionPanel.java | 215 +++
.../collection/bulk/BulkActionsProvider.java | 0
.../collection/count/CollectionCountProvider.java | 0
.../selector/CollectionSelectorHelper.java | 266 +++
.../selector/CollectionSelectorPanel.html | 0
.../selector/CollectionSelectorPanel.java | 233 +++
.../selector/CollectionSelectorProvider.java | 0
.../CollectionContentsAsAjaxTablePanel.html | 0
.../CollectionContentsAsAjaxTablePanel.java | 319 ++++
.../CollectionContentsAsAjaxTablePanelFactory.java | 0
.../CollectionContentsSortableDataProvider.java | 195 +++
.../ajaxtable/IsisAjaxFallbackDataTable.java | 231 +++
.../ajaxtable/IsisAjaxFallbackHeadersToolbar.java | 93 +
.../ajaxtable/IsisAjaxFallbackOrderByBorder.java | 0
.../ajaxtable/IsisAjaxHeadersToolbar.html | 0
.../ajaxtable/IsisAjaxHeadersToolbar.java | 0
.../ajaxtable/IsisAjaxNavigationToolbar.html | 0
.../ajaxtable/IsisAjaxNavigationToolbar.java | 123 ++
.../ajaxtable/IsisAjaxPagingNavigation.java | 0
.../IsisAjaxPagingNavigationIncrementLink.java | 0
.../ajaxtable/IsisAjaxPagingNavigationLink.java | 0
.../ajaxtable/IsisAjaxPagingNavigator.java | 0
.../ajaxtable/IsisTotalRecordsToolbar.html | 0
.../ajaxtable/IsisTotalRecordsToolbar.java | 107 ++
.../ajaxtable/PrototypingMessageProvider.java | 58 +
.../ajaxtable/columns/ColumnAbstract.java | 78 +
.../columns/ObjectAdapterPropertyColumn.java | 123 ++
.../columns/ObjectAdapterTitleColumn.java | 93 +
.../columns/ObjectAdapterToggleboxColumn.java | 128 ++
.../ajaxtable/images/arrow_down.png | Bin
.../ajaxtable/images/arrow_off.png | Bin
.../ajaxtable/images/arrow_up.png | Bin
.../icons/CollectionContentsAsIconsPanel.html | 0
.../icons/CollectionContentsAsIconsPanel.java | 63 +
.../CollectionContentsAsIconsPanelFactory.java | 66 +
.../CollectionContentsMultipleViewsPanel.html | 0
.../CollectionContentsMultipleViewsPanel.java | 0
...ollectionContentsMultipleViewsPanelFactory.java | 0
.../summary/CollectionContentsAsSummary.html | 0
.../summary/CollectionContentsAsSummary.java | 206 +++
.../CollectionContentsAsSummaryFactory.java | 95 ++
.../unresolved/CollectionContentsHiddenPanel.html | 0
.../unresolved/CollectionContentsHiddenPanel.java | 0
.../CollectionContentsHiddenPanelFactory.java | 0
.../ui/components/empty/EmptyCollectionPanel.html | 0
.../ui/components/empty/EmptyCollectionPanel.java | 0
.../empty/EmptyCollectionPanelFactory.java | 0
.../entity/EntityComponentFactoryAbstract.java | 90 +
.../entity/collection/EntityCollectionPanel.html | 0
.../entity/collection/EntityCollectionPanel.java | 191 +++
.../collection/EntityCollectionPanelFactory.java | 0
.../components/entity/fieldset/PropertyGroup.html | 0
.../components/entity/fieldset/PropertyGroup.java | 260 +++
.../entity/header/EntityHeaderPanel.html | 0
.../entity/header/EntityHeaderPanel.java | 97 ++
.../entity/header/EntityHeaderPanelFactory.java | 0
.../entity/icontitle/EntityIconAndTitlePanel.html | 0
.../entity/icontitle/EntityIconAndTitlePanel.java | 239 +++
.../icontitle/EntityIconAndTitlePanelFactory.java | 80 +
.../icontitle/EntityIconTitleAndCopyLinkPanel.html | 0
.../icontitle/EntityIconTitleAndCopyLinkPanel.java | 0
.../EntityIconTitleAndCopyLinkPanelFactory.java | 0
.../selector/links/EntityLinksSelectorPanel.html | 0
.../selector/links/EntityLinksSelectorPanel.java | 381 +++++
.../links/EntityLinksSelectorPanelFactory.java | 65 +
.../wicket/ui/components/footer/CreditImage.java | 0
.../wicket/ui/components/footer/CreditName.java | 0
.../wicket/ui/components/footer/FooterPanel.html | 0
.../wicket/ui/components/footer/FooterPanel.java | 187 ++
.../ui/components/footer/FooterPanelFactory.java | 0
.../wicket/ui/components/header/HeaderPanel.html | 0
.../wicket/ui/components/header/HeaderPanel.java | 0
.../ui/components/header/HeaderPanelFactory.java | 0
.../ui/components/layout/bs3/BS3GridPanel.html | 0
.../ui/components/layout/bs3/BS3GridPanel.java | 0
.../wicket/ui/components/layout/bs3/Util.java | 43 +
.../components/layout/bs3/clearfix/ClearFix.html | 0
.../components/layout/bs3/clearfix/ClearFix.java | 0
.../wicket/ui/components/layout/bs3/col/Col.html | 0
.../wicket/ui/components/layout/bs3/col/Col.java | 323 ++++
...RepeatingViewWithDynamicallyVisibleContent.java | 0
.../wicket/ui/components/layout/bs3/row/Row.html | 0
.../wicket/ui/components/layout/bs3/row/Row.java | 0
.../components/layout/bs3/tabs/TabGroupPanel.java | 134 ++
.../ui/components/layout/bs3/tabs/TabPanel.html | 0
.../ui/components/layout/bs3/tabs/TabPanel.java | 0
.../ui/components/property/PropertyEditForm.java | 0
.../components/property/PropertyEditFormPanel.html | 0
.../components/property/PropertyEditFormPanel.java | 0
.../property/PropertyEditFormPanel.properties | 0
.../property/PropertyEditFormPanelFactory.java | 0
.../ui/components/property/PropertyEditPanel.html | 0
.../ui/components/property/PropertyEditPanel.java | 117 ++
.../property/PropertyEditPanelFactory.java | 0
.../property/PropertyFormExecutorStrategy.java | 85 +
.../PropertyEditPromptHeaderPanel.html | 0
.../PropertyEditPromptHeaderPanel.java | 65 +
.../scalars/ComponentFactoryScalarAbstract.java | 0
.../ui/components/scalars/DateConverter.java | 0
.../components/scalars/DateConverterAbstract.java | 0
.../ui/components/scalars/DateConverterPlugin.java | 0
.../ui/components/scalars/DateFormatSettings.java | 0
.../components/scalars/IsisConverterLocator.java | 126 ++
.../components/scalars/ScalarModelSubscriber.java | 0
.../components/scalars/ScalarModelSubscriber2.java | 0
.../ui/components/scalars/ScalarPanelAbstract.java | 387 +++++
.../components/scalars/ScalarPanelAbstract2.java | 975 +++++++++++
.../scalars/ScalarPanelSelect2Abstract.java | 263 +++
.../scalars/ScalarPanelTextFieldAbstract.html | 0
.../scalars/ScalarPanelTextFieldAbstract.java | 386 +++++
.../ScalarPanelTextFieldDatePickerAbstract.java | 128 ++
.../scalars/ScalarPanelTextFieldNumeric.java | 0
.../ScalarPanelTextFieldParseableAbstract.java | 68 +
.../ui/components/scalars/TextFieldAbstract.java | 0
.../components/scalars/TextFieldStringModel.java | 0
.../ui/components/scalars/TextFieldValueModel.java | 75 +
.../ui/components/scalars/XEditableBehavior2.java | 0
.../scalars/datepicker/DateTimeConfig.java | 0
.../datepicker/TextFieldWithDateTimePicker.java | 169 ++
.../datepicker/css/bootstrap-datetimepicker.css | 0
.../css/bootstrap-datetimepicker.min.css | 0
.../datepicker/js/bootstrap-datetimepicker.js | 0
.../datepicker/js/bootstrap-datetimepicker.min.js | 0
.../ui/components/scalars/datepicker/js/moment.js | 0
.../components/scalars/datepicker/js/moment.min.js | 0
.../scalars/image/JavaAwtImagePanel.html | 0
.../scalars/image/JavaAwtImagePanel.java | 78 +
.../scalars/image/JavaAwtImagePanelFactory.java | 54 +
.../components/scalars/image/wupb-progressBar.css | 0
.../isisapplib/IsisBlobOrClobPanelAbstract.html | 0
.../isisapplib/IsisBlobOrClobPanelAbstract.java | 434 +++++
.../scalars/isisapplib/IsisBlobPanel.java | 0
.../scalars/isisapplib/IsisBlobPanelFactory.java | 0
.../scalars/isisapplib/IsisClobPanel.java | 0
.../scalars/isisapplib/IsisClobPanelFactory.java | 0
.../scalars/isisapplib/IsisPasswordPanel.java | 0
.../isisapplib/IsisPasswordPanelFactory.java | 0
.../scalars/isisapplib/IsisTimePanel.java | 0
.../scalars/isisapplib/ResourceLinkVolatile.java | 0
.../jdk8time/DateConverterForJdk8Abstract.java | 0
.../jdk8time/DateConverterForJdk8LocalDate.java | 0
.../DateConverterForJdk8LocalDateTime.java | 0
.../DateConverterForJdk8OffsetDateTime.java | 0
.../scalars/jdk8time/Jdk8LocalDatePanel.java | 0
.../jdk8time/Jdk8LocalDatePanelFactory.java | 0
.../scalars/jdk8time/Jdk8LocalDateTimePanel.java | 0
.../jdk8time/Jdk8LocalDateTimePanelFactory.java | 0
.../scalars/jdk8time/Jdk8OffsetDateTimePanel.java | 0
.../jdk8time/Jdk8OffsetDateTimePanelFactory.java | 0
.../jdkdates/DateConverterForJavaAbstract.java | 0
.../jdkdates/DateConverterForJavaSqlDate.java | 0
.../jdkdates/DateConverterForJavaSqlTimestamp.java | 0
.../jdkdates/DateConverterForJavaUtilDate.java | 0
.../scalars/jdkdates/JavaSqlDatePanel.java | 0
.../scalars/jdkdates/JavaSqlDatePanelFactory.java | 0
.../scalars/jdkdates/JavaSqlTimePanel.java | 0
.../scalars/jdkdates/JavaSqlTimePanelFactory.java | 0
.../scalars/jdkdates/JavaSqlTimestampPanel.java | 0
.../jdkdates/JavaSqlTimestampPanelFactory.java | 0
.../scalars/jdkdates/JavaUtilDatePanel.java | 0
.../scalars/jdkdates/JavaUtilDatePanelFactory.java | 0
.../jdkmath/BigDecimalConverterWithScale.java | 0
.../scalars/jdkmath/BigDecimalTextField.java | 0
.../scalars/jdkmath/JavaMathBigDecimalPanel.java | 0
.../jdkmath/JavaMathBigDecimalPanelFactory.java | 0
.../scalars/jdkmath/JavaMathBigIntegerPanel.java | 0
.../jdkmath/JavaMathBigIntegerPanelFactory.java | 0
.../jodatime/DateConverterForJodaAbstract.java | 0
.../jodatime/DateConverterForJodaDateTime.java | 0
.../jodatime/DateConverterForJodaLocalDate.java | 0
.../DateConverterForJodaLocalDateTime.java | 0
.../scalars/jodatime/JodaDateTimePanel.java | 0
.../scalars/jodatime/JodaDateTimePanelFactory.java | 0
.../scalars/jodatime/JodaLocalDatePanel.java | 0
.../jodatime/JodaLocalDatePanelFactory.java | 0
.../scalars/jodatime/JodaLocalDateTimePanel.java | 0
.../jodatime/JodaLocalDateTimePanelFactory.java | 0
.../components/scalars/markup/MarkupComponent.java | 81 +
.../scalars/markup/MarkupComponentFactory.java | 0
.../scalars/markup/MarkupComponent_reloadJs.java | 0
.../ui/components/scalars/markup/MarkupPanel.java | 0
.../scalars/markup/MarkupPanelFactories.java | 0
.../scalars/markup/StandaloneMarkupPanel.html | 0
.../scalars/markup/StandaloneMarkupPanel.java | 0
.../components/scalars/primitive/BooleanPanel.html | 0
.../components/scalars/primitive/BooleanPanel.java | 262 +++
.../scalars/primitive/BooleanPanelFactory.java | 0
.../primitive/BooleanPanel_labelRightPosition.html | 0
.../ui/components/scalars/primitive/BytePanel.java | 0
.../scalars/primitive/BytePanelFactory.java | 0
.../scalars/primitive/CharacterPanel.java | 0
.../scalars/primitive/CharacterPanelFactory.java | 0
.../components/scalars/primitive/DoublePanel.java | 0
.../scalars/primitive/DoublePanelFactory.java | 0
.../components/scalars/primitive/FloatPanel.java | 0
.../scalars/primitive/FloatPanelFactory.java | 0
.../components/scalars/primitive/IntegerPanel.java | 0
.../scalars/primitive/IntegerPanelFactory.java | 0
.../ui/components/scalars/primitive/LongPanel.java | 0
.../scalars/primitive/LongPanelFactory.java | 0
.../components/scalars/primitive/ShortPanel.java | 0
.../scalars/primitive/ShortPanelFactory.java | 0
.../scalars/reference/EntityLinkSelect2Panel.html | 0
.../scalars/reference/EntityLinkSelect2Panel.java | 73 +
.../scalars/reference/ReferencePanel.html | 0
.../scalars/reference/ReferencePanel.java | 460 +++++
.../scalars/reference/ReferencePanelFactory.java | 58 +
.../scalars/string/MultiLineStringPanel.java | 113 ++
.../ui/components/scalars/string/StringPanel.java | 0
.../scalars/string/StringPanelFactory.java | 45 +
.../ui/components/scalars/uuid/UuidConverter.java | 63 +
.../ui/components/scalars/uuid/UuidPanel.java | 0
.../components/scalars/uuid/UuidPanelFactory.java | 0
.../ui/components/scalars/uuid/UuidTextField.java | 0
.../ui/components/scalars/value/ValuePanel.java | 0
.../scalars/value/ValuePanelFactory.java | 63 +
.../valuechoices/ValueChoicesSelect2Panel.html | 0
.../valuechoices/ValueChoicesSelect2Panel.java | 190 +++
.../ValueChoicesSelect2PanelFactory.java | 0
.../StandaloneCollectionPanel.html | 0
.../StandaloneCollectionPanel.java | 122 ++
.../StandaloneCollectionPanelFactory.java | 0
.../components/tree/IsisToWicketTreeAdapter.java | 530 ++++++
.../ui/components/tree/StandaloneTreePanel.html | 0
.../ui/components/tree/StandaloneTreePanel.java | 0
.../wicket/ui/components/tree/TreePanel.html | 0
.../wicket/ui/components/tree/TreePanel.java | 0
.../ui/components/tree/TreePanelFactories.java | 0
.../components/tree/themes/TreeThemeProvider.java | 0
.../tree/themes/TreeThemeProviderDefault.java | 0
.../themes/bootstrap/IsisBootstrapTreeTheme.java | 0
.../ui/components/tree/themes/bootstrap/theme.css | 0
.../ui/components/unknown/UnknownModelPanel.html | 0
.../ui/components/unknown/UnknownModelPanel.java | 70 +
.../unknown/UnknownModelPanelFactory.java | 0
.../ui/components/value/StandaloneValuePanel.html | 0
.../ui/components/value/StandaloneValuePanel.java | 0
.../value/StandaloneValuePanelFactory.java | 0
.../ui/components/voidreturn/VoidReturnPanel.html | 0
.../ui/components/voidreturn/VoidReturnPanel.java | 0
.../voidreturn/VoidReturnPanelFactory.java | 0
.../wicket/ui/components/welcome/WelcomePanel.html | 0
.../wicket/ui/components/welcome/WelcomePanel.java | 54 +
.../ui/components/welcome/WelcomePanelFactory.java | 61 +
.../ui/components/widgets/bootstrap/FormGroup.java | 0
.../components/widgets/bootstrap/ModalDialog.java | 0
.../widgets/breadcrumbs/BreadcrumbModel.java | 190 +++
.../breadcrumbs/BreadcrumbModelProvider.java | 0
.../widgets/breadcrumbs/BreadcrumbPanel.html | 0
.../widgets/breadcrumbs/BreadcrumbPanel.java | 158 ++
.../widgets/buttons/ContainedButtonPanel.html | 0
.../widgets/buttons/ContainedButtonPanel.java | 94 +
.../widgets/buttons/ToggleButtonsPanel.html | 0
.../widgets/buttons/ToggleButtonsPanel.java | 0
.../widgets/checkbox/ContainedToggleboxPanel.html | 0
.../widgets/checkbox/ContainedToggleboxPanel.java | 0
.../entitysimplelink/EntityLinkSimplePanel.css | 0
.../entitysimplelink/EntityLinkSimplePanel.html | 0
.../entitysimplelink/EntityLinkSimplePanel.java | 97 ++
.../EntityLinkSimplePanelFactory.java | 54 +
.../ui/components/widgets/favicon/Favicon.java | 65 +
.../widgets/formcomponent/CancelHintRequired.java | 0
.../formcomponent/FormComponentPanelAbstract.java | 0
.../widgets/formcomponent/FormFeedbackPanel.java | 0
.../widgets/linkandlabel/ActionLink.java | 284 ++++
.../widgets/linkandlabel/ActionLinkFactory.java | 38 +
.../linkandlabel/ActionLinkFactoryAbstract.java | 319 ++++
.../linkandlabel/AjaxDeferredBehaviour.java | 0
.../ui/components/widgets/navbar/BrandLogo.java | 72 +
.../ui/components/widgets/navbar/BrandName.java | 68 +
.../ui/components/widgets/navbar/Placement.java | 0
.../ui/components/widgets/select2/ChoiceExt.java | 40 +
.../ui/components/widgets/select2/Select2.java | 176 ++
.../select2/Select2BootstrapCssReference.java | 48 +
.../widgets/select2/Select2ChoiceExt.java | 58 +
.../widgets/select2/Select2JsReference.java | 48 +
.../widgets/select2/Select2MultiChoiceExt.java | 67 +
.../select2/providers/EmptyChoiceProvider.java | 51 +
.../ObjectAdapterMementoProviderAbstract.java | 173 ++
.../ObjectAdapterMementoProviderForChoices.java | 48 +
...tAdapterMementoProviderForReferenceChoices.java | 51 +
...entoProviderForReferenceObjectAutoComplete.java | 51 +
...derForReferenceParamOrPropertyAutoComplete.java | 75 +
...bjectAdapterMementoProviderForValueChoices.java | 66 +
.../widgets/select2/select2-bootstrap.css | 0
.../themepicker/IsisWicketThemeSupport.java | 64 +
.../themepicker/IsisWicketThemeSupportDefault.java | 136 ++
.../widgets/themepicker/ThemeChooser.html | 0
.../widgets/themepicker/ThemeChooser.java | 162 ++
.../themepicker/ThemeProviderComposite.java | 114 ++
.../widgets/zclip/SimpleClipboardModalWindow.html | 0
.../widgets/zclip/SimpleClipboardModalWindow.java | 0
.../zclip/SimpleClipboardModalWindowForm.java | 0
.../zclip/SimpleClipboardModalWindowPanel.html | 0
.../zclip/SimpleClipboardModalWindowPanel.java | 0
.../widgets/zclip/ZeroClipboardPanel.html | 0
.../widgets/zclip/ZeroClipboardPanel.java | 126 ++
.../viewer/wicket/ui/errors/ExceptionModel.java | 193 +++
.../wicket/ui/errors/ExceptionStackTracePanel.css | 0
.../wicket/ui/errors/ExceptionStackTracePanel.html | 0
.../wicket/ui/errors/ExceptionStackTracePanel.java | 0
.../viewer/wicket/ui/errors/JGrowlBehaviour.java | 86 +
.../isis/viewer/wicket/ui/errors/JGrowlUtil.java | 90 +
.../viewer/wicket/ui/errors/StackTraceDetail.java | 0
.../wicket/ui/errors/StackTraceListView.java | 0
.../isis/viewer/wicket/ui/errors/div-toggle.js | 0
.../viewer/wicket/ui/errors/js/bootstrap-growl.js | 0
.../wicket/ui/errors/js/bootstrap-growl.min.js | 0
.../ui/pages/BookmarkedPagesModelProvider.java | 0
.../BootstrapOverridesCssResourceReference.java | 0
.../ui/pages/EmailVerificationUrlService.java | 0
.../isis/viewer/wicket/ui/pages/PageAbstract.html | 0
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 524 ++++++
.../viewer/wicket/ui/pages/PageAbstract.properties | 0
.../isis/viewer/wicket/ui/pages/PageClassList.java | 0
.../viewer/wicket/ui/pages/PageClassRegistry.java | 0
.../wicket/ui/pages/PageClassRegistryAccessor.java | 0
.../wicket/ui/pages/PageClassRegistrySpi.java | 0
.../wicket/ui/pages/PageNavigationService.java | 0
.../ui/pages/SidebarCssResourceReference.java | 0
.../isis/viewer/wicket/ui/pages/WebPageBase.java | 77 +
.../viewer/wicket/ui/pages/about/AboutPage.css | 0
.../viewer/wicket/ui/pages/about/AboutPage.html | 0
.../viewer/wicket/ui/pages/about/AboutPage.java | 0
.../ui/pages/accmngt/AccountConfirmationMap.java | 0
.../accmngt/AccountManagementPageAbstract.html | 0
.../accmngt/AccountManagementPageAbstract.java | 0
.../AccountManagementPageAbstract.properties | 0
.../ui/pages/accmngt/EmailAvailableValidator.java | 78 +
.../EmailVerificationUrlServiceDefault.java | 0
.../pages/accmngt/UsernameAvailableValidator.java | 68 +
.../password_reset/PasswordResetEmailPanel.html | 0
.../password_reset/PasswordResetEmailPanel.java | 0
.../accmngt/password_reset/PasswordResetPage.css | 0
.../accmngt/password_reset/PasswordResetPage.html | 0
.../accmngt/password_reset/PasswordResetPage.java | 0
.../accmngt/password_reset/PasswordResetPanel.html | 0
.../accmngt/password_reset/PasswordResetPanel.java | 0
.../ui/pages/accmngt/register/RegisterPage.css | 0
.../ui/pages/accmngt/register/RegisterPage.html | 0
.../ui/pages/accmngt/register/RegisterPage.java | 0
.../ui/pages/accmngt/register/RegisterPanel.html | 0
.../ui/pages/accmngt/register/RegisterPanel.java | 210 +++
.../pages/accmngt/signup/RegistrationFormPage.css | 0
.../pages/accmngt/signup/RegistrationFormPage.html | 0
.../pages/accmngt/signup/RegistrationFormPage.java | 0
.../accmngt/signup/RegistrationFormPanel.html | 0
.../accmngt/signup/RegistrationFormPanel.java | 128 ++
.../ui/pages/actionprompt/ActionPromptPage.css | 0
.../ui/pages/actionprompt/ActionPromptPage.html | 0
.../ui/pages/actionprompt/ActionPromptPage.java | 80 +
.../wicket/ui/pages/bootstrap-overrides-all-v1.css | 0
.../wicket/ui/pages/bootstrap-overrides-all-v2.css | 0
.../pages/bootstrap-overrides-bootstrap-theme.css | 0
.../ui/pages/bootstrap-overrides-cerulean.css | 0
.../wicket/ui/pages/bootstrap-overrides-cosmo.css | 0
.../wicket/ui/pages/bootstrap-overrides-cyborg.css | 0
.../wicket/ui/pages/bootstrap-overrides-darkly.css | 0
.../wicket/ui/pages/bootstrap-overrides-flatly.css | 0
.../ui/pages/bootstrap-overrides-journal.css | 0
.../wicket/ui/pages/bootstrap-overrides-lumen.css | 0
.../wicket/ui/pages/bootstrap-overrides-paper.css | 0
.../ui/pages/bootstrap-overrides-readable.css | 0
.../ui/pages/bootstrap-overrides-sandstone.css | 0
.../ui/pages/bootstrap-overrides-simplex.css | 0
.../wicket/ui/pages/bootstrap-overrides-slate.css | 0
.../ui/pages/bootstrap-overrides-spacelab.css | 0
.../ui/pages/bootstrap-overrides-superhero.css | 0
.../wicket/ui/pages/bootstrap-overrides-united.css | 0
.../wicket/ui/pages/bootstrap-overrides-yeti.css | 0
.../apache/isis/viewer/wicket/ui/pages/copy-26.png | Bin
.../viewer/wicket/ui/pages/entity/EntityPage.css | 0
.../viewer/wicket/ui/pages/entity/EntityPage.html | 0
.../viewer/wicket/ui/pages/entity/EntityPage.java | 240 +++
.../viewer/wicket/ui/pages/error/ErrorPage.css | 0
.../viewer/wicket/ui/pages/error/ErrorPage.html | 0
.../viewer/wicket/ui/pages/error/ErrorPage.java | 91 +
.../isis/viewer/wicket/ui/pages/home/HomePage.css | 0
.../isis/viewer/wicket/ui/pages/home/HomePage.html | 0
.../isis/viewer/wicket/ui/pages/home/HomePage.java | 90 +
.../wicket/ui/pages/images/bg_header_brown.png | Bin
.../viewer/wicket/ui/pages/images/icon_appuser.png | Bin
.../isis/viewer/wicket/ui/pages/images/logo.pdn | Bin
.../isis/viewer/wicket/ui/pages/images/logo.png | Bin
.../isis-wicket-theme/images/animated-overlay.gif | Bin
.../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin
.../images/ui-bg_flat_75_ffffff_40x100.png | Bin
.../images/ui-bg_glass_55_40c0cb_1x400.png | Bin
.../images/ui-bg_glass_65_ffffff_1x400.png | Bin
.../images/ui-bg_glass_75_dadada_1x400.png | Bin
.../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin
.../images/ui-bg_glass_95_fef1ec_1x400.png | Bin
.../ui-bg_highlight-soft_75_20B5C2_1x100.png | Bin
.../images/ui-icons_00477F_256x240.png | Bin
.../images/ui-icons_2e83ff_256x240.png | Bin
.../images/ui-icons_454545_256x240.png | Bin
.../images/ui-icons_888888_256x240.png | Bin
.../images/ui-icons_F0EFEA_256x240.png | Bin
.../images/ui-icons_cd0a0a_256x240.png | Bin
.../wicket/ui/pages/jquery.isis.wicket.viewer.js | 0
.../viewer/wicket/ui/pages/jquery.livequery.js | 0
.../wicket/ui/pages/login/IsisSignInPanel.html | 0
.../wicket/ui/pages/login/IsisSignInPanel.java | 170 ++
.../wicket/ui/pages/login/WicketLogoutPage.java | 0
.../wicket/ui/pages/login/WicketSignInPage.css | 0
.../wicket/ui/pages/login/WicketSignInPage.html | 0
.../wicket/ui/pages/login/WicketSignInPage.java | 0
.../ui/pages/login/WicketSignInPage.properties | 0
.../wicket/ui/pages/mmverror/MmvErrorPage.css | 0
.../wicket/ui/pages/mmverror/MmvErrorPage.html | 0
.../wicket/ui/pages/mmverror/MmvErrorPage.java | 114 ++
.../isis/viewer/wicket/ui/pages/simple-sidebar.css | 0
.../isis/viewer/wicket/ui/pages/spinning-icon.gif | Bin
.../StandaloneCollectionPage.css | 0
.../StandaloneCollectionPage.html | 0
.../StandaloneCollectionPage.java | 0
.../viewer/wicket/ui/pages/value/ValuePage.css | 0
.../viewer/wicket/ui/pages/value/ValuePage.html | 0
.../viewer/wicket/ui/pages/value/ValuePage.java | 0
.../wicket/ui/pages/voidreturn/VoidReturnPage.css | 0
.../wicket/ui/pages/voidreturn/VoidReturnPage.html | 0
.../wicket/ui/pages/voidreturn/VoidReturnPage.java | 0
.../wicket/ui/pages/wicket-xhtml1.4-strict.dtd | 0
.../isis/viewer/wicket/ui/panels/FormAbstract.java | 89 +
.../wicket/ui/panels/FormExecutorDefault.java | 547 ++++++
.../wicket/ui/panels/FormExecutorStrategy.java | 41 +
.../ui/panels/HasDynamicallyVisibleContent.java | 0
.../panels/IFormSubmitterWithPreValidateHook.java | 0
.../viewer/wicket/ui/panels/PanelAbstract.java | 0
.../isis/viewer/wicket/ui/panels/PanelBase.java | 162 ++
.../isis/viewer/wicket/ui/panels/PanelUtil.java | 116 ++
.../wicket/ui/panels/PromptFormAbstract.java | 378 ++++
.../wicket/ui/panels/PromptFormPanelAbstract.java | 0
.../isis/viewer/wicket/ui/util/Components.java | 118 ++
.../viewer/wicket/ui/util/CssClassAppender.java | 76 +
.../viewer/wicket/ui/util/CssClassRemover.java | 51 +
.../isis/viewer/wicket/ui/util/CssIdAppender.java | 70 +
.../apache/isis/viewer/wicket/ui/util/Links.java | 0
.../isis/viewer/wicket/ui/util/SSESupport.java | 0
.../isis/viewer/wicket/ui/util/SSESupport.js | 0
.../isis/viewer/wicket/ui/util/Tooltips.java | 84 +
.../isis/viewer/wicket/ui/util/isis-tooltips.css | 0
.../viewer/wicket/ui/validation/ValidatorBase.java | 42 +
.../ui/src/main/resources/images/Default.png | Bin
.../ui/ComponentFactoryAbstractTest_init.java | 128 ++
.../wicket/ui/ComponentType_ConstantsTest.java | 0
...ollectionContentsSelectorDropdownPanelTest.java | 79 +
.../EntityIconAndTitlePanelTest_abbreviated.java | 0
.../jdkdates/DateConverterForJavaSqlDateTest.java | 77 +
.../jdkdates/DateConverterForJavaUtilDateTest.java | 101 ++
...BigDecimalConverterWithScaleTest_roundtrip.java | 0
.../jodatime/DateConverterForJodaDateTimeTest.java | 97 ++
.../DateConverterForJodaLocalDateTest.java | 73 +
.../DateConverterForJodaLocalDateTimeTest.java | 96 ++
.../DateConverterForJdk8LocalDateTest.java | 75 +
.../DateConverterForJdk8LocalDateTimeTest.java | 98 ++
.../DateConverterForJdk8OffsetDateTimeTest.java | 108 ++
.../scalars/uuid/UuidConverterTest_roundtrip.java | 0
...tAdapterMementoProviderForValueChoicesTest.java | 116 ++
.../viewer/wicket/ui/errors/JGrowlUtilTest.java | 0
.../isis/viewer/wicket/ui/fixtures/Customers.java | 0
.../viewer/wicket/ui/pages/PageAbstractTest.java | 0
viewers/wicket/viewer/pom.xml | 184 ++
.../wicket/viewer/IsisModuleWicketViewer.java | 0
.../integration/AnonymousWebSessionForIsis.java | 47 +
.../AuthenticatedWebSessionForIsis.java | 284 ++++
.../integration/ConverterForObjectAdapter.java | 85 +
.../ConverterForObjectAdapterMemento.java | 79 +
.../viewer/integration/IsisResourceSettings.java | 0
.../viewer/integration/LocalizerForIsis.java | 149 ++
.../viewer/integration/WebRequestCycleForIsis.java | 404 +++++
.../wicket/viewer/mixins/Object_clearHints.java | 0
.../ComponentFactoryRegistrarDefault.java | 305 ++++
.../ComponentFactoryRegistryDefault.java | 200 +++
.../registries/pages/PageClassListDefault.java | 0
.../registries/pages/PageClassRegistryDefault.java | 93 +
.../pages/PageNavigationServiceDefault.java | 0
.../viewer/services/BookmarkUiServiceWicket.java | 0
.../viewer/services/DeepLinkServiceWicket.java | 76 +
.../services/HintStoreUsingWicketSession.java | 112 ++
.../services/ImageResourceCacheClassPath.java | 301 ++++
.../viewer/services/LocaleProviderWicket.java | 0
.../services/TranslationsResolverWicket.java | 111 ++
.../services/WicketViewerSettingsDefault.java | 114 ++
.../viewer/services/mementos/CollectionData.java | 55 +
.../wicket/viewer/services/mementos/Data.java | 47 +
.../viewer/services/mementos/ObjectData.java | 77 +
.../viewer/services/mementos/ObjectMarshaller.java | 153 ++
.../services/mementos/ObjectMementoLegacy.java | 648 +++++++
.../mementos/ObjectMementoServiceWicket.java | 165 ++
.../services/mementos/ObjectUnmarshaller.java | 298 ++++
.../viewer/services/mementos/StandaloneData.java | 70 +
.../wicket/viewer/webmodule/WebModuleWicket.java | 114 ++
.../viewer/wicketapp/IsisWicketApplication.java | 618 +++++++
.../IsisWicketApplication_Experimental.java | 107 ++
.../IsisWicketApplication_newPageFactory.java | 95 ++
.../IsisWicketApplication_newSession.java | 0
...rgetRespondListenerToResetQueryResultCache.java | 0
.../viewer/src/main/resources/log4j.properties | 0
...uthenticatedWebSessionForIsis_Authenticate.java | 148 ++
...ionForIsis_DownCastsInheritedFunctionality.java | 0
...thenticatedWebSessionForIsis_Instantiation.java | 62 +
...ticatedWebSessionForIsis_NotYetImplemented.java | 0
.../AuthenticatedWebSessionForIsis_SignIn.java | 121 ++
...uthenticatedWebSessionForIsis_TestAbstract.java | 93 +
.../pages/PageClassListDefault_Instantiation.java | 0
...ageClassListDefault_RegistrationAndCaching.java | 0
.../viewer/services/ImageResourceCacheKeyTest.java | 0
.../services/TranslationsResolverWicketTest.java | 0
.../wicketapp/IsisWicketApplication_Defaults.java | 79 +
.../wicketapp/IsisWicketApplication_Pages.java | 97 ++
8051 files changed, 289186 insertions(+), 288361 deletions(-)
rename antora/components/extensions/{ => adoc}/antora.yml (100%)
rename antora/components/extensions/{ => adoc}/modules/ROOT/nav.adoc (100%)
rename antora/components/extensions/{ => adoc}/modules/ROOT/pages/about.adoc (100%)
create mode 100644 antora/components/extensions/adoc/modules/ROOT/partials/component-nav.adoc
rename antora/components/extensions/{ => adoc}/modules/ROOT/partials/module-nav.adoc (100%)
delete mode 100644 antora/components/extensions/modules/ROOT/partials/component-nav.adoc
create mode 100644 antora/components/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2015-HealthAssessmentReport_DRCP594591_138322.pdf
create mode 100644 antora/components/toc/modules/ROOT/images/support/slack/DanHaywood-Bupa-2019-HealthAssessmentReport_DRCJ1712475_138322.pdf
rename {core/viewers/restfulobjects/jaxrs-resteasy-4 => api/applib}/.gitignore (100%)
create mode 100644 api/applib/pom.xml
rename {core/schema => api/applib}/src/main/doc/antora.yml (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/examples.sh (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Action.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/ActionLayout.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Auditing.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/BookmarkPolicy.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Bounding.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Collection.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/CollectionLayout.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/CommandExecuteIn.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/CommandPersistence.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/CommandReification.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Constants.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Contributed.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-ant/examples/annotation/Defaulted.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/DomainObject.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/DomainObjectLayout.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/DomainService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/DomainServiceLayout.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Editing.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/EqualByContent.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-ant/examples/annotation/Facets.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/HomePage.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/LabelPosition.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/MemberOrder.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/MementoSerialization.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/MinLength.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Mixin.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Module.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Nature.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/NatureOfService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Navigable.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Optionality.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/OrderPrecedence.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Parameter.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/ParameterLayout.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Programmatic.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Projecting.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/PromptStyle.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Property.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/PropertyLayout.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Publishing.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/PublishingChangeKind.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Redirect.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/RenderDay.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Repainting.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/RestrictTo.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/SemanticsOf.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Title.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-ant/examples/annotation/Value.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/ViewModel.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/ViewModelLayout.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/Where.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-ant/examples}/annotation/package-info.java (100%)
rename {core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/doc/modules/jaxrs-resteasy-4 => api/applib/src/main/doc/modules/applib-ant}/images/.gitkeep (100%)
rename {core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainObjectLayout => api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout}/bookmarking.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-BELOW.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-PANEL.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-PANEL_DROPDOWN.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout/position-RIGHT.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/CollectionLayout/sortedby-dependencies.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainObjectLayout/bookmarking-nested.png (100%)
rename {core/applib/src/main/doc/modules/applib-ant/images/reference-annotations/ActionLayout => api/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainObjectLayout}/bookmarking.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-primary.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-secondary.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuBar-tertiary.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/DomainServiceLayout/menuOrder.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/HomePage/HomePage.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-LEFT.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-NONE.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-TOP.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-LEFT.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/images/reference-annotations/PropertyLayout/labelPosition-boolean-RIGHT.png (100%)
rename {core/schema/src/main/doc/modules/schema => api/applib/src/main/doc/modules/applib-ant}/nav.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Action.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Action/associateWith.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Action/command.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Action/domainEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Action/hidden.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Action/invokeOn.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Action/publishing.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Action/restrictTo.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Action/semantics.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Action/typeOf.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ActionLayout.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/bookmarking.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/contributedAs.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/cssClass.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/cssClassFa.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/describedAs.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/hidden.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/named.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/position.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/promptStyle.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ActionLayout/redirect.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Collection.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Collection/domainEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Collection/editing.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Collection/hidden.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Collection/notPersisted.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Collection/typeOf.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/cssClass.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/defaultView.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/describedAs.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/hidden.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/named.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/paged.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/CollectionLayout/sortedBy.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Column.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Digits.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Discriminator.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/actionDomainEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/auditing.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/autoCompleteRepository.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/bounding.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/collectionDomainEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/createdLifecycleEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/editing.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/loadedLifecycleEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/mixinMethod.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/nature.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/objectType.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/persistedLifecycleEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/persistingLifecycleEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/propertyDomainEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/publishing.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/removingLifecycleEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/updatedLifecycleEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObject/updatingLifecycleEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/bookmarking.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClass.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClassFa.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/cssClassUiEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/describedAs.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/iconUiEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/layoutUiEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/named.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/paged.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/plural.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainObjectLayout/titleUiEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainService/nature.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainService/objectType.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainService/repositoryFor.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/menuBar.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/menuOrder.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/DomainServiceLayout/named.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Facets.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/HomePage.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Inject.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/MemberGroupLayout.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/MemberOrder.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/MemberOrder/name.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/MemberOrder/sequence.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/MinLength.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Mixin.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Mixin/method.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/NotPersistent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Nullable.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Parameter.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Parameter/fileAccept.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Parameter/maxLength.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Parameter/mustSatisfy.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Parameter/optionality.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Parameter/regexPattern.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/cssClass.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/describedAs.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/labelPosition.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/multiLine.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/named.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/renderedAsDayBefore.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ParameterLayout/typicalLength.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Pattern.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PersistenceCapable.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PostConstruct.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PreDestroy.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PrimaryKey.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Programmatic.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/command.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/domainEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/editing.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/fileAccept.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/hidden.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/maxLength.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/mustSatisfy.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/notPersisted.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/optionality.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/projecting.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/publishing.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Property/regexPattern.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/cssClass.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/describedAs.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/hidden.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/labelPosition.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/multiLine.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/named.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/navigable.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/promptStyle.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/renderedAsDayBefore.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/typicalLength.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/PropertyLayout/unchanging.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/RequestScoped.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/Title.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModel.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModel/objectType.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/bookmarking.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClass.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClassFa.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/cssClassUiEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/describedAs.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/iconUiEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/layoutUiEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/named.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/paged.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/plural.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/ViewModelLayout/titleUiEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/XmlJavaTypeAdapter.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/XmlRootElement.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/about.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/about/jdo.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/about/jee.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/about/main.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/about/other.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/pages/about/partial.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-ant/partials/module-nav.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/examples.sh (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/clock/Clock.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/clock/package-info.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/domain/DomainObjectList.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/ActionArgumentUsabilityEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/ActionArgumentVisibilityEvent.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/domain/ActionDomainEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/domain/CollectionDomainEvent.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/events/domain/EventObjectBase.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/domain/PropertyDomainEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/lifecycle/AbstractLifecycleEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/lifecycle/ObjectCreatedEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/lifecycle/ObjectLoadedEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/lifecycle/ObjectPersistedEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/lifecycle/ObjectPersistingEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/lifecycle/ObjectRemovingEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/lifecycle/ObjectUpdatedEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/lifecycle/ObjectUpdatingEvent.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/ui/CssClassUiEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/ui/IconUiEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/ui/LayoutUiEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/events/ui/TitleUiEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/ActionLayoutData.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/ActionLayoutDataOwner.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/CollectionLayoutDataOwner.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/DomainObjectLayoutData.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/DomainObjectLayoutDataOwner.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSet.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/FieldSetOwner.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/HasBookmarking.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/HasCssClass.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/HasCssClassFa.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/HasDescribedAs.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/HasHidden.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/HasNamed.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/MemberRegion.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/MemberRegionOwner.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/Owned.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/Owner.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/ServiceActionLayoutData.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/ServiceActionLayoutDataOwner.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/component/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/Grid.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/GridAbstract.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/BS3ClearFix.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/BS3ClearFixHidden.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/BS3ClearFixVisible.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/BS3Element.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/BS3ElementAbstract.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/BS3RowContent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/BS3RowContentOwner.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/BS3RowOwner.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/BS3TabGroupOwner.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/BS3TabOwner.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/HasCssId.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/Size.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/SizeSpan.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/WithinGrid.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/grid/bootstrap3/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/links/Link.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/links/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/menubars/Menu.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/menubars/MenuBar.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/menubars/MenuBars.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/menubars/MenuSection.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBars.java
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/menubars/bootstrap3/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/layout/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/MixinConstants.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/dto/Dto.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/DtoMappingHelper.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/dto/Dto_downloadXml.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/dto/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/layout/Object_downloadLayoutXml.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/layout/Object_openRestApi.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/layout/Object_rebuildMetamodel.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/metamodel/Object_downloadMetaModelXml.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/metamodel/Object_objectIdentifier.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/metamodel/Object_objectType.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/timestamp/HoldsUpdatedAt.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/timestamp/HoldsUpdatedBy.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/timestamp/Timestampable.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/mixins/timestamp/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/security/RoleMemento.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/security/UserMemento.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/security/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/spec/AbstractSpecification.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/spec/AbstractSpecification2.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/spec/Specification.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/spec/Specification2.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/spec/SpecificationAnd.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/spec/SpecificationNot.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/spec/SpecificationOr.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/spec/package-info.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/tree/LazyTreeNode.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/tree/TreeAdapter.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/tree/TreeNode_iteratorBreadthFirst.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/tree/TreeNode_iteratorDepthFirst.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/tree/TreeNode_iteratorHierarchyUp.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/tree/TreePath.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/tree/TreePath_Default.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/tree/TreeState.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/tree/TreeState_Default.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/util/Enums.java
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/util/Equality.java
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/util/Hashing.java
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/util/JaxbAdapters.java
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/util/JaxbUtil.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/ObjectContract_Empty.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/ObjectContract_Impl.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Parser.java
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContracts.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/ReasonBuffer.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/util/ReasonBuffer2.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/Reasons.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/util/TitleBuffer.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/TitleBufferException.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/util/ToString.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/util/package-info.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/util/schema/ChangesDtoUtils.java
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommandDtoUtils.java
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/util/schema/InteractionDtoUtils.java
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/util/schema/MemberExecutionDtoUtils.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/value/Blob.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/value/BlobClobFactory.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/value/Clob.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/value/Image.java
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/value/LocalResourcePath.java
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/value/Markup.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/value/NamedWithMimeType.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/examples/value/Password.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-cm/examples}/value/package-info.java (100%)
rename {core/schema/src/main/doc/modules/schema => api/applib/src/main/doc/modules/applib-cm}/images/reference-classes/issue-in-more-detail.png (100%)
rename {core/schema/src/main/doc/modules/schema => api/applib/src/main/doc/modules/applib-cm}/images/reference-methods/prefixes/choices/dependent.png (100%)
rename {core/schema/src/main/doc/modules/schema => api/applib/src/main/doc/modules/applib-cm}/images/reference-methods/reserved/cssClass/strikethrough.png (100%)
rename {core/schema/src/main/doc/modules/schema => api/applib/src/main/doc/modules/applib-cm}/images/reference-methods/reserved/iconName/differing.pdn (100%)
rename {core/schema/src/main/doc/modules/schema => api/applib/src/main/doc/modules/applib-cm}/images/reference-methods/reserved/iconName/differing.png (100%)
rename {core/schema/src/main/doc/modules/schema => api/applib/src/main/doc/modules/applib-cm}/images/reference-methods/reserved/iconName/png-files.png (100%)
rename {core/schema/src/main/doc/modules/schema => api/applib/src/main/doc/modules/applib-cm}/images/value-types/markup.png (100%)
rename {core/applib/src/main/doc/modules/applib-svc => api/applib/src/main/doc/modules/applib-cm}/nav.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/about.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes.adoc (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest-bootstrapping.adoc
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest2-bootstrapping.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/contributee.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasTransactionId.adoc (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasUserName.adoc
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/AbstractDomainEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/ActionDomainEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/CollectionDomainEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/domainevent/PropertyDomainEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/i18n.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/i18n/TranslatableString.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/layout.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/AbstractLifecycleEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectCreatedEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectLoadedEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistedEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectPersistingEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectRemovingEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatedEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/lifecycleevent/ObjectUpdatingEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/menubars.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/mixins.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Dto.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Object.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/mixins/Persistable.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/roles.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/roles/HoldsUpdatedAt.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/roles/HoldsUpdatedBy.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/roles/Timestampable.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/spec.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/super.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractService.adoc (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractSubscriber.adoc
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractViewModel.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScript.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/super/FixtureScripts.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/uievent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/CssClassUiEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/IconUiEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/uievent/TitleUiEvent.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/utility.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/utility/Enums.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/utility/ObjectContracts.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/utility/Reasons.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/utility/TitleBuffer.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/value-types.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Blob.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Clob.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Color.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Markup.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Money.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/classes/value-types/Password.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/created.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/jdo-api.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/loaded.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/persisted.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/persisting.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/removed.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/removing.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/updated.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/lifecycle/updating.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/addTo.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/autoComplete.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/choices.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/clear.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/default.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/disable.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/get.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/hide.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/modify.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/removeFrom.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/set.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validate.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validateAddTo.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/prefixes/validateRemoveFrom.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/reserved.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/cssClass.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/disable.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/getId.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/hide.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/iconName.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/layout.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/title.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/methods/reserved/validate.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/pages/rgcms.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-cm/partials/module-nav.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/examples.sh (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/HasUniqueId.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/HasUsername.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/RepresentsInteractionMemberExecution.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/WithTransactionScope.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/acceptheader/AcceptHeaderService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/appfeat/ApplicationFeatureRepository.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/ApplicationMemberType.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/appfeat/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/audit/AuditEntryPropertyIdType.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/audit/AuditEntryPropertyValueType.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/audit/AuditerService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/audit/AuditerServiceLogging.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/audit/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/background/BackgroundCommandService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/background/package-info.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/Bookmark.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/bookmark/BookmarkHolder.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/bookmark/BookmarkHolder_lookup.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/bookmark/BookmarkHolder_object.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkService.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/bookmark/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/bookmarkui/BookmarkUiService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/clock/ClockService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/clock/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/command/Command.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/command/CommandContext.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/command/CommandDefault.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/command/CommandDtoProcessor.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/command/CommandDtoProcessorForActionAbstract.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/command/CommandDtoProcessorForPropertyAbstract.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/command/CommandExecutorService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/command/CommandWithDto.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/command/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/command/spi/CommandService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/confview/ConfigurationMenu.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/confview/ConfigurationProperty.layout.xml (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/confview/ConfigurationProperty.png (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/confview/ConfigurationViewService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/confview/package-info.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/ContentMappingService.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/conmap/command/ContentMappingServiceForCommandDto.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/conmap/command/ContentMappingServiceForCommandsDto.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/conmap/command/spi/CommandDtoProcessorService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/conmap/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/email/EmailService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/email/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/error/ErrorDetails.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/error/ErrorReportingService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/error/Ticket.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/error/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/eventbus/EventBusService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/eventbus/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/exceprecog/ExceptionRecognizer.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerAbstract.java
create mode 100644 api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerComposite.java
create mode 100644 api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerForType.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/exceprecog/TranslatableException.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/exceprecog/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/factory/FactoryService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/factory/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/grid/GridLoaderService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/grid/GridService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/grid/GridSystemService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/grid/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/health/Health.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/health/HealthCheckService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/hint/HintStore.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/hint/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/i18n/LocaleProvider.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslatableString.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/i18n/TranslationService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/i18n/TranslationsResolver.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/i18n/package-info.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-svc/examples/services/iactn/Interaction.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/iactn/InteractionContext.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/iactn/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/inject/ServiceInjector.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/CatalogingSchemaOutputResolver.java
create mode 100644 api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/JaxbService.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/jaxb/JaxbServiceDefault.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/jaxb/StreamResultWithWriter.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/jaxb/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/layout/LayoutService.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-svc/examples/services/layout/LayoutServiceMenu.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/layout/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/linking/DeepLinkService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/linking/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/menu/MenuBarsLoaderService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/menu/MenuBarsService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/message/MessageService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/message/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/metamodel/DomainMember.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/metamodel/DomainModel.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelService.java
create mode 100644 api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelServicesMenu.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/metamodel/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/metrics/MetricsService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/metrics/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/publish/PublishedObjects.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/publish/PublisherService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/publish/PublisherServiceLogging.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/publish/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/queryresultscache/QueryResultCacheControl.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/queryresultscache/QueryResultsCache.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCacheDefault.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/queryresultscache/package-info.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-svc/examples/services/registry/ServiceRegistry.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/registry/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/repository/RepositoryService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/repository/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/routing/RoutingService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/routing/package-info.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-svc/examples/services/scratchpad/Scratchpad.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/scratchpad/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/session/SessionLoggingService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/session/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/sessmgmt/SessionManagementService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/sessmgmt/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/sudo/SudoService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/sudo/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/swagger/SwaggerService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/swagger/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/tablecol/TableColumnOrderService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/title/TitleService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/title/package-info.java (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingService.java
create mode 100644 api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
create mode 100644 api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceWithCompression.java
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/urlencoding/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/user/UserService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/user/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/userprof/UserProfileService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/userprof/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/userreg/EmailNotificationService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/userreg/UserDetails.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/userreg/UserRegistrationService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/userreg/events/EmailEventAbstract.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/userreg/events/EmailRegistrationEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/userreg/events/PasswordResetEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/userreg/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/AsyncWrap.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/DisabledException.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/HiddenException.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/InteractionException.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/InvalidException.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/WrapperFactory.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/WrappingObject.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/AccessEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/ActionArgumentEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/ActionInvocationEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/ActionUsabilityEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/ActionVisibilityEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/CollectionAccessEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/CollectionAddToEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/CollectionMethodEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/CollectionRemoveFromEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/CollectionUsabilityEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/CollectionVisibilityEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/InteractionEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/ObjectTitleEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/ObjectValidityEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/ObjectVisibilityEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/ParseValueEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/PropertyAccessEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/PropertyModifyEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/PropertyUsabilityEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/PropertyVisibilityEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/ProposedHolderEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/UsabilityEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/ValidityEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/VisibilityEvent.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/events/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/listeners/InteractionAdapter.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/listeners/InteractionListener.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/wrapper/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/xactn/Transaction.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/xactn/TransactionId.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/xactn/TransactionService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/xactn/TransactionState.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/xactn/package-info.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/xmlsnapshot/XmlSnapshotService.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/xmlsnapshot/XmlSnapshotServiceAbstract.java (100%)
rename {core/applib/src/main/java/org/apache/isis/applib => api/applib/src/main/doc/modules/applib-svc/examples}/services/xmlsnapshot/package-info.java (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/images/reference-services-api/acceptheaderservice.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/images/reference-services-api/acceptheaderservice.pptx (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/ErrorReportingService/kitchensink-example.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/EventSerializer/action-invocation-published-to-stderr.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/EventSerializer/changed-object-published-to-stderr.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/PublishingService/yuml.me-23db58a4.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/images/reference-services-spi/UserProfileService/todoapp.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/images/reference-services/categories.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/images/reference-services/categories.pptx (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/images/reference-services/commands-and-events.png (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/images/reference-services/commands-and-events.pptx (100%)
rename {core/applib/src/main/doc/modules/applib-cm => api/applib/src/main/doc/modules/applib-svc}/nav.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/about.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService/BackgroundCommandExecution.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/BackgroundService/Quartz.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/CommandContext.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/CommandExecutorService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/DtoMappingHelper.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/InteractionContext.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/MessageService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/SessionManagementService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/TitleService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/TransactionService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-api/WrapperFactory.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/BackgroundCommandService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/CommandService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/HealthCheckService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/application-layer-spi/HomePageProviderService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/bootstrapping-spi.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/bootstrapping-spi/ClassDiscoveryService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/core-domain-api.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/ClockService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/ConfigurationService.adoc (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/EventBusService.adoc
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/FactoryService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/Scratchpad.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/UserService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/integration-api.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/integration-api/BookmarkService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/integration-api/EmailService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/integration-api/JaxbService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/integration-api/MementoService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/integration-api/XmlSnapshotService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/metadata-api.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/metadata-api/ApplicationFeatureRepository.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/metadata-api/LayoutService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/metadata-api/MetamodelService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/metadata-api/ServiceRegistry.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/metadata-api/SwaggerService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/H2ManagerMenu.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/HsqlDbManagerMenu.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/IsisJdoSupport.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/MetricsService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/QueryResultsCache.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-api/RepositoryService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/AuditerService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/PublisherService.adoc (100%)
create mode 100644 api/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/UserRegistrationService.adoc
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/AcceptHeaderService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/BookmarkUiService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/ConfigurationViewService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/DeepLinkService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-api/GuiceBeanProvider.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ContentMappingService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/EmailNotificationService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ErrorReportingService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/ExceptionRecognizer.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridLoaderService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/GridSystemService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/HintStore.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/LocaleProvider.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/MenuBarsLoaderService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/MenuBarsService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/RoutingService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/SessionLoggingService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TableColumnOrderService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TranslationService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/TranslationsResolver.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/UrlEncodingService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/presentation-layer-spi/UserProfileService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/testing.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/testing/ExecutionParametersService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScripts.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/testing/FixtureScriptsSpecificationProvider.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/testing/SudoService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/pages/testing/SwitchUserService.adoc (100%)
rename {core => api}/applib/src/main/doc/modules/applib-svc/partials/module-nav.adoc (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/AbstractService.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/AbstractViewModel.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/ApplicationException.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/FatalException.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/Identifier.java
rename {core => api}/applib/src/main/java/org/apache/isis/applib/IsisModuleApplib.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java
rename {core => api}/applib/src/main/java/org/apache/isis/applib/PersistFailedException.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/RecoverableException.java
rename {core => api}/applib/src/main/java/org/apache/isis/applib/RecreatableDomainObject.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/RepositoryException.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/ViewModel.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/adapters/AbstractValueSemanticsProvider.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/adapters/DefaultsProvider.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/adapters/EncoderDecoder.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/adapters/EncodingException.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/adapters/Parser.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/adapters/ParsingException.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/adapters/ValueSemanticsProvider.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/adapters/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Action.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/ActionLayout.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Auditing.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/BookmarkPolicy.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Bounding.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Collection.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/CollectionLayout.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/CommandExecuteIn.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/CommandPersistence.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/CommandReification.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Constants.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Contributed.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/annotation/Defaulted.java
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/DomainObject.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/DomainObjectLayout.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/DomainService.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/DomainServiceLayout.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Editing.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/EqualByContent.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/annotation/Facets.java
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/HomePage.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/LabelPosition.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/MemberOrder.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/MementoSerialization.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/MinLength.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Mixin.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Module.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Nature.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/NatureOfService.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Navigable.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Optionality.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/OrderPrecedence.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Parameter.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/ParameterLayout.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Programmatic.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Projecting.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/PromptStyle.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Property.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/PropertyLayout.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Publishing.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/PublishingChangeKind.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Redirect.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/RenderDay.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Repainting.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/RestrictTo.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/SemanticsOf.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Title.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/annotation/Value.java
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/ViewModel.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/ViewModelLayout.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/Where.java (100%)
rename {core/applib/src/main/doc/modules/applib-ant/examples => api/applib/src/main/java/org/apache/isis/applib}/annotation/package-info.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/client/SuppressionType.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/clock/Clock.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/clock/package-info.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/ActionArgumentUsabilityEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/ActionArgumentVisibilityEvent.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/domain/ActionDomainEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/domain/CollectionDomainEvent.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/events/domain/EventObjectBase.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/domain/PropertyDomainEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/lifecycle/AbstractLifecycleEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/lifecycle/ObjectCreatedEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/lifecycle/ObjectLoadedEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/lifecycle/ObjectPersistedEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/lifecycle/ObjectPersistingEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/lifecycle/ObjectRemovingEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/lifecycle/ObjectUpdatedEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/lifecycle/ObjectUpdatingEvent.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/events/ui/AbstractUiEvent.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/ui/CssClassUiEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/ui/IconUiEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/ui/LayoutUiEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/events/ui/TitleUiEvent.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/jaxbadapters/PersistentEntitiesAdapter.java
rename {core => api}/applib/src/main/java/org/apache/isis/applib/jaxbadapters/PersistentEntityAdapter.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/ActionLayoutData.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/ActionLayoutDataOwner.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutData.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/CollectionLayoutDataOwner.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/DomainObjectLayoutData.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/DomainObjectLayoutDataOwner.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/layout/component/FieldSet.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/FieldSetOwner.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/HasBookmarking.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/HasCssClass.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/HasCssClassFa.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/HasDescribedAs.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/HasHidden.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/HasNamed.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/MemberRegion.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/MemberRegionOwner.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/Owned.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/Owner.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/layout/component/PropertyLayoutData.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/ServiceActionLayoutData.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/ServiceActionLayoutDataOwner.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/component/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/Grid.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/layout/grid/GridAbstract.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/BS3ClearFix.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/BS3ClearFixHidden.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/BS3ClearFixVisible.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Col.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/BS3Element.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/BS3ElementAbstract.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Row.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/BS3RowContent.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/BS3RowContentOwner.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/BS3RowOwner.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Tab.java
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3TabGroup.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/BS3TabGroupOwner.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/BS3TabOwner.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/HasCssId.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/Size.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/SizeSpan.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/WithinGrid.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/grid/bootstrap3/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/links/Link.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/links/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/menubars/Menu.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/menubars/MenuBar.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/menubars/MenuBars.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBarsAbstract.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/menubars/MenuSection.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3Menu.java
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBar.java
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars.java
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuSection.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/menubars/bootstrap3/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/layout/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/MixinConstants.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/dto/Dto.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/dto/Dto_downloadXml.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXsd.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/dto/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/layout/Object_downloadLayoutXml.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/layout/Object_openRestApi.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/layout/Object_rebuildMetamodel.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/metamodel/Object_downloadMetaModelXml.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/metamodel/Object_objectIdentifier.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/metamodel/Object_objectType.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/timestamp/HoldsUpdatedAt.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/timestamp/HoldsUpdatedBy.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/timestamp/Timestampable.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/mixins/timestamp/package-info.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/package-info.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/query/Query.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java
rename {core => api}/applib/src/main/java/org/apache/isis/applib/query/QueryDefault.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/query/QueryFindAllInstances.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/query/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/security/RoleMemento.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/security/UserMemento.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/security/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/HasUniqueId.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/HasUsername.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/RepresentsInteractionMemberExecution.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/WithTransactionScope.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/acceptheader/AcceptHeaderService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/appfeat/ApplicationFeatureRepository.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationMemberType.java
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/appfeat/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/audit/AuditEntryPropertyIdType.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/audit/AuditEntryPropertyValueType.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/audit/AuditerService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/audit/AuditerServiceLogging.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/audit/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/background/BackgroundCommandService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/background/package-info.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/bookmark/BookmarkHolder.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/bookmark/BookmarkHolder_lookup.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/bookmark/BookmarkHolder_object.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/bookmark/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/bookmarkui/BookmarkUiService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/clock/ClockService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/clock/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/command/Command.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/command/CommandContext.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/command/CommandDefault.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/command/CommandDtoProcessor.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/command/CommandDtoProcessorForActionAbstract.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/command/CommandDtoProcessorForPropertyAbstract.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/command/CommandExecutorService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/command/CommandWithDto.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/command/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/command/spi/CommandService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/confview/ConfigurationMenu.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.java
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/confview/ConfigurationProperty.layout.xml (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/confview/ConfigurationProperty.png (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/confview/ConfigurationViewService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/confview/package-info.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/conmap/ContentMappingService.java
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/conmap/command/ContentMappingServiceForCommandDto.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/conmap/command/ContentMappingServiceForCommandsDto.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/conmap/command/spi/CommandDtoProcessorService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/conmap/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/email/EmailService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/email/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/error/ErrorDetails.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/error/ErrorReportingService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/error/Ticket.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/error/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/eventbus/EventBusService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/eventbus/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/exceprecog/ExceptionRecognizer.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/exceprecog/TranslatableException.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/exceprecog/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/factory/FactoryService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/factory/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/grid/GridLoaderService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/grid/GridService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/grid/GridSystemService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/grid/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/health/Health.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/health/HealthCheckService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/hint/HintStore.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/hint/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/i18n/LocaleProvider.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/i18n/TranslationService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/i18n/TranslationsResolver.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/i18n/package-info.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/iactn/InteractionContext.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/iactn/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/inject/ServiceInjector.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/jaxb/CatalogingSchemaOutputResolver.java
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/jaxb/JaxbServiceDefault.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/jaxb/StreamResultWithWriter.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/jaxb/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/layout/LayoutService.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/layout/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/linking/DeepLinkService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/linking/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/menu/MenuBarsLoaderService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/menu/MenuBarsService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/message/MessageService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/message/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/metamodel/DomainMember.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/metamodel/DomainModel.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/metamodel/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/metrics/MetricsService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/metrics/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/publish/PublishedObjects.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/publish/PublisherService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/publish/PublisherServiceLogging.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/publish/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/queryresultscache/QueryResultCacheControl.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/queryresultscache/QueryResultsCache.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheDefault.java
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/queryresultscache/package-info.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/registry/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/repository/RepositoryService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/repository/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/routing/RoutingService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/routing/package-info.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/scratchpad/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/session/SessionLoggingService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/session/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/sessmgmt/SessionManagementService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/sessmgmt/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/sudo/SudoService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/sudo/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/swagger/SwaggerService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/swagger/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/tablecol/TableColumnOrderService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/title/TitleService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/title/package-info.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingService.java
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/urlencoding/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/user/UserService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/user/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/userprof/UserProfileService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/userprof/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/userreg/EmailNotificationService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/userreg/UserDetails.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/userreg/UserRegistrationService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/userreg/events/EmailEventAbstract.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/userreg/events/EmailRegistrationEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/userreg/events/PasswordResetEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/userreg/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/AsyncWrap.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/DisabledException.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/HiddenException.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/InteractionException.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/InvalidException.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/WrapperFactory.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/WrappingObject.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/AccessEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/ActionArgumentEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/ActionInvocationEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/ActionUsabilityEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/ActionVisibilityEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/CollectionAccessEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/CollectionAddToEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/CollectionMethodEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/CollectionRemoveFromEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/CollectionUsabilityEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/CollectionVisibilityEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/InteractionEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/ObjectTitleEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/ObjectValidityEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/ObjectVisibilityEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/ParseValueEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/PropertyAccessEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/PropertyModifyEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/PropertyUsabilityEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/PropertyVisibilityEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/ProposedHolderEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/UsabilityEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/ValidityEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/VisibilityEvent.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/events/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/listeners/InteractionAdapter.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/listeners/InteractionListener.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/wrapper/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/xactn/Transaction.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/xactn/TransactionId.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/xactn/TransactionService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/xactn/TransactionState.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/xactn/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/xmlsnapshot/XmlSnapshotService.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/xmlsnapshot/XmlSnapshotServiceAbstract.java (100%)
rename {core/applib/src/main/doc/modules/applib-svc/examples => api/applib/src/main/java/org/apache/isis/applib}/services/xmlsnapshot/package-info.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/snapshot/SnapshottableWithInclusions.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/snapshot/package-info.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/spec/AbstractSpecification.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/spec/Specification.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/spec/Specification2.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/spec/SpecificationAnd.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/spec/SpecificationNot.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/spec/SpecificationOr.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/spec/package-info.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/tree/LazyTreeNode.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/tree/TreeAdapter.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/tree/TreeNode.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/tree/TreeNode_iteratorBreadthFirst.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/tree/TreeNode_iteratorDepthFirst.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/tree/TreeNode_iteratorHierarchyUp.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/tree/TreePath.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/tree/TreePath_Default.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/tree/TreeState.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/tree/TreeState_Default.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/types/DescriptionType.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/types/MemberIdentifierType.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/types/TargetActionType.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/types/TargetClassType.java (100%)
rename {core => api}/applib/src/main/java/org/apache/isis/applib/types/package-info.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/Enums.java
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/Equality.java
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/Hashing.java
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/JaxbAdapters.java
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/JaxbUtil.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/util/ObjectContract_Empty.java (100%)
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/util/ObjectContract_Impl.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Parser.java
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/ObjectContracts.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/util/ReasonBuffer.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/ReasonBuffer2.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/util/Reasons.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/TitleBuffer.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/util/TitleBufferException.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/ToString.java
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/ZipWriter.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/util/package-info.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/schema/ChangesDtoUtils.java
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/schema/CommandDtoUtils.java
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/schema/InteractionDtoUtils.java
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/util/schema/MemberExecutionDtoUtils.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/value/Blob.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/value/BlobClobFactory.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/value/Clob.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/value/Image.java
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/value/LocalResourcePath.java
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/value/Markup.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/value/NamedWithMimeType.java (100%)
create mode 100644 api/applib/src/main/java/org/apache/isis/applib/value/Password.java
rename {core/applib/src/main/doc/modules/applib-cm/examples => api/applib/src/main/java/org/apache/isis/applib}/value/package-info.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/IdentifierTests.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/SomeDomainClass.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/events/InteractionEventTest.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_renderedAsDayBefore_Test.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/layout/component/PropertyLayoutData_repaint_Test.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ColTest.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/layout/grid/bootstrap3/SizeSpanTest.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars_roundtrip_Test.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/query/QueryDefaultTest_withStart_or_withCount.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/services/appfeat/ApplicationMemberTypeTest.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/services/eventbus/AbstractDomainEvent_veto_Test.java (100%)
create mode 100644 api/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java
rename {core => api}/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForTypeTest.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerGeneralTest.java (100%)
create mode 100644 api/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java
rename {core => api}/applib/src/test/java/org/apache/isis/applib/services/interaction/InteractionDefaultTest_next.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/services/metamodel/MetaModelService_Config_Test.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCache_KeyTest.java (100%)
create mode 100644 api/applib/src/test/java/org/apache/isis/applib/services/urlencoding/MementosTest.java
rename {core => api}/applib/src/test/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceTest.java (100%)
create mode 100644 api/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.java
rename {core => api}/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.xml (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/spec/AbstractSpecification2Test.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/spec/AbstractSpecificationTest.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/tree/TreePathTest.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/EnumsTest.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/EnumsTest_converts.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/Invoice.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/InvoiceItem.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/Numbered.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/NumberedEvaluator.java (100%)
create mode 100644 api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_compareTo.java
rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals.java (100%)
create mode 100644 api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_toString.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/ReasonBufferTest.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/ReasonsTest.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/TitleBufferTest.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/TitleTestObject.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/schema/CommandDtoUtils_Test.java (100%)
create mode 100644 api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java
create mode 100644 api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java
rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/schema/InteractionDtoUtilsTest_deriveLogicalMemberId.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/schema/Roundtrip.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/util/schema/Vertical.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/value/BlobTest_constructor.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/value/ClobTest_constructor.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/value/PasswordTest.java (100%)
rename {core => api}/applib/src/test/java/org/apache/isis/applib/value/TestClock.java (100%)
rename {core/testsupport/unittestsupport => api/schema}/.gitignore (100%)
create mode 100644 api/schema/pom.xml
rename {core/applib => api/schema}/src/main/doc/antora.yml (100%)
rename {core/applib/src/main/doc/modules/applib-cm => api/schema/src/main/doc/modules/schema}/images/reference-classes/issue-in-more-detail.png (100%)
rename {core/applib/src/main/doc/modules/applib-cm => api/schema/src/main/doc/modules/schema}/images/reference-methods/prefixes/choices/dependent.png (100%)
rename {core/applib/src/main/doc/modules/applib-cm => api/schema/src/main/doc/modules/schema}/images/reference-methods/reserved/cssClass/strikethrough.png (100%)
rename {core/applib/src/main/doc/modules/applib-cm => api/schema/src/main/doc/modules/schema}/images/reference-methods/reserved/iconName/differing.pdn (100%)
rename {core/applib/src/main/doc/modules/applib-cm => api/schema/src/main/doc/modules/schema}/images/reference-methods/reserved/iconName/differing.png (100%)
rename {core/applib/src/main/doc/modules/applib-cm => api/schema/src/main/doc/modules/schema}/images/reference-methods/reserved/iconName/png-files.png (100%)
rename {core/applib/src/main/doc/modules/applib-cm => api/schema/src/main/doc/modules/schema}/images/value-types/markup.png (100%)
rename {core/applib/src/main/doc/modules/applib-ant => api/schema/src/main/doc/modules/schema}/nav.adoc (100%)
rename {core => api}/schema/src/main/doc/modules/schema/pages/about.adoc (100%)
rename {core => api}/schema/src/main/doc/modules/schema/pages/aim.adoc (100%)
rename {core => api}/schema/src/main/doc/modules/schema/pages/chg.adoc (100%)
rename {core => api}/schema/src/main/doc/modules/schema/pages/cmd.adoc (100%)
rename {core => api}/schema/src/main/doc/modules/schema/pages/common.adoc (100%)
rename {core => api}/schema/src/main/doc/modules/schema/pages/ixn.adoc (100%)
rename {core => api}/schema/src/main/doc/modules/schema/pages/mml.adoc (100%)
rename {core => api}/schema/src/main/doc/modules/schema/partials/module-nav.adoc (100%)
create mode 100644 api/schema/src/main/java/org/apache/isis/schema/IsisModuleSchema.java
rename {core => api}/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JavaSqlTimestampXmlGregorianCalendarAdapter.java (100%)
create mode 100644 api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeStringAdapter.java
rename {core => api}/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaDateTimeXMLGregorianCalendarAdapter.java (100%)
create mode 100644 api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateStringAdapter.java
create mode 100644 api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeStringAdapter.java
rename {core => api}/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateTimeXMLGregorianCalendarAdapter.java (100%)
rename {core => api}/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalDateXMLGregorianCalendarAdapter.java (100%)
create mode 100644 api/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeStringAdapter.java
rename {core => api}/schema/src/main/java/org/apache/isis/schema/jaxbadapters/JodaLocalTimeXMLGregorianCalendarAdapter.java (100%)
rename {core => api}/schema/src/main/java/org/apache/isis/schema/jaxbadapters/Strings.java (100%)
rename {core => api}/schema/src/main/java/org/apache/isis/schema/jaxbadapters/XmlCalendarFactory.java (100%)
rename {core => api}/schema/src/main/resources/org/apache/isis/schema/bindings.xml (100%)
rename {core => api}/schema/src/main/resources/org/apache/isis/schema/chg/chg-1.1.xsd (100%)
rename {core => api}/schema/src/main/resources/org/apache/isis/schema/cmd/cmd-1.4.xsd (100%)
rename {core => api}/schema/src/main/resources/org/apache/isis/schema/common/common-1.1.xsd (100%)
rename {core => api}/schema/src/main/resources/org/apache/isis/schema/ixn/ixn-1.3.xsd (100%)
rename {core => api}/schema/src/main/resources/org/apache/isis/schema/metamodel/metamodel-1.0.xsd (100%)
delete mode 100644 core/applib/pom.xml
delete mode 100644 core/applib/src/main/doc/modules/applib-ant/examples/annotation/Defaulted.java
delete mode 100644 core/applib/src/main/doc/modules/applib-ant/examples/annotation/Facets.java
delete mode 100644 core/applib/src/main/doc/modules/applib-ant/examples/annotation/Value.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/domain/DomainObjectList.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/events/domain/EventObjectBase.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSet.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/GridAbstract.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBars.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/DtoMappingHelper.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/spec/AbstractSpecification2.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/tree/LazyTreeNode.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/Enums.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/Equality.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/Hashing.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/JaxbAdapters.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/JaxbUtil.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Parser.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContracts.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/ReasonBuffer2.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/TitleBuffer.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/ToString.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/schema/ChangesDtoUtils.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommandDtoUtils.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/schema/InteractionDtoUtils.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/util/schema/MemberExecutionDtoUtils.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/value/BlobClobFactory.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/value/Image.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/value/LocalResourcePath.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/value/Markup.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/examples/value/Password.java
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/pages/classes/AppManifest-bootstrapping.adoc
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/pages/classes/contributee/HasUserName.adoc
delete mode 100644 core/applib/src/main/doc/modules/applib-cm/pages/classes/super/AbstractSubscriber.adoc
delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/ApplicationMemberType.java
delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/Bookmark.java
delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkService.java
delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.java
delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/conmap/ContentMappingService.java
delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerAbstract.java
delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerComposite.java
delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerForType.java
delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslatableString.java
delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/iactn/Interaction.java
delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/CatalogingSchemaOutputResolver.java
delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/JaxbService.java
delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/layout/LayoutServiceMenu.java
delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelService.java
delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelServicesMenu.java
delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCacheDefault.java
delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/registry/ServiceRegistry.java
delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/scratchpad/Scratchpad.java
delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingService.java
delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
delete mode 100644 core/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceWithCompression.java
delete mode 100644 core/applib/src/main/doc/modules/applib-svc/pages/core-domain-api/EventBusService.adoc
delete mode 100644 core/applib/src/main/doc/modules/applib-svc/pages/persistence-layer-spi/UserRegistrationService.adoc
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/Identifier.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/RecoverableException.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/annotation/Defaulted.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/annotation/Facets.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/annotation/Value.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/client/SuppressionType.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/domain/DomainObjectList.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/events/domain/AbstractDomainEvent.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/events/domain/EventObjectBase.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/events/ui/AbstractUiEvent.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/jaxbadapters/PersistentEntitiesAdapter.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutData.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/layout/component/FieldSet.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/layout/component/PropertyLayoutData.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/layout/grid/GridAbstract.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Col.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Grid.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Row.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3Tab.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3TabGroup.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/layout/menubars/MenuBarsAbstract.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3Menu.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBar.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuBars.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/layout/menubars/bootstrap3/BS3MenuSection.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/mixins/dto/DtoMappingHelper.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/mixins/dto/Dto_downloadXsd.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/query/QueryAbstract.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationMemberType.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/bookmark/Bookmark.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/bookmark/BookmarkService.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/confview/ConfigurationProperty.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/conmap/ContentMappingService.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerComposite.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerForType.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/iactn/Interaction.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/jaxb/CatalogingSchemaOutputResolver.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/jaxb/JaxbService.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/layout/LayoutServiceMenu.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelService.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/metamodel/MetaModelServicesMenu.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/queryresultscache/QueryResultsCacheDefault.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/registry/ServiceRegistry.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/scratchpad/Scratchpad.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingService.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/services/urlencoding/UrlEncodingServiceWithCompression.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/spec/AbstractSpecification2.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/tree/LazyTreeNode.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/tree/TreeNode.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/util/Enums.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/util/Equality.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/util/Hashing.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/util/JaxbAdapters.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/util/JaxbUtil.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/util/ObjectContract_Parser.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/util/ObjectContracts.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/util/ReasonBuffer2.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/util/TitleBuffer.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/util/ToString.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/util/schema/ChangesDtoUtils.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/util/schema/CommandDtoUtils.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/util/schema/CommonDtoUtils.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/util/schema/InteractionDtoUtils.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/util/schema/MemberExecutionDtoUtils.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/value/BlobClobFactory.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/value/Image.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/value/LocalResourcePath.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/value/Markup.java
delete mode 100644 core/applib/src/main/java/org/apache/isis/applib/value/Password.java
delete mode 100644 core/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java
delete mode 100644 core/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java
delete mode 100644 core/applib/src/test/java/org/apache/isis/applib/services/urlencoding/MementosTest.java
delete mode 100644 core/applib/src/test/java/org/apache/isis/applib/services/xmlsnapshot/XmlSnapshotServiceAbstractTest.java
delete mode 100644 core/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_compareTo.java
delete mode 100644 core/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
delete mode 100644 core/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java
delete mode 100644 core/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java
delete mode 100644 core/codegen-bytebuddy/src/main/java/org/apache/isis/codegen/bytebuddy/IsisModuleCodegenByteBuddy.java
delete mode 100644 core/codegen-bytebuddy/src/main/java/org/apache/isis/codegen/bytebuddy/services/ClassLoadingStrategyAdvisor.java
delete mode 100644 core/codegen-bytebuddy/src/main/java/org/apache/isis/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java
create mode 100644 core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/IsisModuleCoreCodegenByteBuddy.java
create mode 100644 core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/services/ClassLoadingStrategyAdvisor.java
create mode 100644 core/codegen-bytebuddy/src/main/java/org/apache/isis/core/codegen/bytebuddy/services/ProxyFactoryServiceByteBuddy.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/IsisModuleCommons.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/collections/Can.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/collections/Can_Empty.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/collections/Can_Multiple.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/collections/Can_Singleton.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/collections/Cardinality.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/compression/ZipWriter.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/concurrent/AwaitableLatch.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/exceptions/ExceptionUtils.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/exceptions/IsisApplicationException.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/exceptions/IsisException.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/exceptions/UnexpectedCallException.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/exceptions/UnknownTypeException.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/exceptions/package-info.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/handler/ChainOfResponsibility.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/_Constants.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/assertions/_Assert.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Blackhole.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes_GZipCompressor.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Bytes_GZipCompressorSmart.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Casts.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Either.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_Simple.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Lazy_ThreadSafe.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_NullSafe.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Oneshot.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Reduction.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_FastSplit.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_HtmlEscaper.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_KeyValuePair.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_NaturalNames.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Strings_SplitIterator.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Timing.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_Tuples.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/_With.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/base/package-info.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays_Collector.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Arrays_CollectorUnknownSize.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections_Collector.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Collections_SortedSetOfList.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Inbox.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Lists.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Maps.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Multimaps.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Sets.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/_Streams.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/package-info.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/collections/snapshot/_VersionedList.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/compare/_Comparators_SequenceCompare.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/compare/package-info.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentContext.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTask.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/concurrent/_ConcurrentTaskList.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/context/_Context_ThreadLocal.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/context/_Plugin.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/context/package-info.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/debug/_Probe.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/debug/package-info.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputExtended.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputExtendedDecorator.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataInputStreamExtended.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputExtended.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputExtendedDecorator.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DataOutputStreamExtended.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DebugDataInputExtended.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/DebugDataOutputExtended.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/Encodable.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/EncodingConstants.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FailedToDecodeException.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FailedToDeserializeException.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/encoding/FieldType.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/environment/DeploymentType.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/environment/IsisSystemEnvironment.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/_Exceptions.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/exceptions/package-info.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceCreationClassException.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceCreationException.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/factory/InstanceUtil.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/factory/UnavailableClassException.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/factory/package-info.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Functions.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Functions_IndexAwareFunctionAdapter.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/functions/_Predicates.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/functions/package-info.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/BeanSort.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/IocContainer.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/ManagedBeanAdapter.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/PriorityConstants.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/BeanAdapterCDI.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/CdiPlugin.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/cdi/_CDI_Lifecycle.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/BeanAdapterSpring.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/EventSpring.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/IocContainerSpring.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/ioc/spring/_Spring.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/memento/_Mementos_MementoDefault.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/memento/package-info.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/package-info.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/plugins/PluginResolveException.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactory.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/plugins/codegen/ProxyFactoryService.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextHandle.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextService.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/plugins/ioc/ConversationContextServiceDefault.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_AnnotationsLegacy.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_AttributeMethods.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_SyntCache.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_MethodCache.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/reflection/_Reflect.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/reflection/package-info.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/resources/_Json.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/resources/_Resources.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/resources/package-info.java
delete mode 100644 core/commons/src/main/java/org/apache/isis/commons/internal/url/UrlDecoderUtil.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/IsisModuleCoreCommons.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/collections/Can.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Empty.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Multiple.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/collections/Can_Singleton.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/collections/Cardinality.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/concurrent/AwaitableLatch.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/exceptions/ExceptionUtils.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisApplicationException.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/exceptions/IsisException.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnexpectedCallException.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/exceptions/UnknownTypeException.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/exceptions/package-info.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/handler/ChainOfResponsibility.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/_Constants.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/assertions/_Assert.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Blackhole.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressor.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Bytes_GZipCompressorSmart.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Casts.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Either.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_Simple.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Lazy_ThreadSafe.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_NullSafe.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Oneshot.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Reduction.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_FastSplit.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_HtmlEscaper.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_KeyValuePair.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_NaturalNames.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Strings_SplitIterator.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Timing.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Tuples.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_With.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/base/package-info.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_Collector.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Arrays_CollectorUnknownSize.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_Collector.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Collections_SortedSetOfList.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Inbox.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Lists.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Maps.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Multimaps.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Sets.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/_Streams.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/package-info.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/collections/snapshot/_VersionedList.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/_Comparators_SequenceCompare.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/compare/package-info.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentContext.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTask.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/concurrent/_ConcurrentTaskList.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Context_ThreadLocal.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/context/_Plugin.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/context/package-info.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/debug/_Probe.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/debug/package-info.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputExtended.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputExtendedDecorator.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataInputStreamExtended.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputExtended.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputExtendedDecorator.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DataOutputStreamExtended.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DebugDataInputExtended.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/DebugDataOutputExtended.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/Encodable.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/EncodingConstants.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FailedToDecodeException.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FailedToDeserializeException.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/encoding/FieldType.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/environment/DeploymentType.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/environment/IsisSystemEnvironment.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/_Exceptions.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/exceptions/package-info.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationClassException.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceCreationException.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/InstanceUtil.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/UnavailableClassException.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/factory/package-info.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Functions_IndexAwareFunctionAdapter.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/_Predicates.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/functions/package-info.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/BeanSort.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/IocContainer.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/ManagedBeanAdapter.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/PriorityConstants.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/BeanAdapterCDI.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/CdiPlugin.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/cdi/_CDI_Lifecycle.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/BeanAdapterSpring.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/EventSpring.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/IocContainerSpring.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/ioc/spring/_Spring.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/_Mementos_MementoDefault.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/memento/package-info.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/package-info.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/PluginResolveException.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactory.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/codegen/ProxyFactoryService.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextHandle.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextService.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/plugins/ioc/ConversationContextServiceDefault.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_AnnotationsLegacy.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_AttributeMethods.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SyntCache.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Annotations_SynthesizedMergedAnnotationInvocationHandler.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_MethodCache.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/_Reflect.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/reflection/package-info.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Json.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/_Resources.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/resources/package-info.java
create mode 100644 core/commons/src/main/java/org/apache/isis/core/commons/internal/url/UrlDecoderUtil.java
delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/handlers/ChainOfResponsibilityTest.java
delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/base/BytesTest.java
delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/base/NullSafeTest.java
delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/base/ReductionTest.java
delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/base/StringsTest.java
delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/cdi/CDITest.java
delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/cdi/ValidQualifierForTesting.java
delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/collections/_ArraysTest.java
delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/collections/_MapsTest.java
delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/collections/snapshot/VersionedListTest.java
delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/compare/ComparatorsTest.java
delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/concurrent/ConcurrentTaskListTest.java
delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/context/ContextTest.java
delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/resources/ResourcesTest.java
delete mode 100644 core/commons/src/test/java/org/apache/isis/commons/internal/strings/FormatTest.java
create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/handlers/ChainOfResponsibilityTest.java
create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/base/BytesTest.java
create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/base/NullSafeTest.java
create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/base/ReductionTest.java
create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/base/StringsTest.java
create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/cdi/CDITest.java
create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/cdi/ValidQualifierForTesting.java
create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_ArraysTest.java
create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/_MapsTest.java
create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/collections/snapshot/VersionedListTest.java
create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/compare/ComparatorsTest.java
create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/concurrent/ConcurrentTaskListTest.java
create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/context/ContextTest.java
create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/encoding/ByteEncoderDecoderRoundtripTest.java
create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/resources/ResourcesTest.java
create mode 100644 core/commons/src/test/java/org/apache/isis/core/commons/internal/strings/FormatTest.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/ConfigurationConstants.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/IsisModuleConfig.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/RestEasyConfiguration.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/beans/IsisBeanFactoryPostProcessorForSpring.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistry.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/beans/IsisBeanTypeRegistryHolder.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/beans/IsisComponentScanInterceptor.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/beans/TypeMetaData.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/messages/MessageRegistry.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/metamodel/facets/AuditObjectsConfiguration.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandActionsConfiguration.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/metamodel/facets/CommandPropertiesConfiguration.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/metamodel/facets/DefaultViewConfiguration.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/metamodel/facets/EditingObjectsConfiguration.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishActionsConfiguration.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishObjectsConfiguration.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/metamodel/facets/PublishPropertiesConfiguration.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/metamodel/facets/Util.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/metamodel/services/ApplicationFeaturesInitConfiguration.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/metamodel/specloader/IntrospectionMode.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/presets/DebugDiscovery.properties
delete mode 100644 core/config/src/main/java/org/apache/isis/config/presets/DebugMetaModel.properties
delete mode 100644 core/config/src/main/java/org/apache/isis/config/presets/DebugProgrammingModel.properties
delete mode 100644 core/config/src/main/java/org/apache/isis/config/presets/IsisPresets.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/presets/SilenceMetaModel.properties
delete mode 100644 core/config/src/main/java/org/apache/isis/config/presets/SilenceProgrammingModel.properties
delete mode 100644 core/config/src/main/java/org/apache/isis/config/util/ConfigUtil.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/validators/PatternOptionalStringConstraintValidator.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/viewer/wicket/DialogMode.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java
delete mode 100644 core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppContextPath.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/IsisModuleCoreConfig.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/RestEasyConfiguration.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanFactoryPostProcessorForSpring.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistry.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistryHolder.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/beans/IsisComponentScanInterceptor.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/beans/TypeMetaData.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/messages/MessageRegistry.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/AuditObjectsConfiguration.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/CommandActionsConfiguration.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/CommandPropertiesConfiguration.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/DefaultViewConfiguration.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/EditingObjectsConfiguration.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishActionsConfiguration.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishObjectsConfiguration.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/PublishPropertiesConfiguration.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/metamodel/facets/Util.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/metamodel/services/ApplicationFeaturesInitConfiguration.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/metamodel/specloader/IntrospectionMode.java
rename core/config/src/main/java/org/apache/isis/{ => core}/config/presets/DataNucleusAutoCreate.properties (100%)
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/presets/DebugDiscovery.properties
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/presets/DebugMetaModel.properties
rename core/config/src/main/java/org/apache/isis/{ => core}/config/presets/DebugPersistence.properties (100%)
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/presets/DebugProgrammingModel.properties
rename core/config/src/main/java/org/apache/isis/{ => core}/config/presets/H2InMemory.properties (100%)
rename core/config/src/main/java/org/apache/isis/{ => core}/config/presets/H2InMemory_withUniqueSchema.properties (100%)
rename core/config/src/main/java/org/apache/isis/{ => core}/config/presets/HsqlDbInMemory.properties (100%)
rename core/config/src/main/java/org/apache/isis/{ => core}/config/presets/IsisIntegTest.properties (100%)
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/presets/IsisPresets.java
rename core/config/src/main/java/org/apache/isis/{ => core}/config/presets/NoTranslations.properties (100%)
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/presets/SilenceMetaModel.properties
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/presets/SilenceProgrammingModel.properties
rename core/config/src/main/java/org/apache/isis/{ => core}/config/presets/SilenceWicket.properties (100%)
rename core/config/src/main/java/org/apache/isis/{ => core}/config/presets/UseLog4j2Test.properties (100%)
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/util/ConfigUtil.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/validators/PatternOptionalStringConstraintValidator.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/DialogMode.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppConfiguration.java
create mode 100644 core/config/src/main/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath.java
delete mode 100644 core/config/src/test/java/org/apache/isis/config/IsisConfiguration_createSubsetTest.java
delete mode 100644 core/config/src/test/java/org/apache/isis/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
delete mode 100644 core/config/src/test/java/org/apache/isis/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
delete mode 100644 core/config/src/test/java/org/apache/isis/config/IsisConfiguration_primingTest.java
delete mode 100644 core/config/src/test/java/org/apache/isis/config/IsisConfiguration_specialCharTest.java
delete mode 100644 core/config/src/test/java/org/apache/isis/config/IsisConfiguration_whitespaceTest.java
delete mode 100644 core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_isProtected_Test.java
delete mode 100644 core/config/src/test/java/org/apache/isis/config/util/ConfigUtil_mask_Test.java
delete mode 100644 core/config/src/test/java/org/apache/isis/config/viewer/wicket/WebAppContextPath_setContextPath_Test.java
create mode 100644 core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_createSubsetTest.java
create mode 100644 core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInParentedTables_Test.java
create mode 100644 core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_getMaxTitleLengthInStandaloneTables_Test.java
create mode 100644 core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_primingTest.java
create mode 100644 core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_specialCharTest.java
create mode 100644 core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_whitespaceTest.java
create mode 100644 core/config/src/test/java/org/apache/isis/core/config/util/ConfigUtil_isProtected_Test.java
create mode 100644 core/config/src/test/java/org/apache/isis/core/config/util/ConfigUtil_mask_Test.java
create mode 100644 core/config/src/test/java/org/apache/isis/core/config/viewer/wicket/WebAppContextPath_setContextPath_Test.java
delete mode 100644 core/detached-tests/src/test/java/org/apache/isis/commons/internal/reflection/ReflectTest.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAs.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/metamodel/facets/param/name/ParameterNameFacetTest.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/ChildDomainObject.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorForChildDomainObject.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/ParentDomainObject.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObject.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObjectForTesting.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObject.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/SomeDomainObject.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/SomeService.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingConstructorInjection.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingSetterInjection.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/Collaborator.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SomeDomainObject.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java
create mode 100644 core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java
delete mode 100644 core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAs.java
delete mode 100644 core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/object/mixin/MixinIntendedAsActionTest.java
delete mode 100644 core/detached-tests/src/test/java/org/apache/isis/metamodel/facets/param/name/ParameterNameFacetTest.java
delete mode 100644 core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
delete mode 100644 core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/ChildDomainObject.java
delete mode 100644 core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/InstantiatorForChildDomainObject.java
delete mode 100644 core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/ParentDomainObject.java
delete mode 100644 core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/PeerDomainObject.java
... 5950 lines suppressed ...
[isis] 06/14: ISIS-2259: updates packages for isis-core-webapp
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 02836073ad26d949fa45e540845c2ca67b4e40dd
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 15:50:19 2020 +0000
ISIS-2259: updates packages for isis-core-webapp
---
antora/playbooks/site-core.yml | 2 +-
antora/playbooks/site.yml | 2 +-
core/unittestsupport/pom.xml | 4 ++--
core/webapp/pom.xml | 2 +-
.../org/apache/isis/{ => core}/webapp/IsisModuleWebapp.java | 10 +++++-----
.../{ => core}/webapp/context/IsisWebAppCommonContext.java | 6 +++---
.../isis/{ => core}/webapp/context/memento/ObjectMemento.java | 2 +-
.../webapp/context/memento/ObjectMementoCollection.java | 2 +-
.../webapp/context/memento/ObjectMementoService.java | 2 +-
.../webapp/diagnostics/IsisLogOnExceptionFilter.java | 2 +-
.../webapp/health/HealthIndicatorUsingHealthCheckService.java | 2 +-
.../org/apache/isis/{ => core}/webapp/modules/WebModule.java | 4 ++--
.../isis/{ => core}/webapp/modules/WebModuleAbstract.java | 2 +-
.../isis/{ => core}/webapp/modules/WebModuleContext.java | 2 +-
.../webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java | 6 +++---
.../modules/templresources/TemplateResourceCachingFilter.java | 2 +-
.../webapp/modules/templresources/TemplateResourceServlet.java | 2 +-
.../TemplateResourceServlet_HtmlTemplateVariables.java | 2 +-
.../modules/templresources/WebModuleTemplateResources.java | 4 ++--
.../isis/{ => core}/webapp/routing/ForwardingServlet.java | 2 +-
.../apache/isis/{ => core}/webapp/routing/RedirectFilter.java | 2 +-
.../apache/isis/{ => core}/webapp/routing/RedirectServlet.java | 2 +-
.../isis/{ => core}/webapp/routing/RedirectToDocsFilter.java | 4 ++--
.../webapp/webappctx/IsisWebAppContextInitializer.java | 8 ++++----
.../webapp/wormhole/AuthenticationSessionWormhole.java | 2 +-
examples/demo/src/main/resources/application.yml | 2 +-
.../scripts/IsisModuleSecurityFixtureRoleAndPermissions.java | 2 +-
.../extensions/shirorealmldap/realm/impl/IsisLdapRealm.java | 8 ++++----
.../isis/extensions/cors/impl/webmodule/WebModuleCors.java | 2 +-
.../isis/security/keycloak/IsisModuleSecurityKeycloak.java | 2 +-
.../keycloak/authentication/AuthenticatorKeycloak.java | 2 +-
.../isis/security/keycloak/webmodule/KeycloakFilter.java | 2 +-
.../isis/security/keycloak/webmodule/WebModuleKeycloak.java | 2 +-
.../apache/isis/security/shiro/IsisModuleSecurityShiro.java | 2 +-
.../apache/isis/security/shiro/webmodule/WebModuleShiro.java | 4 ++--
starters/src/main/doc/modules/simpleapp/pages/about.adoc | 2 +-
.../testing/fixtures/applib/modules/ModuleWithFixtures.java | 4 ++--
.../testing/h2console/ui/IsisModuleTestingH2ConsoleUi.java | 2 +-
.../testing/h2console/ui/webmodule/WebModuleH2Console.java | 4 ++--
.../isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java | 2 +-
.../valuetypes/sse/ui/webmodule/WebModuleServerSentEvents.java | 2 +-
.../jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java | 4 ++--
.../restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java | 2 +-
.../viewer/webmodule/IsisRestfulObjectsSessionFilter.java | 4 ++--
.../apache/isis/viewer/wicket/model/IsisModuleWicketModel.java | 2 +-
.../isis/viewer/wicket/model/common/CommonContextUtils.java | 2 +-
.../org/apache/isis/viewer/wicket/model/models/AboutModel.java | 2 +-
.../apache/isis/viewer/wicket/model/models/ActionModel.java | 2 +-
.../isis/viewer/wicket/model/models/BookmarkableModel.java | 2 +-
.../isis/viewer/wicket/model/models/BookmarkedPagesModel.java | 2 +-
.../isis/viewer/wicket/model/models/EntityCollectionModel.java | 6 +++---
.../apache/isis/viewer/wicket/model/models/EntityModel.java | 4 ++--
.../viewer/wicket/model/models/EntityModelForReference.java | 2 +-
.../wicket/model/models/HintPageParameterSerializer.java | 2 +-
.../apache/isis/viewer/wicket/model/models/ModelAbstract.java | 2 +-
.../isis/viewer/wicket/model/models/ObjectAdapterModel.java | 2 +-
.../apache/isis/viewer/wicket/model/models/ScalarModel.java | 2 +-
.../wicket/model/models/ScalarModelWithMultiPending.java | 2 +-
.../viewer/wicket/model/models/ScalarModelWithPending.java | 2 +-
.../isis/viewer/wicket/model/models/ServiceActionsModel.java | 2 +-
.../viewer/wicket/model/models/ToggledMementosProvider.java | 2 +-
.../org/apache/isis/viewer/wicket/model/models/ValueModel.java | 4 ++--
.../org/apache/isis/viewer/wicket/model/models/VoidModel.java | 2 +-
.../apache/isis/viewer/wicket/model/models/WelcomeModel.java | 2 +-
.../wicket/model/models/whereami/WhereAmIModelDefault.java | 2 +-
.../apache/isis/viewer/wicket/model/util/ComponentHintKey.java | 2 +-
.../isis/viewer/wicket/model/models/EntityModel_hintsTest.java | 2 +-
.../model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java | 4 ++--
.../apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java | 2 +-
.../actionresponse/ActionResultResponseHandlingStrategy.java | 2 +-
.../wicket/ui/actionresponse/ActionResultResponseType.java | 2 +-
.../viewer/wicket/ui/components/about/JarManifestModel.java | 2 +-
.../ui/components/actionmenu/serviceactions/CssMenuItem.java | 2 +-
.../actionmenu/serviceactions/ServiceActionUtil.java | 2 +-
.../actionmenu/serviceactions/TertiaryActionsPanel.java | 2 +-
.../ui/components/collection/AssociatedWithActionsHelper.java | 2 +-
.../wicket/ui/components/collection/CollectionPanel.java | 2 +-
.../ajaxtable/CollectionContentsAsAjaxTablePanel.java | 2 +-
.../collectioncontents/ajaxtable/columns/ColumnAbstract.java | 2 +-
.../ajaxtable/columns/ObjectAdapterPropertyColumn.java | 2 +-
.../ajaxtable/columns/ObjectAdapterTitleColumn.java | 4 ++--
.../ajaxtable/columns/ObjectAdapterToggleboxColumn.java | 2 +-
.../components/entity/icontitle/EntityIconAndTitlePanel.java | 2 +-
.../ui/components/scalars/ScalarPanelSelect2Abstract.java | 2 +-
.../scalars/datepicker/TextFieldWithDateTimePicker.java | 2 +-
.../wicket/ui/components/scalars/reference/ReferencePanel.java | 2 +-
.../scalars/valuechoices/ValueChoicesSelect2Panel.java | 2 +-
.../wicket/ui/components/tree/IsisToWicketTreeAdapter.java | 2 +-
.../wicket/ui/components/welcome/WelcomePanelFactory.java | 2 +-
.../ui/components/widgets/breadcrumbs/BreadcrumbModel.java | 2 +-
.../wicket/ui/components/widgets/linkandlabel/ActionLink.java | 2 +-
.../widgets/linkandlabel/ActionLinkFactoryAbstract.java | 2 +-
.../viewer/wicket/ui/components/widgets/select2/ChoiceExt.java | 2 +-
.../viewer/wicket/ui/components/widgets/select2/Select2.java | 2 +-
.../wicket/ui/components/widgets/select2/Select2ChoiceExt.java | 2 +-
.../ui/components/widgets/select2/Select2MultiChoiceExt.java | 2 +-
.../widgets/select2/providers/EmptyChoiceProvider.java | 2 +-
.../providers/ObjectAdapterMementoProviderAbstract.java | 4 ++--
.../providers/ObjectAdapterMementoProviderForChoices.java | 2 +-
.../ObjectAdapterMementoProviderForReferenceChoices.java | 2 +-
...ctAdapterMementoProviderForReferenceObjectAutoComplete.java | 2 +-
...MementoProviderForReferenceParamOrPropertyAutoComplete.java | 2 +-
.../providers/ObjectAdapterMementoProviderForValueChoices.java | 2 +-
.../apache/isis/viewer/wicket/ui/errors/ExceptionModel.java | 2 +-
.../apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java | 2 +-
.../org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java | 2 +-
.../wicket/ui/pages/accmngt/EmailAvailableValidator.java | 2 +-
.../wicket/ui/pages/accmngt/UsernameAvailableValidator.java | 2 +-
.../viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java | 2 +-
.../apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java | 2 +-
.../org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java | 2 +-
.../isis/viewer/wicket/ui/panels/FormExecutorDefault.java | 4 ++--
.../org/apache/isis/viewer/wicket/ui/panels/PanelBase.java | 2 +-
.../apache/isis/viewer/wicket/ui/validation/ValidatorBase.java | 2 +-
.../viewer/wicket/ui/ComponentFactoryAbstractTest_init.java | 2 +-
.../selector/CollectionContentsSelectorDropdownPanelTest.java | 2 +-
.../ObjectAdapterMementoProviderForValueChoicesTest.java | 4 ++--
.../viewer/integration/AuthenticatedWebSessionForIsis.java | 4 ++--
.../viewer/integration/ConverterForObjectAdapterMemento.java | 4 ++--
.../wicket/viewer/integration/WebRequestCycleForIsis.java | 2 +-
.../registries/components/ComponentFactoryRegistryDefault.java | 2 +-
.../viewer/services/mementos/ObjectMementoServiceWicket.java | 6 +++---
.../isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java | 4 ++--
.../viewer/wicket/viewer/wicketapp/IsisWicketApplication.java | 4 ++--
.../viewer/wicketapp/IsisWicketApplication_newPageFactory.java | 2 +-
.../AuthenticatedWebSessionForIsis_Authenticate.java | 2 +-
.../integration/AuthenticatedWebSessionForIsis_SignIn.java | 2 +-
.../AuthenticatedWebSessionForIsis_TestAbstract.java | 2 +-
.../viewer/wicketapp/IsisWicketApplication_Defaults.java | 2 +-
129 files changed, 167 insertions(+), 167 deletions(-)
diff --git a/antora/playbooks/site-core.yml b/antora/playbooks/site-core.yml
index 3759e2a..8afaf24 100644
--- a/antora/playbooks/site-core.yml
+++ b/antora/playbooks/site-core.yml
@@ -38,7 +38,7 @@ content:
start_path: core/runtime-services/src/main/doc # core
branches: HEAD
- url: .
- start_path: core/webapp/src/main/doc # core
+ start_path: core/corewebapp/src/main/doc # core
branches: HEAD
# examples
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 97a6138..58ab4f1 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -82,7 +82,7 @@ content:
start_path: core/runtimeservices/src/main/doc # core
branches: HEAD
- url: .
- start_path: core/webapp/src/main/doc # core
+ start_path: core/corewebapp/src/main/doc # core
branches: HEAD
- url: .
start_path: core/security/src/main/doc # security
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 3946926..03b9a29 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -24,8 +24,8 @@
<name>Apache Isis Core - Unit Test Support</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.unittestsupport</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/unittestsupport</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.core.unittestsupport</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/core/unittestsupport</git-plugin.propertiesDir>
</properties>
<description>
diff --git a/core/webapp/pom.xml b/core/webapp/pom.xml
index a7fff88..3a68e10 100644
--- a/core/webapp/pom.xml
+++ b/core/webapp/pom.xml
@@ -34,7 +34,7 @@
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.webapp</jar-plugin.automaticModuleName>
+ <jar-plugin.automaticModuleName>org.apache.isis.corewebapp</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/webapp</git-plugin.propertiesDir>
</properties>
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleWebapp.java
similarity index 79%
rename from core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleWebapp.java
index 697f3a7..19c3ff6 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleWebapp.java
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp;
+package org.apache.isis.core.webapp;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.core.runtime.IsisCoreModuleRuntime;
-import org.apache.isis.webapp.health.HealthIndicatorUsingHealthCheckService;
-import org.apache.isis.webapp.modules.logonlog.WebModuleLogOnExceptionLogger;
-import org.apache.isis.webapp.modules.templresources.WebModuleTemplateResources;
-import org.apache.isis.webapp.webappctx.IsisWebAppContextInitializer;
+import org.apache.isis.core.webapp.modules.logonlog.WebModuleLogOnExceptionLogger;
+import org.apache.isis.core.webapp.modules.templresources.WebModuleTemplateResources;
+import org.apache.isis.core.webapp.health.HealthIndicatorUsingHealthCheckService;
+import org.apache.isis.core.webapp.webappctx.IsisWebAppContextInitializer;
@Configuration
@Import({
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/context/IsisWebAppCommonContext.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/IsisWebAppCommonContext.java
similarity index 96%
rename from core/webapp/src/main/java/org/apache/isis/webapp/context/IsisWebAppCommonContext.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/context/IsisWebAppCommonContext.java
index 54e1b94..6b4c2af 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/context/IsisWebAppCommonContext.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/IsisWebAppCommonContext.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.context;
+package org.apache.isis.core.webapp.context;
import java.util.function.Function;
import java.util.function.Supplier;
@@ -33,8 +33,8 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.session.IsisSession;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
-import org.apache.isis.webapp.context.memento.ObjectMementoService;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMementoService;
import lombok.AccessLevel;
import lombok.Getter;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/context/memento/ObjectMemento.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMemento.java
similarity index 98%
rename from core/webapp/src/main/java/org/apache/isis/webapp/context/memento/ObjectMemento.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMemento.java
index d7cd2f3..6c206ad 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/context/memento/ObjectMemento.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMemento.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.webapp.context.memento;
+package org.apache.isis.core.webapp.context.memento;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/context/memento/ObjectMementoCollection.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMementoCollection.java
similarity index 97%
rename from core/webapp/src/main/java/org/apache/isis/webapp/context/memento/ObjectMementoCollection.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMementoCollection.java
index a814b21..be5c7b9 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/context/memento/ObjectMementoCollection.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMementoCollection.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.context.memento;
+package org.apache.isis.core.webapp.context.memento;
import java.util.ArrayList;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/context/memento/ObjectMementoService.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMementoService.java
similarity index 96%
rename from core/webapp/src/main/java/org/apache/isis/webapp/context/memento/ObjectMementoService.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMementoService.java
index be25c16..9ef899b 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/context/memento/ObjectMementoService.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMementoService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.context.memento;
+package org.apache.isis.core.webapp.context.memento;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.spec.ManagedObject;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/diagnostics/IsisLogOnExceptionFilter.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/diagnostics/IsisLogOnExceptionFilter.java
similarity index 98%
rename from core/webapp/src/main/java/org/apache/isis/webapp/diagnostics/IsisLogOnExceptionFilter.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/diagnostics/IsisLogOnExceptionFilter.java
index 6ae8b8d..8e4b4a2 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/diagnostics/IsisLogOnExceptionFilter.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/diagnostics/IsisLogOnExceptionFilter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.diagnostics;
+package org.apache.isis.core.webapp.diagnostics;
import java.io.IOException;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/health/HealthIndicatorUsingHealthCheckService.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/health/HealthIndicatorUsingHealthCheckService.java
similarity index 97%
rename from core/webapp/src/main/java/org/apache/isis/webapp/health/HealthIndicatorUsingHealthCheckService.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/health/HealthIndicatorUsingHealthCheckService.java
index 5c100d8..65bf1f0 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/health/HealthIndicatorUsingHealthCheckService.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/health/HealthIndicatorUsingHealthCheckService.java
@@ -1,4 +1,4 @@
-package org.apache.isis.webapp.health;
+package org.apache.isis.core.webapp.health;
import java.util.Optional;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModule.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModule.java
similarity index 96%
rename from core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModule.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModule.java
index aaa101a..ffb6e19 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModule.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModule.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.modules;
+package org.apache.isis.core.webapp.modules;
import javax.annotation.Priority;
import javax.servlet.Filter;
@@ -30,7 +30,7 @@ import org.springframework.core.annotation.Order;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.core.commons.collections.Can;
-import org.apache.isis.webapp.webappctx.IsisWebAppContextInitializer;
+import org.apache.isis.core.webapp.webappctx.IsisWebAppContextInitializer;
import lombok.val;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleAbstract.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModuleAbstract.java
similarity index 98%
rename from core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleAbstract.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModuleAbstract.java
index 8df21c9..0b0f138 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleAbstract.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModuleAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.modules;
+package org.apache.isis.core.webapp.modules;
import java.util.Optional;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModuleContext.java
similarity index 99%
rename from core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModuleContext.java
index 327032a..539ac1e 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModuleContext.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.modules;
+package org.apache.isis.core.webapp.modules;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
similarity index 92%
rename from core/webapp/src/main/java/org/apache/isis/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
index 3da0d38..e4c1eff 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/logonlog/WebModuleLogOnExceptionLogger.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.modules.logonlog;
+package org.apache.isis.core.webapp.modules.logonlog;
import javax.inject.Inject;
import javax.inject.Named;
@@ -31,8 +31,8 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.commons.collections.Can;
-import org.apache.isis.webapp.diagnostics.IsisLogOnExceptionFilter;
-import org.apache.isis.webapp.modules.WebModuleAbstract;
+import org.apache.isis.core.webapp.diagnostics.IsisLogOnExceptionFilter;
+import org.apache.isis.core.webapp.modules.WebModuleAbstract;
import lombok.Getter;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceCachingFilter.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/TemplateResourceCachingFilter.java
similarity index 99%
rename from core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceCachingFilter.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/TemplateResourceCachingFilter.java
index b71cd0a..fedf92c 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceCachingFilter.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/TemplateResourceCachingFilter.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.webapp.modules.templresources;
+package org.apache.isis.core.webapp.modules.templresources;
import java.io.IOException;
import java.text.DateFormat;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/TemplateResourceServlet.java
similarity index 99%
rename from core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/TemplateResourceServlet.java
index e79aaa3..5b5cbb5 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/TemplateResourceServlet.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.webapp.modules.templresources;
+package org.apache.isis.core.webapp.modules.templresources;
import java.io.IOException;
import java.io.InputStream;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet_HtmlTemplateVariables.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/TemplateResourceServlet_HtmlTemplateVariables.java
similarity index 97%
rename from core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet_HtmlTemplateVariables.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/TemplateResourceServlet_HtmlTemplateVariables.java
index a6dc71e..e8f79b3 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/TemplateResourceServlet_HtmlTemplateVariables.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/TemplateResourceServlet_HtmlTemplateVariables.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.webapp.modules.templresources;
+package org.apache.isis.core.webapp.modules.templresources;
import java.util.HashMap;
import java.util.Map;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/WebModuleTemplateResources.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/WebModuleTemplateResources.java
similarity index 95%
rename from core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/WebModuleTemplateResources.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/WebModuleTemplateResources.java
index f93c751..05ef038 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/modules/templresources/WebModuleTemplateResources.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/templresources/WebModuleTemplateResources.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.modules.templresources;
+package org.apache.isis.core.webapp.modules.templresources;
import javax.inject.Inject;
import javax.inject.Named;
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.commons.collections.Can;
-import org.apache.isis.webapp.modules.WebModuleAbstract;
+import org.apache.isis.core.webapp.modules.WebModuleAbstract;
import lombok.Getter;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/routing/ForwardingServlet.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/routing/ForwardingServlet.java
similarity index 97%
rename from core/webapp/src/main/java/org/apache/isis/webapp/routing/ForwardingServlet.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/routing/ForwardingServlet.java
index 8e3b886..f6177c3 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/routing/ForwardingServlet.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/routing/ForwardingServlet.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.webapp.routing;
+package org.apache.isis.core.webapp.routing;
import java.io.IOException;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/routing/RedirectFilter.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/routing/RedirectFilter.java
similarity index 97%
rename from core/webapp/src/main/java/org/apache/isis/webapp/routing/RedirectFilter.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/routing/RedirectFilter.java
index 1bd6dce..13e3e36 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/routing/RedirectFilter.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/routing/RedirectFilter.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.webapp.routing;
+package org.apache.isis.core.webapp.routing;
import java.io.IOException;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/routing/RedirectServlet.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/routing/RedirectServlet.java
similarity index 97%
rename from core/webapp/src/main/java/org/apache/isis/webapp/routing/RedirectServlet.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/routing/RedirectServlet.java
index b374235..068ad44 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/routing/RedirectServlet.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/routing/RedirectServlet.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.webapp.routing;
+package org.apache.isis.core.webapp.routing;
import java.io.IOException;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/routing/RedirectToDocsFilter.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/routing/RedirectToDocsFilter.java
similarity index 96%
rename from core/webapp/src/main/java/org/apache/isis/webapp/routing/RedirectToDocsFilter.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/routing/RedirectToDocsFilter.java
index d7375bc..96476b6 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/routing/RedirectToDocsFilter.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/routing/RedirectToDocsFilter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.routing;
+package org.apache.isis.core.webapp.routing;
import java.io.IOException;
@@ -39,7 +39,7 @@ import lombok.extern.log4j.Log4j2;
* <p>
* Specifically, if the request is to "/" but the Accept header is anything
* other than "application/json" (eg is set to "text/html" and suggesting that
- * the user is using a browser to access the webapp) then the filter redirects
+ * the user is using a browser to access the corewebapp) then the filter redirects
* to /index.html (the documentation pages).
*
* <p>
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextInitializer.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/webappctx/IsisWebAppContextInitializer.java
similarity index 95%
rename from core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextInitializer.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/webappctx/IsisWebAppContextInitializer.java
index ce8a93b..66394a2 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextInitializer.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/webappctx/IsisWebAppContextInitializer.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.webappctx;
+package org.apache.isis.core.webapp.webappctx;
import java.util.EventListener;
import java.util.concurrent.atomic.LongAdder;
@@ -34,8 +34,8 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.core.commons.internal.context._Context;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
-import org.apache.isis.webapp.modules.WebModule;
-import org.apache.isis.webapp.modules.WebModuleContext;
+import org.apache.isis.core.webapp.modules.WebModule;
+import org.apache.isis.core.webapp.modules.WebModuleContext;
import lombok.NonNull;
import lombok.Value;
@@ -49,7 +49,7 @@ import lombok.extern.log4j.Log4j2;
* Acts as the single application entry-point for setting up the
* ServletContext programmatically.
* </p><p>
- * Installs {@link WebModule}s on the ServletContext.
+ * Installs {@link WebModule}s on the ServletContext.
* </p>
*
* @since 2.0
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/wormhole/AuthenticationSessionWormhole.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/wormhole/AuthenticationSessionWormhole.java
similarity index 96%
rename from core/webapp/src/main/java/org/apache/isis/webapp/wormhole/AuthenticationSessionWormhole.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/wormhole/AuthenticationSessionWormhole.java
index 6388f63..9c18837 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/wormhole/AuthenticationSessionWormhole.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/wormhole/AuthenticationSessionWormhole.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webapp.wormhole;
+package org.apache.isis.core.webapp.wormhole;
import org.apache.isis.security.api.authentication.AuthenticationSession;
diff --git a/examples/demo/src/main/resources/application.yml b/examples/demo/src/main/resources/application.yml
index 7eb0ff6..cbb592a 100644
--- a/examples/demo/src/main/resources/application.yml
+++ b/examples/demo/src/main/resources/application.yml
@@ -49,7 +49,7 @@ isis:
viewer:
wicket:
application:
- menubars-layout-xml: demoapp/webapp/menubars.layout.xml
+ menubars-layout-xml: demoapp/corewebapp/menubars.layout.xml
favicon-url: /images/favicon.png
brand-logo-header: /images/gift_48.png
brand-logo-signin: /images/gift_256.png
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityFixtureRoleAndPermissions.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityFixtureRoleAndPermissions.java
index c2b6cd6..47f6a7a 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityFixtureRoleAndPermissions.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/scripts/IsisModuleSecurityFixtureRoleAndPermissions.java
@@ -23,7 +23,7 @@ import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionMod
import org.apache.isis.extensions.secman.api.permission.ApplicationPermissionRule;
/**
- * Role to run in the prototype fixture scripts for the example webapp for the security module.
+ * Role to run in the prototype fixture scripts for the example corewebapp for the security module.
*/
public class IsisModuleSecurityFixtureRoleAndPermissions extends AbstractRoleAndPermissionsFixtureScript {
diff --git a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapRealm.java b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapRealm.java
index d1ac924..011486c 100644
--- a/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapRealm.java
+++ b/extensions/security/shiro-realm-ldap/impl/src/main/java/org/apache/isis/extensions/shirorealmldap/realm/impl/IsisLdapRealm.java
@@ -95,11 +95,11 @@ import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
* {@link #setResourcePath(String)} to an 'ini' file with a [roles] section, eg:
* <p/>
* <pre>
- * ldapRealm.resourcePath=classpath:webapp/myroles.ini
+ * ldapRealm.resourcePath=classpath:corewebapp/myroles.ini
* </pre>
* <p/>
* <p>
- * where <tt>myroles.ini</tt> is in <tt>src/main/resources/webapp</tt>, and takes the form:
+ * where <tt>myroles.ini</tt> is in <tt>src/main/resources/corewebapp</tt>, and takes the form:
* <p/>
* <pre>
* [roles]
@@ -416,11 +416,11 @@ public class IsisLdapRealm extends DefaultLdapRealm {
/**
* <pre>
- * ldapRealm.resourcePath=classpath:webapp/myroles.ini
+ * ldapRealm.resourcePath=classpath:corewebapp/myroles.ini
* </pre>
* <p/>
* <p/>
- * where <tt>myroles.ini</tt> is in <tt>src/main/resources/webapp</tt>, and takes the form:
+ * where <tt>myroles.ini</tt> is in <tt>src/main/resources/corewebapp</tt>, and takes the form:
* <p/>
* <pre>
* [roles]
diff --git a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java
index 515167c..f8d458d 100644
--- a/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java
+++ b/extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java
@@ -32,7 +32,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.commons.collections.Can;
-import org.apache.isis.webapp.modules.WebModuleAbstract;
+import org.apache.isis.core.webapp.modules.WebModuleAbstract;
import lombok.Getter;
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
index 886493d..ad4455a 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
@@ -25,7 +25,7 @@ import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.security.keycloak.authentication.AuthenticatorKeycloak;
import org.apache.isis.security.keycloak.authorization.AuthorizorKeycloak;
import org.apache.isis.security.keycloak.webmodule.WebModuleKeycloak;
-import org.apache.isis.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleWebapp;
/**
* Configuration Bean to support Isis Security using Shiro.
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
index 403986f..8ac6117 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.security.api.authentication.AuthenticationRequest;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.api.authentication.standard.Authenticator;
-import org.apache.isis.webapp.wormhole.AuthenticationSessionWormhole;
+import org.apache.isis.core.webapp.wormhole.AuthenticationSessionWormhole;
@Service
@Named("isisSecurityKeycloak.AuthenticatorKeycloak")
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
index 7bfd6e0..711eff8 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
@@ -16,7 +16,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.api.authentication.standard.SimpleSession;
-import org.apache.isis.webapp.wormhole.AuthenticationSessionWormhole;
+import org.apache.isis.core.webapp.wormhole.AuthenticationSessionWormhole;
import lombok.val;
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
index c4419b4..181fb90 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/WebModuleKeycloak.java
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.commons.collections.Can;
-import org.apache.isis.webapp.modules.WebModuleAbstract;
+import org.apache.isis.core.webapp.modules.WebModuleAbstract;
import lombok.Getter;
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
index 7e1a9c1..6057631 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
@@ -25,7 +25,7 @@ import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.security.shiro.authentication.AuthenticatorShiro;
import org.apache.isis.security.shiro.authorization.AuthorizorShiro;
import org.apache.isis.security.shiro.webmodule.WebModuleShiro;
-import org.apache.isis.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleWebapp;
/**
* Configuration Bean to support Isis Security using Shiro.
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
index c194969..a925d34 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/webmodule/WebModuleShiro.java
@@ -47,8 +47,8 @@ import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.commons.internal._Constants;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.webapp.modules.WebModuleAbstract;
-import org.apache.isis.webapp.modules.WebModuleContext;
+import org.apache.isis.core.webapp.modules.WebModuleAbstract;
+import org.apache.isis.core.webapp.modules.WebModuleContext;
import lombok.Getter;
import lombok.NoArgsConstructor;
diff --git a/starters/src/main/doc/modules/simpleapp/pages/about.adoc b/starters/src/main/doc/modules/simpleapp/pages/about.adoc
index 2f2a6bf..2bad5cd 100644
--- a/starters/src/main/doc/modules/simpleapp/pages/about.adoc
+++ b/starters/src/main/doc/modules/simpleapp/pages/about.adoc
@@ -532,7 +532,7 @@ The files in `src/main/jettyconsole` provide a splash image (if not run in headl
This uses the Dockerfile residing in `docker/Dockerfile` (under `src/main/resources`).
// FIXME: currently removed in v2, may reinstate
-//* also, the xref:refguide:mvn:about.adoc[Apache Isis Maven plugin] is also configured to generate a xref:refguide:mvn:swagger.adoc[swagger] spec file for the entire application, in the `xxx-webapp` module
+//* also, the xref:refguide:mvn:about.adoc[Apache Isis Maven plugin] is also configured to generate a xref:refguide:mvn:swagger.adoc[swagger] spec file for the entire application, in the `xxx-corewebapp` module
Under `src/main/resources` there is:
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixtures.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixtures.java
index 391e859..10a336d 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixtures.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixtures.java
@@ -35,7 +35,7 @@ public interface ModuleWithFixtures {
*
* <p>
* These are automatically executed whenever running integration tests (but are ignored when bootstrapping the
- * runtime as a webapp).
+ * runtime as a corewebapp).
* </p>
*
* <p>
@@ -52,7 +52,7 @@ public interface ModuleWithFixtures {
*
* <p>
* These are automatically executed whenever running integration tests (but are ignored when bootstrapping the
- * runtime as a webapp).
+ * runtime as a corewebapp).
* </p>
*
* <p>
diff --git a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/IsisModuleTestingH2ConsoleUi.java b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/IsisModuleTestingH2ConsoleUi.java
index 7e5d48e..56e4272 100644
--- a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/IsisModuleTestingH2ConsoleUi.java
+++ b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/IsisModuleTestingH2ConsoleUi.java
@@ -22,7 +22,7 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleWebapp;
@Configuration
@Import({
diff --git a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java
index 206c37d..9ca87ee 100644
--- a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java
+++ b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/webmodule/WebModuleH2Console.java
@@ -36,8 +36,8 @@ import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.webapp.modules.WebModuleAbstract;
-import org.apache.isis.webapp.modules.WebModuleContext;
+import org.apache.isis.core.webapp.modules.WebModuleAbstract;
+import org.apache.isis.core.webapp.modules.WebModuleContext;
import lombok.Getter;
import lombok.val;
diff --git a/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java b/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java
index beb3e7e..70be418 100644
--- a/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java
+++ b/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java
@@ -22,7 +22,7 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleWebapp;
@Configuration
@Import({
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/webmodule/WebModuleServerSentEvents.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/webmodule/WebModuleServerSentEvents.java
index 4432340..f6ce156 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/webmodule/WebModuleServerSentEvents.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/webmodule/WebModuleServerSentEvents.java
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.commons.collections.Can;
-import org.apache.isis.webapp.modules.WebModuleAbstract;
+import org.apache.isis.core.webapp.modules.WebModuleAbstract;
import lombok.Getter;
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
index 04ee46e..c99e269 100644
--- a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
+++ b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
@@ -37,8 +37,8 @@ import org.apache.isis.core.config.RestEasyConfiguration;
import org.apache.isis.viewer.restfulobjects.viewer.webmodule.IsisRestfulObjectsSessionFilter;
import org.apache.isis.viewer.restfulobjects.viewer.webmodule.IsisTransactionFilterForRestfulObjects;
import org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationSessionStrategyBasicAuth;
-import org.apache.isis.webapp.modules.WebModuleAbstract;
-import org.apache.isis.webapp.modules.WebModuleContext;
+import org.apache.isis.core.webapp.modules.WebModuleAbstract;
+import org.apache.isis.core.webapp.modules.WebModuleContext;
import lombok.Getter;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java
index e030782..f8a5ae6 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java
@@ -36,7 +36,7 @@ import org.apache.isis.viewer.restfulobjects.viewer.resources.MenuBarsResourceSe
import org.apache.isis.viewer.restfulobjects.viewer.resources.SwaggerSpecResource;
import org.apache.isis.viewer.restfulobjects.viewer.resources.UserResourceServerside;
import org.apache.isis.viewer.restfulobjects.viewer.resources.VersionResourceServerside;
-import org.apache.isis.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleWebapp;
/**
*
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
index 90601c0..241ca7d 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
@@ -49,7 +49,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidExcep
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationSessionStrategy;
import org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationSessionStrategyDefault;
-import org.apache.isis.webapp.modules.templresources.TemplateResourceCachingFilter;
+import org.apache.isis.core.webapp.modules.templresources.TemplateResourceCachingFilter;
import static org.apache.isis.core.commons.internal.base._With.requires;
@@ -134,7 +134,7 @@ public class IsisRestfulObjectsSessionFilter implements Filter {
/**
* Init parameter key for which extensions should be ignored (typically,
- * mappings for other viewers within the webapp context).
+ * mappings for other viewers within the corewebapp context).
*
* <p>
* It can also be used to specify ignored static resources (though putting
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java
index 9cefcde..05683d0 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java
@@ -3,7 +3,7 @@ package org.apache.isis.viewer.wicket.model;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleWebapp;
@Configuration
@Import({
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/CommonContextUtils.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/CommonContextUtils.java
index 06a0dd9..900c335 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/CommonContextUtils.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/common/CommonContextUtils.java
@@ -20,7 +20,7 @@ package org.apache.isis.viewer.wicket.model.common;
import org.apache.wicket.Session;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/AboutModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/AboutModel.java
index 4612b64..bdc2d71 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/AboutModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/AboutModel.java
@@ -19,7 +19,7 @@
package org.apache.isis.viewer.wicket.model.models;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
/**
* Model providing welcome text.
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
index 08ec6f9..5c2c99d 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
@@ -73,7 +73,7 @@ import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
import org.apache.isis.viewer.wicket.model.mementos.ActionMemento;
import org.apache.isis.viewer.wicket.model.mementos.ActionParameterMemento;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkableModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkableModel.java
index 405833a..0753fdb 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkableModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkableModel.java
@@ -21,7 +21,7 @@ package org.apache.isis.viewer.wicket.model.models;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
public abstract class BookmarkableModel<T> extends ModelAbstract<T> {
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
index 092e62c..0f6af9e 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/BookmarkedPagesModel.java
@@ -28,7 +28,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
public class BookmarkedPagesModel extends ModelAbstract<List<BookmarkTreeNode>> {
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
index af8f49e..f342aeb 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityCollectionModel.java
@@ -54,9 +54,9 @@ import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.links.LinksProvider;
import org.apache.isis.viewer.wicket.model.mementos.CollectionMemento;
import org.apache.isis.viewer.wicket.model.models.Util.LowestCommonSuperclassFinder;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
-import org.apache.isis.webapp.context.memento.ObjectMementoService;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMementoService;
import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
index 4df593c..0fe60f8 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
@@ -45,8 +45,8 @@ import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
import org.apache.isis.viewer.wicket.model.mementos.PropertyMemento;
import org.apache.isis.viewer.wicket.model.util.ComponentHintKey;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import static org.apache.isis.core.commons.internal.base._With.requires;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModelForReference.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModelForReference.java
index 64f51e8..23d591f 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModelForReference.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModelForReference.java
@@ -23,7 +23,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.applib.services.hint.HintStore;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import static org.apache.isis.viewer.wicket.model.models.EntityModel.createPageParameters;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java
index 7c87d58..e4e5281 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/HintPageParameterSerializer.java
@@ -26,7 +26,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.hint.HintStore;
import org.apache.isis.viewer.wicket.model.util.ComponentHintKey;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
index a620dff..8fd7a49 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ModelAbstract.java
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.wicket.model.models;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.NonNull;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ObjectAdapterModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ObjectAdapterModel.java
index 5b3595d..b74adef 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ObjectAdapterModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ObjectAdapterModel.java
@@ -23,7 +23,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
public interface ObjectAdapterModel extends IModel<ManagedObject> {
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index 4b3a89a..97e49ec 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -54,7 +54,7 @@ import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.links.LinksProvider;
import org.apache.isis.viewer.wicket.model.mementos.ActionParameterMemento;
import org.apache.isis.viewer.wicket.model.mementos.PropertyMemento;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.Getter;
import lombok.Setter;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java
index 7484538..495fb04 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithMultiPending.java
@@ -25,7 +25,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java
index e6ae447..2e1b001 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModelWithPending.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java
index 5c3d465..74a5461 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ServiceActionsModel.java
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.core.metamodel.facets.object.domainservicelayout.DomainServiceLayoutFacet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
/**
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ToggledMementosProvider.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ToggledMementosProvider.java
index b388ef7..5b0dae6 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ToggledMementosProvider.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ToggledMementosProvider.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.isis.core.commons.collections.Can;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
public interface ToggledMementosProvider extends Serializable {
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java
index 6fdc662..0c8a6d9 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ValueModel.java
@@ -21,8 +21,8 @@ package org.apache.isis.viewer.wicket.model.models;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
/**
* Represents a standalone value.
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/VoidModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/VoidModel.java
index 7f7bd82..6c4cab8 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/VoidModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/VoidModel.java
@@ -20,7 +20,7 @@
package org.apache.isis.viewer.wicket.model.models;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
/**
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WelcomeModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WelcomeModel.java
index e061d4f..9d891ba 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WelcomeModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/WelcomeModel.java
@@ -19,7 +19,7 @@
package org.apache.isis.viewer.wicket.model.models;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
/**
* Model providing welcome text.
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
index c9ccdd5..d369246 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/whereami/WhereAmIModelDefault.java
@@ -24,7 +24,7 @@ import java.util.stream.Stream;
import org.apache.isis.core.metamodel.util.pchain.ParentChain;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
index 39bbd55..f1505be 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/util/ComponentHintKey.java
@@ -28,7 +28,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.hint.HintStore;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.AccessLevel;
import lombok.Getter;
diff --git a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
index 48d5d2d..f47979a 100644
--- a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
+++ b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
index 948bae0..5130849 100644
--- a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
+++ b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
@@ -33,8 +33,8 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.webapp.context.memento.ObjectMementoService;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.memento.ObjectMementoService;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java
index 9ebe3a6..fb5e645 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstract.java
@@ -24,7 +24,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.Getter;
import lombok.Setter;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
index 2354d0d..85ed34c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
@@ -33,7 +33,7 @@ import org.apache.wicket.util.time.Duration;
import org.apache.isis.viewer.wicket.model.models.VoidModel;
import org.apache.isis.viewer.wicket.ui.pages.voidreturn.VoidReturnPage;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
public enum ActionResultResponseHandlingStrategy {
REDIRECT_TO_VOID {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
index 4fa2099..719a866 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
@@ -39,7 +39,7 @@ import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
import org.apache.isis.viewer.wicket.ui.pages.standalonecollection.StandaloneCollectionPage;
import org.apache.isis.viewer.wicket.ui.pages.value.ValuePage;
import org.apache.isis.viewer.wicket.ui.pages.voidreturn.VoidReturnPage;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java
index 7e92545..e93a667 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/JarManifestModel.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.context._Context;
import org.apache.isis.core.metamodel.commons.CloseableExtensions;
import org.apache.isis.viewer.wicket.model.models.ModelAbstract;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
public class JarManifestModel extends ModelAbstract<JarManifestModel> {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
index 0b74d5f..7472a73 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/CssMenuItem.java
@@ -46,7 +46,7 @@ import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
import org.apache.isis.viewer.wicket.ui.util.Components;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
index 4b198da..93dd5cd 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionUtil.java
@@ -44,7 +44,7 @@ import org.apache.isis.viewer.wicket.model.models.ServiceActionsModel;
import org.apache.isis.viewer.wicket.ui.components.actionmenu.CssClassFaBehavior;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
index dbfa734..7b1db1a 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
@@ -39,7 +39,7 @@ import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.panels.PanelBase;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
-import org.apache.isis.webapp.wormhole.AuthenticationSessionWormhole;
+import org.apache.isis.core.webapp.wormhole.AuthenticationSessionWormhole;
/**
* A panel responsible to render the application actions as menu in a navigation bar.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
index aaa4e89..a9520ea 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/AssociatedWithActionsHelper.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
index aa322f7..ee2b0f5 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
@@ -46,7 +46,7 @@ import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract2;
import org.apache.isis.viewer.wicket.ui.components.widgets.checkbox.ContainedToggleboxPanel;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index 14da8e5..f3c4649 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -56,7 +56,7 @@ import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ObjectAdapterTitleColumn;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.columns.ObjectAdapterToggleboxColumn;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import static org.apache.isis.core.commons.internal.base._With.mapIfPresentElse;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbstract.java
index becca30..5109ce8 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ColumnAbstract.java
@@ -31,7 +31,7 @@ import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.CollectionContentsAsAjaxTablePanel;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
index cb229f4..15de3d7 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
@@ -38,7 +38,7 @@ import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.CollectionContentsAsAjaxTablePanel;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java
index 6300b7f..7b2a18c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterTitleColumn.java
@@ -30,8 +30,8 @@ import org.apache.isis.viewer.wicket.model.models.EntityModel.RenderingHint;
import org.apache.isis.viewer.wicket.model.models.ValueModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java
index 0614765..e545c40 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterToggleboxColumn.java
@@ -34,7 +34,7 @@ import org.apache.isis.viewer.wicket.model.common.OnSelectionHandler;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.checkbox.ContainedToggleboxPanel;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
index f66e4f0..8019f1d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
@@ -39,7 +39,7 @@ import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.Components;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
index c1d307f..7b2e948 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelect2Abstract.java
@@ -40,7 +40,7 @@ import org.apache.isis.viewer.wicket.ui.components.widgets.select2.Select2;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.ObjectAdapterMementoProviderAbstract;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
index 8325175..e0cd072 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
@@ -32,7 +32,7 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.util.convert.IConverter;
import org.apache.isis.viewer.wicket.ui.components.scalars.DateConverter;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import de.agilecoders.wicket.core.util.Attributes;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
index 077562d..775f380 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
@@ -55,7 +55,7 @@ import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.Obj
import org.apache.isis.viewer.wicket.ui.util.Components;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
index 21b2da9..9c33827 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
@@ -37,7 +37,7 @@ import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelSelect2Abs
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.Select2;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.ObjectAdapterMementoProviderForValueChoices;
import org.apache.isis.viewer.wicket.ui.util.Tooltips;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
index 060baae..8449ecd 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/IsisToWicketTreeAdapter.java
@@ -54,7 +54,7 @@ import org.apache.isis.viewer.wicket.model.models.ModelAbstract;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.model.models.ValueModel;
import org.apache.isis.viewer.wicket.ui.components.entity.icontitle.EntityIconAndTitlePanel;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import static org.apache.isis.core.commons.internal.base._With.requires;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java
index d41d3bd..4be85b8 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/welcome/WelcomePanelFactory.java
@@ -38,7 +38,7 @@ public class WelcomePanelFactory extends ComponentFactoryAbstract {
private static final String DEFAULT_MESSAGE =
"Apache Isis' Wicket Viewer combines the power of Apache Wicket " +
"for web UIs with Apache Isis for domain modelling. " +
- "Out-of-the box you get a fully-functional webapp just from " +
+ "Out-of-the box you get a fully-functional corewebapp just from " +
"your domain objects; you can then customize the UI by " +
"writing custom Wicket components, replacing the page layouts or " +
"simply by altering the CSS";
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
index 2b39114..5b0a012 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbModel.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
index a68eeea..5c9b8cc 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLink.java
@@ -38,7 +38,7 @@ import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettingsAccessor;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.Getter;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
index 5bb80db..5f2f7e8 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/linkandlabel/ActionLinkFactoryAbstract.java
@@ -60,7 +60,7 @@ import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
import org.apache.isis.viewer.wicket.ui.panels.FormExecutorDefault;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/ChoiceExt.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/ChoiceExt.java
index 3079653..8adf772 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/ChoiceExt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/ChoiceExt.java
@@ -24,7 +24,7 @@ import org.wicketstuff.select2.Select2MultiChoice;
import org.wicketstuff.select2.Settings;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
/**
* Represents functionality that is common to both {@link Select2Choice} and {@link Select2MultiChoice}, but for
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
index 5ddf28e..05da7b6 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2.java
@@ -35,7 +35,7 @@ import org.wicketstuff.select2.Settings;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.model.models.ScalarModelWithMultiPending;
import org.apache.isis.viewer.wicket.model.models.ScalarModelWithPending;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
/**
* Wrapper around either a {@link Select2Choice} or a {@link Select2MultiChoice}.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java
index c566764..b32b8ce 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2ChoiceExt.java
@@ -24,7 +24,7 @@ import org.wicketstuff.select2.Select2Choice;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.EmptyChoiceProvider;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
public class Select2ChoiceExt extends Select2Choice<ObjectMemento> implements ChoiceExt {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
index 4bac1ed..de50859 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/Select2MultiChoiceExt.java
@@ -27,7 +27,7 @@ import org.wicketstuff.select2.Select2MultiChoice;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.EmptyChoiceProvider;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
public class Select2MultiChoiceExt
extends Select2MultiChoice<ObjectMemento>
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/EmptyChoiceProvider.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/EmptyChoiceProvider.java
index b50a097..a4b28c7 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/EmptyChoiceProvider.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/EmptyChoiceProvider.java
@@ -23,7 +23,7 @@ import java.util.Collection;
import org.wicketstuff.select2.ChoiceProvider;
import org.wicketstuff.select2.Response;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
public class EmptyChoiceProvider extends ChoiceProvider<ObjectMemento> {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
index 034b376..77241d3 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderAbstract.java
@@ -37,8 +37,8 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.IsisConverterLocator;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.Getter;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForChoices.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForChoices.java
index ff26e8c..49c2245 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForChoices.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForChoices.java
@@ -38,7 +38,7 @@ package org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers;
import java.util.List;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
public interface ObjectAdapterMementoProviderForChoices {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceChoices.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceChoices.java
index d88269b..c42a68b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceChoices.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceChoices.java
@@ -21,7 +21,7 @@ package org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers;
import java.util.List;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.Getter;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java
index e04bcf4..f5203b5 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceObjectAutoComplete.java
@@ -24,7 +24,7 @@ import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facets.object.autocomplete.AutoCompleteFacet;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java
index 6366fc5..df3926e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForReferenceParamOrPropertyAutoComplete.java
@@ -25,7 +25,7 @@ import org.apache.isis.core.commons.internal.base._NullSafe;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForValueChoices.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForValueChoices.java
index 9413b5c..b24f275 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForValueChoices.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/select2/providers/ObjectAdapterMementoProviderForValueChoices.java
@@ -24,7 +24,7 @@ import java.util.function.Predicate;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.Getter;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java
index 8e9cfba..e9e3f02 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionModel.java
@@ -28,7 +28,7 @@ import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.viewer.wicket.model.models.ModelAbstract;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
public class ExceptionModel extends ModelAbstract<List<StackTraceDetail>> {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
index b4011dd..a03c0dd 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
@@ -29,7 +29,7 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.security.api.authentication.MessageBroker;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
/**
* Attach to any Ajax button that might trigger a notification (ie calls
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
index 16c093e..ba4130e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
@@ -25,7 +25,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
/**
* Provides all the system dependencies for sub-classes.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
index 97a7200..662dbb0 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
@@ -24,7 +24,7 @@ import org.apache.wicket.validation.ValidationError;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.ui.validation.ValidatorBase;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
index 9040699..47ab96d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
@@ -24,7 +24,7 @@ import org.apache.wicket.validation.ValidationError;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.ui.validation.ValidatorBase;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
index 1a7e97a..f7ab184 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/actionprompt/ActionPromptPage.java
@@ -25,7 +25,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
index dc42651..ab29733 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.java
@@ -48,7 +48,7 @@ import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.Breadcrum
import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModelProvider;
import org.apache.isis.viewer.wicket.ui.pages.PageAbstract;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
index a560c14..fa8a763 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
@@ -31,7 +31,7 @@ import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistryAccessor;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
public abstract class FormAbstract<T> extends Form<T>
implements ComponentFactoryRegistryAccessor, PageClassRegistryAccessor {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
index f63422b..5576a39 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
@@ -62,8 +62,8 @@ import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib.IsisBlobOrClobPanelAbstract;
import org.apache.isis.viewer.wicket.ui.errors.JGrowlUtil;
import org.apache.isis.viewer.wicket.ui.util.Components;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
index 995c50a..df6d846 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
@@ -43,7 +43,7 @@ import org.apache.isis.viewer.wicket.ui.components.tree.themes.TreeThemeProvider
import org.apache.isis.viewer.wicket.ui.pages.EmailVerificationUrlService;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.PageNavigationService;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
/**
* Provides the <em>common context</em> for all implementing sub-classes.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/validation/ValidatorBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/validation/ValidatorBase.java
index 8af99e9..5239aee 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/validation/ValidatorBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/validation/ValidatorBase.java
@@ -20,7 +20,7 @@ package org.apache.isis.viewer.wicket.ui.validation;
import org.apache.wicket.validation.IValidator;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.Getter;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstractTest_init.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstractTest_init.java
index 255b847..9738c50 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstractTest_init.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/ComponentFactoryAbstractTest_init.java
@@ -27,7 +27,7 @@ import org.junit.rules.ExpectedException;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
public class ComponentFactoryAbstractTest_init {
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
index dcca4dc..1b8ef3a 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.CollectionContentsAsAjaxTablePanelFactory;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
index cd8049e..02b3459 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
@@ -39,8 +39,8 @@ import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.ObjectAdapterMementoProviderForValueChoices;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
public class ObjectAdapterMementoProviderForValueChoicesTest {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
index 60a8662..ca1da89 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
@@ -39,8 +39,8 @@ import org.apache.isis.viewer.wicket.model.models.BookmarkedPagesModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModelProvider;
import org.apache.isis.viewer.wicket.ui.pages.BookmarkedPagesModelProvider;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.webapp.wormhole.AuthenticationSessionWormhole;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.wormhole.AuthenticationSessionWormhole;
import lombok.Getter;
import lombok.val;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java
index db961ee..e6ac2a8 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/ConverterForObjectAdapterMemento.java
@@ -27,8 +27,8 @@ import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
index 816edf4..a353e06 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
@@ -66,7 +66,7 @@ import org.apache.isis.viewer.wicket.ui.pages.error.ErrorPage;
import org.apache.isis.viewer.wicket.ui.pages.login.WicketSignInPage;
import org.apache.isis.viewer.wicket.ui.pages.mmverror.MmvErrorPage;
import org.apache.isis.viewer.wicket.ui.panels.PromptFormAbstract;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
index e34009c..4241680 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
@@ -48,7 +48,7 @@ import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistrar.ComponentFactoryList;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoServiceWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoServiceWicket.java
index ff2e6ed..c259ee9 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoServiceWicket.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoServiceWicket.java
@@ -38,9 +38,9 @@ import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
-import org.apache.isis.webapp.context.memento.ObjectMementoCollection;
-import org.apache.isis.webapp.context.memento.ObjectMementoService;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMementoCollection;
+import org.apache.isis.core.webapp.context.memento.ObjectMementoService;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
index 8c8432a..7db2a14 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
@@ -36,8 +36,8 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.webapp.modules.WebModuleAbstract;
-import org.apache.isis.webapp.modules.WebModuleContext;
+import org.apache.isis.core.webapp.modules.WebModuleAbstract;
+import org.apache.isis.core.webapp.modules.WebModuleContext;
import lombok.Getter;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
index 684894f..a5c3168 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
@@ -91,8 +91,8 @@ import org.apache.isis.viewer.wicket.viewer.integration.ConverterForObjectAdapte
import org.apache.isis.viewer.wicket.viewer.integration.ConverterForObjectAdapterMemento;
import org.apache.isis.viewer.wicket.viewer.integration.IsisResourceSettings;
import org.apache.isis.viewer.wicket.viewer.integration.WebRequestCycleForIsis;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
import static org.apache.isis.core.commons.internal.base._With.requires;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_newPageFactory.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_newPageFactory.java
index f509d16..50a2518 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_newPageFactory.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_newPageFactory.java
@@ -26,7 +26,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.entity.EntityPage;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
index 345fbaa..8a419c1 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
@@ -45,7 +45,7 @@ import org.apache.isis.security.api.authentication.standard.Authenticator;
import org.apache.isis.security.api.authentication.standard.RandomCodeGeneratorDefault;
import org.apache.isis.security.api.authentication.standard.SimpleSession;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
public class AuthenticatedWebSessionForIsis_Authenticate {
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
index 7590839..771366a 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
@@ -42,7 +42,7 @@ import org.apache.isis.security.api.authentication.manager.AuthenticationManager
import org.apache.isis.security.api.authentication.standard.Authenticator;
import org.apache.isis.security.api.authentication.standard.RandomCodeGeneratorDefault;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
public class AuthenticatedWebSessionForIsis_SignIn {
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
index f1731f3..e7eda88 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.webapp.context.IsisWebAppCommonContext;
+import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
public abstract class AuthenticatedWebSessionForIsis_TestAbstract {
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java
index c44913b..2deab61 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.viewer.integration.AuthenticatedWebSessionForIsis;
-import org.apache.isis.webapp.context.memento.ObjectMemento;
+import org.apache.isis.core.webapp.context.memento.ObjectMemento;
public class IsisWicketApplication_Defaults {
[isis] 03/14: ISIS-2259: fixes up some module names
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1769a6667f3837750f82960a579de4e54422d343
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 15:30:42 2020 +0000
ISIS-2259: fixes up some module names
---
core/metamodel/pom.xml | 4 ++--
.../{IsisModuleMetamodel.java => IsisModuleCoreMetamodel.java} | 2 +-
core/runtime/pom.xml | 4 ++--
.../java/org/apache/isis/core/runtime/IsisCoreModuleRuntime.java | 6 +++---
.../org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java | 4 ++--
.../src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java | 4 ++--
.../persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java | 4 ++--
.../restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java | 4 ++--
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index deca218..705045b 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -30,8 +30,8 @@
<name>Apache Isis Core - MetaModel</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.metamodel</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/metamodel</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.core.metamodel</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/core/metamodel</git-plugin.propertiesDir>
</properties>
<build>
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleMetamodel.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java
similarity index 99%
rename from core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleMetamodel.java
rename to core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java
index 4b68215..4a1affd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleMetamodel.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java
@@ -96,6 +96,6 @@ import org.apache.isis.security.api.IsisModuleSecurityApi;
ApplicationFeatureRepositoryDefault.class,
})
-public class IsisModuleMetamodel {
+public class IsisModuleCoreMetamodel {
}
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 823b1ec..2b72eac 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -30,8 +30,8 @@
<name>Apache Isis Core - Runtime</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.runtime</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/runtime</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.core.runtime</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/core/runtime</git-plugin.propertiesDir>
</properties>
<build>
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisCoreModuleRuntime.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisCoreModuleRuntime.java
index 5f6c635..5a70cfd 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisCoreModuleRuntime.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisCoreModuleRuntime.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.runtime;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.core.metamodel.IsisModuleMetamodel;
+import org.apache.isis.core.metamodel.IsisModuleCoreMetamodel;
import org.apache.isis.core.runtime.context.session.RuntimeEventService;
import org.apache.isis.core.runtime.context.session.RuntimeEventSupport_Spring;
import org.apache.isis.core.runtime.persistence.session.events.PersistenceEventService;
@@ -34,7 +34,7 @@ import org.apache.isis.core.runtime.session.IsisSessionFactoryDefault;
@Configuration
@Import({
// modules
- IsisModuleMetamodel.class,
+ IsisModuleCoreMetamodel.class,
// @Service's
RuntimeEventService.class,
@@ -49,6 +49,6 @@ import org.apache.isis.core.runtime.session.IsisSessionFactoryDefault;
PersistenceEventService_Spring.class,
})
-public class IsisModuleRuntime {
+public class IsisCoreModuleRuntime {
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
index c7cdcbe..9143047 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
@@ -22,7 +22,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.core.codegen.bytebuddy.IsisModuleCoreCodegenByteBuddy;
-import org.apache.isis.core.runtime.IsisModuleRuntime;
+import org.apache.isis.core.runtime.IsisCoreModuleRuntime;
import org.apache.isis.runtimeservices.auth.AuthenticationSessionProviderDefault;
import org.apache.isis.runtimeservices.bookmarks.BookmarkServiceInternalDefault;
import org.apache.isis.runtimeservices.command.CommandDtoServiceInternalDefault;
@@ -53,7 +53,7 @@ import org.apache.isis.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefault;
@Configuration
@Import({
// modules
- IsisModuleRuntime.class,
+ IsisCoreModuleRuntime.class,
IsisModuleCoreCodegenByteBuddy.class,
// @Service's
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java b/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java
index 1ac3dec..697f3a7 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java
@@ -21,7 +21,7 @@ package org.apache.isis.webapp;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.core.runtime.IsisModuleRuntime;
+import org.apache.isis.core.runtime.IsisCoreModuleRuntime;
import org.apache.isis.webapp.health.HealthIndicatorUsingHealthCheckService;
import org.apache.isis.webapp.modules.logonlog.WebModuleLogOnExceptionLogger;
import org.apache.isis.webapp.modules.templresources.WebModuleTemplateResources;
@@ -30,7 +30,7 @@ import org.apache.isis.webapp.webappctx.IsisWebAppContextInitializer;
@Configuration
@Import({
// modules
- IsisModuleRuntime.class,
+ IsisCoreModuleRuntime.class,
// @Service's
WebModuleLogOnExceptionLogger.class,
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java
index 9aecb35..bafa317 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java
@@ -39,12 +39,12 @@ import org.apache.isis.persistence.jdo.datanucleus5.metamodel.JdoProgrammingMode
import org.apache.isis.persistence.jdo.datanucleus5.metrics.MetricsServiceDefault;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPlatformTransactionManagerForJdo;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSessionFactory5;
-import org.apache.isis.core.runtime.IsisModuleRuntime;
+import org.apache.isis.core.runtime.IsisCoreModuleRuntime;
@Configuration
@Import({
// modules
- IsisModuleRuntime.class,
+ IsisCoreModuleRuntime.class,
IsisModuleJdoApplib.class,
// @Component's
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java
index 51b0874..f1bc2a4 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java
@@ -3,7 +3,7 @@ package org.apache.isis.viewer.restfulobjects.rendering;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.core.runtime.IsisModuleRuntime;
+import org.apache.isis.core.runtime.IsisCoreModuleRuntime;
import org.apache.isis.viewer.restfulobjects.applib.IsisModuleRestfulObjectsApplib;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.JsonValueEncoder;
import org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationServiceContentNegotiator;
@@ -22,7 +22,7 @@ import org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal.
@Import({
// modules
IsisModuleRestfulObjectsApplib.class,
- IsisModuleRuntime.class,
+ IsisCoreModuleRuntime.class,
// @Component's
ClassExcluderDefault.class,
[isis] 08/14: ISIS-2259: search-n-replace text references to
isis.apache.isis where missing "core" as the next bit.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 4613ed6746861c794dc43ec2a62b373be7108ed5
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 16:53:55 2020 +0000
ISIS-2259: search-n-replace text references to isis.apache.isis where missing "core" as the next bit.
Also adds in some missing dependencies on core-commons and lombok.
---
.../isis-configurations-and-modules.pptx | Bin 49792 -> 49796 bytes
.../modules/ROOT/partials/component-nav.adoc | 2 +-
.../applib-ant/examples/annotation/Facets.java | 4 ++--
.../applib-cm/examples/tree/LazyTreeNode.java | 2 +-
.../doc/modules/applib-cm/examples/value/Image.java | 2 +-
.../applib-cm/examples/value/LocalResourcePath.java | 2 +-
.../modules/applib-cm/examples/value/Markup.java | 2 +-
.../modules/applib-cm/examples/value/Password.java | 2 +-
.../org/apache/isis/applib/annotation/Facets.java | 4 ++--
.../org/apache/isis/applib/tree/LazyTreeNode.java | 2 +-
.../java/org/apache/isis/applib/value/Image.java | 2 +-
.../apache/isis/applib/value/LocalResourcePath.java | 2 +-
.../java/org/apache/isis/applib/value/Markup.java | 2 +-
.../java/org/apache/isis/applib/value/Password.java | 2 +-
api/schema/pom.xml | 6 ------
core/codegen-bytebuddy/pom.xml | 2 +-
core/commons/pom.xml | 5 +++--
core/config/pom.xml | 5 +++++
.../apache/isis/core/config/IsisConfiguration.java | 4 ++--
.../core/config/presets/DebugDiscovery.properties | 4 ++--
.../core/config/presets/DebugMetaModel.properties | 2 +-
.../core/config/presets/SilenceMetaModel.properties | 2 +-
.../BidirectionalRelationshipContractTestAll.java | 2 +-
.../files/FilesTest_deleteFiles.java | 8 ++++----
...jectServiceMethodMustBeFinalContractTestAll.java | 2 +-
.../IsisActionsTest_returnNewTransientInstance.java | 2 +-
.../jmocking/JMockActionsTest_returnArgument.java | 2 +-
.../jmocking/JMockActionsTest_returnEach.java | 2 +-
.../jmocking/JUnitRuleMockery2Test.java | 2 +-
...t_autoWiring_constructorInjection_happyCase.java | 4 ++--
...ry2Test_autoWiring_sadCase_noClassUnderTest.java | 2 +-
...Test_autoWiring_sadCase_twoClassesUnderTest.java | 4 ++--
...y2Test_autoWiring_setterInjection_happyCase.java | 4 ++--
...tRuleMockery2Test_mockAnnotatedWithAllowing.java | 6 +++---
...tRuleMockery2Test_mockAnnotatedWithChecking.java | 8 ++++----
...tRuleMockery2Test_mockAnnotatedWithIgnoring.java | 6 +++---
...ckery2Test_mockAnnotatedWithNever_happyCase.java | 6 +++---
...Mockery2Test_mockAnnotatedWithNever_sadCase.java | 6 +++---
...Mockery2Test_mockAnnotatedWithOne_happyCase.java | 6 +++---
...leMockery2Test_mockAnnotatedWithOne_sadCase.java | 6 +++---
.../sortedsets/SortedSetsContractTestAll.java | 2 +-
core/metamodel/pom.xml | 13 +++++++++++--
.../core/metamodel/IsisModuleCoreMetamodel.java | 4 ++--
.../core/metamodel/adapter/oid/Oid_Parented.java | 1 +
.../core/metamodel/adapter/oid/ParentedOid.java | 2 ++
.../standard/AuthorizationFacetAbstract.java | 2 +-
.../authorization/standard/package-info.java | 4 ++--
.../core/metamodel/context/MetaModelContext.java | 8 ++++----
.../context/MetaModelContext_usingIoc.java | 6 +++---
.../facets/members/cssclass/CssClassFacet.java | 2 +-
.../facets/members/hidden/HiddenFacetAbstract.java | 4 ++--
.../object/immutable/ImmutableFacetAbstract.java | 6 +++---
.../recreatable/RecreatableObjectFacetFactory.java | 2 +-
.../metamodel/interactions/InteractionContext.java | 2 +-
.../ProgrammingModelInitFilterDefault.java | 2 ++
.../classsubstitutor/ClassSubstitutorDefault.java | 2 +-
.../title/TitlesAndTranslationsValidator.java | 2 +-
.../metamodel/services/user/UserServiceDefault.java | 2 +-
.../core/metamodel/spec/ObjectSpecification.java | 4 ++--
.../core/metamodel/spec/feature/ObjectMember.java | 2 +-
.../core/metamodel/specloader/package-info.java | 6 +++---
.../specimpl/ObjectSpecificationAbstract.java | 2 +-
.../core/metamodel/MetaModelContext_configTest.java | 4 ++--
.../core/metamodel/MetaModelContext_forTesting.java | 12 ++++++------
.../oid/CollectionOidTest_valueSemantics.java | 2 +-
...idDefaultTest_valueSemantics_whenPersistent.java | 2 +-
...OidDefaultTest_valueSemantics_whenTransient.java | 2 +-
.../facets/AbstractFacetFactoryJUnit4TestCase.java | 6 +++---
.../metamodel/facets/AbstractFacetFactoryTest.java | 6 +++---
.../metamodel/facets/ObjectAdapterUtilsTest.java | 4 ++--
.../actions/ActionMethodsFacetFactoryTest.java | 4 ++--
.../action/ActionAnnotationFacetFactoryTest.java | 2 +-
.../prototype/PrototypeFacetAbstractTest.java | 2 +-
.../CollectionFieldMethodsFacetFactoryTest.java | 4 ++--
.../facets/collections/JavaCollectionFacetTest.java | 4 ++--
.../ViewModelSemanticCheckingFacetFactoryTest.java | 4 ++--
.../object/defaults/DefaultedFacetFactoryTest.java | 2 +-
.../DomainObjectAnnotationFacetFactoryTest.java | 2 +-
.../DomainObjectLayoutFactoryTest.java | 2 +-
.../annotation/TitleAnnotationFacetFactoryTest.java | 4 ++--
.../TitleFacetViaTitleAnnotationTest.java | 4 ++--
.../NavigableParentAnnotationFacetFactoryTest.java | 4 ++--
.../parseable/ParseableFacetUsingParserTest.java | 6 +++---
...ueFacetAnnotationOrConfigurationFactoryTest.java | 2 +-
.../ordering/memberorder/DeweyOrderSetTest.java | 2 +-
.../MemberOrderAnnotationFacetFactoryTest.java | 2 +-
.../memberorder/MemberOrderComparatorTest.java | 2 +-
...PromptStyleFacetFromPropertyAnnotation_Test.java | 2 +-
.../PropertyAnnotationFacetFactoryTest.java | 2 +-
.../value/BigDecimalValueSemanticsProviderTest.java | 2 +-
.../value/BigIntValueSemanticsProviderTest.java | 2 +-
.../value/ByteValueSemanticsProviderTest.java | 2 +-
.../value/DoubleValueSemanticsProviderTest.java | 2 +-
.../value/FloatValueSemanticsProviderTest.java | 2 +-
.../ImageValueSemanticsProviderAbstractTest.java | 6 +++---
.../facets/value/IntValueSemanticsProviderTest.java | 2 +-
.../JavaSqlDateValueSemanticsProviderTest.java | 2 +-
.../JavaSqlTimeValueSemanticsProviderTest.java | 2 +-
.../JavaUtilDateValueSemanticsProviderTest.java | 2 +-
.../value/LongValueSemanticsProviderTest.java | 2 +-
.../value/ShortValueSemanticsProviderTest.java | 2 +-
.../ValueSemanticsProviderAbstractTestCase.java | 8 ++++----
...JodaLocalDateTimeValueSemanticsProviderTest.java | 4 ++--
...bjectAssociationPredicatesTest_visibleWhere.java | 4 ++--
.../services/appfeat/ApplicationFeatureIdTest.java | 4 ++--
.../ApplicationFeatureRepositoryDefaultTest.java | 2 +-
...ceptionRecognizerDocDefault_recognizes_Test.java | 4 ++--
.../metamodel/MetaModelServiceDefaultTest.java | 4 ++--
.../spec/ObjectSpecIdTest_valueSemantics.java | 2 +-
.../specloader/SpecificationCacheDefaultTest.java | 4 ++--
.../specloader/SpecificationLoaderTestAbstract.java | 2 +-
...tionParameterAbstractTest_getId_and_getName.java | 4 ++--
.../specimpl/ObjectAssociationAbstractTest.java | 4 ++--
.../ObjectAssociationAbstractTest_alwaysHidden.java | 4 ++--
.../metamodel/testspec/ObjectSpecificationStub.java | 2 +-
.../isis/core/runtime/context/IsisContext.java | 2 +-
.../runtime/context/session/RuntimeContext.java | 2 +-
.../runtime/context/session/RuntimeContextBase.java | 4 ++--
.../session/PersistenceSessionFactory.java | 2 +-
.../isis/core/runtime/session/IsisRequestCycle.java | 2 +-
.../isis/core/runtime/session/IsisSession.java | 4 ++--
.../core/runtime/session/IsisSessionFactory.java | 2 +-
.../runtime/session/IsisSessionFactoryDefault.java | 4 ++--
.../runtime/session/init/InitialisationSession.java | 2 +-
.../template/AbstractIsisSessionTemplate.java | 2 +-
.../system/ObjectActionLayoutXmlDefaultTest.java | 2 +-
.../system/OneToManyAssociationDefaultTest.java | 2 +-
.../auth/AuthenticationSessionProviderDefault.java | 6 +++---
.../message/MessageServiceDefault.java | 2 +-
.../userprof/UserProfileServiceDefault.java | 2 +-
.../handlers/DomainObjectInvocationHandler.java | 2 +-
core/security/pom.xml | 7 ++++++-
.../main/doc/modules/api/partials/module-nav.adoc | 2 --
.../configure-isis-to-use-bypass.PNG | Bin
.../src/main/doc/modules/{api => core}/nav.adoc | 0
.../main/doc/modules/{api => core}/pages/about.adoc | 0
.../main/doc/modules/core/partials/module-nav.adoc | 2 ++
.../security/IsisModuleCoreSecurity.java} | 10 +++++-----
.../authentication/AuthenticationRequest.java | 2 +-
.../AuthenticationRequestAbstract.java | 2 +-
.../AuthenticationRequestPassword.java | 2 +-
.../authentication/AuthenticationSession.java | 4 ++--
.../AuthenticationSessionAbstract.java | 2 +-
.../AuthenticationSessionProvider.java | 2 +-
.../security}/authentication/MessageBroker.java | 2 +-
.../fixtures/AuthenticationRequestLogonFixture.java | 6 +++---
.../authentication/health/HealthAuthSession.java | 4 ++--
.../manager/AuthenticationManager.java | 16 ++++++++--------
.../authentication/manager/RegistrationDetails.java | 2 +-
.../singleuser/AuthenticationRequestSingleUser.java | 4 ++--
.../singleuser/SingleUserSession.java | 4 ++--
.../authentication/standard/Authenticator.java | 6 +++---
.../standard/AuthenticatorAbstract.java | 6 +++---
.../standard/NoAuthenticatorException.java | 2 +-
.../standard/RandomCodeGenerator.java | 2 +-
.../standard/RandomCodeGeneratorDefault.java | 2 +-
.../authentication/standard/Registrar.java | 4 ++--
.../standard/RegistrationDetailsPassword.java | 4 ++--
.../authentication/standard/SimpleSession.java | 4 ++--
.../authorization/manager/AuthorizationManager.java | 6 +++---
.../standard/AuthorizationConstants.java | 2 +-
.../authorization/standard/Authorizor.java | 2 +-
.../isis/security/EncodabilityContractTest.java | 2 +-
.../AuthenticationManager_authenticators_Test.java | 10 +++++-----
.../standard/AuthenticatorDefaultTest.java | 4 ++--
.../SimpleSessionEncodabilityNoRolesTest.java | 2 +-
.../SimpleSessionEncodabilityTestAbstract.java | 2 +-
.../SimpleSessionEncodabilityWithRolesTest.java | 2 +-
...ardAuthenticationManager_AuthenticationTest.java | 12 ++++++------
core/unittestsupport/pom.xml | 6 ++++++
.../core/webapp/context/memento/ObjectMemento.java | 4 ++--
.../wormhole/AuthenticationSessionWormhole.java | 2 +-
core/webspringboot/pom.xml | 2 +-
.../bootstrapping/builtin-domain-services.list | 16 ++++++++--------
.../bootstrapping/builtin-requestscoped.list | 4 ++--
.../secman/shiro/IsisModuleExtSecmanShiroRealm.java | 2 +-
.../examples/facets/jsr303/Jsr303FacetFactory.java | 12 ++++++------
.../facets/jsr303/Jsr303ProgModelFacets.java | 8 ++++----
.../jsr303/Jsr303PropertyValidationFacet.java | 18 +++++++++---------
.../examples/facets/jsr303/CustomPattern.java | 2 +-
.../facets/jsr303/CustomPatternValidator.java | 2 +-
.../examples/facets/jsr303/CustomPatterns.java | 2 +-
.../examples/facets/jsr303/DomainObjectVanilla.java | 2 +-
.../jsr303/DomainObjectWithBuiltInValidation.java | 2 +-
.../jsr303/DomainObjectWithCustomValidation.java | 2 +-
.../facets/jsr303/Jsr303FacetFacetHolder.java | 6 +++---
.../jsr303/Jsr303FacetFactoryFeatureTypes.java | 6 +++---
.../jsr303/Jsr303FacetFactoryInstantiation.java | 4 ++--
.../jsr303/Jsr303FacetFactoryProcessObject.java | 8 ++++----
.../jsr303/Jsr303FacetFactoryProcessProperty.java | 12 ++++++------
.../facets/jsr303/Jsr303FacetInstantiation.java | 6 +++---
.../jsr303/Jsr303FacetValidatingInteraction.java | 10 +++++-----
.../org/apache/isis/legacy/applib/value/Color.java | 2 +-
.../org/apache/isis/legacy/applib/value/Money.java | 2 +-
.../apache/isis/legacy/applib/value/Percentage.java | 2 +-
mavendeps/pom.xml | 10 ++++++++--
mavendeps/testing/pom.xml | 2 +-
.../objectadapter/ObjectAdapterContext.java | 2 +-
.../persistence/IsisPersistenceSessionJdoBase.java | 2 +-
.../IsisPlatformTransactionManagerForJdo.java | 2 +-
.../persistence/PersistenceSession5.java | 2 +-
.../persistence/PersistenceSessionFactory5.java | 2 +-
.../adapterfactory/pojo/PojoAdapterTest.java | 2 +-
.../runtime/system/ObjectMemberAbstractTest.java | 4 ++--
.../WrapperFactoryDefault_wrappedObject_Test.java | 4 ++--
...FactoryDefault_wrappedObject_transient_Test.java | 4 ++--
.../bypass/authentication/AuthenticatorBypass.java | 4 ++--
.../bypass/authorization/AuthorizorBypass.java | 2 +-
.../authentication/AuthenticatorKeycloak.java | 6 +++---
.../keycloak/authorization/AuthorizorKeycloak.java | 2 +-
.../security/keycloak/webmodule/KeycloakFilter.java | 4 ++--
.../shiro/authentication/AuthenticatorShiro.java | 12 ++++++------
.../shiro/authorization/AuthorizorShiro.java | 4 ++--
.../shiro/context/ShiroSecurityContext.java | 4 ++--
...oAuthenticatorOrAuthorizorTest_authenticate.java | 6 +++---
...nticatorOrAuthorizorTest_isVisibleInAnyRole.java | 4 ++--
subdomains/pom.xml | 4 +++-
subdomains/spring/pom.xml | 1 -
testing/fixtures/applib/pom.xml | 4 ++--
.../applib/modules/ModuleWithFixturesService.java | 2 +-
testing/pom.xml | 20 ++++++++++----------
.../valuetypes/asciidoc/applib/value/AsciiDoc.java | 2 +-
.../valuetypes/markdown/applib/value/Markdown.java | 2 +-
valuetypes/markdown/pom.xml | 20 ++++++++++++++++++++
.../restfulobjects/rendering/IResourceContext.java | 2 +-
.../viewer/resources/HomePageReprRenderer.java | 2 +-
.../viewer/resources/UserReprRenderer.java | 2 +-
.../auth/AuthenticationSessionStrategy.java | 4 ++--
.../auth/AuthenticationSessionStrategyAbstract.java | 2 +-
.../AuthenticationSessionStrategyBasicAuth.java | 4 ++--
.../auth/AuthenticationSessionStrategyDefault.java | 2 +-
...t_ensureCompatibleAcceptHeader_ContractTest.java | 2 +-
.../viewer/context/ResourceContext_getArg_Test.java | 2 +-
.../viewer/wicket/model/models/ScalarModel.java | 2 +-
.../serviceactions/TertiaryActionsPanel.java | 2 +-
.../widgets/breadcrumbs/BreadcrumbPanel.java | 2 +-
.../viewer/wicket/ui/errors/JGrowlBehaviour.java | 2 +-
.../isis/viewer/wicket/ui/errors/JGrowlUtil.java | 2 +-
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 2 +-
.../isis/viewer/wicket/ui/panels/FormAbstract.java | 2 +-
.../wicket/ui/panels/FormExecutorDefault.java | 4 ++--
.../isis/viewer/wicket/ui/panels/PanelBase.java | 2 +-
.../integration/AnonymousWebSessionForIsis.java | 2 +-
.../integration/AuthenticatedWebSessionForIsis.java | 8 ++++----
.../viewer/integration/WebRequestCycleForIsis.java | 4 ++--
...AuthenticatedWebSessionForIsis_Authenticate.java | 12 ++++++------
.../AuthenticatedWebSessionForIsis_SignIn.java | 10 +++++-----
...AuthenticatedWebSessionForIsis_TestAbstract.java | 2 +-
248 files changed, 498 insertions(+), 446 deletions(-)
diff --git a/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx b/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx
index e855177..05aebce 100644
Binary files a/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx and b/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx differ
diff --git a/antora/components/security/modules/ROOT/partials/component-nav.adoc b/antora/components/security/modules/ROOT/partials/component-nav.adoc
index ddfab02..b4a276b 100644
--- a/antora/components/security/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/security/modules/ROOT/partials/component-nav.adoc
@@ -1,5 +1,5 @@
include::security:ROOT:partial$module-nav.adoc[]
-include::security:api:partial$module-nav.adoc[]
+include::security:core:partial$module-nav.adoc[]
include::security:bypass:partial$module-nav.adoc[]
include::security:shiro:partial$module-nav.adoc[]
include::security:keycloak:partial$module-nav.adoc[]
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Facets.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Facets.java
index 804ca3f..db68ad0 100644
--- a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Facets.java
+++ b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Facets.java
@@ -39,7 +39,7 @@ import java.lang.annotation.Target;
public @interface Facets {
/**
* Array of fully qualified names of classes each implementing
- * <tt>org.apache.isis.metamodel.facets.FacetFactory</tt>.
+ * <tt>org.apache.isis.core.metamodel.facets.FacetFactory</tt>.
*
* <p>
* Either the array provided by this method or by
@@ -49,7 +49,7 @@ public @interface Facets {
/**
* Array of {@link Class}s, each indicating a class implementing
- * <tt>org.apache.isis.metamodel.facets.FacetFactory</tt>.
+ * <tt>org.apache.isis.core.metamodel.facets.FacetFactory</tt>.
*
* <p>
* Either the array provided by this method or by
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/tree/LazyTreeNode.java b/api/applib/src/main/doc/modules/applib-cm/examples/tree/LazyTreeNode.java
index f34b28f..bf39556 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/tree/LazyTreeNode.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/tree/LazyTreeNode.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.Value;
import org.apache.isis.commons.internal.base._Lazy;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-@Value(semanticsProviderName="org.apache.isis.metamodel.facets.value.treenode.TreeNodeValueSemanticsProvider")
+@Value(semanticsProviderName="org.apache.isis.core.metamodel.facets.value.treenode.TreeNodeValueSemanticsProvider")
public class LazyTreeNode<T> implements TreeNode<T> {
private final TreeState sharedState;
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/value/Image.java b/api/applib/src/main/doc/modules/applib-cm/examples/value/Image.java
index 73522ce..e282895 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/value/Image.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/value/Image.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.Value;
/**
* Represents an image.
*/
-@Value(semanticsProviderName = "org.apache.isis.metamodel.facets.value.image.ImageValueSemanticsProvider")
+@Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.value.image.ImageValueSemanticsProvider")
public class Image implements Serializable {
private static final long serialVersionUID = 1L;
private final int[][] image;
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/value/LocalResourcePath.java b/api/applib/src/main/doc/modules/applib-cm/examples/value/LocalResourcePath.java
index 34b45af..915bc2b 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/value/LocalResourcePath.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/value/LocalResourcePath.java
@@ -31,7 +31,7 @@ import lombok.NonNull;
/**
* Represents a local resource path, typically a relative path originating at this web-app's root or context-root.
*/
-@Value(semanticsProviderName = "org.apache.isis.metamodel.facets.value.localrespath.LocalResourcePathValueSemanticsProvider")
+@Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.value.localrespath.LocalResourcePathValueSemanticsProvider")
public final class LocalResourcePath implements Serializable {
private static final long serialVersionUID = 1L;
@NonNull private final String path;
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/value/Markup.java b/api/applib/src/main/doc/modules/applib-cm/examples/value/Markup.java
index 882ec47..c70d337 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/value/Markup.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/value/Markup.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.annotation.Value;
* Immutable value type holding pre-rendered HTML.
*
*/
-@Value(semanticsProviderName = "org.apache.isis.metamodel.facets.value.markup.MarkupValueSemanticsProvider")
+@Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.value.markup.MarkupValueSemanticsProvider")
public class Markup implements Serializable {
private static final long serialVersionUID = 1L;
private final String html;
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/value/Password.java b/api/applib/src/main/doc/modules/applib-cm/examples/value/Password.java
index a3ca4f5..6026d74 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/value/Password.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/value/Password.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
import org.apache.isis.applib.annotation.Value;
-@Value(semanticsProviderName = "org.apache.isis.metamodel.facets.value.password.PasswordValueSemanticsProvider")
+@Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.value.password.PasswordValueSemanticsProvider")
public class Password implements Serializable {
private static final long serialVersionUID = 1L;
private static final String STARS = "********************";
diff --git a/api/applib/src/main/java/org/apache/isis/applib/annotation/Facets.java b/api/applib/src/main/java/org/apache/isis/applib/annotation/Facets.java
index 804ca3f..db68ad0 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/annotation/Facets.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/annotation/Facets.java
@@ -39,7 +39,7 @@ import java.lang.annotation.Target;
public @interface Facets {
/**
* Array of fully qualified names of classes each implementing
- * <tt>org.apache.isis.metamodel.facets.FacetFactory</tt>.
+ * <tt>org.apache.isis.core.metamodel.facets.FacetFactory</tt>.
*
* <p>
* Either the array provided by this method or by
@@ -49,7 +49,7 @@ public @interface Facets {
/**
* Array of {@link Class}s, each indicating a class implementing
- * <tt>org.apache.isis.metamodel.facets.FacetFactory</tt>.
+ * <tt>org.apache.isis.core.metamodel.facets.FacetFactory</tt>.
*
* <p>
* Either the array provided by this method or by
diff --git a/api/applib/src/main/java/org/apache/isis/applib/tree/LazyTreeNode.java b/api/applib/src/main/java/org/apache/isis/applib/tree/LazyTreeNode.java
index 34001ce..673d3d1 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/tree/LazyTreeNode.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/tree/LazyTreeNode.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.Value;
import org.apache.isis.core.commons.internal.base._Lazy;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-@Value(semanticsProviderName="org.apache.isis.metamodel.facets.value.treenode.TreeNodeValueSemanticsProvider")
+@Value(semanticsProviderName="org.apache.isis.core.metamodel.facets.value.treenode.TreeNodeValueSemanticsProvider")
public class LazyTreeNode<T> implements TreeNode<T> {
private final TreeState sharedState;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/Image.java b/api/applib/src/main/java/org/apache/isis/applib/value/Image.java
index 73522ce..e282895 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/value/Image.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/value/Image.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.annotation.Value;
/**
* Represents an image.
*/
-@Value(semanticsProviderName = "org.apache.isis.metamodel.facets.value.image.ImageValueSemanticsProvider")
+@Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.value.image.ImageValueSemanticsProvider")
public class Image implements Serializable {
private static final long serialVersionUID = 1L;
private final int[][] image;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/LocalResourcePath.java b/api/applib/src/main/java/org/apache/isis/applib/value/LocalResourcePath.java
index 34b45af..915bc2b 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/value/LocalResourcePath.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/value/LocalResourcePath.java
@@ -31,7 +31,7 @@ import lombok.NonNull;
/**
* Represents a local resource path, typically a relative path originating at this web-app's root or context-root.
*/
-@Value(semanticsProviderName = "org.apache.isis.metamodel.facets.value.localrespath.LocalResourcePathValueSemanticsProvider")
+@Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.value.localrespath.LocalResourcePathValueSemanticsProvider")
public final class LocalResourcePath implements Serializable {
private static final long serialVersionUID = 1L;
@NonNull private final String path;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/Markup.java b/api/applib/src/main/java/org/apache/isis/applib/value/Markup.java
index 882ec47..c70d337 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/value/Markup.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/value/Markup.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.annotation.Value;
* Immutable value type holding pre-rendered HTML.
*
*/
-@Value(semanticsProviderName = "org.apache.isis.metamodel.facets.value.markup.MarkupValueSemanticsProvider")
+@Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.value.markup.MarkupValueSemanticsProvider")
public class Markup implements Serializable {
private static final long serialVersionUID = 1L;
private final String html;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/Password.java b/api/applib/src/main/java/org/apache/isis/applib/value/Password.java
index a3ca4f5..6026d74 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/value/Password.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/value/Password.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
import org.apache.isis.applib.annotation.Value;
-@Value(semanticsProviderName = "org.apache.isis.metamodel.facets.value.password.PasswordValueSemanticsProvider")
+@Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.value.password.PasswordValueSemanticsProvider")
public class Password implements Serializable {
private static final long serialVersionUID = 1L;
private static final String STARS = "********************";
diff --git a/api/schema/pom.xml b/api/schema/pom.xml
index bb7ca79..e2e1637 100644
--- a/api/schema/pom.xml
+++ b/api/schema/pom.xml
@@ -35,12 +35,6 @@
</properties>
<dependencies>
-<!--
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-core-commons</artifactId>
- </dependency>
--->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
diff --git a/core/codegen-bytebuddy/pom.xml b/core/codegen-bytebuddy/pom.xml
index 359f01c..0ad22a8 100644
--- a/core/codegen-bytebuddy/pom.xml
+++ b/core/codegen-bytebuddy/pom.xml
@@ -20,7 +20,7 @@
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
- a<artifactId>isis-core-codegen-bytebuddy</artifactId>
+ <artifactId>isis-core-codegen-bytebuddy</artifactId>
<name>Apache Isis Core - Code Gen (ByteBuddy)</name>
<description>
diff --git a/core/commons/pom.xml b/core/commons/pom.xml
index 61e5e00..3126113 100644
--- a/core/commons/pom.xml
+++ b/core/commons/pom.xml
@@ -28,8 +28,8 @@
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.commons</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/commons</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.core.commons</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/core/commons</git-plugin.propertiesDir>
</properties>
<build>
@@ -67,6 +67,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/core/config/pom.xml b/core/config/pom.xml
index 616853c..dbbdcfc 100644
--- a/core/config/pom.xml
+++ b/core/config/pom.xml
@@ -93,6 +93,11 @@
<type>test-jar</type>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
diff --git a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index 14bd2b8..f737b4b 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -1188,7 +1188,7 @@ public class IsisConfiguration {
* eg: {@code isis.value.format.datetime=iso}
* <p>
* A pre-determined list of values is available, specifically 'iso_encoding', 'iso' and 'medium' (see
- * <code>org.apache.isis.metamodel.facets.value.datetimejdk8local.Jdk8LocalDateTimeValueSemanticsProvider#NAMED_TITLE_FORMATTERS</code>).
+ * <code>org.apache.isis.core.metamodel.facets.value.datetimejdk8local.Jdk8LocalDateTimeValueSemanticsProvider#NAMED_TITLE_FORMATTERS</code>).
* Alternatively, can also specify a mask, eg <tt>dd-MMM-yyyy</tt>.
*/
DATETIME,
@@ -1198,7 +1198,7 @@ public class IsisConfiguration {
* eg: {@code isis.value.format.date=iso}
* <p>
* A pre-determined list of values is available, specifically 'iso_encoding', 'iso' and 'medium' (see
- * <code>org.apache.isis.metamodel.facets.value.datejdk8local.Jdk8LocalDateValueSemanticsProvider.NAMED_TITLE_FORMATTERS</code>).
+ * <code>org.apache.isis.core.metamodel.facets.value.datejdk8local.Jdk8LocalDateValueSemanticsProvider.NAMED_TITLE_FORMATTERS</code>).
* Alternatively, can also specify a mask, eg <tt>dd-MMM-yyyy</tt>.
*/
DATE,
diff --git a/core/config/src/main/java/org/apache/isis/core/config/presets/DebugDiscovery.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugDiscovery.properties
index 53d21fb..6ec936a 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/presets/DebugDiscovery.properties
+++ b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugDiscovery.properties
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-logging.level.org.apache.isis.config.beans.IsisBeanTypeRegistry = DEBUG
-logging.level.org.apache.isis.config.beans.IsisBeanFactoryPostProcessorForSpring = DEBUG
+logging.level.org.apache.isis.core.config.beans.IsisBeanTypeRegistry = DEBUG
+logging.level.org.apache.isis.core.config.beans.IsisBeanFactoryPostProcessorForSpring = DEBUG
diff --git a/core/config/src/main/java/org/apache/isis/core/config/presets/DebugMetaModel.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugMetaModel.properties
index c6e2e2a..5d008ee 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/presets/DebugMetaModel.properties
+++ b/core/config/src/main/java/org/apache/isis/core/config/presets/DebugMetaModel.properties
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-logging.level.org.apache.isis.metamodel.specloader.MetaModelValidatorServiceDefault = DEBUG
+logging.level.org.apache.isis.core.metamodel.specloader.MetaModelValidatorServiceDefault = DEBUG
logging.level.SpecificationLoaderDefault = DEBUG
\ No newline at end of file
diff --git a/core/config/src/main/java/org/apache/isis/core/config/presets/SilenceMetaModel.properties b/core/config/src/main/java/org/apache/isis/core/config/presets/SilenceMetaModel.properties
index 573565c..77aed6b 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/presets/SilenceMetaModel.properties
+++ b/core/config/src/main/java/org/apache/isis/core/config/presets/SilenceMetaModel.properties
@@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-logging.level.org.apache.isis.metamodel.specloader.MetaModelValidatorServiceDefault = WARN
+logging.level.org.apache.isis.core.metamodel.specloader.MetaModelValidatorServiceDefault = WARN
logging.level.SpecificationLoaderDefault = WARN
\ No newline at end of file
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
index 920cfed..cc0b8e4 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
@@ -23,7 +23,7 @@ import org.apache.isis.core.commons.internal.collections._Maps;
public class BidirectionalRelationshipContractTestAll extends BidirectionalRelationshipContractTestAbstract {
public BidirectionalRelationshipContractTestAll() {
- super("org.apache.isis.unittestsupport.bidir",
+ super("org.apache.isis.core.unittestsupport.bidir",
_Maps.<Class<?>,Instantiator>unmodifiable(
// no instantiator need be registered for ParentDomainObject.class;
// will default to using new InstantiatorSimple(AgreementForTesting.class),
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java
index ae1490d..a7ea30e 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java
@@ -29,10 +29,10 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.files.Files.Deleter;
-import org.apache.isis.unittestsupport.files.Files.Recursion;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.files.Files.Deleter;
+import org.apache.isis.core.unittestsupport.files.Files.Recursion;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class FilesTest_deleteFiles {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java
index 62efadc..8fcb405 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.unittestsupport.inject;
public class InjectServiceMethodMustBeFinalContractTestAll extends InjectServiceMethodMustBeFinalContractTestAbstract {
public InjectServiceMethodMustBeFinalContractTestAll() {
- super("org.apache.isis.unittestsupport.inject");
+ super("org.apache.isis.core.unittestsupport.inject");
withLoggingTo(System.out);
}
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
index db6bdea..9bdcedb 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
@@ -31,7 +31,7 @@ import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class IsisActionsTest_returnNewTransientInstance {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
index 66c1596..af57dee 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JMockActionsTest_returnArgument {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java
index b95eafb..d0aa901 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JMockActionsTest_returnEach {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java
index 8b83738..6976961 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java
@@ -24,7 +24,7 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
index eddf0ee..dd042d4 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
@@ -28,8 +28,8 @@ import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
index efdea13..6c82c6c 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
@@ -23,7 +23,7 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
index 601a9d9..6249a8a 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
@@ -24,8 +24,8 @@ import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
index f31fb63..630246a 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
@@ -28,8 +28,8 @@ import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
index 05b8183..e22c5a6 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
@@ -23,9 +23,9 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Allowing;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Allowing;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test_mockAnnotatedWithAllowing {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
index e22055e..b71427d 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
@@ -23,10 +23,10 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Checking;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ExpectationsOn;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Checking;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ExpectationsOn;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test_mockAnnotatedWithChecking {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
index afed4e2..21a33ef 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
@@ -23,9 +23,9 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Ignoring;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Ignoring;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JUnitRuleMockery2Test_mockAnnotatedWithIgnoring {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
index d7953f9..7f87f5b 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
@@ -23,9 +23,9 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Never;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Never;
public class JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
index b6aa7f8..162837e 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
@@ -24,9 +24,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Never;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Never;
public class JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
index 3e11207..363d0c1 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
@@ -23,9 +23,9 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.One;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.One;
public class JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
index 61f3a1d..7e14479 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
@@ -24,9 +24,9 @@ import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.One;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.ClassUnderTest;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.One;
public class JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java
index d3e1faa..b348df1 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.unittestsupport.sortedsets;
public class SortedSetsContractTestAll extends SortedSetsContractTestAbstract {
public SortedSetsContractTestAll() {
- super("org.apache.isis.unittestsupport.sortedsets");
+ super("org.apache.isis.core.unittestsupport.sortedsets");
withLoggingTo(System.out);
}
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 705045b..b21692c 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -109,13 +109,16 @@
</exclusions>
</dependency>
-<!--
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-commons</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-unittestsupport</artifactId>
<scope>test</scope>
</dependency>
--->
<dependency>
<groupId>org.apache.isis.core</groupId>
@@ -131,6 +134,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java
index 4a1affd..e5647aa 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/IsisModuleCoreMetamodel.java
@@ -50,14 +50,14 @@ import org.apache.isis.core.metamodel.services.user.UserServiceDefault;
import org.apache.isis.core.metamodel.valuetypes.ValueTypeProviderDefault;
import org.apache.isis.core.metamodel.valuetypes.ValueTypeProviderForCollections;
import org.apache.isis.core.metamodel.valuetypes.ValueTypeRegistry;
-import org.apache.isis.security.api.IsisModuleSecurityApi;
+import org.apache.isis.core.security.IsisModuleCoreSecurity;
@Configuration
@Import({
// modules
IsisModuleApplib.class,
IsisModuleCoreConfig.class,
- IsisModuleSecurityApi.class,
+ IsisModuleCoreSecurity.class,
// @Configuration's
MetaModelContexts.class,
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Parented.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Parented.java
index 551d207..7e12136 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Parented.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/Oid_Parented.java
@@ -25,6 +25,7 @@ import java.util.Objects;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import static org.apache.isis.core.commons.internal.base._With.requires;
+import static org.apache.isis.core.metamodel.adapter.oid.Oid.*;
final class Oid_Parented implements ParentedOid {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ParentedOid.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ParentedOid.java
index f721fba..a2b87e1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ParentedOid.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/ParentedOid.java
@@ -23,6 +23,8 @@ import org.apache.isis.applib.annotation.Collection;
import org.apache.isis.core.commons.internal.url.UrlDecoderUtil;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import static org.apache.isis.core.metamodel.adapter.oid.Oid.unmarshaller;
+
/**
* Used as the {@link Oid} for {@link OneToManyAssociation} (collections).
*/
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/AuthorizationFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/AuthorizationFacetAbstract.java
index 6f569c9..a022310 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/AuthorizationFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/AuthorizationFacetAbstract.java
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.interactions.UsabilityContext;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
-import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
+import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/package-info.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/package-info.java
index ea27f71..b14f48f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/package-info.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/authorization/standard/package-info.java
@@ -23,10 +23,10 @@
* <p>
* Used in two different ways:
* <ul>
- * <li>in prototyping or single user, used by the {@link org.apache.isis.runtimes.dflt.runtime.authorization.standard.AuthorizationFacetFactoryImpl facet factory}
+ * <li>in prototyping or single user, used by the {@link org.apache.isis.core.runtimes.dflt.runtime.authorization.standard.AuthorizationFacetFactoryImpl facet factory}
* implementations, that is, enforcing authorization on the "client-side".
* </li>
- * <li>In client/server mode, used by a {@link org.apache.isis.metamodel.facetdecorator.FacetDecorator} for proxy authorization,
+ * <li>In client/server mode, used by a {@link org.apache.isis.core.metamodel.facetdecorator.FacetDecorator} for proxy authorization,
* that is, enforcing authorization by delegating to the "server-side".</li>
* </ul>
*/
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext.java
index 756a480..5a2586b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext.java
@@ -34,10 +34,10 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.services.homepage.HomePageAction;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
-import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
/**
*
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext_usingIoc.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext_usingIoc.java
index 81a5e90..ee90a02 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext_usingIoc.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/context/MetaModelContext_usingIoc.java
@@ -42,9 +42,9 @@ import org.apache.isis.core.metamodel.services.ServiceUtil;
import org.apache.isis.core.metamodel.services.homepage.HomePageAction;
import org.apache.isis.core.metamodel.services.homepage.HomePageResolverService;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
-import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
import lombok.Getter;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassFacet.java
index 11a08fd..dec9798 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclass/CssClassFacet.java
@@ -31,7 +31,7 @@ public interface CssClassFacet extends Facet {
/**
* return custom CSS (if any) for provided {@link ManagedObject object}.
*
- * @param objectAdapter - to evaluate. May be <tt>null</tt> in exceptional circumstances (specifically: the {@link org.apache.isis.metamodel.layoutmetadata.json.LayoutMetadataReaderFromJson#asJson(ObjectSpecification)} which generates <tt>xxx.layout.json</tt> for a spec without recourse to any given object).
+ * @param objectAdapter - to evaluate. May be <tt>null</tt> in exceptional circumstances (specifically: the {@link org.apache.isis.core.metamodel.layoutmetadata.json.LayoutMetadataReaderFromJson#asJson(ObjectSpecification)} which generates <tt>xxx.layout.json</tt> for a spec without recourse to any given object).
*/
public String cssClass(final ManagedObject objectAdapter);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
index 43e1ad0..ccaaae4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/hidden/HiddenFacetAbstract.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.interactions.VisibilityContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
/**
- * This implements {@link org.apache.isis.metamodel.facetapi.MultiTypedFacet} so that each concrete implementation
+ * This implements {@link org.apache.isis.core.metamodel.facetapi.MultiTypedFacet} so that each concrete implementation
* is added to the eventual {@link FacetHolder} twice: once under
* <tt>HiddeFacet.class</tt> and once under its own concrete type class (eg <tt>HiddenFacetForActionAnnotation</tt>).
* This satisfies a couple of (independent) requirements:
@@ -41,7 +41,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
* <li>that we don't have the concept of a single (blessed?) HiddenFacet; rather there are simply facets some of
* which implement {@link HidingInteractionAdvisor}</li>
* <li>that there is nevertheless always at least one facet that is registered under <tt>HiddenFacet.class</tt>;
- * this is used by the {@link org.apache.isis.metamodel.layoutmetadata.json.LayoutMetadataReaderFromJson} exporter</li>
+ * this is used by the {@link org.apache.isis.core.metamodel.layoutmetadata.json.LayoutMetadataReaderFromJson} exporter</li>
* </ul>
* <p>
* Note that the {@link FacetUtil#getFacets(java.util.Map, Predicate)}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java
index 5a3fbd1..0edf94f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/immutable/ImmutableFacetAbstract.java
@@ -44,9 +44,9 @@ public abstract class ImmutableFacetAbstract extends FacetAbstract implements Im
public String disables(final UsabilityContext<? extends UsabilityEvent> ic) {
final ManagedObject target = ic.getTarget();
switch (ic.getInteractionType()) {
- case InteractionContextType.PROPERTY_MODIFY:
- case InteractionContextType.COLLECTION_ADD_TO:
- case InteractionContextType.COLLECTION_REMOVE_FROM:
+ case PROPERTY_MODIFY:
+ case COLLECTION_ADD_TO:
+ case COLLECTION_REMOVE_FROM:
return disabledReason(target);
default:
return null;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
index 848469c..09f256e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/object/recreatable/RecreatableObjectFacetFactory.java
@@ -50,7 +50,7 @@ implements MetaModelRefiner, PostConstructMethodCache {
}
/**
- * We simply attach all facets we can find; the {@link #refineMetaModelValidator(org.apache.isis.metamodel.specloader.validator.MetaModelValidatorComposite, IsisConfiguration) meta-model validation} will detect if multiple interfaces/annotations have
+ * We simply attach all facets we can find; the {@link #refineMetaModelValidator(org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorComposite, IsisConfiguration) meta-model validation} will detect if multiple interfaces/annotations have
* been attached.
*/
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
index 6255567..d55d98b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/interactions/InteractionContext.java
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.consent.InteractionContextType;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
/**
* Represents an interaction between the framework and (a {@link Facet} of) the
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
index 62244d4..14c1bbc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/progmodel/ProgrammingModelInitFilterDefault.java
@@ -31,6 +31,8 @@ import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
import org.apache.isis.core.metamodel.facets.FacetFactory;
+import static org.apache.isis.core.metamodel.progmodel.ProgrammingModelInitFilter.*;
+
import lombok.val;
/**
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java
index f410f1c..b79d7b3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/classsubstitutor/ClassSubstitutorDefault.java
@@ -60,7 +60,7 @@ public class ClassSubstitutorDefault extends ClassSubstitutorAbstract {
private void ignoreApacheIsisInternals() {
// can't ignoring this class ... will result in NPEs...
- // ignoreClass("org.apache.isis.commons.internal.ioc.spring.BeanAdapterSpring");
+ // ignoreClass("org.apache.isis.core.commons.internal.ioc.spring.BeanAdapterSpring");
}
protected void ignoreJacksonAndGson() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitlesAndTranslationsValidator.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitlesAndTranslationsValidator.java
index b146eb9..216ed18 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitlesAndTranslationsValidator.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/title/TitlesAndTranslationsValidator.java
@@ -138,7 +138,7 @@ public class TitlesAndTranslationsValidator extends MetaModelValidatorAbstract {
val translationService = serviceRegistry.lookupServiceElseFail(TranslationService.class);
// as used by the Wicket UI
- final String context = "org.apache.isis.runtime.system.session.IsisSessionFactory";
+ final String context = "org.apache.isis.core.runtime.system.session.IsisSessionFactory";
final MessageRegistry messageRegistry = new MessageRegistry();
for (String message : messageRegistry.listMessages()) {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
index 4901a5b..63e2607 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/user/UserServiceDefault.java
@@ -37,7 +37,7 @@ import org.apache.isis.applib.security.UserMemento;
import org.apache.isis.applib.services.sudo.SudoService;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.core.commons.collections.Can;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import lombok.val;
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
index 0ef8190..97cc115 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/ObjectSpecification.java
@@ -59,7 +59,7 @@ import org.apache.isis.core.metamodel.facets.object.immutable.ImmutableFacet;
import org.apache.isis.core.metamodel.facets.object.parented.ParentedCollectionFacet;
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import lombok.val;
@@ -206,7 +206,7 @@ public interface ObjectSpecification extends Specification, ObjectActionContaine
* Returns the CSS class name to use for the specified object.
*
* <p>
- * Corresponds to the {@link CssClassFacet#cssClass(org.apache.isis.metamodel.spec.Instance)} value}
+ * Corresponds to the {@link CssClassFacet#cssClass(org.apache.isis.core.metamodel.spec.Instance)} value}
* returned by the {@link CssClassFacet}.
*
* @param objectAdapter - to evaluate (may be <tt>null</tt> if called by deprecated {@link #getCssClass}).
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
index 9b8aa5c..52e7caf 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/spec/feature/ObjectMember.java
@@ -144,7 +144,7 @@ public interface ObjectMember extends ObjectFeature {
*
* <p>
* For the former case, is thrown by
- * {@link ObjectAction#executeWithRuleChecking(ObjectAdapter, ObjectAdapter[], org.apache.isis.commons.authentication.AuthenticationSession, org.apache.isis.applib.annotation.Where)}
+ * {@link ObjectAction#executeWithRuleChecking(ObjectAdapter, ObjectAdapter[], org.apache.isis.core.commons.authentication.AuthenticationSession, org.apache.isis.applib.annotation.Where)}
* when the action being executed is not visible or not usable for the specified session. One reason this
* might occur if there was an attempt to construct a URL (eg a bookmarked action) and invoke in an unauthenticated session.
* </p>
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/package-info.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/package-info.java
index 5fc5386..2d2563f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/package-info.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/package-info.java
@@ -28,15 +28,15 @@
* Concrete implementations are in the <tt>programmingmodel-xxx-impl</tt> modules. These
* are expected to be based heavily on <tt>ObjectReflectorAbstract</tt>, defined in
* <tt>nof-core</tt>. This implementation defines two further sub-APIs which are based on
- * the {@link org.apache.isis.core.metamodel.facetapi.Facet}s and {@link org.apache.isis.metamodel.facetdecorator.FacetDecorator}s:
+ * the {@link org.apache.isis.core.metamodel.facetapi.Facet}s and {@link org.apache.isis.core.metamodel.facetdecorator.FacetDecorator}s:
* <ul>
* <li> the {@link ProgrammingModelInstaller} is used to specify the collection of {@link org.apache.isis.core.metamodel.facets.FacetFactory}s
* that will be used to actually process and build up the metamodel.
* <li> the {@link FacetDecoratorInstaller} API specifies how {@link org.apache.isis.core.metamodel.facetapi.Facet}, once created,
* can be additionally decorated to modify their behaviour. A number of other components are implemented as
- * {@link org.apache.isis.metamodel.facetdecorator.FacetDecorator}s, such as {@link org.apache.isis.authorization.AuthorisationFacetDecorator authorisation},
+ * {@link org.apache.isis.core.metamodel.facetdecorator.FacetDecorator}s, such as {@link org.apache.isis.authorization.AuthorisationFacetDecorator authorisation},
* {@link org.apache.isis.help.HelpFacetDecorator help}, and {@link org.apache.isis.transaction.facetdecorator.TransactionFacetDecorator transactions}. However
- * it is possible for other {@link org.apache.isis.metamodel.facetdecorator.FacetDecorator}s to be defined and installed also (such as <tt>i18n</tt>).
+ * it is possible for other {@link org.apache.isis.core.metamodel.facetdecorator.FacetDecorator}s to be defined and installed also (such as <tt>i18n</tt>).
* </ul>
*
*/
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index bb79f56..bee946c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -89,7 +89,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java
index 9cdeb70..ac12b31 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_configTest.java
@@ -25,8 +25,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
index 0f3ea6d..95eb59a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/MetaModelContext_forTesting.java
@@ -48,12 +48,12 @@ import org.apache.isis.core.metamodel.services.homepage.HomePageAction;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.SpecificationLoaderDefault;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
-import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
+import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
import lombok.Builder;
import lombok.Getter;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java
index 46d9420..19357fa 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/CollectionOidTest_valueSemantics.java
@@ -22,7 +22,7 @@ import java.util.Arrays;
import java.util.List;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
+import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
public class CollectionOidTest_valueSemantics extends ValueTypeContractTestAbstract<ParentedOid> {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java
index 3d11aa3..7fd4921 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenPersistent.java
@@ -22,7 +22,7 @@ import java.util.Arrays;
import java.util.List;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
+import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
public class RootOidDefaultTest_valueSemantics_whenPersistent extends ValueTypeContractTestAbstract<RootOid> {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenTransient.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenTransient.java
index c0a0e44..327d03c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenTransient.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefaultTest_valueSemantics_whenTransient.java
@@ -22,7 +22,7 @@ import java.util.Arrays;
import java.util.List;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
+import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
public class RootOidDefaultTest_valueSemantics_whenTransient extends ValueTypeContractTestAbstract<RootOid> {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
index 6b2b5e1..c0d04f8 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryJUnit4TestCase.java
@@ -48,9 +48,9 @@ import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneActionParameter;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public abstract class AbstractFacetFactoryJUnit4TestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
index bdd3da4..b2d37d5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/AbstractFacetFactoryTest.java
@@ -36,9 +36,9 @@ import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import junit.framework.TestCase;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java
index 5ce10b3..74398d1 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ObjectAdapterUtilsTest.java
@@ -28,8 +28,8 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ObjectAdapterUtilsTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
index c9c26ef..a51119f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/ActionMethodsFacetFactoryTest.java
@@ -52,8 +52,8 @@ import org.apache.isis.core.metamodel.facets.param.defaults.methodnum.ActionPara
import org.apache.isis.core.metamodel.facets.param.defaults.methodnum.ActionParameterDefaultsFacetViaMethodFactory;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.testspec.ObjectSpecificationStub;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
index dabe879..7a890bf 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/action/ActionAnnotationFacetFactoryTest.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.config.metamodel.facets.PublishActionsConfiguration;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.metamodel.facets.object.domainobject.domainevents.ActionDomainEventDefaultFacetForDomainObjectAnnotation;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java
index 339731b..d2d3755 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/actions/prototype/PrototypeFacetAbstractTest.java
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals;
import org.apache.isis.core.commons.internal.environment.DeploymentType;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.interactions.VisibilityContext;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class PrototypeFacetAbstractTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
index 18b6fa7..f0d1b15 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/CollectionFieldMethodsFacetFactoryTest.java
@@ -50,8 +50,8 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.facets.collections.clear.CollectionClearFacetFactory;
import org.apache.isis.core.metamodel.facets.collections.clear.CollectionClearFacetViaAccessor;
import org.apache.isis.core.metamodel.facets.collections.clear.CollectionClearFacetViaClearMethod;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java
index c352216..49503cd 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java
@@ -38,8 +38,8 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.collections.javautilcollection.JavaCollectionFacet;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class JavaCollectionFacetTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
index 2b83006..5695681 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ViewModelSemanticCheckingFacetFactoryTest.java
@@ -41,8 +41,8 @@ import org.apache.isis.core.metamodel.progmodel.ProgrammingModelAbstract;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModelInitFilterDefault;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorAbstract;
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
-import org.apache.isis.unittestsupport.config.internal._Config;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
index 65b82a5..00a0ff3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
@@ -24,7 +24,7 @@ import org.apache.isis.applib.annotation.Defaulted;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryTest;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.core.metamodel.facets.object.defaults.annotcfg.DefaultedFacetAnnotationElseConfigurationFactory;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class DefaultedFacetFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
index ad4104b..3d14a9a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobject/DomainObjectAnnotationFacetFactoryTest.java
@@ -60,7 +60,7 @@ import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObj
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.choices.ChoicesFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
index c7e3059..fea2797 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/domainobjectlayout/DomainObjectLayoutFactoryTest.java
@@ -47,7 +47,7 @@ import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaFacet;
import org.apache.isis.core.metamodel.facets.members.cssclassfa.CssClassFaPosition;
import org.apache.isis.core.metamodel.facets.object.bookmarkpolicy.BookmarkPolicyFacet;
import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class DomainObjectLayoutFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
index 22ad752..4b538d4 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleAnnotationFacetFactoryTest.java
@@ -43,8 +43,8 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.AbstractFacetFactoryJUnit4TestCase;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
public class TitleAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
index a5dd9b7..722563d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/ident/title/annotation/TitleFacetViaTitleAnnotationTest.java
@@ -41,8 +41,8 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.Annotations;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class TitleFacetViaTitleAnnotationTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java
index ba0d200..b4da653 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/navparent/annotation/NavigableParentAnnotationFacetFactoryTest.java
@@ -36,8 +36,8 @@ import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessClassContext;
import org.apache.isis.core.metamodel.facets.object.navparent.NavigableParentFacet;
import org.apache.isis.core.metamodel.facets.object.navparent.annotation.NavigableParentTestSamples.DomainObjectA;
import org.apache.isis.core.metamodel.facets.object.navparent.method.NavigableParentFacetMethod;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
public class NavigableParentAnnotationFacetFactoryTest extends AbstractFacetFactoryJUnit4TestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
index 26560f9..71be3d6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/parseable/ParseableFacetUsingParserTest.java
@@ -36,9 +36,9 @@ import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.parseable.parser.ParseableFacetUsingParser;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ParseableFacetUsingParserTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
index 0c00da5..bef8f2c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.facets.object.value.annotcfg.ValueFacetAnn
import org.apache.isis.core.metamodel.facets.object.value.annotcfg.ValueFacetAnnotationOrConfigurationFactory;
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderUtil;
import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java
index f6c918e..3ba024d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/DeweyOrderSetTest.java
@@ -34,7 +34,7 @@ import org.apache.isis.core.metamodel.facetapi.IdentifiedHolder;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.members.order.annotprop.MemberOrderFacetAnnotation;
import org.apache.isis.core.metamodel.layout.DeweyOrderSet;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import junit.framework.TestCase;
import junit.framework.TestSuite;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java
index b4a2b84..9eb2c9b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderAnnotationFacetFactoryTest.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.facets.FacetFactory.ProcessMethodContext;
import org.apache.isis.core.metamodel.facets.members.order.MemberOrderFacet;
import org.apache.isis.core.metamodel.facets.members.order.annotprop.MemberOrderFacetAnnotation;
import org.apache.isis.core.metamodel.facets.members.order.annotprop.MemberOrderFacetFactory;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class MemberOrderAnnotationFacetFactoryTest extends AbstractFacetFactoryTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderComparatorTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderComparatorTest.java
index f132417..621bcd5 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderComparatorTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/ordering/memberorder/MemberOrderComparatorTest.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.commons.internal.context._Context;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.facets.members.order.annotprop.MemberOrderFacetAnnotation;
import org.apache.isis.core.metamodel.layout.memberorderfacet.MemberOrderComparator;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import junit.framework.TestCase;
import junit.framework.TestSuite;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
index 52f8a3b..a819306 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/promptstyle/PromptStyleFacetFromPropertyAnnotation_Test.java
@@ -39,7 +39,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.promptStyle.PromptStyleFacet;
import org.apache.isis.core.metamodel.facets.object.promptStyle.PromptStyleFacetAsConfigured;
import org.apache.isis.core.metamodel.facets.properties.propertylayout.PromptStyleFacetForPropertyLayoutAnnotation;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class PromptStyleFacetFromPropertyAnnotation_Test {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
index bb5d30d..58f55fb 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/properties/property/PropertyAnnotationFacetFactoryTest.java
@@ -76,7 +76,7 @@ import org.apache.isis.core.metamodel.facets.properties.update.modify.PropertySe
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
index 1bab314..9f6d7fa 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigDecimalValueSemanticsProviderTest.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class BigDecimalValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
index 30fa373..ab68e5e 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/BigIntValueSemanticsProviderTest.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class BigIntValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
index afc3ee7..046dd4c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ByteValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.bytes.ByteValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.bytes.ByteWrapperValueSemanticsProvider;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class ByteValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
index 862c9db..aeefa19 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/DoubleValueSemanticsProviderTest.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.doubles.DoubleWrapperValueSemanticsProvider;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class DoubleValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
index 30bbe6e..d6f669c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/FloatValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.floats.FloatValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.floats.FloatWrapperValueSemanticsProvider;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class FloatValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
index 34f6bf6..104f00d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ImageValueSemanticsProviderAbstractTest.java
@@ -32,9 +32,9 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.value.image.ImageValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ImageValueSemanticsProviderAbstractTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
index 6d6b0c6..552f950 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/IntValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.integer.IntValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.integer.IntWrapperValueSemanticsProvider;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class IntValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
index e160d5b..8a555b3 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlDateValueSemanticsProviderTest.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.datesql.JavaSqlDateValueSemanticsProvider;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class JavaSqlDateValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
index bea1dbf..e55359b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java
@@ -33,7 +33,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.value.timesql.JavaSqlTimeValueSemanticsProvider;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class JavaSqlTimeValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
index 0b8bd67..c981cf2 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaUtilDateValueSemanticsProviderTest.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.dateutil.JavaUtilDateValueSemanticsProvider;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class JavaUtilDateValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
index f513e69..e248f7d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/LongValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.longs.LongValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.longs.LongWrapperValueSemanticsProvider;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class LongValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
index 6227a29..7962e7d 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ShortValueSemanticsProviderTest.java
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
import org.apache.isis.core.metamodel.facets.value.shortint.ShortValueSemanticsProviderAbstract;
import org.apache.isis.core.metamodel.facets.value.shortint.ShortWrapperValueSemanticsProvider;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class ShortValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
index da3cfce..069873f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/ValueSemanticsProviderAbstractTestCase.java
@@ -45,10 +45,10 @@ import org.apache.isis.core.metamodel.facets.object.encodeable.encoder.Encodable
import org.apache.isis.core.metamodel.facets.object.parseable.ParseableFacet;
import org.apache.isis.core.metamodel.facets.object.parseable.parser.ParseableFacetUsingParser;
import org.apache.isis.core.metamodel.facets.object.value.vsp.ValueSemanticsProviderAndFacetAbstract;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.unittestsupport.config.internal._Config;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public abstract class ValueSemanticsProviderAbstractTestCase {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
index f67c857..e2a4186 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
@@ -32,8 +32,8 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.unittestsupport.config.internal._Config;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class JodaLocalDateTimeValueSemanticsProviderTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationPredicatesTest_visibleWhere.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationPredicatesTest_visibleWhere.java
index 1dbeae3..87b4806 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationPredicatesTest_visibleWhere.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/feature/ObjectAssociationPredicatesTest_visibleWhere.java
@@ -42,8 +42,8 @@ import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facets.WhereValueFacet;
import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
@RunWith(Parameterized.class)
public class ObjectAssociationPredicatesTest_visibleWhere {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java
index 9f228a9..0cf2058 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java
@@ -39,8 +39,8 @@ import static org.hamcrest.Matchers.lessThan;
import static org.junit.Assert.assertThat;
import org.apache.isis.applib.services.appfeat.ApplicationMemberType;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
public class ApplicationFeatureIdTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
index 168fd97..6d25e07 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefaultTest.java
@@ -56,7 +56,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class ApplicationFeatureRepositoryDefaultTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerDocDefault_recognizes_Test.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerDocDefault_recognizes_Test.java
index 5b4bc97..04210ba 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerDocDefault_recognizes_Test.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/exceprecog/ExceptionRecognizerDocDefault_recognizes_Test.java
@@ -27,8 +27,8 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ExceptionRecognizerDocDefault_recognizes_Test {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefaultTest.java
index 6d6aa51..071c385 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefaultTest.java
@@ -53,8 +53,8 @@ import org.apache.isis.core.metamodel.spec.Hierarchical;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionDefault;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
class MetaModelServiceDefaultTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_valueSemantics.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_valueSemantics.java
index 3693d85..e324b16 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_valueSemantics.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/spec/ObjectSpecIdTest_valueSemantics.java
@@ -21,7 +21,7 @@ package org.apache.isis.core.metamodel.spec;
import java.util.Arrays;
import java.util.List;
-import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
+import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
public class ObjectSpecIdTest_valueSemantics extends ValueTypeContractTestAbstract<ObjectSpecId> {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java
index 5607022..f99aa12 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationCacheDefaultTest.java
@@ -32,8 +32,8 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
index 2b85973..3c2def6 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
@@ -49,7 +49,7 @@ import org.apache.isis.core.metamodel.progmodels.dflt.ProgrammingModelFacetsJava
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.facets.collections.modify.CollectionFacet;
import org.apache.isis.core.metamodel.facets.object.plural.PluralFacet;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import lombok.val;
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
index b3badc3..a72c159 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionParameterAbstractTest_getId_and_getName.java
@@ -40,8 +40,8 @@ import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ObjectActionParameterAbstractTest_getId_and_getName {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
index 453a1ec..a2ec67c 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest.java
@@ -43,8 +43,8 @@ import org.apache.isis.core.metamodel.interactions.VisibilityContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ObjectAssociationAbstractTest {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
index 2b92020..243c600 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectAssociationAbstractTest_alwaysHidden.java
@@ -46,8 +46,8 @@ import org.apache.isis.core.metamodel.interactions.VisibilityContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ObjectAssociationAbstractTest_alwaysHidden {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
index aec4394..5cfa3af 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/testspec/ObjectSpecificationStub.java
@@ -47,7 +47,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
public class ObjectSpecificationStub extends FacetHolderImpl implements ObjectSpecification {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java
index 455e914..664ee57 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java
@@ -27,7 +27,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidExcep
import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
/**
* Provides static access to current context's singletons
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContext.java
index 68b742d..9e7cf4f 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContext.java
@@ -24,7 +24,7 @@ import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.services.homepage.HomePageAction;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
/**
* TODO [2033] this was introduced when refactoring, maybe use MetaModelContext instead if possible
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContextBase.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContextBase.java
index e7c3b34..0637c09 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContextBase.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContextBase.java
@@ -29,8 +29,8 @@ import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.services.homepage.HomePageAction;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import lombok.Getter;
import lombok.val;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSessionFactory.java
index 84200a2..98717e6 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSessionFactory.java
@@ -19,7 +19,7 @@
package org.apache.isis.core.runtime.persistence.session;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
public interface PersistenceSessionFactory {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisRequestCycle.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisRequestCycle.java
index 535a6e6..11431ec 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisRequestCycle.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisRequestCycle.java
@@ -22,7 +22,7 @@ import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionTemplate;
import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSession.java
index 1f4fd96..25ea526 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSession.java
@@ -29,8 +29,8 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.runtime.context.session.RuntimeContextBase;
import org.apache.isis.core.runtime.context.session.RuntimeEventService;
import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.MessageBroker;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.MessageBroker;
import lombok.Getter;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactory.java
index e27f672..cf8ad41 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactory.java
@@ -25,7 +25,7 @@ import javax.inject.Inject;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.core.runtime.session.init.InitialisationSession;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
/**
* Is the factory of {@link IsisSession}s, also holding a reference to the current session using
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactoryDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactoryDefault.java
index 378e729..b91e4bf 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactoryDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactoryDefault.java
@@ -48,8 +48,8 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.context.session.RuntimeEventService;
import org.apache.isis.core.runtime.session.init.IsisLocaleInitializer;
import org.apache.isis.core.runtime.session.init.IsisTimeZoneInitializer;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import static org.apache.isis.core.commons.internal.base._With.requires;
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/InitialisationSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/InitialisationSession.java
index 3f04fc4..ce2950a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/InitialisationSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/InitialisationSession.java
@@ -22,7 +22,7 @@ package org.apache.isis.core.runtime.session.init;
import java.io.IOException;
import org.apache.isis.core.commons.internal.encoding.DataInputExtended;
-import org.apache.isis.security.api.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.core.security.authentication.AuthenticationSessionAbstract;
public final class InitialisationSession extends AuthenticationSessionAbstract {
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/template/AbstractIsisSessionTemplate.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/template/AbstractIsisSessionTemplate.java
index b6ffe3a..4eb7ad2 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/session/template/AbstractIsisSessionTemplate.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/template/AbstractIsisSessionTemplate.java
@@ -24,7 +24,7 @@ import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
public abstract class AbstractIsisSessionTemplate {
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
index b44b832..b432880 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
@@ -38,7 +38,7 @@ import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
import org.apache.isis.core.metamodel.facets.all.named.NamedFacetAbstract;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionDefault;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
index c7154f8..fe10470 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
@@ -43,7 +43,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.OneToManyAssociationDefault;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/auth/AuthenticationSessionProviderDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/auth/AuthenticationSessionProviderDefault.java
index 8534674..8545e3d 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/auth/AuthenticationSessionProviderDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/auth/AuthenticationSessionProviderDefault.java
@@ -30,9 +30,9 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.core.metamodel.services.user.UserServiceDefault;
import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.security.api.authentication.standard.SimpleSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.security.authentication.standard.SimpleSession;
import lombok.val;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/message/MessageServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/message/MessageServiceDefault.java
index bce6d69..d1a0d98 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/message/MessageServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/message/MessageServiceDefault.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.MessageBroker;
+import org.apache.isis.core.security.authentication.MessageBroker;
@Service
@Named("isisRuntimeServices.MessageServiceDefault")
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userprof/UserProfileServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userprof/UserProfileServiceDefault.java
index bb8b111..0060840 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userprof/UserProfileServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userprof/UserProfileServiceDefault.java
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.userprof.UserProfileService;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
@Service
@Named("isisRuntimeServices.UserProfileServiceDefault")
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
index 03d463d..596d5dc 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
@@ -67,7 +67,7 @@ import org.apache.isis.core.metamodel.specloader.specimpl.ContributeeMember;
import org.apache.isis.core.metamodel.specloader.specimpl.MixedInMember;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionContributee;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import lombok.val;
diff --git a/core/security/pom.xml b/core/security/pom.xml
index d1d356a..3492f17 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -24,7 +24,6 @@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>isis-core-security</artifactId>
@@ -78,6 +77,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
</project>
diff --git a/core/security/src/main/doc/modules/api/partials/module-nav.adoc b/core/security/src/main/doc/modules/api/partials/module-nav.adoc
deleted file mode 100644
index e636f85..0000000
--- a/core/security/src/main/doc/modules/api/partials/module-nav.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-* xref:security:api:about.adoc[API]
-
diff --git a/core/security/src/main/doc/modules/api/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG b/core/security/src/main/doc/modules/core/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
similarity index 100%
rename from core/security/src/main/doc/modules/api/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
rename to core/security/src/main/doc/modules/core/images/security/security-apis-impl/configure-isis-to-use-bypass.PNG
diff --git a/core/security/src/main/doc/modules/api/nav.adoc b/core/security/src/main/doc/modules/core/nav.adoc
similarity index 100%
rename from core/security/src/main/doc/modules/api/nav.adoc
rename to core/security/src/main/doc/modules/core/nav.adoc
diff --git a/core/security/src/main/doc/modules/api/pages/about.adoc b/core/security/src/main/doc/modules/core/pages/about.adoc
similarity index 100%
rename from core/security/src/main/doc/modules/api/pages/about.adoc
rename to core/security/src/main/doc/modules/core/pages/about.adoc
diff --git a/core/security/src/main/doc/modules/core/partials/module-nav.adoc b/core/security/src/main/doc/modules/core/partials/module-nav.adoc
new file mode 100644
index 0000000..0bf37dd
--- /dev/null
+++ b/core/security/src/main/doc/modules/core/partials/module-nav.adoc
@@ -0,0 +1,2 @@
+* xref:security:core:about.adoc[API]
+
diff --git a/core/security/src/main/java/org/apache/isis/security/api/IsisModuleSecurityApi.java b/core/security/src/main/java/org/apache/isis/core/security/IsisModuleCoreSecurity.java
similarity index 77%
rename from core/security/src/main/java/org/apache/isis/security/api/IsisModuleSecurityApi.java
rename to core/security/src/main/java/org/apache/isis/core/security/IsisModuleCoreSecurity.java
index ae9cbfd..b5349f9 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/IsisModuleSecurityApi.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/IsisModuleCoreSecurity.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.security.api;
+package org.apache.isis.core.security;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
-import org.apache.isis.security.api.authentication.standard.RandomCodeGeneratorDefault;
-import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.standard.RandomCodeGeneratorDefault;
+import org.apache.isis.core.security.authorization.manager.AuthorizationManager;
@Configuration
@Import({
@@ -34,5 +34,5 @@ import org.apache.isis.security.api.authorization.manager.AuthorizationManager;
// @Component's
RandomCodeGeneratorDefault.class,
})
-public class IsisModuleSecurityApi {
+public class IsisModuleCoreSecurity {
}
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequest.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequest.java
similarity index 96%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequest.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequest.java
index 88cc8df..f9aeab5 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequest.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication;
+package org.apache.isis.core.security.authentication;
import java.util.Collection;
import java.util.stream.Stream;
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestAbstract.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequestAbstract.java
similarity index 96%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestAbstract.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequestAbstract.java
index ec83086..02e7c50 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestAbstract.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequestAbstract.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication;
+package org.apache.isis.core.security.authentication;
import java.util.Set;
import java.util.stream.Stream;
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestPassword.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequestPassword.java
similarity index 95%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestPassword.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequestPassword.java
index 362d941..159bbaf 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationRequestPassword.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationRequestPassword.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication;
+package org.apache.isis.core.security.authentication;
public class AuthenticationRequestPassword extends AuthenticationRequestAbstract {
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSession.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSession.java
similarity index 95%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSession.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSession.java
index 59158de..f80b1c0 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSession.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSession.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication;
+package org.apache.isis.core.security.authentication;
import java.io.Serializable;
import org.apache.isis.applib.security.UserMemento;
import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.commons.internal.encoding.Encodable;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
/**
* The representation within the system of an authenticated user.
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionAbstract.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionAbstract.java
similarity index 98%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionAbstract.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionAbstract.java
index 635eb48..8103089 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionAbstract.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionAbstract.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication;
+package org.apache.isis.core.security.authentication;
import java.io.IOException;
import java.io.Serializable;
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionProvider.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionProvider.java
similarity index 94%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionProvider.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionProvider.java
index 1062367..fbc6acd 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/AuthenticationSessionProvider.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationSessionProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.security.api.authentication;
+package org.apache.isis.core.security.authentication;
/**
* This is implemented by an (internal) domain service
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/MessageBroker.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/MessageBroker.java
similarity index 97%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/MessageBroker.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/MessageBroker.java
index 5a0e6dc..7dd153e 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/MessageBroker.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/MessageBroker.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication;
+package org.apache.isis.core.security.authentication;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/fixtures/AuthenticationRequestLogonFixture.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/fixtures/AuthenticationRequestLogonFixture.java
similarity index 87%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/fixtures/AuthenticationRequestLogonFixture.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/fixtures/AuthenticationRequestLogonFixture.java
index cf4b6d9..2b31fc7 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/fixtures/AuthenticationRequestLogonFixture.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/fixtures/AuthenticationRequestLogonFixture.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication.fixtures;
+package org.apache.isis.core.security.authentication.fixtures;
import java.util.Collection;
import java.util.Collections;
import org.apache.isis.core.commons.internal.collections._Lists;
-import org.apache.isis.security.api.authentication.AuthenticationRequestAbstract;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.AuthenticationRequestAbstract;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
/**
* For testing purposes, request corresponding to a {@link LogonFixture}.
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/health/HealthAuthSession.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthSession.java
similarity index 90%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/health/HealthAuthSession.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthSession.java
index b99f5f4..11db2b2 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/health/HealthAuthSession.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/health/HealthAuthSession.java
@@ -17,13 +17,13 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication.health;
+package org.apache.isis.core.security.authentication.health;
import java.io.IOException;
import java.util.stream.Stream;
import org.apache.isis.core.commons.internal.encoding.DataInputExtended;
-import org.apache.isis.security.api.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.core.security.authentication.AuthenticationSessionAbstract;
public class HealthAuthSession extends AuthenticationSessionAbstract {
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/manager/AuthenticationManager.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java
similarity index 90%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/manager/AuthenticationManager.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java
index 9c18b50..26ab71f 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/manager/AuthenticationManager.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/AuthenticationManager.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication.manager;
+package org.apache.isis.core.security.authentication.manager;
import java.util.List;
import java.util.Map;
@@ -36,13 +36,13 @@ import org.apache.isis.applib.util.ToString;
import org.apache.isis.core.commons.internal.base._NullSafe;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.standard.Authenticator;
-import org.apache.isis.security.api.authentication.standard.NoAuthenticatorException;
-import org.apache.isis.security.api.authentication.standard.RandomCodeGenerator;
-import org.apache.isis.security.api.authentication.standard.Registrar;
-import org.apache.isis.security.api.authentication.standard.SimpleSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.standard.NoAuthenticatorException;
+import org.apache.isis.core.security.authentication.standard.RandomCodeGenerator;
+import org.apache.isis.core.security.authentication.standard.SimpleSession;
+import org.apache.isis.core.security.authentication.AuthenticationRequest;
+import org.apache.isis.core.security.authentication.standard.Authenticator;
+import org.apache.isis.core.security.authentication.standard.Registrar;
import lombok.Getter;
import lombok.val;
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/manager/RegistrationDetails.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/RegistrationDetails.java
similarity index 93%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/manager/RegistrationDetails.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/manager/RegistrationDetails.java
index 116dcac..1bdb942 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/manager/RegistrationDetails.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/manager/RegistrationDetails.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.security.api.authentication.manager;
+package org.apache.isis.core.security.authentication.manager;
public interface RegistrationDetails {
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/singleuser/AuthenticationRequestSingleUser.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/AuthenticationRequestSingleUser.java
similarity index 89%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/singleuser/AuthenticationRequestSingleUser.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/AuthenticationRequestSingleUser.java
index a435d0c..e679dbf 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/singleuser/AuthenticationRequestSingleUser.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/AuthenticationRequestSingleUser.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication.singleuser;
+package org.apache.isis.core.security.authentication.singleuser;
-import org.apache.isis.security.api.authentication.AuthenticationRequestAbstract;
+import org.apache.isis.core.security.authentication.AuthenticationRequestAbstract;
/**
* Requests corresponding to an {@link SingleUserSession}.
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/singleuser/SingleUserSession.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserSession.java
similarity index 92%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/singleuser/SingleUserSession.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserSession.java
index 2e9ceef..01c0fab 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/singleuser/SingleUserSession.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/singleuser/SingleUserSession.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication.singleuser;
+package org.apache.isis.core.security.authentication.singleuser;
import java.io.IOException;
import org.apache.isis.core.commons.internal.encoding.DataInputExtended;
import org.apache.isis.core.commons.internal.encoding.DataOutputExtended;
import org.apache.isis.core.commons.internal.encoding.Encodable;
-import org.apache.isis.security.api.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.core.security.authentication.AuthenticationSessionAbstract;
public final class SingleUserSession extends AuthenticationSessionAbstract implements Encodable {
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/Authenticator.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Authenticator.java
similarity index 86%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/standard/Authenticator.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Authenticator.java
index 4f9d9d0..8c9b7dd 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/Authenticator.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Authenticator.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication.standard;
+package org.apache.isis.core.security.authentication.standard;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationRequest;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
public interface Authenticator {
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticatorAbstract.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticatorAbstract.java
similarity index 88%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticatorAbstract.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticatorAbstract.java
index 55b7ea3..393a3c0 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/AuthenticatorAbstract.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/AuthenticatorAbstract.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication.standard;
+package org.apache.isis.core.security.authentication.standard;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationRequest;
public abstract class AuthenticatorAbstract implements Authenticator {
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/NoAuthenticatorException.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/NoAuthenticatorException.java
similarity index 95%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/standard/NoAuthenticatorException.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/standard/NoAuthenticatorException.java
index 3ef7da0..1d47e55 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/NoAuthenticatorException.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/NoAuthenticatorException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication.standard;
+package org.apache.isis.core.security.authentication.standard;
import org.apache.isis.core.commons.exceptions.IsisException;
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGenerator.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGenerator.java
similarity index 93%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGenerator.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGenerator.java
index f77c892..f288062 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGenerator.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGenerator.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication.standard;
+package org.apache.isis.core.security.authentication.standard;
public interface RandomCodeGenerator {
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGeneratorDefault.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGeneratorDefault.java
similarity index 96%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGeneratorDefault.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGeneratorDefault.java
index 721386b..4854bc7 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RandomCodeGeneratorDefault.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RandomCodeGeneratorDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.security.api.authentication.standard;
+package org.apache.isis.core.security.authentication.standard;
import java.util.Random;
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/Registrar.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Registrar.java
similarity index 88%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/standard/Registrar.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Registrar.java
index 6855d2d..0435479 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/Registrar.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/Registrar.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication.standard;
+package org.apache.isis.core.security.authentication.standard;
-import org.apache.isis.security.api.authentication.manager.RegistrationDetails;
+import org.apache.isis.core.security.authentication.manager.RegistrationDetails;
public interface Registrar extends Authenticator {
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RegistrationDetailsPassword.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RegistrationDetailsPassword.java
similarity index 87%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RegistrationDetailsPassword.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RegistrationDetailsPassword.java
index ba8458d..9c68bef 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/RegistrationDetailsPassword.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/RegistrationDetailsPassword.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.security.api.authentication.standard;
+package org.apache.isis.core.security.authentication.standard;
-import org.apache.isis.security.api.authentication.manager.RegistrationDetails;
+import org.apache.isis.core.security.authentication.manager.RegistrationDetails;
import lombok.Data;
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/SimpleSession.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleSession.java
similarity index 94%
rename from core/security/src/main/java/org/apache/isis/security/api/authentication/standard/SimpleSession.java
rename to core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleSession.java
index 765283a..b060c9f 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authentication/standard/SimpleSession.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/standard/SimpleSession.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.isis.security.api.authentication.standard;
+package org.apache.isis.core.security.authentication.standard;
import java.io.IOException;
import java.util.List;
import java.util.stream.Stream;
import org.apache.isis.core.commons.internal.encoding.DataInputExtended;
-import org.apache.isis.security.api.authentication.AuthenticationSessionAbstract;
+import org.apache.isis.core.security.authentication.AuthenticationSessionAbstract;
import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authorization/manager/AuthorizationManager.java b/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManager.java
similarity index 94%
rename from core/security/src/main/java/org/apache/isis/security/api/authorization/manager/AuthorizationManager.java
rename to core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManager.java
index 2791681..eec982d 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authorization/manager/AuthorizationManager.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authorization/manager/AuthorizationManager.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.api.authorization.manager;
+package org.apache.isis.core.security.authorization.manager;
import javax.annotation.Nullable;
import javax.inject.Inject;
@@ -31,8 +31,8 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.sudo.SudoService;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authorization.standard.Authorizor;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authorization.standard.Authorizor;
/**
* Authorizes the user in the current session view and use members of an object.
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java b/core/security/src/main/java/org/apache/isis/core/security/authorization/standard/AuthorizationConstants.java
similarity index 94%
rename from core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
rename to core/security/src/main/java/org/apache/isis/core/security/authorization/standard/AuthorizationConstants.java
index be462ac..2a1aa5d 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/AuthorizationConstants.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authorization/standard/AuthorizationConstants.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.api.authorization.standard;
+package org.apache.isis.core.security.authorization.standard;
public final class AuthorizationConstants {
diff --git a/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/Authorizor.java b/core/security/src/main/java/org/apache/isis/core/security/authorization/standard/Authorizor.java
similarity index 96%
rename from core/security/src/main/java/org/apache/isis/security/api/authorization/standard/Authorizor.java
rename to core/security/src/main/java/org/apache/isis/core/security/authorization/standard/Authorizor.java
index 1f93c49..a2550e7 100644
--- a/core/security/src/main/java/org/apache/isis/security/api/authorization/standard/Authorizor.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authorization/standard/Authorizor.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.security.api.authorization.standard;
+package org.apache.isis.core.security.authorization.standard;
import org.apache.isis.applib.Identifier;
diff --git a/core/security/src/test/java/org/apache/isis/security/EncodabilityContractTest.java b/core/security/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
index a567b28..71dab7a 100644
--- a/core/security/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
+++ b/core/security/src/test/java/org/apache/isis/security/EncodabilityContractTest.java
@@ -37,7 +37,7 @@ import org.apache.isis.core.commons.internal.encoding.DataInputExtended;
import org.apache.isis.core.commons.internal.encoding.DataInputStreamExtended;
import org.apache.isis.core.commons.internal.encoding.DataOutputStreamExtended;
import org.apache.isis.core.commons.internal.encoding.Encodable;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
public abstract class EncodabilityContractTest {
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
index 4fefa4f..7df1785 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticationManager_authenticators_Test.java
@@ -32,11 +32,11 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.sameInstance;
import static org.junit.Assert.assertThat;
-import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
-import org.apache.isis.security.api.authentication.standard.Authenticator;
-import org.apache.isis.security.api.authentication.standard.NoAuthenticatorException;
-import org.apache.isis.security.api.authentication.standard.RandomCodeGeneratorDefault;
+import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.standard.Authenticator;
+import org.apache.isis.core.security.authentication.standard.NoAuthenticatorException;
+import org.apache.isis.core.security.authentication.standard.RandomCodeGeneratorDefault;
@RunWith(JMock.class)
public class AuthenticationManager_authenticators_Test {
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java
index 9f61f65..f001460 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/AuthenticatorDefaultTest.java
@@ -26,8 +26,8 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.standard.AuthenticatorAbstract;
+import org.apache.isis.core.security.authentication.AuthenticationRequest;
+import org.apache.isis.core.security.authentication.standard.AuthenticatorAbstract;
@RunWith(JMock.class)
public class AuthenticatorDefaultTest {
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
index 08d553b..0478512 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityNoRolesTest.java
@@ -25,7 +25,7 @@ import org.jmock.integration.junit4.JMock;
import org.junit.runner.RunWith;
import org.apache.isis.core.commons.internal.encoding.Encodable;
-import org.apache.isis.security.api.authentication.standard.SimpleSession;
+import org.apache.isis.core.security.authentication.standard.SimpleSession;
@RunWith(JMock.class)
public class SimpleSessionEncodabilityNoRolesTest extends SimpleSessionEncodabilityTestAbstract {
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
index 0d93ce0..1d67946 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityTestAbstract.java
@@ -24,7 +24,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import org.apache.isis.security.EncodabilityContractTest;
-import org.apache.isis.security.api.authentication.standard.SimpleSession;
+import org.apache.isis.core.security.authentication.standard.SimpleSession;
public abstract class SimpleSessionEncodabilityTestAbstract extends EncodabilityContractTest {
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
index bb2f595..3dc472c 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/SimpleSessionEncodabilityWithRolesTest.java
@@ -25,7 +25,7 @@ import org.jmock.integration.junit4.JMock;
import org.junit.runner.RunWith;
import org.apache.isis.core.commons.internal.encoding.Encodable;
-import org.apache.isis.security.api.authentication.standard.SimpleSession;
+import org.apache.isis.core.security.authentication.standard.SimpleSession;
@RunWith(JMock.class)
public class SimpleSessionEncodabilityWithRolesTest extends SimpleSessionEncodabilityTestAbstract {
diff --git a/core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java b/core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
index 679c53f..50da857 100644
--- a/core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
+++ b/core/security/src/test/java/org/apache/isis/security/authentication/standard/StandardAuthenticationManager_AuthenticationTest.java
@@ -35,12 +35,12 @@ import org.junit.runner.RunWith;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
-import org.apache.isis.security.api.authentication.standard.Authenticator;
-import org.apache.isis.security.api.authentication.standard.RandomCodeGenerator;
+import org.apache.isis.core.security.authentication.AuthenticationRequest;
+import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.standard.Authenticator;
+import org.apache.isis.core.security.authentication.standard.RandomCodeGenerator;
@RunWith(JMock.class)
public class StandardAuthenticationManager_AuthenticationTest {
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 03b9a29..0189f69 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -179,6 +179,12 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
<profiles>
diff --git a/core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMemento.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMemento.java
index 6c206ad..750451a 100644
--- a/core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMemento.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/context/memento/ObjectMemento.java
@@ -39,7 +39,7 @@ public interface ObjectMemento extends Serializable {
/**
* Returns a bookmark only if
- * {@link org.apache.isis.runtime.services.memento.ObjectMementoLegacy.RecreateStrategy#LOOKUP} and
+ * {@link org.apache.isis.core.runtimeservices.memento.ObjectMementoLegacy.RecreateStrategy#LOOKUP} and
* {@link #getCardinality() sort} is {@link Cardinality#SCALAR scalar}.
* Returns {@code null} otherwise.
*/
@@ -47,7 +47,7 @@ public interface ObjectMemento extends Serializable {
/**
* Returns a bookmark only if
- * {@link org.apache.isis.runtime.services.memento.ObjectMementoLegacy.RecreateStrategy#LOOKUP} and
+ * {@link org.apache.isis.core.runtimeservices.memento.ObjectMementoLegacy.RecreateStrategy#LOOKUP} and
* {@link #getCardinality() sort} is {@link Cardinality#SCALAR scalar}.
* Returns {@code null} otherwise.
*/
diff --git a/core/webapp/src/main/java/org/apache/isis/core/webapp/wormhole/AuthenticationSessionWormhole.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/wormhole/AuthenticationSessionWormhole.java
index 9c18837..690711e 100644
--- a/core/webapp/src/main/java/org/apache/isis/core/webapp/wormhole/AuthenticationSessionWormhole.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/wormhole/AuthenticationSessionWormhole.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.core.webapp.wormhole;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import lombok.experimental.UtilityClass;
diff --git a/core/webspringboot/pom.xml b/core/webspringboot/pom.xml
index f820000..32202d4 100644
--- a/core/webspringboot/pom.xml
+++ b/core/webspringboot/pom.xml
@@ -34,7 +34,7 @@
</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.webboot.springboot</jar-plugin.automaticModuleName>
+ <jar-plugin.automaticModuleName>org.apache.isis.core.webspringboot</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/webboot/springboot</git-plugin.propertiesDir>
</properties>
diff --git a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list
index 8e62669..b3ce4c7 100644
--- a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list
+++ b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list
@@ -12,11 +12,11 @@ org.apache.isis.extensions.fixtures.fixturescripts.FixtureScripts
ServiceRegistryDefault
UserServiceDefault$SudoServiceSpi
org.apache.isis.persistence.jdo.datanucleus5.metrics.MetricsServiceDefault
-org.apache.isis.runtime.services.command.CommandDtoServiceInternalDefault
-org.apache.isis.runtime.services.confmenu.ConfigurationViewServiceDefault
-org.apache.isis.runtime.services.email.EmailServiceDefault
-org.apache.isis.runtime.services.i18n.po.TranslationServicePoMenu
-org.apache.isis.runtime.services.ixn.InteractionDtoServiceInternalDefault
-org.apache.isis.runtime.services.sudo.SudoServiceDefault
-org.apache.isis.runtime.services.userprof.UserProfileServiceDefault
-org.apache.isis.runtime.services.userreg.EmailNotificationServiceDefault
\ No newline at end of file
+org.apache.isis.core.runtimeservices.command.CommandDtoServiceInternalDefault
+org.apache.isis.core.runtimeservices.confmenu.ConfigurationViewServiceDefault
+org.apache.isis.core.runtimeservices.email.EmailServiceDefault
+org.apache.isis.core.runtimeservices.i18n.po.TranslationServicePoMenu
+org.apache.isis.core.runtimeservices.ixn.InteractionDtoServiceInternalDefault
+org.apache.isis.core.runtimeservices.sudo.SudoServiceDefault
+org.apache.isis.core.runtimeservices.userprof.UserProfileServiceDefault
+org.apache.isis.core.runtimeservices.userreg.EmailNotificationServiceDefault
\ No newline at end of file
diff --git a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.list b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.list
index 5dfef67..b7036eb 100644
--- a/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.list
+++ b/examples/smoketests/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-requestscoped.list
@@ -2,7 +2,7 @@ org.apache.isis.applib.services.command.CommandContext
org.apache.isis.applib.services.iactn.InteractionContext
org.apache.isis.applib.services.queryresultscache.QueryResultsCacheInternal
org.apache.isis.applib.services.scratchpad.Scratchpad
-org.apache.isis.runtime.services.changes.ChangedObjectsServiceInternal
-org.apache.isis.runtime.services.metrics.MetricsServiceDefault
+org.apache.isis.core.runtimeservices.changes.ChangedObjectsServiceInternal
+org.apache.isis.core.runtimeservices.metrics.MetricsServiceDefault
PublisherDispatchServiceDefault
org.apache.isis.objectstore.jdo.datanucleus.service.support.TimestampService
\ No newline at end of file
diff --git a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java
index 7135598..093bab8 100644
--- a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java
+++ b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java
@@ -47,7 +47,7 @@ import org.apache.isis.extensions.secman.api.user.AccountType;
import org.apache.isis.extensions.secman.api.user.ApplicationUserRepository;
import org.apache.isis.extensions.secman.shiro.util.ShiroUtils;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authorization.standard.Authorizor;
+import org.apache.isis.core.security.authorization.standard.Authorizor;
import lombok.Getter;
import lombok.Setter;
diff --git a/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java b/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java
index 2942859..3d59e52 100644
--- a/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java
+++ b/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactory.java
@@ -18,15 +18,15 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import java.lang.reflect.Method;
-import org.apache.isis.metamodel.facets.FacetFactory;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.FacetUtil;
-import org.apache.isis.metamodel.facets.MethodRemover;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.FacetUtil;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
public class Jsr303FacetFactory implements FacetFactory {
diff --git a/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java b/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java
index dacd6e3..6b18c97 100644
--- a/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java
+++ b/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303ProgModelFacets.java
@@ -18,11 +18,11 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
-import org.apache.isis.metamodel.facets.FacetFactory;
-import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
-import org.apache.isis.metamodel.specloader.progmodelfacets.ProgrammingModelFacetsJava5;
+import org.apache.isis.core.metamodel.facets.FacetFactory;
+import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacets;
+import org.apache.isis.core.metamodel.specloader.progmodelfacets.ProgrammingModelFacetsJava5;
/**
diff --git a/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java b/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java
index da2a0a1..d8b1d76 100644
--- a/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java
+++ b/incubator/extensions/core/jsr303/src/main/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303PropertyValidationFacet.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import java.util.Set;
@@ -27,14 +27,14 @@ import javax.validation.ValidationProviderFactory;
import javax.validation.Validator;
import org.apache.isis.applib.events.ValidityEvent;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.facets.Facet;
-import org.apache.isis.metamodel.facets.FacetAbstract;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.interactions.ProposedHolder;
-import org.apache.isis.metamodel.interactions.ValidatingInteractionAdvisor;
-import org.apache.isis.metamodel.interactions.ValidityContext;
-import org.apache.isis.metamodel.spec.identifier.Identified;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.Facet;
+import org.apache.isis.core.metamodel.facets.FacetAbstract;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.interactions.ProposedHolder;
+import org.apache.isis.core.metamodel.interactions.ValidatingInteractionAdvisor;
+import org.apache.isis.core.metamodel.interactions.ValidityContext;
+import org.apache.isis.core.metamodel.spec.identifier.Identified;
public class Jsr303PropertyValidationFacet extends FacetAbstract implements ValidatingInteractionAdvisor {
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
index 05ed767..0a5bed8 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPattern.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java
index 4adc9f4..15a3297 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatternValidator.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import javax.validation.Constraint;
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
index 17eefcb..39a82bf 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/CustomPatterns.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java
index 148120f..0f7288e 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectVanilla.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import org.apache.isis.applib.AbstractDomainObject;
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java
index 4d24609..63e89f3 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithBuiltInValidation.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import javax.validation.Pattern;
import javax.validation.Patterns;
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java
index e7be3da..4ba69e9 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/DomainObjectWithCustomValidation.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
public class DomainObjectWithCustomValidation {
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
index 421c9e2..f9dfe9b 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFacetHolder.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
@@ -32,8 +32,8 @@ import org.junit.runner.RunWith;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
-import org.apache.isis.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
index 59083a5..20976c7 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryFeatureTypes.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import org.junit.After;
import org.junit.Before;
@@ -28,8 +28,8 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.collection.IsArrayContaining.hasItemInArray;
import static org.junit.Assert.assertThat;
-import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
-import org.apache.isis.metamodel.spec.feature.ObjectFeatureType;
+import org.apache.isis.core.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
+import org.apache.isis.core.metamodel.spec.feature.ObjectFeatureType;
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
index 731c7ff..643b798 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryInstantiation.java
@@ -18,11 +18,11 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import org.junit.Test;
-import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
+import org.apache.isis.core.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
public class Jsr303FacetFactoryInstantiation {
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
index f8f846e..034e049 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessObject.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
@@ -32,9 +32,9 @@ import org.junit.runner.RunWith;
import static org.junit.Assert.fail;
-import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
@RunWith(JMock.class)
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
index 821a92a..61dbebd 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetFactoryProcessProperty.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import java.lang.reflect.Method;
@@ -32,12 +32,12 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
-import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
-import org.apache.isis.metamodel.facets.FacetHolder;
-import org.apache.isis.metamodel.facets.MethodRemover;
+import org.apache.isis.core.metamodel.examples.facets.jsr303.Jsr303FacetFactory;
+import org.apache.isis.core.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
+import org.apache.isis.core.metamodel.facets.FacetHolder;
+import org.apache.isis.core.metamodel.facets.MethodRemover;
-import static org.apache.isis.metamodel.commons.matchers.NofMatchers.anInstanceOf;
+import static org.apache.isis.core.metamodel.commons.matchers.NofMatchers.anInstanceOf;
@RunWith(JMock.class)
public class Jsr303FacetFactoryProcessProperty {
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
index 27c1849..e0db582 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetInstantiation.java
@@ -18,14 +18,14 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
-import org.apache.isis.metamodel.facets.FacetHolderImpl;
+import org.apache.isis.core.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
+import org.apache.isis.core.metamodel.facets.FacetHolderImpl;
public class Jsr303FacetInstantiation {
diff --git a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
index 04b61ff..645bda3 100644
--- a/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
+++ b/incubator/extensions/core/jsr303/src/test/java/org/apache/isis/metamodel/examples/facets/jsr303/Jsr303FacetValidatingInteraction.java
@@ -18,7 +18,7 @@
*/
-package org.apache.isis.metamodel.examples.facets.jsr303;
+package org.apache.isis.core.metamodel.examples.facets.jsr303;
import org.jmock.Expectations;
import org.jmock.Mockery;
@@ -36,10 +36,10 @@ import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import org.apache.isis.applib.Identifier;
-import org.apache.isis.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
-import org.apache.isis.metamodel.interactions.PropertyModifyContext;
-import org.apache.isis.metamodel.spec.identifier.Identified;
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.examples.facets.jsr303.Jsr303PropertyValidationFacet;
+import org.apache.isis.core.metamodel.interactions.PropertyModifyContext;
+import org.apache.isis.core.metamodel.spec.identifier.Identified;
@RunWith(JMock.class)
diff --git a/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Color.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Color.java
index 6b0124e..ba7829f 100644
--- a/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Color.java
+++ b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Color.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.annotation.Value;
* Where there is no basic colors (RGB all equal 0) then you get black; where
* each color is at maximum (RGB all equal 255) you get white.
*/
-@Value(semanticsProviderName = "org.apache.isis.metamodel.facets.value.color.ColorValueSemanticsProvider")
+@Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.value.color.ColorValueSemanticsProvider")
public class Color extends Magnitude<Color> {
private static final long serialVersionUID = 1L;
diff --git a/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Money.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Money.java
index 37fd105..82bc539 100644
--- a/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Money.java
+++ b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Money.java
@@ -23,7 +23,7 @@ import java.math.BigDecimal;
import org.apache.isis.applib.annotation.Value;
-@Value(semanticsProviderName = "org.apache.isis.metamodel.facets.value.money.MoneyValueSemanticsProvider")
+@Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.value.money.MoneyValueSemanticsProvider")
public class Money extends Magnitude<Money> {
private static final long serialVersionUID = 1L;
diff --git a/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Percentage.java b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Percentage.java
index 1fffc6d..b99e6fb 100644
--- a/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Percentage.java
+++ b/legacy/extensions/core/applib/src/main/java/org/apache/isis/legacy/applib/value/Percentage.java
@@ -21,7 +21,7 @@ package org.apache.isis.legacy.applib.value;
import org.apache.isis.applib.annotation.Value;
-@Value(semanticsProviderName = "org.apache.isis.metamodel.facets.value.percentage.PercentageValueSemanticsProvider")
+@Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.value.percentage.PercentageValueSemanticsProvider")
public class Percentage extends Magnitude<Percentage> {
private static final long serialVersionUID = 1L;
diff --git a/mavendeps/pom.xml b/mavendeps/pom.xml
index 86124e6..f1bedf7 100644
--- a/mavendeps/pom.xml
+++ b/mavendeps/pom.xml
@@ -70,7 +70,6 @@
<dependencyManagement>
<dependencies>
- <!-- ISIS CORE -->
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis</artifactId>
@@ -79,7 +78,14 @@
<scope>import</scope>
</dependency>
- <!-- LOMBOK -->
+ <dependency>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
diff --git a/mavendeps/testing/pom.xml b/mavendeps/testing/pom.xml
index f2b4362..79c661d 100644
--- a/mavendeps/testing/pom.xml
+++ b/mavendeps/testing/pom.xml
@@ -57,7 +57,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.testing</groupId>
<artifactId>isis-testing-integtestsupport-applib</artifactId>
</dependency>
<dependency>
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
index ceec585..ebebdf7 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
@@ -40,7 +40,7 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPersistenceSessionJdo;
import org.apache.isis.core.runtime.context.session.RuntimeContextBase;
import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import lombok.Getter;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
index 178092e..8a299e4 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
@@ -44,7 +44,7 @@ import org.apache.isis.persistence.jdo.applib.fixturestate.FixturesInstalledStat
import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.persistence.queries.PersistenceQueryProcessor;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQueryFactory;
import org.apache.isis.core.runtime.persistence.transaction.ChangedObjectsService;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import lombok.Getter;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
index 5f8cf5a..37df2fb 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
@@ -45,7 +45,7 @@ import org.apache.isis.core.runtime.persistence.transaction.events.TransactionBe
import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.core.runtime.session.init.InitialisationSession;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
index e8fe44c..aa39a07 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSession5.java
@@ -92,7 +92,7 @@ import org.apache.isis.persistence.jdo.datanucleus5.persistence.command.Persiste
import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQuery;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQueryFindAllInstances;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQueryFindUsingApplibQueryDefault;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import static org.apache.isis.core.commons.internal.base._Casts.uncheckedCast;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
index 50792b4..017ea91 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
@@ -51,7 +51,7 @@ import org.apache.isis.persistence.jdo.datanucleus5.entities.JdoEntityTypeRegist
import org.apache.isis.persistence.jdo.datanucleus5.lifecycles.JdoStoreLifecycleListenerForIsis;
import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import org.apache.isis.core.runtime.persistence.session.PersistenceSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import lombok.Getter;
import lombok.Setter;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
index d46c666..c4e5ecc 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
index 0ba63d9..920a50f 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
@@ -62,8 +62,8 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectMemberAbstract;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.PojoAdapterBuilder;
import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
index 2b37416..bbc403e 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
@@ -71,8 +71,8 @@ import org.apache.isis.core.runtimeservices.wrapper.dom.employees.EmployeeReposi
import org.apache.isis.core.runtimeservices.wrapper.dom.employees.EmployeeRepositoryImpl;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.schema.cmd.v1.CommandDto;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.security.api.authentication.standard.SimpleSession;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.security.authentication.standard.SimpleSession;
import org.apache.isis.core.unittestsupport.config.internal._Config;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
index c8aeca0..edc24b6 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
@@ -65,8 +65,8 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
import org.apache.isis.core.runtimeservices.wrapper.dom.employees.Employee;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.security.api.authentication.standard.SimpleSession;
+import org.apache.isis.core.security.authentication.AuthenticationSessionProvider;
+import org.apache.isis.core.security.authentication.standard.SimpleSession;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java b/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
index 38d97fb..8ddf0c3 100644
--- a/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
+++ b/security/bypass/src/main/java/org/apache/isis/security/bypass/authentication/AuthenticatorBypass.java
@@ -26,8 +26,8 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.standard.AuthenticatorAbstract;
+import org.apache.isis.core.security.authentication.AuthenticationRequest;
+import org.apache.isis.core.security.authentication.standard.AuthenticatorAbstract;
/**
* Implementation that bypasses authentication.
diff --git a/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java b/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
index 0c1cce7..f71a56b 100644
--- a/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
+++ b/security/bypass/src/main/java/org/apache/isis/security/bypass/authorization/AuthorizorBypass.java
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.security.api.authorization.standard.Authorizor;
+import org.apache.isis.core.security.authorization.standard.Authorizor;
@Service
@Named("isisSecurityBypass.AuthorizorBypass")
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
index 8ac6117..92288ff 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
@@ -26,9 +26,9 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.standard.Authenticator;
+import org.apache.isis.core.security.authentication.AuthenticationRequest;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.standard.Authenticator;
import org.apache.isis.core.webapp.wormhole.AuthenticationSessionWormhole;
@Service
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
index 3f0197c..17ab0da 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authorization/AuthorizorKeycloak.java
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.security.api.authorization.standard.Authorizor;
+import org.apache.isis.core.security.authorization.standard.Authorizor;
@Service
@Named("isisSecurityKeycloak.AuthorizorKeycloak")
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
index 711eff8..b5a95c9 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/webmodule/KeycloakFilter.java
@@ -14,8 +14,8 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.standard.SimpleSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.standard.SimpleSession;
import org.apache.isis.core.webapp.wormhole.AuthenticationSessionWormhole;
import lombok.val;
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
index 0ee2b3f..3424d5b 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/authentication/AuthenticatorShiro.java
@@ -49,12 +49,12 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.core.commons.internal.collections._Sets;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.standard.Authenticator;
-import org.apache.isis.security.api.authentication.standard.SimpleSession;
-import org.apache.isis.security.api.authorization.standard.Authorizor;
+import org.apache.isis.core.security.authentication.AuthenticationRequest;
+import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.standard.Authenticator;
+import org.apache.isis.core.security.authentication.standard.SimpleSession;
+import org.apache.isis.core.security.authorization.standard.Authorizor;
import org.apache.isis.security.shiro.context.ShiroSecurityContext;
import lombok.extern.log4j.Log4j2;
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java
index 0a7bbbf..684305d 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/authorization/AuthorizorShiro.java
@@ -30,8 +30,8 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.security.api.authentication.standard.Authenticator;
-import org.apache.isis.security.api.authorization.standard.Authorizor;
+import org.apache.isis.core.security.authentication.standard.Authenticator;
+import org.apache.isis.core.security.authorization.standard.Authorizor;
import org.apache.isis.security.shiro.context.ShiroSecurityContext;
import lombok.extern.log4j.Log4j2;
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/context/ShiroSecurityContext.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/context/ShiroSecurityContext.java
index 1267ebc..de9e6df 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/context/ShiroSecurityContext.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/context/ShiroSecurityContext.java
@@ -23,8 +23,8 @@ import org.apache.shiro.UnavailableSecurityManagerException;
import org.apache.shiro.mgt.RealmSecurityManager;
import org.apache.shiro.mgt.SecurityManager;
-import org.apache.isis.security.api.authentication.standard.Authenticator;
-import org.apache.isis.security.api.authorization.standard.Authorizor;
+import org.apache.isis.core.security.authentication.standard.Authenticator;
+import org.apache.isis.core.security.authorization.standard.Authorizor;
/**
* @since 2.0
diff --git a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
index 739fbb3..4faaf83 100644
--- a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
+++ b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
@@ -36,9 +36,9 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationRequest;
+import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.security.shiro.authentication.AuthenticatorShiro;
import org.apache.isis.security.shiro.authorization.AuthorizorShiro;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
diff --git a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
index 2d1b94f..4a25fd3 100644
--- a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
+++ b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
@@ -35,8 +35,8 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.security.authentication.AuthenticationRequest;
+import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
import org.apache.isis.security.shiro.authentication.AuthenticatorShiro;
import org.apache.isis.security.shiro.authorization.AuthorizorShiro;
import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index 1a59f6a..a4004b9 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -134,8 +134,10 @@
<!-- testing -->
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures-applib</artifactId>
+ <artifactId>isis-testing</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
</dependencies>
diff --git a/subdomains/spring/pom.xml b/subdomains/spring/pom.xml
index e02db86..7e28707 100644
--- a/subdomains/spring/pom.xml
+++ b/subdomains/spring/pom.xml
@@ -18,7 +18,6 @@
<groupId>org.apache.isis.subdomains</groupId>
<artifactId>isis-subdomains</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>isis-subdomains-spring</artifactId>
diff --git a/testing/fixtures/applib/pom.xml b/testing/fixtures/applib/pom.xml
index 5db80c0..dcc2009 100644
--- a/testing/fixtures/applib/pom.xml
+++ b/testing/fixtures/applib/pom.xml
@@ -66,7 +66,7 @@
<version>${jdo-api.version}</version>
<!-- provided by plugins -->
<scope>provided</scope>
- </dependency>p
+ </dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
@@ -75,7 +75,7 @@
</dependency>
<dependency>
- <groupId>org.apache.isis.core</groupId>
+ <groupId>org.apache.isis.testing</groupId>
<artifactId>isis-testing-integtestsupport-applib</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixturesService.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixturesService.java
index 9cb0005..ac5a9af 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixturesService.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/modules/ModuleWithFixturesService.java
@@ -43,7 +43,7 @@ import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.subdomains.spring.applib.service.BeanDescriptor;
import org.apache.isis.subdomains.spring.applib.service.ContextBeans;
import org.apache.isis.subdomains.spring.applib.service.SpringBeansService;
-import org.apache.isis.metamodel.facets.Annotations;
+import org.apache.isis.core.metamodel.facets.Annotations;
import lombok.Data;
import lombok.val;
diff --git a/testing/pom.xml b/testing/pom.xml
index 9b332c4..a5facdc 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -61,15 +61,11 @@
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-testing-integtestsupport-applib</artifactId>
- <version>2.0.0-M3-SNAPSHOT</version>
- </dependency>
+ <!-- this module -->
<dependency>
- <groupId>org.apache.isis.subdomains</groupId>
- <artifactId>isis-subdomains-spring-applib</artifactId>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing-integtestsupport-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -119,6 +115,13 @@
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
+ <!-- dependencies -->
+ <dependency>
+ <groupId>org.apache.isis.subdomains</groupId>
+ <artifactId>isis-subdomains-spring-applib</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -128,10 +131,7 @@
<module>h2console</module>
<module>hsqldbmgr</module>
<module>specsupport</module>
-
<module>integtestsupport</module>
- <module>integtestsupport/applib</module>
-
<module>unittestsupport</module>
</modules>
diff --git a/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/AsciiDoc.java b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/AsciiDoc.java
index 402dc4a..2747841 100644
--- a/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/AsciiDoc.java
+++ b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/AsciiDoc.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.value.Markup;
*
*/
@Value(semanticsProviderName =
- "org.apache.isis.metamodel.facets.value.markup.MarkupValueSemanticsProvider")
+ "org.apache.isis.core.metamodel.facets.value.markup.MarkupValueSemanticsProvider")
public class AsciiDoc extends Markup {
private static final long serialVersionUID = 1L;
diff --git a/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Markdown.java b/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Markdown.java
index 807ffec..01e14a0 100644
--- a/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Markdown.java
+++ b/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Markdown.java
@@ -26,7 +26,7 @@ import org.apache.isis.applib.value.Markup;
*
*/
@Value(semanticsProviderName =
- "org.apache.isis.metamodel.facets.value.markup.MarkupValueSemanticsProvider")
+ "org.apache.isis.core.metamodel.facets.value.markup.MarkupValueSemanticsProvider")
public class Markdown extends Markup {
private static final long serialVersionUID = 1L;
diff --git a/valuetypes/markdown/pom.xml b/valuetypes/markdown/pom.xml
index 6b0d833..3d3e8b0 100644
--- a/valuetypes/markdown/pom.xml
+++ b/valuetypes/markdown/pom.xml
@@ -37,4 +37,24 @@
<module>ui</module>
</modules>
+ <profiles>
+ <profile>
+ <id>resolving-conflicts</id>
+ <activation>
+ <property>
+ <name>!skip.resolving-conflicts</name>
+ </property>
+ </activation>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jsoup</groupId>
+ <artifactId>jsoup</artifactId>
+ <version>1.10.2</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
+ </profiles>
+
</project>
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
index 7e6ac4d..27306f9 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IResourceContext.java
@@ -29,7 +29,7 @@ import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.DomainObjectReprRenderer;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ObjectAdapterLinkTo;
import org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationService;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageReprRenderer.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageReprRenderer.java
index a296964..d94cb24 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageReprRenderer.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/HomePageReprRenderer.java
@@ -23,7 +23,7 @@ import java.util.stream.Stream;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserReprRenderer.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserReprRenderer.java
index 9435383..05a157a 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserReprRenderer.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/UserReprRenderer.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.viewer.restfulobjects.viewer.resources;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategy.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategy.java
index c30bc83..6443042 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategy.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategy.java
@@ -22,8 +22,8 @@ package org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
/**
* Decouples the <code>IsisSessionFilter</code> from the mechanism of obtaining the
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyAbstract.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyAbstract.java
index 7f5fc82..c6c8319 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyAbstract.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyAbstract.java
@@ -26,7 +26,7 @@ import javax.servlet.http.HttpSession;
import org.springframework.web.context.support.WebApplicationContextUtils;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import lombok.val;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyBasicAuth.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyBasicAuth.java
index ae22d83..608eca3 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyBasicAuth.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyBasicAuth.java
@@ -28,8 +28,8 @@ import javax.servlet.http.HttpSession;
import org.apache.isis.core.commons.internal.base._Bytes;
import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import lombok.val;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyDefault.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyDefault.java
index 2f3f6e4..5c9b15a 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyDefault.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/auth/AuthenticationSessionStrategyDefault.java
@@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import lombok.val;
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index 3f9d291..3520507 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
@@ -45,7 +45,7 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
index 73c18c4..90e05ef 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
@@ -43,7 +43,7 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index 97e49ec..878a24c 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -49,7 +49,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
import org.apache.isis.viewer.wicket.model.links.LinksProvider;
import org.apache.isis.viewer.wicket.model.mementos.ActionParameterMemento;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
index 7b1db1a..d2dcbde 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/TertiaryActionsPanel.java
@@ -33,7 +33,7 @@ import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.isis.core.commons.internal.collections._Lists;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.panels.PanelBase;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
index d1feac7..0a5e391 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
@@ -36,7 +36,7 @@ import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.runtime.session.IsisSession;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.errors.JGrowlUtil;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
index a03c0dd..ae0510e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlBehaviour.java
@@ -28,7 +28,7 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.security.api.authentication.MessageBroker;
+import org.apache.isis.core.security.authentication.MessageBroker;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
/**
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java
index b0ecfb9..b358bbf 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java
@@ -20,7 +20,7 @@ package org.apache.isis.viewer.wicket.ui.errors;
import org.apache.wicket.util.string.Strings;
-import org.apache.isis.security.api.authentication.MessageBroker;
+import org.apache.isis.core.security.authentication.MessageBroker;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 704e881..228b755 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -63,7 +63,7 @@ import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizerComposite;
import org.apache.isis.core.commons.internal.ioc.BeanSort;
import org.apache.isis.core.config.viewer.wicket.DialogMode;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.model.common.PageParametersUtils;
import org.apache.isis.viewer.wicket.model.hints.IsisEnvelopeEvent;
import org.apache.isis.viewer.wicket.model.hints.IsisEventLetterAbstract;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
index fa8a763..77308e4 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormAbstract.java
@@ -25,7 +25,7 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistry;
import org.apache.isis.viewer.wicket.ui.app.registry.ComponentFactoryRegistryAccessor;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
index 5576a39..5881b8e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
@@ -50,8 +50,8 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.session.IsisRequestCycle;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.MessageBroker;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.MessageBroker;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.model.models.BookmarkableModel;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
index df6d846..9eb28e1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.services.userreg.EmailNotificationService;
import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.MessageBroker;
+import org.apache.isis.core.security.authentication.MessageBroker;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AnonymousWebSessionForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AnonymousWebSessionForIsis.java
index 41e28e1..71fafa7 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AnonymousWebSessionForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AnonymousWebSessionForIsis.java
@@ -22,7 +22,7 @@ package org.apache.isis.viewer.wicket.viewer.integration;
import org.apache.wicket.Session;
import org.apache.wicket.request.Request;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import lombok.Getter;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
index ca1da89..53ba371 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
@@ -31,10 +31,10 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.AuthenticationRequest;
+import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import org.apache.isis.viewer.wicket.model.models.BookmarkedPagesModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModelProvider;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
index a353e06..e8a9b38 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
@@ -56,8 +56,8 @@ import org.apache.isis.core.runtime.context.IsisContext;
import org.apache.isis.core.runtime.session.IsisRequestCycle;
import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.security.api.authentication.MessageBroker;
+import org.apache.isis.core.security.authentication.AuthenticationSession;
+import org.apache.isis.core.security.authentication.MessageBroker;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.errors.ExceptionModel;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
index 8a419c1..feae634 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
@@ -38,12 +38,12 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
-import org.apache.isis.security.api.authentication.standard.Authenticator;
-import org.apache.isis.security.api.authentication.standard.RandomCodeGeneratorDefault;
-import org.apache.isis.security.api.authentication.standard.SimpleSession;
+import org.apache.isis.core.security.authentication.AuthenticationRequest;
+import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.standard.Authenticator;
+import org.apache.isis.core.security.authentication.standard.RandomCodeGeneratorDefault;
+import org.apache.isis.core.security.authentication.standard.SimpleSession;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
index 771366a..f379664 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
@@ -36,11 +36,11 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.AuthenticationRequest;
-import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
-import org.apache.isis.security.api.authentication.standard.Authenticator;
-import org.apache.isis.security.api.authentication.standard.RandomCodeGeneratorDefault;
+import org.apache.isis.core.security.authentication.AuthenticationRequest;
+import org.apache.isis.core.security.authentication.AuthenticationRequestPassword;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.standard.Authenticator;
+import org.apache.isis.core.security.authentication.standard.RandomCodeGeneratorDefault;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
index e7eda88..fd36163 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
@@ -30,7 +30,7 @@ import org.junit.Rule;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
-import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
+import org.apache.isis.core.security.authentication.manager.AuthenticationManager;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.core.webapp.context.IsisWebAppCommonContext;
[isis] 01/14: ISIS-2259: fixes up packages for sse module
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit c1cd28d9883c1d098c9596c4b07e4c4ffa8106e2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 15:24:48 2020 +0000
ISIS-2259: fixes up packages for sse module
---
.../main/java/demoapp/dom/actions/async/AsyncActionDemo.java | 8 ++++----
.../demo/src/main/java/demoapp/dom/actions/async/DemoTask.java | 4 ++--
examples/demo/src/main/java/demoapp/webapp/DemoApp.java | 2 +-
.../sse/applib/IsisModuleValSseApplib.java | 2 +-
.../sse/applib/annotations/ServerSentEvents.java | 2 +-
.../sse/applib/annotations/SseSource.java | 4 ++--
.../sse/applib/service/SseChannel.java | 4 ++--
.../sse/applib/service/SseService.java | 4 ++--
.../sse/applib/value/ListeningMarkup.java | 4 ++--
.../sse/metamodel/IsisModuleValSseMetaModel.java | 6 +++---
.../sse/metamodel/facets/SseAnnotationFacetFactory.java | 4 ++--
.../sse/metamodel/facets/SseObserveFacet.java | 4 ++--
.../sse/metamodel/facets/SseObserveFacetAbstract.java | 4 ++--
.../facets/SseObserveFacetForServerSentEventsAnnotation.java | 6 +++---
.../{extensions => valuetypes}/sse/ui/IsisModuleValSseUi.java | 10 +++++-----
.../sse/ui/markup/ListeningMarkupComponent.java | 2 +-
.../sse/ui/markup/ListeningMarkupComponent_observing.java | 2 +-
.../sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java | 4 ++--
.../sse/ui/markup/js/ObservingComponent.js | 0
.../sse/ui/services/SseServiceDefault.java | 8 ++++----
.../sse/ui/webmodule/ServerSentEventsServlet.java | 8 ++++----
.../sse/ui/webmodule/WebModuleServerSentEvents.java | 2 +-
22 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.java b/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.java
index d3196b0..a5bcf56 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.java
@@ -33,10 +33,10 @@ import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.util.JaxbAdapters;
-import org.apache.isis.extensions.sse.applib.annotations.ServerSentEvents;
-import org.apache.isis.extensions.sse.applib.service.SseService;
-import org.apache.isis.extensions.sse.applib.service.SseService.ExecutionBehavior;
-import org.apache.isis.extensions.sse.applib.value.ListeningMarkup;
+import org.apache.isis.valuetypes.sse.applib.annotations.ServerSentEvents;
+import org.apache.isis.valuetypes.sse.applib.service.SseService;
+import org.apache.isis.valuetypes.sse.applib.service.SseService.ExecutionBehavior;
+import org.apache.isis.valuetypes.sse.applib.value.ListeningMarkup;
import lombok.Getter;
import lombok.Setter;
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/async/DemoTask.java b/examples/demo/src/main/java/demoapp/dom/actions/async/DemoTask.java
index 750049a..8a3e5d4 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/async/DemoTask.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/async/DemoTask.java
@@ -23,8 +23,8 @@ import java.util.concurrent.atomic.LongAdder;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.extensions.sse.applib.service.SseChannel;
-import org.apache.isis.extensions.sse.applib.annotations.SseSource;
+import org.apache.isis.valuetypes.sse.applib.service.SseChannel;
+import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
import lombok.RequiredArgsConstructor;
diff --git a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
index 61160a8..8130b27 100644
--- a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
+++ b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
@@ -39,7 +39,7 @@ import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleSecmanEncr
import org.apache.isis.extensions.secman.jdo.IsisModuleSecmanPersistenceJdo;
import org.apache.isis.extensions.secman.model.IsisModuleSecmanModel;
import org.apache.isis.extensions.secman.shiro.IsisModuleSecmanRealmShiro;
-import org.apache.isis.extensions.sse.applib.IsisModuleValSseApplib;
+import org.apache.isis.valuetypes.sse.applib.IsisModuleValSseApplib;
import org.apache.isis.incubator.model.metamodel.IsisModuleIncModelMetaModel;
import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
diff --git a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/IsisModuleValSseApplib.java b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/IsisModuleValSseApplib.java
similarity index 97%
rename from valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/IsisModuleValSseApplib.java
rename to valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/IsisModuleValSseApplib.java
index dfd66cd..e4eb732 100644
--- a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/IsisModuleValSseApplib.java
+++ b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/IsisModuleValSseApplib.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.applib;
+package org.apache.isis.valuetypes.sse.applib;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
diff --git a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/ServerSentEvents.java b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/annotations/ServerSentEvents.java
similarity index 95%
rename from valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/ServerSentEvents.java
rename to valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/annotations/ServerSentEvents.java
index 3d87bd1..7011360 100644
--- a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/ServerSentEvents.java
+++ b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/annotations/ServerSentEvents.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.applib.annotations;
+package org.apache.isis.valuetypes.sse.applib.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/SseSource.java b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/annotations/SseSource.java
similarity index 93%
rename from valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/SseSource.java
rename to valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/annotations/SseSource.java
index 5c7756e..3d55e0d 100644
--- a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/SseSource.java
+++ b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/annotations/SseSource.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.applib.annotations;
+package org.apache.isis.valuetypes.sse.applib.annotations;
-import org.apache.isis.extensions.sse.applib.service.SseChannel;
+import org.apache.isis.valuetypes.sse.applib.service.SseChannel;
/**
* Server-sent events.
diff --git a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseChannel.java b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/service/SseChannel.java
similarity index 91%
rename from valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseChannel.java
rename to valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/service/SseChannel.java
index fbc3689..6b1200e 100644
--- a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseChannel.java
+++ b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/service/SseChannel.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.applib.service;
+package org.apache.isis.valuetypes.sse.applib.service;
import java.util.UUID;
import java.util.function.Predicate;
-import org.apache.isis.extensions.sse.applib.annotations.SseSource;
+import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
/**
* Server-sent events.
diff --git a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseService.java b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/service/SseService.java
similarity index 91%
rename from valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseService.java
rename to valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/service/SseService.java
index caad878..ce57eed 100644
--- a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseService.java
+++ b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/service/SseService.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.applib.service;
+package org.apache.isis.valuetypes.sse.applib.service;
import java.util.Optional;
-import org.apache.isis.extensions.sse.applib.annotations.SseSource;
+import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
/**
* Server-sent events.
diff --git a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/value/ListeningMarkup.java b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/value/ListeningMarkup.java
similarity index 84%
rename from valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/value/ListeningMarkup.java
rename to valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/value/ListeningMarkup.java
index 4d909e7..4798ca5 100644
--- a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/value/ListeningMarkup.java
+++ b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/value/ListeningMarkup.java
@@ -1,8 +1,8 @@
-package org.apache.isis.extensions.sse.applib.value;
+package org.apache.isis.valuetypes.sse.applib.value;
import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.value.Markup;
-import org.apache.isis.extensions.sse.applib.annotations.ServerSentEvents;
+import org.apache.isis.valuetypes.sse.applib.annotations.ServerSentEvents;
/**
* Immutable value type holding pre-rendered HTML. Supports server sent events.
diff --git a/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/IsisModuleValSseMetaModel.java b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/IsisModuleValSseMetaModel.java
similarity index 86%
rename from valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/IsisModuleValSseMetaModel.java
rename to valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/IsisModuleValSseMetaModel.java
index 7c6a0f6..4fa079d 100644
--- a/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/IsisModuleValSseMetaModel.java
+++ b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/IsisModuleValSseMetaModel.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.metamodel;
+package org.apache.isis.valuetypes.sse.metamodel;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.sse.applib.IsisModuleValSseApplib;
-import org.apache.isis.extensions.sse.metamodel.facets.SseAnnotationFacetFactory;
+import org.apache.isis.valuetypes.sse.applib.IsisModuleValSseApplib;
+import org.apache.isis.valuetypes.sse.metamodel.facets.SseAnnotationFacetFactory;
@Configuration
@Import({
diff --git a/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseAnnotationFacetFactory.java
similarity index 94%
rename from valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java
rename to valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseAnnotationFacetFactory.java
index f7856d0..4f52e9b 100644
--- a/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java
+++ b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseAnnotationFacetFactory.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.metamodel.facets;
+package org.apache.isis.valuetypes.sse.metamodel.facets;
import org.springframework.stereotype.Component;
-import org.apache.isis.extensions.sse.applib.annotations.ServerSentEvents;
+import org.apache.isis.valuetypes.sse.applib.annotations.ServerSentEvents;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
diff --git a/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacet.java b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacet.java
similarity index 92%
rename from valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacet.java
rename to valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacet.java
index b75c3b8..e9000bc 100644
--- a/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacet.java
+++ b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacet.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.metamodel.facets;
+package org.apache.isis.valuetypes.sse.metamodel.facets;
import org.apache.isis.applib.value.LocalResourcePath;
-import org.apache.isis.extensions.sse.applib.annotations.SseSource;
+import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
import org.apache.isis.core.metamodel.facets.SingleClassValueFacet;
/**
diff --git a/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetAbstract.java b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacetAbstract.java
similarity index 94%
rename from valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetAbstract.java
rename to valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacetAbstract.java
index a447df1..134490f 100644
--- a/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetAbstract.java
+++ b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacetAbstract.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.metamodel.facets;
+package org.apache.isis.valuetypes.sse.metamodel.facets;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.extensions.sse.applib.annotations.SseSource;
+import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java
similarity index 90%
rename from valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java
rename to valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java
index 9f61b9f..9a41197 100644
--- a/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java
+++ b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.metamodel.facets;
+package org.apache.isis.valuetypes.sse.metamodel.facets;
import java.util.Optional;
-import org.apache.isis.extensions.sse.applib.annotations.ServerSentEvents;
-import org.apache.isis.extensions.sse.applib.annotations.SseSource;
+import org.apache.isis.valuetypes.sse.applib.annotations.ServerSentEvents;
+import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
/**
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/IsisModuleValSseUi.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/IsisModuleValSseUi.java
similarity index 82%
rename from valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/IsisModuleValSseUi.java
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/IsisModuleValSseUi.java
index c69d563..7a1529e 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/IsisModuleValSseUi.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/IsisModuleValSseUi.java
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.ui;
+package org.apache.isis.valuetypes.sse.ui;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.sse.metamodel.IsisModuleValSseMetaModel;
-import org.apache.isis.extensions.sse.ui.markup.ListeningMarkupPanelFactoriesForWicket;
-import org.apache.isis.extensions.sse.ui.services.SseServiceDefault;
-import org.apache.isis.extensions.sse.ui.webmodule.WebModuleServerSentEvents;
+import org.apache.isis.valuetypes.sse.metamodel.IsisModuleValSseMetaModel;
+import org.apache.isis.valuetypes.sse.ui.markup.ListeningMarkupPanelFactoriesForWicket;
+import org.apache.isis.valuetypes.sse.ui.services.SseServiceDefault;
+import org.apache.isis.valuetypes.sse.ui.webmodule.WebModuleServerSentEvents;
@Configuration
@Import({
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupComponent.java
similarity index 97%
rename from valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent.java
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupComponent.java
index b8c68b0..8b7d593 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupComponent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.ui.markup;
+package org.apache.isis.valuetypes.sse.ui.markup;
import javax.inject.Inject;
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent_observing.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupComponent_observing.java
similarity index 98%
rename from valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent_observing.java
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupComponent_observing.java
index 36d42c4..ed1b210 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent_observing.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupComponent_observing.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.ui.markup;
+package org.apache.isis.valuetypes.sse.ui.markup;
import java.io.IOException;
import java.util.UUID;
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java
similarity index 96%
rename from valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java
index 84c0d3b..8695c16 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.ui.markup;
+package org.apache.isis.valuetypes.sse.ui.markup;
import org.springframework.stereotype.Component;
import org.apache.isis.applib.value.LocalResourcePath;
-import org.apache.isis.extensions.sse.metamodel.facets.SseObserveFacet;
+import org.apache.isis.valuetypes.sse.metamodel.facets.SseObserveFacet;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.markup.MarkupComponentFactory;
import org.apache.isis.viewer.wicket.ui.components.scalars.markup.MarkupPanelFactories;
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/js/ObservingComponent.js b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/js/ObservingComponent.js
similarity index 100%
rename from valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/js/ObservingComponent.js
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/js/ObservingComponent.js
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/services/SseServiceDefault.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/services/SseServiceDefault.java
similarity index 97%
rename from valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/services/SseServiceDefault.java
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/services/SseServiceDefault.java
index 73eacb1..c196f8e 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/services/SseServiceDefault.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/services/SseServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.ui.services;
+package org.apache.isis.valuetypes.sse.ui.services;
import java.util.List;
import java.util.Map;
@@ -42,9 +42,9 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.core.commons.internal.collections._Lists;
-import org.apache.isis.extensions.sse.applib.service.SseChannel;
-import org.apache.isis.extensions.sse.applib.service.SseService;
-import org.apache.isis.extensions.sse.applib.annotations.SseSource;
+import org.apache.isis.valuetypes.sse.applib.service.SseChannel;
+import org.apache.isis.valuetypes.sse.applib.service.SseService;
+import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
import org.apache.isis.runtime.persistence.transaction.IsisTransactionAspectSupport;
import org.apache.isis.runtime.session.IsisSessionFactory;
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/webmodule/ServerSentEventsServlet.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/webmodule/ServerSentEventsServlet.java
similarity index 95%
rename from valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/webmodule/ServerSentEventsServlet.java
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/webmodule/ServerSentEventsServlet.java
index a4484a0..090b018 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/webmodule/ServerSentEventsServlet.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/webmodule/ServerSentEventsServlet.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.ui.webmodule;
+package org.apache.isis.valuetypes.sse.ui.webmodule;
import java.io.IOException;
import java.util.Optional;
@@ -34,9 +34,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.apache.isis.applib.util.JaxbAdapters;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.commons.internal.context._Context;
-import org.apache.isis.extensions.sse.applib.service.SseChannel;
-import org.apache.isis.extensions.sse.applib.service.SseService;
-import org.apache.isis.extensions.sse.applib.value.ListeningMarkup;
+import org.apache.isis.valuetypes.sse.applib.service.SseChannel;
+import org.apache.isis.valuetypes.sse.applib.service.SseService;
+import org.apache.isis.valuetypes.sse.applib.value.ListeningMarkup;
import static org.apache.isis.core.commons.internal.base._With.requires;
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/webmodule/WebModuleServerSentEvents.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/webmodule/WebModuleServerSentEvents.java
similarity index 97%
rename from valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/webmodule/WebModuleServerSentEvents.java
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/webmodule/WebModuleServerSentEvents.java
index 9aa7225..4432340 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/webmodule/WebModuleServerSentEvents.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/webmodule/WebModuleServerSentEvents.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.ui.webmodule;
+package org.apache.isis.valuetypes.sse.ui.webmodule;
import javax.inject.Inject;
import javax.inject.Named;
[isis] 14/14: Merge remote-tracking branch 'origin/master' into ide
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit ba0793afe16ec0fc2b89a40851209e3e27af3b64
Merge: f6ec8f9 b0b446f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 18:15:02 2020 +0000
Merge remote-tracking branch 'origin/master' into ide
# Conflicts:
# core/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
# core/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
# core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModule.java
# core/webapp/src/main/java/org/apache/isis/webapp/modules/WebModuleContext.java
# core/webapp/src/main/java/org/apache/isis/webapp/webappctx/IsisWebAppContextInitializer.java
.../isis/core/commons/internal/base/_Oneshot.java | 64 ++++++++++++++++++++++
.../apache/isis/core/webapp/modules/WebModule.java | 2 +-
.../isis/core/webapp/modules/WebModuleContext.java | 12 ----
.../webappctx/IsisWebAppContextInitializer.java | 13 ++---
.../webmodule/WebModuleJaxrsResteasy4.java | 1 -
.../wicket/viewer/webmodule/WebModuleWicket.java | 1 -
6 files changed, 71 insertions(+), 22 deletions(-)
diff --cc core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Oneshot.java
index 0000000,0000000..fa2ef05
new file mode 100644
--- /dev/null
+++ b/core/commons/src/main/java/org/apache/isis/core/commons/internal/base/_Oneshot.java
@@@ -1,0 -1,0 +1,64 @@@
++/*
++ * Licensed to the Apache Software Foundation (ASF) under one
++ * or more contributor license agreements. See the NOTICE file
++ * distributed with this work for additional information
++ * regarding copyright ownership. The ASF licenses this file
++ * to you under the Apache License, Version 2.0 (the
++ * "License"); you may not use this file except in compliance
++ * with the License. You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing,
++ * software distributed under the License is distributed on an
++ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
++ * KIND, either express or implied. See the License for the
++ * specific language governing permissions and limitations
++ * under the License.
++ */
++package org.apache.isis.core.commons.internal.base;
++
++import java.io.Serializable;
++
++/**
++ * <h1>- internal use only -</h1>
++ * <p>
++ * One-shot idiom helper utility, thread-safe and serializable
++ * <p>
++ * <b>WARNING</b>: Do <b>NOT</b> use any of the classes provided by this package! <br/>
++ * These may be changed or removed without notice!
++ *
++ * @since 2.0
++ *
++ */
++public final class _Oneshot implements Serializable {
++
++ private static final long serialVersionUID = 1L;
++
++ private final Object $lock = new Object[0]; // serializable lock
++
++ private int shotCount = 0;
++
++ /**
++ * @return whether the shot actually happened (was allowed)
++ */
++ public boolean shoot() {
++ synchronized ($lock) {
++ if(shotCount==0) {
++ ++ shotCount;
++ return true;
++ }
++ return false;
++ }
++ }
++
++ /**
++ * resets to initial condition, that is it allows one more shot
++ */
++ public void reset() {
++ synchronized ($lock) {
++ shotCount = 0;
++ }
++ }
++
++}
diff --cc core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModule.java
index ffb6e19,0000000..5689fc2
mode 100644,000000..100644
--- a/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModule.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModule.java
@@@ -1,103 -1,0 +1,103 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.core.webapp.modules;
+
+import javax.annotation.Priority;
+import javax.servlet.Filter;
+import javax.servlet.Servlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebListener;
+
+import org.springframework.core.annotation.Order;
+
+import org.apache.isis.applib.services.registry.ServiceRegistry;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.webapp.webappctx.IsisWebAppContextInitializer;
+
+import lombok.val;
+
+/**
+ * Introduced to render web.xml Filter/Listener/Servlet configurations obsolete.
+ * <p>
+ * WebModule instances are used by the {@link IsisWebAppContextInitializer} to setup
+ * the ServletContext programmatically.
+ * </p>
+ * <p>
+ * The order in which all enabled/applicable WebModules are registered with the
+ * filter-chain is determined by their specified {@link Order} or {@link Priority}
+ * annotation.
+ * </p>
+ *
+ * @since 2.0
+ */
+public interface WebModule {
+
+ // -- INTERFACE
+
+ /**
+ * @return (display-) name of this module
+ */
+ public String getName();
+
+ /**
+ * Before initializing any WebModule we call each WebModule's prepare method
+ * to allow for a WebModule to leave information useful for other modules on
+ * the shared WebModuleContext.
+ *
+ * @param ctx WebModuleContext
+ */
+ default public void prepare(WebModuleContext ctx) {}
+
+ /**
+ * Expected to be called after all WebModules had a chance to prepare the WebModuleContext.
+ * Sets this WebModule's {@link Filter}s, {@link Servlet}s or {@link WebListener}s
+ * up and registers them with the {@link ServletContext} as provided via {@code ctx}.
+ * @param ctx ServletContext
+ * @return optionally any listeners to be registered
+ * @apiNote don't add {@link ServletContextListener}s to given {@code ctx} directly, because
+ * when on a JEE container, we have no means to veto it to be getting managed by the container;
+ * {@link ServletContextListener}s should only be known to the {@link IsisWebAppContextInitializer}
+ * and not any of the containers, since the {@link IsisWebAppContextInitializer} acts as a delegator,
+ * that passes over any events to the registered {@link WebModule}s.
+ */
+ public Can<ServletContextListener> init(ServletContext ctx) throws ServletException;
+
+ /**
+ * Expected to be called after all WebModules had a chance to prepare the WebModuleContext.
+ * @param ctx WebModuleContext
+ * @return whether this module is applicable/usable
+ */
+ default public boolean isApplicable(WebModuleContext ctx) { return true; }
+
+ // -- DISCOVERY
+
+ /**
+ * @return non-null Can of 'discovered' WebModules, whether applicable or not is not decided here
+ * @apiNote order of filters is relevant/critical
- * and defined by the WebModules' {@link Order} annotations
++ * and defined by the WebModules' {@link Order} or {@link Priority} annotations
+ */
+ static Can<WebModule> discoverWebModules(ServiceRegistry serviceRegistry) {
+ val webModules = serviceRegistry.select(WebModule.class);
+ return webModules;
+ }
+
+
+}
diff --cc core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModuleContext.java
index 539ac1e,0000000..3014723
mode 100644,000000..100644
--- a/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModuleContext.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/modules/WebModuleContext.java
@@@ -1,131 -1,0 +1,119 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.core.webapp.modules;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletException;
+
+import org.apache.isis.applib.services.registry.ServiceRegistry;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.config.IsisConfiguration;
+
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
+
+/**
+ *
+ * @since 2.0
+ *
+ */
+@Log4j2 @RequiredArgsConstructor
+public class WebModuleContext {
+
- private final StringBuilder viewers = new StringBuilder();
+ private final StringBuilder protectedPath = new StringBuilder();
+
+ @NonNull @Getter private final ServletContext servletContext;
+ @NonNull @Getter private final IsisConfiguration configuration;
+ @NonNull @Getter private final ServiceRegistry serviceRegistry;
+
+ private Can<WebModule> webModules;
+ private final List<ServletContextListener> activeListeners = new ArrayList<>();
+
+ /**
- * Adds to the list of viewer names (<tt>isis.viewers</tt> context param)
- * @param viewerName
- */
- public void addViewer(String viewerName) {
- if(viewers.length()>0) {
- viewers.append(",");
- }
- viewers.append(viewerName);
- }
-
- /**
+ * Adds to the list of protected path names (<tt>isis.protected</tt> context param)
+ * @param path
+ */
+ public void addProtectedPath(String path) {
+ if(protectedPath.length()>0) {
+ protectedPath.append(",");
+ }
+ protectedPath.append(path);
+ }
+
+ /**
+ * immutable list of protected path names (<tt>isis.protected</tt> context param)
+ */
+ public Can<String> getProtectedPaths() {
+ final String listLiteral = protectedPath.toString();
+ return Can.<String>ofStream(_Strings.splitThenStream(listLiteral, ","));
+ }
+
+ public void prepare() {
+ webModules = WebModule.discoverWebModules(serviceRegistry);
+ webModules.forEach(module->module.prepare(this));
+ }
+
+ public void init() {
+
+ val event = new ServletContextEvent(servletContext);
+
+ webModules.stream()
+ .filter(module->module.isApplicable(this)) // filter those WebModules that are applicable
+ .forEach(module->addListener(event.getServletContext(), module));
+
+ activeListeners.forEach(listener->listener.contextInitialized(event));
+ }
+
+ public void shutdown(ServletContextEvent event) {
+ activeListeners.forEach(listener->shutdownListener(event, listener));
+ activeListeners.clear();
+ }
+
+ // -- HELPER
+
+ private void addListener(ServletContext servletContext, WebModule webModule) {
+ log.info(String.format("Setup ServletContext, adding WebModule '%s'", webModule.getName()));
+ try {
+ final Can<ServletContextListener> listeners = webModule.init(servletContext);
+ if(listeners != null && !listeners.isEmpty()) {
+ activeListeners.addAll(listeners.toList());
+ }
+ } catch (ServletException e) {
+ log.error(String.format("Failed to add WebModule '%s' to the ServletContext.", webModule.getName()), e);
+ }
+ }
+
+ private void shutdownListener(ServletContextEvent event, ServletContextListener listener) {
+ try {
+ listener.contextDestroyed(event);
+ } catch (Exception e) {
+ log.error(String.format("Failed to shutdown WebListener '%s'.", listener.getClass().getName()), e);
+ }
+ }
+
+}
diff --cc core/webapp/src/main/java/org/apache/isis/core/webapp/webappctx/IsisWebAppContextInitializer.java
index 66394a2,0000000..7a1d226
mode 100644,000000..100644
--- a/core/webapp/src/main/java/org/apache/isis/core/webapp/webappctx/IsisWebAppContextInitializer.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/webappctx/IsisWebAppContextInitializer.java
@@@ -1,134 -1,0 +1,133 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.core.webapp.webappctx;
+
+import java.util.EventListener;
+import java.util.concurrent.atomic.LongAdder;
+
+import javax.inject.Inject;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletException;
+
+import org.springframework.boot.web.servlet.ServletContextInitializer;
+import org.springframework.stereotype.Component;
+
+import org.apache.isis.applib.services.registry.ServiceRegistry;
++import org.apache.isis.core.commons.internal.base._Oneshot;
+import org.apache.isis.core.commons.internal.context._Context;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.config.viewer.wicket.WebAppContextPath;
+import org.apache.isis.core.webapp.modules.WebModule;
+import org.apache.isis.core.webapp.modules.WebModuleContext;
+
+import lombok.NonNull;
+import lombok.Value;
+import lombok.val;
+import lombok.extern.log4j.Log4j2;
+
+/**
+ *
+ * Introduced to render web.xml Filter/Listener/Servlet configurations obsolete.
+ * <p>
+ * Acts as the single application entry-point for setting up the
+ * ServletContext programmatically.
+ * </p><p>
+ * Installs {@link WebModule}s on the ServletContext.
+ * </p>
+ *
+ * @since 2.0
+ *
+ */
+@Component
+@Log4j2
+public class IsisWebAppContextInitializer implements ServletContextInitializer {
+
- private final static LongAdder instanceCount = new LongAdder();
++ private final static _Oneshot oneshot = new _Oneshot();
+
+ @Inject private ServiceRegistry serviceRegistry; // this dependency ensures Isis has been initialized/provisioned
+ @Inject private IsisConfiguration isisConfiguration;
+ @Inject private WebAppContextPath webAppContextPath;
+
+ // -- INTERFACE IMPLEMENTATION
+
+ @Override
+ public void onStartup(ServletContext servletContext) throws ServletException {
+
- { // onStartup(...) must be a one shot, otherwise just ignore
- if(instanceCount.intValue() > 0) {
- return;
- }
- instanceCount.increment();
++ // onStartup(...) must be a one shot, otherwise just ignore
++ if(!oneshot.shoot()) {
++ return;
+ }
+
+ if(!isIsisProvisioned()) {
+ log.error("skipping initialization, Spring should already have provisioned all configured Beans");
+ return;
+ }
+
+ // set the ServletContext initializing thread as preliminary default until overridden by
+ // IsisWicketApplication#init() or others, that better know what ClassLoader to use as application default.
+ _Context.setDefaultClassLoader(Thread.currentThread().getContextClassLoader(), false);
+
+ val contextPath = servletContext.getContextPath();
+
+ log.info("=== PHASE 1 === Setting up ServletContext parameters, contextPath = " + contextPath);
+
+ webAppContextPath.setContextPath(contextPath);
+
+ val webModuleContext = new WebModuleContext(servletContext, isisConfiguration, serviceRegistry);
+ webModuleContext.prepare();
+
+ log.info("=== PHASE 2 === Initializing the ServletContext");
+
+ webModuleContext.init();
+ servletContext.addListener(new ShutdownHook(webModuleContext));
+
+ log.info("=== DONE === ServletContext initialized.");
+
+ }
+
+ public void contextDestroyed(WebModuleContext webModuleContext, ServletContextEvent event) {
+ if(webModuleContext!=null) {
+ log.info("about to destroy the context");
+ webModuleContext.shutdown(event);
+ }
- instanceCount.reset();
++ oneshot.reset();
+ log.info("context destroyed");
+ }
+
+ // -- HELPER
+
+ @Value
+ private class ShutdownHook implements EventListener, ServletContextListener {
+ @NonNull WebModuleContext webModuleContext;
+
+ @Override
+ public void contextDestroyed(ServletContextEvent sce) {
+ IsisWebAppContextInitializer.this.contextDestroyed(webModuleContext, sce);
+ }
+ }
+
+ private boolean isIsisProvisioned() {
+ return serviceRegistry!=null;
+ }
+
+
+
+}
diff --cc viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
index c99e269,0000000..f95d249
mode 100644,000000..100644
--- a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
+++ b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
@@@ -1,142 -1,0 +1,141 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.webmodule;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletException;
+
+import org.jboss.resteasy.core.providerfactory.ResteasyProviderFactoryImpl;
+import org.jboss.resteasy.spi.ResteasyProviderFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Service;
+
+import org.apache.isis.applib.annotation.OrderPrecedence;
+import org.apache.isis.applib.services.inject.ServiceInjector;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.config.RestEasyConfiguration;
+import org.apache.isis.viewer.restfulobjects.viewer.webmodule.IsisRestfulObjectsSessionFilter;
+import org.apache.isis.viewer.restfulobjects.viewer.webmodule.IsisTransactionFilterForRestfulObjects;
+import org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationSessionStrategyBasicAuth;
+import org.apache.isis.core.webapp.modules.WebModuleAbstract;
+import org.apache.isis.core.webapp.modules.WebModuleContext;
+
+import lombok.Getter;
+
+/**
+ * WebModule that provides the RestfulObjects Viewer.
+ *
+ * @since 2.0
+ *
+ * @implNote CDI feels responsible to resolve injection points for any Servlet or Filter
+ * we register programmatically on the ServletContext.
+ * As long as injection points are considered to be resolved by Spring, we can workaround this fact:
+ * By replacing annotations {@code @Inject} with {@code @Autowire} for any Servlet or Filter,
+ * that get contributed by a WebModule, these will be ignored by CDI.
+ *
+ */
+@Service
+@Named("isisRoViewer.WebModuleJaxrsRestEasy4")
+@Order(OrderPrecedence.MIDPOINT - 80)
+@Qualifier("JaxrsRestEasy4")
+public final class WebModuleJaxrsResteasy4 extends WebModuleAbstract {
+
+ private static final String ISIS_SESSION_FILTER_FOR_RESTFUL_OBJECTS = "IsisSessionFilterForRestfulObjects";
+ private static final String ISIS_TRANSACTION_FILTER = "IsisTransactionFilterForRestfulObjects";
+
+ private final RestEasyConfiguration restEasyConfiguration;
+
+ private final String restfulPath;
+ private final String urlPattern;
+
+ @Inject
+ public WebModuleJaxrsResteasy4(
+ final RestEasyConfiguration restEasyConfiguration,
+ final ServiceInjector serviceInjector) {
+ super(serviceInjector);
+ this.restEasyConfiguration = restEasyConfiguration;
+ this.restfulPath = this.restEasyConfiguration.getJaxrs().getDefaultPath() + "/";
+ this.urlPattern = this.restfulPath + "*";
+ }
+
+ @Getter
+ private final String name = "JaxrsRestEasy4";
+
+ @Override
+ public void prepare(WebModuleContext ctx) {
+
+ // forces RuntimeDelegate.getInstance() to be provided by RestEasy
+ // (and not by eg. the JEE container if any)
+ ResteasyProviderFactory.setInstance(new ResteasyProviderFactoryImpl());
+
+ super.prepare(ctx);
+
+ if(!isApplicable(ctx)) {
+ return;
+ }
+
- ctx.addViewer("restfulobjects");
+ ctx.addProtectedPath(urlPattern);
+ }
+
+ @Override
+ public Can<ServletContextListener> init(ServletContext ctx) throws ServletException {
+
+ registerFilter(ctx, ISIS_SESSION_FILTER_FOR_RESTFUL_OBJECTS, IsisRestfulObjectsSessionFilter.class)
+ .ifPresent(filterReg -> {
+ // this is mapped to the entire application;
+ // however the IsisSessionFilter will
+ // "notice" if the session filter has already been
+ // executed for the request pipeline, and if so will do nothing
+ filterReg.addMappingForUrlPatterns(
+ null,
+ true,
+ this.urlPattern);
+
+ filterReg.setInitParameter(
+ "authenticationSessionStrategy",
+ AuthenticationSessionStrategyBasicAuth.class.getName());
+ filterReg.setInitParameter(
+ "whenNoSession", // what to do if no session was found ...
+ "auto"); // ... 401 and a basic authentication challenge if request originates from web browser
+ filterReg.setInitParameter(
+ "passThru",
+ String.join(",",
+ this.restfulPath + "swagger",
+ this.restfulPath + "health"));
+
+ } );
+
+ registerFilter(ctx, ISIS_TRANSACTION_FILTER, IsisTransactionFilterForRestfulObjects.class)
+ .ifPresent(filterReg -> {
+ filterReg.addMappingForUrlPatterns(
+ null,
+ true,
+ this.urlPattern);
+ });
+
+
+ return Can.empty(); // registers no listeners
+ }
+
+
+}
diff --cc viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
index 7db2a14,0000000..eeb66b3
mode 100644,000000..100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
@@@ -1,115 -1,0 +1,114 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.viewer.wicket.viewer.webmodule;
+
+import static java.util.Objects.requireNonNull;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletException;
+
+import org.apache.wicket.protocol.http.WicketFilter;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Service;
+
+import org.apache.isis.applib.annotation.OrderPrecedence;
+import org.apache.isis.applib.services.inject.ServiceInjector;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
+import org.apache.isis.core.config.IsisConfiguration;
+import org.apache.isis.core.webapp.modules.WebModuleAbstract;
+import org.apache.isis.core.webapp.modules.WebModuleContext;
+
+import lombok.Getter;
+
+/**
+ * WebModule that provides the Wicket Viewer.
+ * @since 2.0
+ */
+@Service
+@Named("isisWicketViewer.WebModuleWicket")
+@Order(OrderPrecedence.MIDPOINT - 80)
+@Qualifier("Wicket")
+public final class WebModuleWicket extends WebModuleAbstract {
+
+ private final static String WICKET_FILTER_NAME = "WicketFilter";
+
+ private final IsisSystemEnvironment isisSystemEnvironment;
+ private final IsisConfiguration isisConfiguration;
+
+ private final String wicketBasePath;
+ private final String deploymentMode;
+ private final String wicketApp;
+ private final String urlPattern;
+
+ @Inject
+ public WebModuleWicket(
+ final IsisSystemEnvironment isisSystemEnvironment,
+ final IsisConfiguration isisConfiguration,
+ final ServiceInjector serviceInjector) {
+ super(serviceInjector);
+
+ this.isisSystemEnvironment = isisSystemEnvironment;
+ this.isisConfiguration = isisConfiguration;
+
+ this.wicketBasePath = this.isisConfiguration.getViewer().getWicket().getBasePath();
+
+ deploymentMode = this.isisSystemEnvironment.isPrototyping()
+ ? "development"
+ : "deployment";
+
+ wicketApp = isisConfiguration.getViewer().getWicket().getApp();
+
+ requireNonNull(wicketBasePath, "Config property 'isis.viewer.wicket.base-path' is required.");
+ requireNonNull(wicketApp, "Config property 'isis.viewer.wicket.app' is required.");
+
+ this.urlPattern = wicketBasePath + "*";
+ }
+
+ @Getter
+ private final String name = "Wicket";
+
+ @Override
+ public void prepare(final WebModuleContext ctx) {
+ super.prepare(ctx);
- ctx.addViewer("wicket");
+ ctx.addProtectedPath(this.urlPattern);
+ }
+
+ @Override
+ public Can<ServletContextListener> init(final ServletContext ctx) throws ServletException {
+
+ registerFilter(ctx, WICKET_FILTER_NAME, WicketFilter.class)
+ .ifPresent(filterReg -> {
+ filterReg.setInitParameter("applicationClassName", wicketApp);
+ filterReg.setInitParameter("filterMappingUrlPattern", urlPattern);
+ filterReg.setInitParameter("configuration", deploymentMode);
+ filterReg.addMappingForUrlPatterns(
+ null,
+ true,
+ urlPattern);
+ });
+
+ return Can.empty(); // registers no listeners
+ }
+
+}
[isis] 12/14: ISIS-2259: fixing further unit tests
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f3e2749cd17387fcf59b704cd22008e1c76be3ac
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 17:58:14 2020 +0000
ISIS-2259: fixing further unit tests
---
.../base/applib/utils/ClassUtilsTest.java | 6 +++---
subdomains/base/pom.xml | 2 +-
.../excel/fixtures/IsisModuleSubExcelFixtures.java | 12 +++++------
.../contributions/ExcelDemoToDoItem_export2.java | 2 +-
.../BulkUpdateLineItemForDemoToDoItem.java | 13 +++++++++++-
.../BulkUpdateManagerForDemoToDoItem.java | 12 ++++++++---
.../bulkupdate/BulkUpdateMenuForDemoToDoItem.java | 19 +++++++++++------
.../pivot/ExcelPivotByCategoryAndSubcategory.java | 8 ++++----
.../ExcelPivotByCategoryAndSubcategoryMenu.java | 7 ++++++-
.../demotodoitem/DemoToDoItemRowHandler.java | 4 ++--
.../demotodoitem/DemoToDoItemRowHandler2.java | 6 +++---
.../ExcelUploadRowHandler4ToDoItem.java | 4 ++--
.../ExcelUploadServiceForDemoToDoItem.java | 8 +++++++-
.../DemoFixture_extending_ExcelFixture2.java | 6 +++---
.../DemoToDoItem_create_usingExcelFixture.java | 2 +-
.../ExcelDemoToDoItem_recreate5_for.java | 2 +-
.../ExcelDemoToDoItem_tearDown2.java | 2 +-
.../integtests/ExcelModuleIntegTestAbstract.java | 21 ++++++++++---------
...uleDemoToDoItemBulkUpdateManager_IntegTest.java | 2 +-
.../ExcelModuleDemoUploadService_IntegTest.java | 2 +-
subdomains/excel/integtests/translations.pot | 16 +++++++--------
subdomains/xdocreport/applib/pom.xml | 2 +-
.../applib/service/XDocReportServiceTest.java | 2 +-
subdomains/xdocreport/pom.xml | 2 +-
testing/fakedata/applib/pom.xml | 2 +-
testing/fakedata/fixtures/pom.xml | 2 +-
testing/fakedata/integtests/pom.xml | 2 +-
.../FakeDataModuleIntegTestAbstract.java | 24 +++++++++++-----------
.../fakedata/integtests/tests/Smoke_IntegTest.java | 12 +++++------
testing/fakedata/pom.xml | 2 +-
testing/fixtures/applib/pom.xml | 2 +-
testing/fixtures/pom.xml | 2 +-
testing/h2console/pom.xml | 2 +-
testing/h2console/ui/pom.xml | 2 +-
testing/hsqldbmgr/pom.xml | 2 +-
testing/hsqldbmgr/ui/pom.xml | 2 +-
testing/integtestsupport/applib/pom.xml | 2 +-
testing/integtestsupport/pom.xml | 2 +-
testing/specsupport/applib/pom.xml | 2 +-
testing/specsupport/pom.xml | 2 +-
testing/unittestsupport/applib/pom.xml | 2 +-
testing/unittestsupport/pom.xml | 2 +-
.../sse/applib/IsisModuleValSseApplib.java | 13 ------------
.../ListeningMarkupPanelFactoriesForWicket.java | 1 +
44 files changed, 134 insertions(+), 110 deletions(-)
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/ClassUtilsTest.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/ClassUtilsTest.java
index 02633f0..4bfd09a 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/ClassUtilsTest.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/utils/ClassUtilsTest.java
@@ -34,8 +34,8 @@ public class ClassUtilsTest {
@Test
public void doesNotExist() throws Exception {
thrown.expect(IllegalArgumentException.class);
- thrown.expectMessage("Class 'org.incode.module.base.dom.utils.SomeNonExistentClass' not found");
- final Class<? extends SomeClass> cls = ClassUtils.load("org.incode.module.base.dom.utils.SomeNonExistentClass", SomeClass.class);
+ thrown.expectMessage("Class 'org.apache.isis.subdomains.base.applib.utils.SomeNonExistentClass' not found");
+ final Class<? extends SomeClass> cls = ClassUtils.load("org.apache.isis.subdomains.base.applib.utils.SomeNonExistentClass", SomeClass.class);
assertThat(cls, is(not(nullValue())));
}
@@ -48,7 +48,7 @@ public class ClassUtilsTest {
@Test
public void existsAndIsNotASubclass() throws Exception {
thrown.expect(IllegalArgumentException.class);
- thrown.expectMessage("Class 'org.apache.isis.extensions.base.dom.utils.ClassUtilsTest$Load$SomeOtherClass' not a subclass of org.apache.isis.extensions.base.dom.utils.ClassUtilsTest$Load$SomeClass");
+ thrown.expectMessage("Class 'org.apache.isis.subdomains.base.applib.utils.ClassUtilsTest$Load$SomeOtherClass' not a subclass of org.apache.isis.subdomains.base.applib.utils.ClassUtilsTest$Load$SomeClass");
final Class<? extends SomeClass> cls = ClassUtils.load(SomeOtherClass.class.getName(), SomeClass.class);
assertThat(cls, is(not(nullValue())));
}
diff --git a/subdomains/base/pom.xml b/subdomains/base/pom.xml
index ec52bfe..a2ec1d8 100644
--- a/subdomains/base/pom.xml
+++ b/subdomains/base/pom.xml
@@ -10,7 +10,7 @@
<artifactId>isis-subdomains-base</artifactId>
- <name>Apache Isis Sub - Base (applib)</name>
+ <name>Apache Isis Sub - Base (parent)</name>
<description>
A module providing Base utilities for other subdomain modules
</description>
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubExcelFixtures.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubExcelFixtures.java
index b9ef710..a743477 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubExcelFixtures.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubExcelFixtures.java
@@ -4,19 +4,19 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.excel.ExcelModule;
+import org.apache.isis.subdomains.excel.applib.IsisModuleSubExcelApplib;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescripts.ExcelDemoToDoItem_tearDown;
-import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.fixtures.modules.Module;
+import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
@Configuration
@Import({
- ExcelModule.class,
- IsisExtFixturesModule.class
+ IsisModuleSubExcelApplib.class,
+ IsisModuleTstFixturesApplib.class
})
@ComponentScan
-public class IsisModuleSubExcelFixtures implements Module {
+public class IsisModuleSubExcelFixtures implements ModuleWithFixtures {
@Override public FixtureScript getTeardownFixture() {
return new ExcelDemoToDoItem_tearDown();
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java
index 99d1452..e5ee13d 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java
@@ -7,7 +7,7 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.Contributed;
import org.apache.isis.applib.annotation.Mixin;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.excel.dom.ExcelService;
+import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
index b93efed..80d3b49 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java
@@ -5,7 +5,18 @@ import java.time.LocalDate;
import javax.inject.Inject;
import javax.jdo.annotations.Column;
-
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.BookmarkPolicy;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.DomainObjectLayout;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.applib.services.user.UserService;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
index b562f7d..2e2f930 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
@@ -5,6 +5,11 @@ import java.util.stream.Collectors;
import javax.annotation.Nullable;
import javax.inject.Inject;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
@@ -22,9 +27,10 @@ import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.excel.dom.ExcelService;
-import org.apache.isis.extensions.excel.dom.WorksheetContent;
-import org.apache.isis.extensions.excel.dom.WorksheetSpec;
+import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
+import org.apache.isis.subdomains.excel.applib.dom.WorksheetContent;
+import org.apache.isis.subdomains.excel.applib.dom.WorksheetSpec;
+import org.apache.isis.subdomains.excel.applib.dom.WorksheetSpec;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
index ec358cf..a1da3b8 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
@@ -1,12 +1,19 @@
package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.bulkupdate;
import javax.inject.Inject;
+import javax.xml.bind.annotation.XmlTransient;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
+import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.user.UserService;
-import org.apache.isis.extensions.excel.dom.ExcelService;
+import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
@@ -32,10 +39,10 @@ public class BulkUpdateMenuForDemoToDoItem {
}
- @Inject private RepositoryService repositoryService;
- @Inject private FactoryService factoryService;
- @Inject private UserService userService;
- @Inject private ExcelService excelService;
- @Inject private BookmarkService bookmarkService;
+ @XmlTransient @Inject private RepositoryService repositoryService;
+ @XmlTransient @Inject private FactoryService factoryService;
+ @XmlTransient @Inject private UserService userService;
+ @XmlTransient @Inject private ExcelService excelService;
+ @XmlTransient @Inject private BookmarkService bookmarkService;
}
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
index 0cdf79a..4eb68b9 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
@@ -4,10 +4,10 @@ import java.math.BigDecimal;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.extensions.excel.dom.AggregationType;
-import org.apache.isis.extensions.excel.dom.PivotColumn;
-import org.apache.isis.extensions.excel.dom.PivotRow;
-import org.apache.isis.extensions.excel.dom.PivotValue;
+import org.apache.isis.subdomains.excel.applib.dom.AggregationType;
+import org.apache.isis.subdomains.excel.applib.dom.PivotColumn;
+import org.apache.isis.subdomains.excel.applib.dom.PivotRow;
+import org.apache.isis.subdomains.excel.applib.dom.PivotValue;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
index 3b3c022..e6b1d3f 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java
@@ -5,9 +5,14 @@ import java.util.List;
import javax.inject.Inject;
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
+import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.excel.dom.ExcelService;
+import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
@DomainService(
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
index 188f9a0..50ec857 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java
@@ -9,8 +9,8 @@ import javax.inject.Inject;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.user.UserService;
-import org.apache.isis.extensions.excel.dom.ExcelFixture;
-import org.apache.isis.extensions.excel.dom.ExcelFixtureRowHandler;
+import org.apache.isis.subdomains.excel.testing.ExcelFixture;
+import org.apache.isis.subdomains.excel.testing.ExcelFixtureRowHandler;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
index 1f77de6..e4e0aa3 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
@@ -2,9 +2,9 @@ package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehand
import java.math.BigDecimal;
-import org.apache.isis.extensions.excel.dom.ExcelFixture2;
-import org.apache.isis.extensions.excel.dom.ExcelMetaDataEnabled;
-import org.apache.isis.extensions.excel.dom.FixtureAwareRowHandler;
+import org.apache.isis.subdomains.excel.testing.ExcelFixture2;
+import org.apache.isis.subdomains.excel.applib.dom.ExcelMetaDataEnabled;
+import org.apache.isis.subdomains.excel.testing.FixtureAwareRowHandler;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Subcategory;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
index 24b1f45..50a1949 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java
@@ -14,8 +14,8 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
-import org.apache.isis.extensions.excel.dom.ExcelFixture;
-import org.apache.isis.extensions.excel.dom.ExcelFixtureRowHandler;
+import org.apache.isis.subdomains.excel.testing.ExcelFixture;
+import org.apache.isis.subdomains.excel.testing.ExcelFixtureRowHandler;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
index c80acb2..40b3efa 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java
@@ -4,8 +4,14 @@ import java.util.List;
import javax.inject.Inject;
+import org.apache.isis.applib.annotation.DomainService;
+import org.apache.isis.applib.annotation.DomainServiceLayout;
+import org.apache.isis.applib.annotation.NatureOfService;
+import org.apache.isis.applib.annotation.Optionality;
+import org.apache.isis.applib.annotation.Parameter;
+import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.excel.dom.ExcelFixture;
+import org.apache.isis.subdomains.excel.testing.ExcelFixture;
import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureResult;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
index 4bddf70..7a308df 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
@@ -3,10 +3,10 @@ package org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturescri
import com.google.common.io.Resources;
import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.extensions.excel.dom.ExcelFixture2;
-import org.apache.isis.extensions.excel.dom.WorksheetSpec;
-import org.apache.isis.extensions.excel.dom.util.Mode;
+import org.apache.isis.subdomains.excel.applib.dom.WorksheetSpec;
+import org.apache.isis.subdomains.excel.applib.dom.util.Mode;
import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler2;
+import org.apache.isis.subdomains.excel.testing.ExcelFixture2;
import lombok.Getter;
import lombok.Setter;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
index e5b9565..f159d50 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java
@@ -10,7 +10,7 @@ import com.google.common.io.Resources;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.extensions.excel.dom.ExcelFixture;
+import org.apache.isis.subdomains.excel.testing.ExcelFixture;
import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
index aea4c93..27841e5 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java
@@ -4,7 +4,7 @@ import java.math.BigDecimal;
import java.time.LocalDate;
import org.apache.isis.applib.clock.Clock;
-import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
+import org.apache.isis.persistence.jdo.applib.services.IsisJdoSupport;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.Category;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
diff --git a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
index 3a6dd12..48b5ac7 100644
--- a/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
+++ b/subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java
@@ -2,7 +2,7 @@ package org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.fixturescri
import javax.inject.Inject;
-import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
+import org.apache.isis.persistence.jdo.applib.services.IsisJdoSupport;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
public class ExcelDemoToDoItem_tearDown2 extends FixtureScript {
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
index d53c135..04cdd8f 100644
--- a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
+++ b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
@@ -6,15 +6,16 @@ import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
-import org.apache.isis.config.IsisPresets;
+import org.apache.isis.core.config.presets.IsisPresets;
+import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
+import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
+import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
import org.apache.isis.subdomains.excel.fixtures.IsisModuleSubExcelFixtures;
-import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
-import org.apache.isis.jdo.IsisBootDataNucleus;
-import org.apache.isis.core.runtime.spring.IsisBoot;
-import org.apache.isis.security.bypass.IsisBootSecurityBypass;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
@SpringBootTest(
classes = ExcelModuleIntegTestAbstract.AppManifest.class
@@ -31,13 +32,13 @@ public abstract class ExcelModuleIntegTestAbstract extends IsisIntegrationTestAb
@PropertySource(IsisPresets.DataNucleusAutoCreate),
})
@Import({
- IsisBoot.class,
- IsisBootSecurityBypass.class,
- IsisBootDataNucleus.class,
- IsisExtFixturesModule.class,
+ IsisModuleCoreWebSpringBoot.class,
+ IsisModuleSecurityBypass.class,
+ IsisModuleJdoDataNucleus5.class,
+ IsisModuleTstFixturesApplib.class,
/*
- new ExcelFixturesModule(),
+ new ExcelFixturesModule(),
FakeDataModule.class
*/
IsisModuleSubExcelFixtures.class
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
index 1865a0a..e8a1650 100644
--- a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
+++ b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
@@ -18,7 +18,7 @@ import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.excel.dom.ExcelService;
+import org.apache.isis.subdomains.excel.applib.dom.ExcelService;
import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateLineItemForDemoToDoItem;
import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateManagerForDemoToDoItem;
import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateMenuForDemoToDoItem;
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java
index 30bd8cf..bd02fcf 100644
--- a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java
+++ b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java
@@ -12,7 +12,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.excel.dom.util.ExcelFileBlobConverter;
+import org.apache.isis.subdomains.excel.applib.dom.util.ExcelFileBlobConverter;
import org.apache.isis.subdomains.excel.fixtures.demoapp.demomodule.fixturehandlers.excelupload.ExcelUploadServiceForDemoToDoItem;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.subdomains.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
diff --git a/subdomains/excel/integtests/translations.pot b/subdomains/excel/integtests/translations.pot
index ffb722d..a973b91 100644
--- a/subdomains/excel/integtests/translations.pot
+++ b/subdomains/excel/integtests/translations.pot
@@ -263,8 +263,8 @@ msgstr ""
#: org.apache.isis.applib.fixturescripts.FixtureScript#downloadLayoutXml()
#: org.apache.isis.applib.fixturescripts.SimpleFixtureScript#downloadLayoutXml()
#: org.apache.isis.applib.services.config.ConfigurationProperty#downloadLayoutXml()
-#: org.apache.isis.extensions.excel.dom.ExcelFixture#downloadLayoutXml()
-#: org.apache.isis.extensions.excel.dom.ExcelFixture2#downloadLayoutXml()
+#:org.apache.isis.subdomains.excel.applib.ExcelFixture#downloadLayoutXml()
+#:org.apache.isis.subdomains.excel.applib.ExcelFixture2#downloadLayoutXml()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateLineItemForDemoToDoItem#downloadLayoutXml()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateManagerForDemoToDoItem#downloadLayoutXml()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.pivot.ExcelPivotByCategoryAndSubcategory#downloadLayoutXml()
@@ -533,8 +533,8 @@ msgstr ""
#: org.apache.isis.applib.fixturescripts.SimpleFixtureScript#openRestApi()
#: org.apache.isis.applib.services.config.ConfigurationProperty#openRestApi()
#: org.apache.isis.applib.services.swagger.SwaggerServiceMenu#openRestApi()
-#: org.apache.isis.extensions.excel.dom.ExcelFixture#openRestApi()
-#: org.apache.isis.extensions.excel.dom.ExcelFixture2#openRestApi()
+#:org.apache.isis.subdomains.excel.applib.ExcelFixture#openRestApi()
+#:org.apache.isis.subdomains.excel.applib.ExcelFixture2#openRestApi()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateLineItemForDemoToDoItem#openRestApi()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateManagerForDemoToDoItem#openRestApi()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.pivot.ExcelPivotByCategoryAndSubcategory#openRestApi()
@@ -659,8 +659,8 @@ msgstr ""
#: org.apache.isis.applib.fixturescripts.FixtureScript#rebuildMetamodel()
#: org.apache.isis.applib.fixturescripts.SimpleFixtureScript#rebuildMetamodel()
#: org.apache.isis.applib.services.config.ConfigurationProperty#rebuildMetamodel()
-#: org.apache.isis.extensions.excel.dom.ExcelFixture#rebuildMetamodel()
-#: org.apache.isis.extensions.excel.dom.ExcelFixture2#rebuildMetamodel()
+#:org.apache.isis.subdomains.excel.applib.ExcelFixture#rebuildMetamodel()
+#:org.apache.isis.subdomains.excel.applib.ExcelFixture2#rebuildMetamodel()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateLineItemForDemoToDoItem#rebuildMetamodel()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateManagerForDemoToDoItem#rebuildMetamodel()
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.pivot.ExcelPivotByCategoryAndSubcategory#rebuildMetamodel()
@@ -711,8 +711,8 @@ msgstr ""
#: org.apache.isis.applib.fixturescripts.DiscoverableFixtureScript
#: org.apache.isis.applib.fixturescripts.FixtureScript
#: org.apache.isis.applib.fixturescripts.SimpleFixtureScript
-#: org.apache.isis.extensions.excel.dom.ExcelFixture
-#: org.apache.isis.extensions.excel.dom.ExcelFixture2
+#:org.apache.isis.subdomains.excel.applib.ExcelFixture
+#:org.apache.isis.subdomains.excel.applib.ExcelFixture2
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescripts.DemoFixture_extending_ExcelFixture2
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescripts.DemoToDoItem_create_usingExcelFixture
#: org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescripts.DemoToDoItem_recreate_usingExcelFixture
diff --git a/subdomains/xdocreport/applib/pom.xml b/subdomains/xdocreport/applib/pom.xml
index 4b12354..e98a695 100644
--- a/subdomains/xdocreport/applib/pom.xml
+++ b/subdomains/xdocreport/applib/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-subdomains-xdocreport-applib</artifactId>
- <name>Apache Isis Sub - xdocreport (applib)</name>
+ <name>Apache Isis Sub - XdocReport (applib)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.subdomains.xdocreport.applib</jar-plugin.automaticModuleName>
diff --git a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java
index c6df8d8..741e672 100644
--- a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java
+++ b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java
@@ -38,7 +38,7 @@ public class XDocReportServiceTest {
public void simple() throws Exception {
// given
- InputStream in= new FileInputStream(new File("src/test/java/org/apache/isis/extensions/xdocreport/dom/impl/example/template/Project-template.docx"));
+ InputStream in= new FileInputStream(new File("src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/example/template/Project-template.docx"));
final byte[] templateBytes = IOUtils.toByteArray(in);
Project project = new Project("XDocReport");
diff --git a/subdomains/xdocreport/pom.xml b/subdomains/xdocreport/pom.xml
index 8068baf..03f34b0 100644
--- a/subdomains/xdocreport/pom.xml
+++ b/subdomains/xdocreport/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-subdomains-xdocreport</artifactId>
- <name>Apache Isis Sub - xdocreport (parent)</name>
+ <name>Apache Isis Sub - XdocReport (parent)</name>
<description>Integrates XDoc Report Library</description>
<packaging>pom</packaging>
diff --git a/testing/fakedata/applib/pom.xml b/testing/fakedata/applib/pom.xml
index 257c94f..40f9559 100644
--- a/testing/fakedata/applib/pom.xml
+++ b/testing/fakedata/applib/pom.xml
@@ -9,7 +9,7 @@
</parent>
<artifactId>isis-testing-fakedata-applib</artifactId>
- <name>Apache Isis Testing - FakeData (applib)</name>
+ <name>Apache Isis Tst - FakeData (applib)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.testing.fakedata.applib</jar-plugin.automaticModuleName>
diff --git a/testing/fakedata/fixtures/pom.xml b/testing/fakedata/fixtures/pom.xml
index a1f9231..cf6dcfc 100644
--- a/testing/fakedata/fixtures/pom.xml
+++ b/testing/fakedata/fixtures/pom.xml
@@ -9,7 +9,7 @@
</parent>
<artifactId>isis-testing-fakedata-fixtures</artifactId>
- <name>Apache Isis Testing - FakeData (Fixtures)</name>
+ <name>Apache Isis Tst - FakeData (fixtures)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.testing.fakedata.fixtures</jar-plugin.automaticModuleName>
diff --git a/testing/fakedata/integtests/pom.xml b/testing/fakedata/integtests/pom.xml
index d8ca296..3d64a2d 100644
--- a/testing/fakedata/integtests/pom.xml
+++ b/testing/fakedata/integtests/pom.xml
@@ -10,7 +10,7 @@
</parent>
<artifactId>isis-testing-fakedata-integtests</artifactId>
- <name>Apache Isis Testing - FakeData (Integ Tests)</name>
+ <name>Apache Isis Tst - FakeData (integ tests)</name>
<properties>
diff --git a/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
index a26f069..ba4252e 100644
--- a/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
+++ b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
@@ -7,16 +7,16 @@ import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
import org.springframework.transaction.annotation.Transactional;
-import org.apache.isis.config.IsisPresets;
-import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
+import org.apache.isis.core.config.presets.IsisPresets;
+import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
+import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
+import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
+import org.apache.isis.testing.fakedata.fixtures.IsisModuleTstFakeDataFixtures;
import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
-import org.apache.isis.jdo.IsisBootDataNucleus;
-import org.apache.isis.core.runtime.spring.IsisBoot;
-import org.apache.isis.security.bypass.IsisBootSecurityBypass;
-
-import org.isisaddons.module.fakedata.fixture.FakeDataFixturesModule;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
@SpringBootTest(
classes = FakeDataModuleIntegTestAbstract.AppManifest.class
@@ -33,11 +33,11 @@ public abstract class FakeDataModuleIntegTestAbstract extends IsisIntegrationTes
@PropertySource(IsisPresets.DataNucleusAutoCreate),
})
@Import({
- IsisBoot.class,
- IsisBootSecurityBypass.class,
- IsisBootDataNucleus.class,
- IsisExtFixturesModule.class,
- FakeDataFixturesModule.class
+ IsisModuleCoreWebSpringBoot.class,
+ IsisModuleSecurityBypass.class,
+ IsisModuleJdoDataNucleus5.class,
+ IsisModuleTstFixturesApplib.class,
+ IsisModuleTstFakeDataFixtures.class
})
public static class AppManifest {
}
diff --git a/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/tests/Smoke_IntegTest.java b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/tests/Smoke_IntegTest.java
index 39bf4e6..4b4648b 100644
--- a/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/tests/Smoke_IntegTest.java
+++ b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/tests/Smoke_IntegTest.java
@@ -18,15 +18,15 @@ import org.junit.jupiter.api.Test;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
import org.apache.isis.applib.value.Password;
-import org.apache.isis.extensions.fakedata.dom.services.FakeDataService;
+import org.apache.isis.testing.fakedata.applib.services.FakeDataService;
+import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.EnumOf3;
+import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
+import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.dom.FakeDataDemoObjectWithAllMenu;
+import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.fixturescripts.FakeDataDemoObjectWithAll_create3;
+import org.apache.isis.testing.fakedata.fixtures.demoapp.demomodule.fixturescripts.data.FakeDataDemoObjectWithAll_update_withFakeData;
import org.apache.isis.testing.fakedata.integtests.FakeDataModuleIntegTestAbstract;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
-import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.EnumOf3;
-import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAll;
-import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.dom.FakeDataDemoObjectWithAllMenu;
-import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.fixturescripts.FakeDataDemoObjectWithAll_create3;
-import org.isisaddons.module.fakedata.fixture.demoapp.demomodule.fixturescripts.data.FakeDataDemoObjectWithAll_update_withFakeData;
public class Smoke_IntegTest extends FakeDataModuleIntegTestAbstract {
diff --git a/testing/fakedata/pom.xml b/testing/fakedata/pom.xml
index 72862ae..c7e7275 100644
--- a/testing/fakedata/pom.xml
+++ b/testing/fakedata/pom.xml
@@ -9,7 +9,7 @@
</parent>
<artifactId>isis-testing-fakedata</artifactId>
- <name>Apache Isis Testing - FakeData (parent)</name>
+ <name>Apache Isis Tst - FakeData (parent)</name>
<description>
A module providing a domain service to generate fake random data
diff --git a/testing/fixtures/applib/pom.xml b/testing/fixtures/applib/pom.xml
index dcc2009..1ff08a7 100644
--- a/testing/fixtures/applib/pom.xml
+++ b/testing/fixtures/applib/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-testing-fixtures-applib</artifactId>
- <name>Apache Isis Testing - Fixtures (applib)</name>
+ <name>Apache Isis Tst - Fixtures (applib)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.testing.fixtures.applib</jar-plugin.automaticModuleName>
diff --git a/testing/fixtures/pom.xml b/testing/fixtures/pom.xml
index b02bff5..11785d7 100644
--- a/testing/fixtures/pom.xml
+++ b/testing/fixtures/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-testing-fixtures</artifactId>
- <name>Apache Isis Testing - Fixtures (parent)</name>
+ <name>Apache Isis Tst - Fixtures (parent)</name>
<description>
Library to initialize the system under test, either for integration testing or for prototyping.
</description>
diff --git a/testing/h2console/pom.xml b/testing/h2console/pom.xml
index 9950716..324c84d 100644
--- a/testing/h2console/pom.xml
+++ b/testing/h2console/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-testing-h2console</artifactId>
- <name>Apache Isis Testing - H2 Console (parent)</name>
+ <name>Apache Isis Tst - H2 Console (parent)</name>
<description>Menu and configuration to open up H2 Console</description>
<packaging>pom</packaging>
diff --git a/testing/h2console/ui/pom.xml b/testing/h2console/ui/pom.xml
index fee82bf..34fe560 100644
--- a/testing/h2console/ui/pom.xml
+++ b/testing/h2console/ui/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-testing-h2console-ui</artifactId>
- <name>Apache Isis Testing - H2 Console (ui)</name>
+ <name>Apache Isis Tst - H2 Console (ui)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.testing.h2console.ui</jar-plugin.automaticModuleName>
diff --git a/testing/hsqldbmgr/pom.xml b/testing/hsqldbmgr/pom.xml
index 43b785b..4d45c3d 100644
--- a/testing/hsqldbmgr/pom.xml
+++ b/testing/hsqldbmgr/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-testing-hsqldbmgr</artifactId>
- <name>Apache Isis Testing - HSQLDB Manager (parent)</name>
+ <name>Apache Isis Tst - HSQLDB Manager (parent)</name>
<description>Menu and configuration to open up HSQLDB Manager</description>
<packaging>pom</packaging>
diff --git a/testing/hsqldbmgr/ui/pom.xml b/testing/hsqldbmgr/ui/pom.xml
index f3d90c7..2912469 100644
--- a/testing/hsqldbmgr/ui/pom.xml
+++ b/testing/hsqldbmgr/ui/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-testing-hsqldbmgr-ui</artifactId>
- <name>Apache Isis Testing - HSQLDB Manager</name>
+ <name>Apache Isis Tst - HSQLDB Manager</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.testing.hsqldbmgr.ui</jar-plugin.automaticModuleName>
diff --git a/testing/integtestsupport/applib/pom.xml b/testing/integtestsupport/applib/pom.xml
index e1322ba..0dfb3b8 100644
--- a/testing/integtestsupport/applib/pom.xml
+++ b/testing/integtestsupport/applib/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-testing-integtestsupport-applib</artifactId>
- <name>Apache Isis Testing - Integ Test Support (applib)</name>
+ <name>Apache Isis Tst - Integ Test Support (applib)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.testing.integtestsupport.applib</jar-plugin.automaticModuleName>
diff --git a/testing/integtestsupport/pom.xml b/testing/integtestsupport/pom.xml
index b1752c8..7f5c8dd 100644
--- a/testing/integtestsupport/pom.xml
+++ b/testing/integtestsupport/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-testing-integtestsupport</artifactId>
- <name>Apache Isis Testing - Integ Test Support (parent)</name>
+ <name>Apache Isis Tst - Integ Test Support (parent)</name>
<description>
Support for writing integ tests in JUnit 5; should be added as a dependency with scope=test only
diff --git a/testing/specsupport/applib/pom.xml b/testing/specsupport/applib/pom.xml
index df9e129..f3018b2 100644
--- a/testing/specsupport/applib/pom.xml
+++ b/testing/specsupport/applib/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-testing-specsupport-applib</artifactId>
- <name>Apache Isis Testing - Spec/Cucumber (applib)</name>
+ <name>Apache Isis Tst - Spec/Cucumber (applib)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.testing.specsupport.applib</jar-plugin.automaticModuleName>
diff --git a/testing/specsupport/pom.xml b/testing/specsupport/pom.xml
index dc5f056..c71e737 100644
--- a/testing/specsupport/pom.xml
+++ b/testing/specsupport/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-testing-specsupport</artifactId>
- <name>Apache Isis Testing - Spec/Cucumber (parent)</name>
+ <name>Apache Isis Tst - Spec/Cucumber (parent)</name>
<description>
Allows Cucumber to be used to write BDD-style specifications, generally as an alternative to integration tests.
</description>
diff --git a/testing/unittestsupport/applib/pom.xml b/testing/unittestsupport/applib/pom.xml
index 91a6301..53df518 100644
--- a/testing/unittestsupport/applib/pom.xml
+++ b/testing/unittestsupport/applib/pom.xml
@@ -9,7 +9,7 @@
</parent>
<artifactId>isis-testing-unittestsupport-applib</artifactId>
- <name>Apache Isis Testing - Unit Test Support (applib)</name>
+ <name>Apache Isis Tst - Unit Test Support (applib)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.testing.unittestsupport.applib</jar-plugin.automaticModuleName>
diff --git a/testing/unittestsupport/pom.xml b/testing/unittestsupport/pom.xml
index 2bf6209..e08ed79 100644
--- a/testing/unittestsupport/pom.xml
+++ b/testing/unittestsupport/pom.xml
@@ -10,7 +10,7 @@
<artifactId>isis-testing-unittestsupport</artifactId>
- <name>Apache Isis Testing - Unit Test Support (parent)</name>
+ <name>Apache Isis Tst - Unit Test Support (parent)</name>
<description>
A module providing test utilities for unit testing of domain modules
</description>
diff --git a/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/IsisModuleValSseApplib.java b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/IsisModuleValSseApplib.java
index e4eb732..6cbdc6f 100644
--- a/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/IsisModuleValSseApplib.java
+++ b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/IsisModuleValSseApplib.java
@@ -21,21 +21,8 @@ package org.apache.isis.valuetypes.sse.applib;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.sse.markup.ListeningMarkupPanelFactoriesForWicket;
-import org.apache.isis.extensions.sse.services.SseServiceDefault;
-import org.apache.isis.extensions.sse.webmodule.WebModuleServerSentEvents;
@Configuration
-@Import({
- // @Component's
- SseMetaModelPlugin.class,
- ListeningMarkupPanelFactoriesForWicket.Parented.class,
- ListeningMarkupPanelFactoriesForWicket.Standalone.class,
-
- // @Service's
- SseServiceDefault.class,
- WebModuleServerSentEvents.class
-})
public class IsisModuleValSseApplib {
}
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java
index 8695c16..f7f6cf4 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java
@@ -22,6 +22,7 @@ package org.apache.isis.valuetypes.sse.ui.markup;
import org.springframework.stereotype.Component;
import org.apache.isis.applib.value.LocalResourcePath;
+import org.apache.isis.valuetypes.sse.applib.value.ListeningMarkup;
import org.apache.isis.valuetypes.sse.metamodel.facets.SseObserveFacet;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.markup.MarkupComponentFactory;
[isis] 04/14: ISIS-2259: updates packages for
isis-core-runtimeservices.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 3a21a480fcee0f2c7b0319eaa1a044d19fb4b19b
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 15:35:20 2020 +0000
ISIS-2259: updates packages for isis-core-runtimeservices.
---
.../proxy/ProxyCreatorTestUsingCodegenPlugin.java | 3 +-
core/runtimeservices/pom.xml | 4 +-
.../runtimeservices/InitialisationException.java | 2 +-
.../IsisModuleCoreRuntimeServices.java} | 56 +++++++++++-----------
.../runtimeservices/ServiceException.java | 2 +-
.../auth/AuthenticationSessionProviderDefault.java | 2 +-
.../background/BackgroundCommandExecution.java | 2 +-
.../background/CommandExecutionAbstract.java | 2 +-
.../bookmarks/BookmarkServiceInternalDefault.java | 2 +-
.../command/CommandDtoServiceInternalDefault.java | 2 +-
.../command/CommandExecutorServiceDefault.java | 2 +-
.../command/CommandServiceDefault.java | 2 +-
.../confmenu/ConfigurationViewServiceDefault.java | 2 +-
.../runtimeservices/email/EmailServiceDefault.java | 2 +-
.../runtimeservices/error/EmailTicket.java | 2 +-
.../runtimeservices/error/SimpleTicket.java | 2 +-
.../eventbus/EventBusServiceSpring.java | 2 +-
.../factory/FactoryServiceDefault.java | 2 +-
.../homepage/HomePageResolverServiceDefault.java | 2 +-
.../{ => core}/runtimeservices/i18n/po/Block.java | 2 +-
.../runtimeservices/i18n/po/ContextAndMsgId.java | 2 +-
.../runtimeservices/i18n/po/PoAbstract.java | 2 +-
.../runtimeservices/i18n/po/PoDisabled.java | 2 +-
.../runtimeservices/i18n/po/PoReader.java | 2 +-
.../runtimeservices/i18n/po/PoWriter.java | 2 +-
.../i18n/po/TranslationServicePo.java | 2 +-
.../i18n/po/TranslationServicePoMenu.java | 2 +-
.../{ => core}/runtimeservices/i18n/po/Util.java | 2 +-
.../ixn/InteractionDtoServiceInternalDefault.java | 2 +-
.../menubars/MenuBarsLoaderServiceDefault.java | 2 +-
.../menubars/bootstrap3/MenuBarsServiceBS3.java | 2 +-
.../menubars/bootstrap3/ServiceAndAction.java | 2 +-
.../message/MessageServiceDefault.java | 2 +-
.../publish/PublishedObjectsDefault.java | 2 +-
.../publish/PublisherDispatchServiceDefault.java | 2 +-
.../repository/RepositoryServiceDefault.java | 2 +-
.../routing/RoutingServiceDefault.java | 2 +-
.../sessmgmt/SessionManagementServiceDefault.java | 2 +-
.../runtimeservices/sudo/SudoServiceDefault.java | 2 +-
.../userprof/UserProfileServiceDefault.java | 2 +-
.../userreg/EmailNotificationServiceDefault.java | 2 +-
.../userreg/EmailVerificationTemplate.html | 0
.../userreg/PasswordResetTemplate.html | 0
.../runtimeservices/wrapper/AsyncWrapDefault.java | 2 +-
.../wrapper/WrapperFactoryDefault.java | 10 ++--
.../dispatchers/InteractionEventDispatcher.java | 2 +-
.../InteractionEventDispatcherTypeSafe.java | 2 +-
.../AbstractCollectionInvocationHandler.java | 2 +-
.../handlers/CollectionInvocationHandler.java | 2 +-
.../handlers/DelegatingInvocationHandler.java | 2 +-
.../DelegatingInvocationHandlerDefault.java | 2 +-
.../handlers/DomainObjectInvocationHandler.java | 2 +-
.../wrapper/handlers/MapInvocationHandler.java | 2 +-
.../wrapper/handlers/ProxyContextHandler.java | 4 +-
.../wrapper/internal/util/MethodPrefixFinder.java | 2 +-
.../wrapper/proxy/ProxyCreator.java | 4 +-
.../xactn/TransactionServiceSpring.java | 2 +-
.../xmlsnapshot/XmlSnapshotBuilder.java | 2 +-
.../xmlsnapshot/XmlSnapshotServiceDefault.java | 2 +-
.../runtimeservices/ServiceInstantiatorTest.java | 2 +-
.../changes/PreAndPostValues_shouldAudit_Test.java | 2 +-
.../email/EmailServiceDefaultTest_actually.java | 2 +-
.../email/EmailServiceDefaultTest_notEmpty.java | 2 +-
.../runtimeservices/i18n/po/PoReaderTest.java | 2 +-
.../i18n/po/PoWriterTest_escape.java | 2 +-
.../wrapper/WrapperFactoryDefaultTest.java | 2 +-
.../wrapper/dom/claims/Approver.java | 2 +-
.../wrapper/dom/claims/Claimant.java | 2 +-
.../wrapper/dom/employees/Employee.java | 6 +--
.../wrapper/dom/employees/EmployeeRepository.java | 2 +-
.../dom/employees/EmployeeRepositoryImpl.java | 2 +-
.../webboot/springboot/IsisModuleSpringBoot.java | 4 +-
.../error/service/DemoErrorReportingService.java | 4 +-
.../SpringServiceInjectOrderTest.java | 2 +-
.../eventhandling/GenericEventPublishingTest.java | 2 +-
.../WrapperFactoryDefault_wrappedObject_Test.java | 8 ++--
...actoryDefault_wrappedObject_transient_Test.java | 4 +-
.../security/bypass/IsisModuleSecurityBypass.java | 4 +-
.../keycloak/IsisModuleSecurityKeycloak.java | 4 +-
.../security/shiro/IsisModuleSecurityShiro.java | 4 +-
80 files changed, 123 insertions(+), 124 deletions(-)
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java b/core/detached-tests/src/test/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
index 24ae0df..aba6655 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
@@ -27,8 +27,7 @@ import org.junit.Before;
import org.junit.Test;
import org.apache.isis.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
-import org.apache.isis.runtimeservices.wrapper.handlers.DelegatingInvocationHandler;
-import org.apache.isis.runtimeservices.wrapper.proxy.ProxyCreator;
+import org.apache.isis.core.runtimeservices.wrapper.handlers.DelegatingInvocationHandler;
public class ProxyCreatorTestUsingCodegenPlugin {
diff --git a/core/runtimeservices/pom.xml b/core/runtimeservices/pom.xml
index eeecb1a..d9e064e 100644
--- a/core/runtimeservices/pom.xml
+++ b/core/runtimeservices/pom.xml
@@ -31,8 +31,8 @@
<description>Introduced to keep the 'runtime' package concise. Viewers don't have dependencies on this module.</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.runtime.services</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/runtime/services</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.core.runtimeservices</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/core.runtimeservices</git-plugin.propertiesDir>
</properties>
<build>
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/InitialisationException.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/InitialisationException.java
similarity index 96%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/InitialisationException.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/InitialisationException.java
index fbf4e37..4a1aa52 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/InitialisationException.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/InitialisationException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices;
+package org.apache.isis.core.runtimeservices;
import org.apache.isis.core.commons.exceptions.IsisException;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
similarity index 53%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
index 9143047..3e63ffd 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
@@ -16,39 +16,39 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices;
+package org.apache.isis.core.runtimeservices;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.core.codegen.bytebuddy.IsisModuleCoreCodegenByteBuddy;
import org.apache.isis.core.runtime.IsisCoreModuleRuntime;
-import org.apache.isis.runtimeservices.auth.AuthenticationSessionProviderDefault;
-import org.apache.isis.runtimeservices.bookmarks.BookmarkServiceInternalDefault;
-import org.apache.isis.runtimeservices.command.CommandDtoServiceInternalDefault;
-import org.apache.isis.runtimeservices.command.CommandExecutorServiceDefault;
-import org.apache.isis.runtimeservices.command.CommandServiceDefault;
-import org.apache.isis.runtimeservices.confmenu.ConfigurationViewServiceDefault;
-import org.apache.isis.runtimeservices.email.EmailServiceDefault;
-import org.apache.isis.runtimeservices.eventbus.EventBusServiceSpring;
-import org.apache.isis.runtimeservices.factory.FactoryServiceDefault;
-import org.apache.isis.runtimeservices.homepage.HomePageResolverServiceDefault;
-import org.apache.isis.runtimeservices.i18n.po.TranslationServicePo;
-import org.apache.isis.runtimeservices.i18n.po.TranslationServicePoMenu;
-import org.apache.isis.runtimeservices.ixn.InteractionDtoServiceInternalDefault;
-import org.apache.isis.runtimeservices.menubars.MenuBarsLoaderServiceDefault;
-import org.apache.isis.runtimeservices.menubars.bootstrap3.MenuBarsServiceBS3;
-import org.apache.isis.runtimeservices.message.MessageServiceDefault;
-import org.apache.isis.runtimeservices.publish.PublisherDispatchServiceDefault;
-import org.apache.isis.runtimeservices.repository.RepositoryServiceDefault;
-import org.apache.isis.runtimeservices.routing.RoutingServiceDefault;
-import org.apache.isis.runtimeservices.sessmgmt.SessionManagementServiceDefault;
-import org.apache.isis.runtimeservices.sudo.SudoServiceDefault;
-import org.apache.isis.runtimeservices.userprof.UserProfileServiceDefault;
-import org.apache.isis.runtimeservices.userreg.EmailNotificationServiceDefault;
-import org.apache.isis.runtimeservices.wrapper.WrapperFactoryDefault;
-import org.apache.isis.runtimeservices.xactn.TransactionServiceSpring;
-import org.apache.isis.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefault;
+import org.apache.isis.core.runtimeservices.auth.AuthenticationSessionProviderDefault;
+import org.apache.isis.core.runtimeservices.bookmarks.BookmarkServiceInternalDefault;
+import org.apache.isis.core.runtimeservices.command.CommandDtoServiceInternalDefault;
+import org.apache.isis.core.runtimeservices.command.CommandExecutorServiceDefault;
+import org.apache.isis.core.runtimeservices.command.CommandServiceDefault;
+import org.apache.isis.core.runtimeservices.confmenu.ConfigurationViewServiceDefault;
+import org.apache.isis.core.runtimeservices.factory.FactoryServiceDefault;
+import org.apache.isis.core.runtimeservices.homepage.HomePageResolverServiceDefault;
+import org.apache.isis.core.runtimeservices.i18n.po.TranslationServicePo;
+import org.apache.isis.core.runtimeservices.i18n.po.TranslationServicePoMenu;
+import org.apache.isis.core.runtimeservices.ixn.InteractionDtoServiceInternalDefault;
+import org.apache.isis.core.runtimeservices.menubars.MenuBarsLoaderServiceDefault;
+import org.apache.isis.core.runtimeservices.menubars.bootstrap3.MenuBarsServiceBS3;
+import org.apache.isis.core.runtimeservices.message.MessageServiceDefault;
+import org.apache.isis.core.runtimeservices.publish.PublisherDispatchServiceDefault;
+import org.apache.isis.core.runtimeservices.repository.RepositoryServiceDefault;
+import org.apache.isis.core.runtimeservices.routing.RoutingServiceDefault;
+import org.apache.isis.core.runtimeservices.sessmgmt.SessionManagementServiceDefault;
+import org.apache.isis.core.runtimeservices.userprof.UserProfileServiceDefault;
+import org.apache.isis.core.runtimeservices.userreg.EmailNotificationServiceDefault;
+import org.apache.isis.core.runtimeservices.wrapper.WrapperFactoryDefault;
+import org.apache.isis.core.runtimeservices.xactn.TransactionServiceSpring;
+import org.apache.isis.core.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefault;
+import org.apache.isis.core.runtimeservices.email.EmailServiceDefault;
+import org.apache.isis.core.runtimeservices.eventbus.EventBusServiceSpring;
+import org.apache.isis.core.runtimeservices.sudo.SudoServiceDefault;
@Configuration
@Import({
@@ -90,6 +90,6 @@ import org.apache.isis.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefault;
// @DomainService's
TranslationServicePoMenu.class,
})
-public class IsisModuleRuntimeServices {
+public class IsisModuleCoreRuntimeServices {
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/ServiceException.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/ServiceException.java
similarity index 96%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/ServiceException.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/ServiceException.java
index 74d343d..3d7d748 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/ServiceException.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/ServiceException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices;
+package org.apache.isis.core.runtimeservices;
import org.apache.isis.core.commons.exceptions.IsisException;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/auth/AuthenticationSessionProviderDefault.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/auth/AuthenticationSessionProviderDefault.java
index 64ded5d..8534674 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/auth/AuthenticationSessionProviderDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.auth;
+package org.apache.isis.core.runtimeservices.auth;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/background/BackgroundCommandExecution.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/background/BackgroundCommandExecution.java
similarity index 97%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/background/BackgroundCommandExecution.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/background/BackgroundCommandExecution.java
index 88322fb..392b4d6 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/background/BackgroundCommandExecution.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/background/BackgroundCommandExecution.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.background;
+package org.apache.isis.core.runtimeservices.background;
import java.util.List;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/background/CommandExecutionAbstract.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/background/CommandExecutionAbstract.java
similarity index 97%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/background/CommandExecutionAbstract.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/background/CommandExecutionAbstract.java
index 15ffeb0..6a25a22 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/background/CommandExecutionAbstract.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/background/CommandExecutionAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.background;
+package org.apache.isis.core.runtimeservices.background;
import javax.inject.Inject;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/bookmarks/BookmarkServiceInternalDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/bookmarks/BookmarkServiceInternalDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/bookmarks/BookmarkServiceInternalDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/bookmarks/BookmarkServiceInternalDefault.java
index ec38838..7467b23 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/bookmarks/BookmarkServiceInternalDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/bookmarks/BookmarkServiceInternalDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.bookmarks;
+package org.apache.isis.core.runtimeservices.bookmarks;
import java.io.Serializable;
import java.math.BigDecimal;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandDtoServiceInternalDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoServiceInternalDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandDtoServiceInternalDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoServiceInternalDefault.java
index 3892ab0..0a1fe10 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandDtoServiceInternalDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoServiceInternalDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.command;
+package org.apache.isis.core.runtimeservices.command;
import java.util.List;
import java.util.UUID;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java
index 8795977..5d9051d 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.command;
+package org.apache.isis.core.runtimeservices.command;
import java.sql.Timestamp;
import java.util.Collections;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandServiceDefault.java
similarity index 97%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandServiceDefault.java
index bcf00a9..d9f3c00 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.command;
+package org.apache.isis.core.runtimeservices.command;
import javax.inject.Named;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
index 8b89cd6..64a7bc3 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.confmenu;
+package org.apache.isis.core.runtimeservices.confmenu;
import java.util.Map;
import java.util.Optional;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/email/EmailServiceDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/email/EmailServiceDefault.java
index 98a1a04..e3e48e8 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/email/EmailServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.email;
+package org.apache.isis.core.runtimeservices.email;
import java.util.Collections;
import java.util.List;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/error/EmailTicket.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/error/EmailTicket.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/error/EmailTicket.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/error/EmailTicket.java
index 2850342..dad42d3 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/error/EmailTicket.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/error/EmailTicket.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.error;
+package org.apache.isis.core.runtimeservices.error;
import java.io.Serializable;
import java.util.List;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/error/SimpleTicket.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/error/SimpleTicket.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/error/SimpleTicket.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/error/SimpleTicket.java
index 9ef3874..8a2741a 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/error/SimpleTicket.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/error/SimpleTicket.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.error;
+package org.apache.isis.core.runtimeservices.error;
import java.io.Serializable;
import java.util.function.UnaryOperator;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/eventbus/EventBusServiceSpring.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/eventbus/EventBusServiceSpring.java
similarity index 96%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/eventbus/EventBusServiceSpring.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/eventbus/EventBusServiceSpring.java
index e77b40e..4aaa2df 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/eventbus/EventBusServiceSpring.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/eventbus/EventBusServiceSpring.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.eventbus;
+package org.apache.isis.core.runtimeservices.eventbus;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/factory/FactoryServiceDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/factory/FactoryServiceDefault.java
index 0bd2811..c5a1506 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/factory/FactoryServiceDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.factory;
+package org.apache.isis.core.runtimeservices.factory;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/homepage/HomePageResolverServiceDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/homepage/HomePageResolverServiceDefault.java
index 9af5de3..d327af1 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/homepage/HomePageResolverServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.homepage;
+package org.apache.isis.core.runtimeservices.homepage;
import javax.enterprise.inject.Vetoed;
import javax.inject.Inject;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/Block.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/Block.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/Block.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/Block.java
index 851cac8..83cd3dd 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/Block.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/Block.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.i18n.po;
+package org.apache.isis.core.runtimeservices.i18n.po;
import java.util.List;
import java.util.Map;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/ContextAndMsgId.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/ContextAndMsgId.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/ContextAndMsgId.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/ContextAndMsgId.java
index b5d66f0..26aedc0 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/ContextAndMsgId.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/ContextAndMsgId.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.i18n.po;
+package org.apache.isis.core.runtimeservices.i18n.po;
/**
* The combination of a <tt>msgId</tt> and context (optionally null) that represents a key to a translatable resource.
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoAbstract.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoAbstract.java
similarity index 96%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoAbstract.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoAbstract.java
index bd86875..f041c71 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoAbstract.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.i18n.po;
+package org.apache.isis.core.runtimeservices.i18n.po;
import org.apache.isis.applib.services.i18n.TranslationService;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoDisabled.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoDisabled.java
similarity index 95%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoDisabled.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoDisabled.java
index 7111db8..77e9161 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoDisabled.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoDisabled.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.i18n.po;
+package org.apache.isis.core.runtimeservices.i18n.po;
import org.apache.isis.applib.services.i18n.TranslationService;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoReader.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoReader.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoReader.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoReader.java
index 534f742..6a62470 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoReader.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoReader.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.i18n.po;
+package org.apache.isis.core.runtimeservices.i18n.po;
import java.util.Collections;
import java.util.List;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoWriter.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoWriter.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoWriter.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoWriter.java
index 039abb9..9651285 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoWriter.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoWriter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.i18n.po;
+package org.apache.isis.core.runtimeservices.i18n.po;
import java.util.SortedMap;
import java.util.SortedSet;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/TranslationServicePo.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/TranslationServicePo.java
index 51b0301..2dbe112 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/TranslationServicePo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.i18n.po;
+package org.apache.isis.core.runtimeservices.i18n.po;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePoMenu.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/TranslationServicePoMenu.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePoMenu.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/TranslationServicePoMenu.java
index 38950e4..9b34db8 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePoMenu.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/TranslationServicePoMenu.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.i18n.po;
+package org.apache.isis.core.runtimeservices.i18n.po;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/Util.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/Util.java
similarity index 95%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/Util.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/Util.java
index da2db3c..364ec88 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/Util.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/Util.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.i18n.po;
+package org.apache.isis.core.runtimeservices.i18n.po;
class Util {
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java
index c20bf5b..93c0027 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.ixn;
+package org.apache.isis.core.runtimeservices.ixn;
import java.util.List;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
index bdd7262..e553226 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.menubars;
+package org.apache.isis.core.runtimeservices.menubars;
import java.nio.charset.StandardCharsets;
import java.util.Optional;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
index 477a344..274530d 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.menubars.bootstrap3;
+package org.apache.isis.core.runtimeservices.menubars.bootstrap3;
import java.util.List;
import java.util.Map;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/ServiceAndAction.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/ServiceAndAction.java
similarity index 95%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/ServiceAndAction.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/ServiceAndAction.java
index 034647e..9598cf3 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/ServiceAndAction.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/ServiceAndAction.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.menubars.bootstrap3;
+package org.apache.isis.core.runtimeservices.menubars.bootstrap3;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/message/MessageServiceDefault.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/message/MessageServiceDefault.java
index 887ddff..bce6d69 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/message/MessageServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.message;
+package org.apache.isis.core.runtimeservices.message;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublishedObjectsDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/PublishedObjectsDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublishedObjectsDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/PublishedObjectsDefault.java
index b5fe049..a8e71ad 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublishedObjectsDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/PublishedObjectsDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.publish;
+package org.apache.isis.core.runtimeservices.publish;
import java.sql.Timestamp;
import java.util.Collection;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/PublisherDispatchServiceDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/PublisherDispatchServiceDefault.java
index 6758cf5..51e617b 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/PublisherDispatchServiceDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.publish;
+package org.apache.isis.core.runtimeservices.publish;
import java.sql.Timestamp;
import java.util.HashMap;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/repository/RepositoryServiceDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/repository/RepositoryServiceDefault.java
index e0b19ed..d8ae9b2 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/repository/RepositoryServiceDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.repository;
+package org.apache.isis.core.runtimeservices.repository;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/routing/RoutingServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/routing/RoutingServiceDefault.java
similarity index 97%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/routing/RoutingServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/routing/RoutingServiceDefault.java
index aae393c..8040945 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/routing/RoutingServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/routing/RoutingServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.routing;
+package org.apache.isis.core.runtimeservices.routing;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
similarity index 97%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
index b667ccf..f5c63ed 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.sessmgmt;
+package org.apache.isis.core.runtimeservices.sessmgmt;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sudo/SudoServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sudo/SudoServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java
index 84cf6a1..d70f035 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sudo/SudoServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.sudo;
+package org.apache.isis.core.runtimeservices.sudo;
import java.util.List;
import java.util.concurrent.Callable;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userprof/UserProfileServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userprof/UserProfileServiceDefault.java
similarity index 96%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userprof/UserProfileServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userprof/UserProfileServiceDefault.java
index 977b668..bb8b111 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userprof/UserProfileServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userprof/UserProfileServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.userprof;
+package org.apache.isis.core.runtimeservices.userprof;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userreg/EmailNotificationServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userreg/EmailNotificationServiceDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userreg/EmailNotificationServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userreg/EmailNotificationServiceDefault.java
index 31abbc8..fb57286 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userreg/EmailNotificationServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userreg/EmailNotificationServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.userreg;
+package org.apache.isis.core.runtimeservices.userreg;
import java.io.IOException;
import java.net.URL;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userreg/EmailVerificationTemplate.html b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userreg/EmailVerificationTemplate.html
similarity index 100%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userreg/EmailVerificationTemplate.html
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userreg/EmailVerificationTemplate.html
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userreg/PasswordResetTemplate.html b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userreg/PasswordResetTemplate.html
similarity index 100%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userreg/PasswordResetTemplate.html
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userreg/PasswordResetTemplate.html
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/AsyncWrapDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/AsyncWrapDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/AsyncWrapDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/AsyncWrapDefault.java
index 6e96995..7dc9fcc 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/AsyncWrapDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/AsyncWrapDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper;
+package org.apache.isis.core.runtimeservices.wrapper;
import java.util.EnumSet;
import java.util.concurrent.Callable;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
similarity index 96%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
index a1e4c13..9277ecc 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper;
+package org.apache.isis.core.runtimeservices.wrapper;
import java.util.ArrayList;
import java.util.Collections;
@@ -64,10 +64,10 @@ import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.commons.internal.plugins.codegen.ProxyFactoryService;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.runtimeservices.wrapper.dispatchers.InteractionEventDispatcher;
-import org.apache.isis.runtimeservices.wrapper.dispatchers.InteractionEventDispatcherTypeSafe;
-import org.apache.isis.runtimeservices.wrapper.handlers.ProxyContextHandler;
-import org.apache.isis.runtimeservices.wrapper.proxy.ProxyCreator;
+import org.apache.isis.core.runtimeservices.wrapper.dispatchers.InteractionEventDispatcher;
+import org.apache.isis.core.runtimeservices.wrapper.dispatchers.InteractionEventDispatcherTypeSafe;
+import org.apache.isis.core.runtimeservices.wrapper.handlers.ProxyContextHandler;
+import org.apache.isis.core.runtimeservices.wrapper.proxy.ProxyCreator;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import lombok.val;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcher.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/dispatchers/InteractionEventDispatcher.java
similarity index 93%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcher.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/dispatchers/InteractionEventDispatcher.java
index 3a083f1..c164635 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcher.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/dispatchers/InteractionEventDispatcher.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.dispatchers;
+package org.apache.isis.core.runtimeservices.wrapper.dispatchers;
import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
similarity index 95%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
index 479229f..5c9889a 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.dispatchers;
+package org.apache.isis.core.runtimeservices.wrapper.dispatchers;
import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
import org.apache.isis.core.commons.internal.base._Casts;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/AbstractCollectionInvocationHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/AbstractCollectionInvocationHandler.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/AbstractCollectionInvocationHandler.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/AbstractCollectionInvocationHandler.java
index 1e887f2..1f5ebbb 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/AbstractCollectionInvocationHandler.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/AbstractCollectionInvocationHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.handlers;
+package org.apache.isis.core.runtimeservices.wrapper.handlers;
import java.lang.reflect.Method;
import java.util.List;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/CollectionInvocationHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/CollectionInvocationHandler.java
similarity index 97%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/CollectionInvocationHandler.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/CollectionInvocationHandler.java
index 40eb86c..1c7491c 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/CollectionInvocationHandler.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/CollectionInvocationHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.handlers;
+package org.apache.isis.core.runtimeservices.wrapper.handlers;
import java.util.Collection;
import java.util.List;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DelegatingInvocationHandler.java
similarity index 94%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandler.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DelegatingInvocationHandler.java
index 333028b..6f3daac 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandler.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DelegatingInvocationHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.handlers;
+package org.apache.isis.core.runtimeservices.wrapper.handlers;
import java.lang.reflect.InvocationHandler;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java
index 352e131..74511e8 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.handlers;
+package org.apache.isis.core.runtimeservices.wrapper.handlers;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
index ca0097e..03d463d 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.handlers;
+package org.apache.isis.core.runtimeservices.wrapper.handlers;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/MapInvocationHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/MapInvocationHandler.java
similarity index 97%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/MapInvocationHandler.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/MapInvocationHandler.java
index fad80bf..e523558 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/MapInvocationHandler.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/MapInvocationHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.handlers;
+package org.apache.isis.core.runtimeservices.wrapper.handlers;
import java.util.Map;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/ProxyContextHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/ProxyContextHandler.java
similarity index 95%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/ProxyContextHandler.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/ProxyContextHandler.java
index f60d287..95aa592 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/ProxyContextHandler.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/ProxyContextHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.handlers;
+package org.apache.isis.core.runtimeservices.wrapper.handlers;
import java.util.Collection;
import java.util.EnumSet;
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.runtimeservices.wrapper.proxy.ProxyCreator;
+import org.apache.isis.core.runtimeservices.wrapper.proxy.ProxyCreator;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/internal/util/MethodPrefixFinder.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/internal/util/MethodPrefixFinder.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/internal/util/MethodPrefixFinder.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/internal/util/MethodPrefixFinder.java
index 7e7ff66..b3820f5 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/internal/util/MethodPrefixFinder.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/internal/util/MethodPrefixFinder.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.internal.util;
+package org.apache.isis.core.runtimeservices.wrapper.internal.util;
import java.util.Arrays;
import java.util.LinkedHashSet;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/proxy/ProxyCreator.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreator.java
similarity index 95%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/proxy/ProxyCreator.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreator.java
index eb5152d..cc32b30 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/proxy/ProxyCreator.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreator.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.proxy;
+package org.apache.isis.core.runtimeservices.wrapper.proxy;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
@@ -31,7 +31,7 @@ import org.apache.isis.core.commons.internal.collections._Arrays;
import org.apache.isis.core.commons.internal.plugins.codegen.ProxyFactory;
import org.apache.isis.core.commons.internal.plugins.codegen.ProxyFactoryService;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.ProxyEnhanced;
-import org.apache.isis.runtimeservices.wrapper.handlers.DelegatingInvocationHandler;
+import org.apache.isis.core.runtimeservices.wrapper.handlers.DelegatingInvocationHandler;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xactn/TransactionServiceSpring.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xactn/TransactionServiceSpring.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xactn/TransactionServiceSpring.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xactn/TransactionServiceSpring.java
index 55a1873..52f8935 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xactn/TransactionServiceSpring.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xactn/TransactionServiceSpring.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.xactn;
+package org.apache.isis.core.runtimeservices.xactn;
import java.util.function.Supplier;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java
index c34c59a..952c637 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.xmlsnapshot;
+package org.apache.isis.core.runtimeservices.xmlsnapshot;
import java.util.List;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
index 67a83b3..21cf984 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.xmlsnapshot;
+package org.apache.isis.core.runtimeservices.xmlsnapshot;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/ServiceInstantiatorTest.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/ServiceInstantiatorTest.java
similarity index 95%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/ServiceInstantiatorTest.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/ServiceInstantiatorTest.java
index 8dbbb05..133c167 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/ServiceInstantiatorTest.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/ServiceInstantiatorTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices;
+package org.apache.isis.core.runtimeservices;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
similarity index 97%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
index 0608a8a..6c582ad 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.changes;
+package org.apache.isis.core.runtimeservices.changes;
import org.junit.Test;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_actually.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/email/EmailServiceDefaultTest_actually.java
similarity index 97%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_actually.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/email/EmailServiceDefaultTest_actually.java
index 74f6d1b..4612c86 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_actually.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/email/EmailServiceDefaultTest_actually.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.email;
+package org.apache.isis.core.runtimeservices.email;
import org.junit.Test;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_notEmpty.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/email/EmailServiceDefaultTest_notEmpty.java
similarity index 96%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_notEmpty.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/email/EmailServiceDefaultTest_notEmpty.java
index c7a2141..2996687 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_notEmpty.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/email/EmailServiceDefaultTest_notEmpty.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.email;
+package org.apache.isis.core.runtimeservices.email;
import org.junit.Test;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoReaderTest.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoReaderTest.java
similarity index 99%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoReaderTest.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoReaderTest.java
index b8645cd..6c95e79 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoReaderTest.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoReaderTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.i18n.po;
+package org.apache.isis.core.runtimeservices.i18n.po;
import java.util.List;
import java.util.Locale;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoWriterTest_escape.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoWriterTest_escape.java
similarity index 96%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoWriterTest_escape.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoWriterTest_escape.java
index f7902ec..f6b1c9f 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoWriterTest_escape.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoWriterTest_escape.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.i18n.po;
+package org.apache.isis.core.runtimeservices.i18n.po;
import org.junit.Test;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefaultTest.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
similarity index 98%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
index 9390360..ac075c1 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper;
+package org.apache.isis.core.runtimeservices.wrapper;
import java.util.EnumSet;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Approver.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/claims/Approver.java
similarity index 92%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Approver.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/claims/Approver.java
index 16642f2..dd8b6dc 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Approver.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/claims/Approver.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.dom.claims;
+package org.apache.isis.core.runtimeservices.wrapper.dom.claims;
public interface Approver {
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Claimant.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/claims/Claimant.java
similarity index 93%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Claimant.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/claims/Claimant.java
index 20046ae..34cbb30 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Claimant.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/claims/Claimant.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.dom.claims;
+package org.apache.isis.core.runtimeservices.wrapper.dom.claims;
public interface Claimant {
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/Employee.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/employees/Employee.java
similarity index 92%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/Employee.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/employees/Employee.java
index d0032d3..98d2869 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/Employee.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/employees/Employee.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.dom.employees;
+package org.apache.isis.core.runtimeservices.wrapper.dom.employees;
import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.runtimeservices.wrapper.dom.claims.Approver;
-import org.apache.isis.runtimeservices.wrapper.dom.claims.Claimant;
+import org.apache.isis.core.runtimeservices.wrapper.dom.claims.Approver;
+import org.apache.isis.core.runtimeservices.wrapper.dom.claims.Claimant;
public class Employee implements Claimant, Approver {
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepository.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/employees/EmployeeRepository.java
similarity index 93%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepository.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/employees/EmployeeRepository.java
index b22e728..96756ee 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepository.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/employees/EmployeeRepository.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.dom.employees;
+package org.apache.isis.core.runtimeservices.wrapper.dom.employees;
import java.util.List;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepositoryImpl.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/employees/EmployeeRepositoryImpl.java
similarity index 94%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepositoryImpl.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/employees/EmployeeRepositoryImpl.java
index 7c7a065..b79cc67 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepositoryImpl.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/employees/EmployeeRepositoryImpl.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.dom.employees;
+package org.apache.isis.core.runtimeservices.wrapper.dom.employees;
import java.util.List;
diff --git a/core/webboot-springboot/src/main/java/org/apache/isis/webboot/springboot/IsisModuleSpringBoot.java b/core/webboot-springboot/src/main/java/org/apache/isis/webboot/springboot/IsisModuleSpringBoot.java
index a5b7c28..c4a9e41 100644
--- a/core/webboot-springboot/src/main/java/org/apache/isis/webboot/springboot/IsisModuleSpringBoot.java
+++ b/core/webboot-springboot/src/main/java/org/apache/isis/webboot/springboot/IsisModuleSpringBoot.java
@@ -29,12 +29,12 @@ import org.springframework.context.annotation.Import;
import org.springframework.core.OrderComparator;
import org.springframework.core.annotation.AnnotationAwareOrderComparator;
-import org.apache.isis.runtimeservices.IsisModuleRuntimeServices;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
@Configuration
@Import({
// modules
- IsisModuleRuntimeServices.class,
+ IsisModuleCoreRuntimeServices.class,
})
public class IsisModuleSpringBoot implements ApplicationContextAware {
diff --git a/examples/demo/src/main/java/demoapp/dom/error/service/DemoErrorReportingService.java b/examples/demo/src/main/java/demoapp/dom/error/service/DemoErrorReportingService.java
index 2b96276..5dca219 100644
--- a/examples/demo/src/main/java/demoapp/dom/error/service/DemoErrorReportingService.java
+++ b/examples/demo/src/main/java/demoapp/dom/error/service/DemoErrorReportingService.java
@@ -27,8 +27,8 @@ import org.apache.isis.applib.services.error.ErrorDetails;
import org.apache.isis.applib.services.error.ErrorReportingService;
import org.apache.isis.applib.services.error.Ticket;
import org.apache.isis.applib.services.error.Ticket.StackTracePolicy;
-import org.apache.isis.runtimeservices.error.EmailTicket;
-import org.apache.isis.runtimeservices.error.EmailTicket.MailTo;
+import org.apache.isis.core.runtimeservices.error.EmailTicket;
+import org.apache.isis.core.runtimeservices.error.EmailTicket.MailTo;
import lombok.val;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
index 6abe21f..b037905 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
@@ -47,7 +47,7 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.runtimeservices.message.MessageServiceDefault;
+import org.apache.isis.core.runtimeservices.message.MessageServiceDefault;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_headless;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/GenericEventPublishingTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/GenericEventPublishingTest.java
index 54f6aea..9e6c306 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/GenericEventPublishingTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/GenericEventPublishingTest.java
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Service;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.isis.applib.services.eventbus.EventBusService;
-import org.apache.isis.runtimeservices.eventbus.EventBusServiceSpring;
+import org.apache.isis.core.runtimeservices.eventbus.EventBusServiceSpring;
import lombok.Getter;
import lombok.Value;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
similarity index 98%
rename from persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
index e36b32d..588b248 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper;
+package org.apache.isis.core.runtimeservices.wrapper;
import java.lang.reflect.Method;
import java.util.Collections;
@@ -66,9 +66,9 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.OneToOneAssociationDefault;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
-import org.apache.isis.runtimeservices.wrapper.dom.employees.Employee;
-import org.apache.isis.runtimeservices.wrapper.dom.employees.EmployeeRepository;
-import org.apache.isis.runtimeservices.wrapper.dom.employees.EmployeeRepositoryImpl;
+import org.apache.isis.core.runtimeservices.wrapper.dom.employees.Employee;
+import org.apache.isis.core.runtimeservices.wrapper.dom.employees.EmployeeRepository;
+import org.apache.isis.core.runtimeservices.wrapper.dom.employees.EmployeeRepositoryImpl;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.schema.cmd.v1.CommandDto;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
similarity index 98%
rename from persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
index 435d911..447a7de 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper;
+package org.apache.isis.core.runtimeservices.wrapper;
import java.lang.reflect.Method;
import java.util.Arrays;
@@ -63,7 +63,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
-import org.apache.isis.runtimeservices.wrapper.dom.employees.Employee;
+import org.apache.isis.core.runtimeservices.wrapper.dom.employees.Employee;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import org.apache.isis.security.api.authentication.standard.SimpleSession;
diff --git a/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java b/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java
index 1e25327..710a0e7 100644
--- a/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java
+++ b/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java
@@ -21,7 +21,7 @@ package org.apache.isis.security.bypass;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.runtimeservices.IsisModuleRuntimeServices;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.security.bypass.authentication.AuthenticatorBypass;
import org.apache.isis.security.bypass.authorization.AuthorizorBypass;
@@ -33,7 +33,7 @@ import org.apache.isis.security.bypass.authorization.AuthorizorBypass;
@Configuration
@Import({
// modules
- IsisModuleRuntimeServices.class,
+ IsisModuleCoreRuntimeServices.class,
// @Service's
AuthenticatorBypass.class,
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
index b5cd8be..886493d 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
@@ -21,7 +21,7 @@ package org.apache.isis.security.keycloak;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.runtimeservices.IsisModuleRuntimeServices;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.security.keycloak.authentication.AuthenticatorKeycloak;
import org.apache.isis.security.keycloak.authorization.AuthorizorKeycloak;
import org.apache.isis.security.keycloak.webmodule.WebModuleKeycloak;
@@ -35,7 +35,7 @@ import org.apache.isis.webapp.IsisModuleWebapp;
@Configuration
@Import({
// modules
- IsisModuleRuntimeServices.class,
+ IsisModuleCoreRuntimeServices.class,
IsisModuleWebapp.class,
// @Service's
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
index 63dc32f..7e1a9c1 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
@@ -21,7 +21,7 @@ package org.apache.isis.security.shiro;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.runtimeservices.IsisModuleRuntimeServices;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.security.shiro.authentication.AuthenticatorShiro;
import org.apache.isis.security.shiro.authorization.AuthorizorShiro;
import org.apache.isis.security.shiro.webmodule.WebModuleShiro;
@@ -35,7 +35,7 @@ import org.apache.isis.webapp.IsisModuleWebapp;
@Configuration
@Import({
// modules
- IsisModuleRuntimeServices.class,
+ IsisModuleCoreRuntimeServices.class,
IsisModuleWebapp.class,
// @Service's
[isis] 05/14: ISIS-2259: updates packages for
isis-core-unittestsupport
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 57763d66e07408725e5e2ae5194228b8b9ee62d8
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 15:48:08 2020 +0000
ISIS-2259: updates packages for isis-core-unittestsupport
---
.../modules/ROOT/partials/component-nav.adoc | 4 ++--
.../pages/what-is-apache-isis/screencasts.adoc | 2 +-
.../toc/modules/relnotes/pages/rn-1.12.0.adoc | 2 +-
antora/playbooks/site-security.yml | 10 +++++----
antora/playbooks/site.yml | 20 +++++++++--------
.../ExceptionRecognizerCompositeTest.java | 2 +-
.../services/i18n/TranslatableStringTest.java | 2 +-
.../applib/util/ObjectContractsTest_compareTo.java | 2 +-
.../ObjectContractsTest_equals_and_hashCode.java | 2 +-
.../applib/util/schema/CommonDtoUtils_Test.java | 2 +-
.../schema/CommonDtoUtils_setValueOn_Test.java | 2 +-
.../config/IsisConfiguration_createSubsetTest.java | 4 ++--
.../core/config/IsisConfiguration_primingTest.java | 2 +-
.../config/IsisConfiguration_specialCharTest.java | 4 ++--
.../config/IsisConfiguration_whitespaceTest.java | 4 ++--
.../BidirectionalRelationshipContractTestAll.java | 2 +-
.../unittestsupport/bidir/ChildDomainObject.java | 2 +-
.../bidir/InstantiatorForChildDomainObject.java | 2 +-
.../unittestsupport/bidir/ParentDomainObject.java | 2 +-
.../unittestsupport/bidir/PeerDomainObject.java | 2 +-
.../bidir/PeerDomainObjectForTesting.java | 2 +-
.../comparable/CategorizedDomainObject.java | 2 +-
...mainObjectComparableContractTest_compareTo.java | 2 +-
.../files/FilesTest_deleteFiles.java | 2 +-
...ectServiceMethodMustBeFinalContractTestAll.java | 2 +-
.../unittestsupport/inject/SomeDomainObject.java | 2 +-
.../unittestsupport/inject/SomeService.java | 2 +-
.../CollaboratingUsingConstructorInjection.java | 2 +-
.../CollaboratingUsingSetterInjection.java | 2 +-
.../unittestsupport/jmocking/Collaborator.java | 2 +-
.../ImposteriserTestUsingCodegenPlugin.java | 2 +-
...IsisActionsTest_returnNewTransientInstance.java | 2 +-
.../jmocking/JMockActionsTest_returnArgument.java | 2 +-
.../jmocking/JMockActionsTest_returnEach.java | 2 +-
.../jmocking/JUnitRuleMockery2Test.java | 2 +-
..._autoWiring_constructorInjection_happyCase.java | 2 +-
...y2Test_autoWiring_sadCase_noClassUnderTest.java | 2 +-
...est_autoWiring_sadCase_twoClassesUnderTest.java | 2 +-
...2Test_autoWiring_setterInjection_happyCase.java | 2 +-
...RuleMockery2Test_mockAnnotatedWithAllowing.java | 2 +-
...RuleMockery2Test_mockAnnotatedWithChecking.java | 2 +-
...RuleMockery2Test_mockAnnotatedWithIgnoring.java | 2 +-
...kery2Test_mockAnnotatedWithNever_happyCase.java | 2 +-
...ockery2Test_mockAnnotatedWithNever_sadCase.java | 2 +-
...ockery2Test_mockAnnotatedWithOne_happyCase.java | 2 +-
...eMockery2Test_mockAnnotatedWithOne_sadCase.java | 2 +-
.../sortedsets/SomeDomainObject.java | 2 +-
.../sortedsets/SortedSetsContractTestAll.java | 2 +-
...lueTypeContractTestAbstract_BigIntegerTest.java | 2 +-
.../ValueTypeContractTestAbstract_ColorTest.java | 2 +-
.../ValueTypeContractTestAbstract_StringTest.java | 2 +-
.../system/ObjectActionLayoutXmlDefaultTest.java | 4 ++--
.../system/OneToManyAssociationDefaultTest.java | 4 ++--
.../core/runtimeservices/i18n/po/PoReaderTest.java | 2 +-
.../wrapper/WrapperFactoryDefaultTest.java | 2 +-
.../unit-test-support/partials/module-nav.adoc | 1 -
.../nav.adoc | 0
.../pages/about.adoc | 8 +++----
.../pages/unit-test-support/contract-tests.adoc | 0
.../pages/unit-test-support/jmock-extensions.adoc | 0
.../unit-test-support/maven-configuration.adoc | 0
.../soap-fake-server-junit-rule.adoc | 0
.../unittestsupport/partials/module-nav.adoc | 1 +
.../AbstractApplyToAllContractTest.java | 4 ++--
...irectionalRelationshipContractTestAbstract.java | 25 ++++++++++------------
.../{ => core}/unittestsupport/bidir/Child.java | 2 +-
.../unittestsupport/bidir/Instantiator.java | 2 +-
.../unittestsupport/bidir/InstantiatorMap.java | 2 +-
.../unittestsupport/bidir/InstantiatorSimple.java | 2 +-
.../unittestsupport/bidir/Instantiators.java | 2 +-
.../{ => core}/unittestsupport/bidir/Parent.java | 2 +-
.../ComparableContractTest_compareTo.java | 2 +-
.../comparable/ComparableContractTester.java | 2 +-
.../config/IsisConfigurationLegacy.java | 2 +-
.../unittestsupport/config/internal/_Config.java | 4 ++--
.../config/internal/_Config_Instance.java | 4 ++--
.../config/internal/_Config_LifecycleResource.java | 4 ++--
.../config/internal/_Config_Parsers.java | 2 +-
.../config/internal/_Config_trim.java | 2 +-
.../{ => core}/unittestsupport/files/Files.java | 2 +-
...rviceMethodMustBeFinalContractTestAbstract.java | 4 ++--
.../unittestsupport/jaxb/JaxbMatchers.java | 2 +-
.../jmocking/ImposteriserUsingCodegenPlugin.java | 2 +-
.../unittestsupport/jmocking/Imposterisers.java | 2 +-
.../jmocking/InjectIntoJMockAction.java | 2 +-
.../unittestsupport/jmocking/IsisActions.java | 2 +-
.../unittestsupport/jmocking/JMockActions.java | 2 +-
.../jmocking/JUnitRuleMockery2.java | 2 +-
.../unittestsupport/jmocking/MyMockomatic.java | 23 +++++++-------------
.../unittestsupport/jmocking/PostponedAction.java | 2 +-
.../unittestsupport/soap/PublishedEndpoints.java | 2 +-
.../unittestsupport/soap/SoapEndpoint.java | 2 +-
.../soap/SoapEndpointPublishingRule.java | 2 +-
.../unittestsupport/soap/SoapEndpointSpec.java | 2 +-
.../sortedsets/SortedSetsContractTestAbstract.java | 4 ++--
.../unittestsupport/streams/NullPrintStream.java | 2 +-
.../unittestsupport/utils/CollectUtils.java | 2 +-
.../unittestsupport/utils/IndentPrinter.java | 2 +-
.../unittestsupport/utils/ReflectUtils.java | 2 +-
.../unittestsupport/utils/StringUtils.java | 2 +-
.../value/ValueTypeContractTestAbstract.java | 2 +-
.../PercentageValueSemanticsProviderTest.java | 2 +-
.../lib/RestfulHttpMethodTest_setUp.java | 6 ++----
.../adapterfactory/pojo/PojoAdapterTest.java | 4 ++--
.../runtime/system/ObjectMemberAbstractTest.java | 4 ++--
.../WrapperFactoryDefault_wrappedObject_Test.java | 6 +++---
...actoryDefault_wrappedObject_transient_Test.java | 6 +++---
...onRecognizerCompositeForJdoObjectStoreTest.java | 2 +-
...AnnotationFacetFactoryTest_refineMetaModel.java | 4 ++--
...AuthenticatorOrAuthorizorTest_authenticate.java | 4 ++--
...ticatorOrAuthorizorTest_isVisibleInAnyRole.java | 6 +++---
.../with/ComparableByCodeContractTester.java | 2 +-
.../ComparableByDescriptionContractTester.java | 2 +-
.../with/ComparableByNameContractTester.java | 2 +-
.../with/ComparableByReferenceContractTester.java | 2 +-
.../with/ComparableByTitleContractTester.java | 2 +-
.../with/InstantiatorForComparableByCode.java | 2 +-
.../InstantiatorForComparableByDescription.java | 2 +-
.../with/InstantiatorForComparableByName.java | 2 +-
.../with/InstantiatorForComparableByReference.java | 2 +-
.../applib/with/InstantiatorForWithStartDate.java | 2 +-
...valMutableContractTestAbstract_changeDates.java | 2 +-
.../applib/service/XDocReportServiceTest.java | 4 +---
.../applib/services/FakeDataServiceTest.java | 2 +-
.../pages/integ-test-support/abstract-class.adoc | 2 +-
.../applib/bean/AbstractBeanPropertiesTest.java | 2 +-
.../unit-test-support-ext/partials/module-nav.adoc | 2 +-
.../JsonValueEncoderTest_appendValueAndFormat.java | 2 +-
.../JsonValueEncoderTest_asAdapter.java | 2 +-
.../JsonValueEncoderTest_asObject.java | 2 +-
..._ensureCompatibleAcceptHeader_ContractTest.java | 4 ++--
.../context/ResourceContext_getArg_Test.java | 6 +++---
...tsApplicationExceptionMapper_Test_Contract.java | 2 +-
...ulObjectsSessionFilter_lookupPassThru_Test.java | 2 +-
.../wicket/model/models/EntityModel_hintsTest.java | 2 +-
.../ScalarModel_isScalarSubtypingAnyOf_Test.java | 2 +-
...ollectionContentsSelectorDropdownPanelTest.java | 4 ++--
.../jdkdates/DateConverterForJavaSqlDateTest.java | 4 ++--
.../jdkdates/DateConverterForJavaUtilDateTest.java | 4 ++--
.../jodatime/DateConverterForJodaDateTimeTest.java | 4 ++--
.../DateConverterForJodaLocalDateTest.java | 4 ++--
.../DateConverterForJodaLocalDateTimeTest.java | 4 ++--
.../DateConverterForJdk8LocalDateTest.java | 4 ++--
.../DateConverterForJdk8LocalDateTimeTest.java | 4 ++--
.../DateConverterForJdk8OffsetDateTimeTest.java | 4 ++--
...tAdapterMementoProviderForValueChoicesTest.java | 2 +-
...uthenticatedWebSessionForIsis_Authenticate.java | 2 +-
...thenticatedWebSessionForIsis_Instantiation.java | 4 ++--
.../AuthenticatedWebSessionForIsis_SignIn.java | 2 +-
...uthenticatedWebSessionForIsis_TestAbstract.java | 4 ++--
.../wicketapp/IsisWicketApplication_Defaults.java | 4 ++--
.../wicketapp/IsisWicketApplication_Pages.java | 4 ++--
152 files changed, 220 insertions(+), 230 deletions(-)
diff --git a/antora/components/testing/modules/ROOT/partials/component-nav.adoc b/antora/components/testing/modules/ROOT/partials/component-nav.adoc
index c2ec9e7..b0d175f 100644
--- a/antora/components/testing/modules/ROOT/partials/component-nav.adoc
+++ b/antora/components/testing/modules/ROOT/partials/component-nav.adoc
@@ -1,6 +1,6 @@
include::testing:ROOT:partial$module-nav.adoc[]
-include::testing:unit-test-support:partial$module-nav.adoc[]
-include::testing:unit-test-support-ext:partial$module-nav.adoc[]
+include::testing:unittestsupport:partial$module-nav.adoc[]
+include::testing:unittestsupport-ext:partial$module-nav.adoc[]
include::testing:integ-test-support:partial$module-nav.adoc[]
include::testing:specsupport:partial$module-nav.adoc[]
include::testing:fixtures:partial$module-nav.adoc[]
diff --git a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
index 28d16f9..83c39a4 100644
--- a/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
+++ b/antora/components/toc/modules/ROOT/pages/what-is-apache-isis/screencasts.adoc
@@ -89,7 +89,7 @@ Implementing xref:userguide:fun:business-rules.adoc[business rules]for domain ob
|x||||||||||
|link:https://www.youtube.com/watch?v=imHfxQGUgV8[007^] +
-Writing xref:testing:unit-test-support:about.adoc[unit tests] for a domain object responsibility
+Writing xref:testing:unittestsupport:about.adoc[unit tests] for a domain object responsibility
||x|||||||||
diff --git a/antora/components/toc/modules/relnotes/pages/rn-1.12.0.adoc b/antora/components/toc/modules/relnotes/pages/rn-1.12.0.adoc
index 8ac806e..ac7c23c 100644
--- a/antora/components/toc/modules/relnotes/pages/rn-1.12.0.adoc
+++ b/antora/components/toc/modules/relnotes/pages/rn-1.12.0.adoc
@@ -63,7 +63,7 @@ In all cases these mixins can be hidden using either security or by writing a li
== Bug
-* link:https://issues.apache.org/jira/browse/ISIS-1348[ISIS-1348] - Bug with link:https://isis.apache.org/versions/1.12.0/guides/ugtst/ugtst.html#_ugtst_unit-test-support_soap-fake-server-junit-rule[SoapEndpointPublishingRule] when multiple endpoints.
+* link:https://issues.apache.org/jira/browse/ISIS-1348[ISIS-1348] - Bug with link:https://isis.apache.org/versions/1.12.0/guides/ugtst/ugtst.html#_ugtst_unittestsupport_soap-fake-server-junit-rule[SoapEndpointPublishingRule] when multiple endpoints.
* link:https://issues.apache.org/jira/browse/ISIS-1347[ISIS-1347] - Missing annotation in SimpleObject
* link:https://issues.apache.org/jira/browse/ISIS-1346[ISIS-1346] - ActionInvocationContext isn't populated properly
* link:https://issues.apache.org/jira/browse/ISIS-1342[ISIS-1342] - The metamodel validation error page doesn't reliably render itself if there are errors.
diff --git a/antora/playbooks/site-security.yml b/antora/playbooks/site-security.yml
index 2557843..24c5818 100644
--- a/antora/playbooks/site-security.yml
+++ b/antora/playbooks/site-security.yml
@@ -17,16 +17,18 @@ content:
# core
- url: .
- start_path: core/security/api/src/main/doc # security
+ start_path: core/security/src/main/doc # security
branches: HEAD
+
+# security
- url: .
- start_path: core/security/bypass/src/main/doc # security
+ start_path: security/bypass/src/main/doc # security
branches: HEAD
- url: .
- start_path: core/security/shiro/src/main/doc # security
+ start_path: security/shiro/src/main/doc # security
branches: HEAD
- url: .
- start_path: core/security/keycloak/src/main/doc # security
+ start_path: security/keycloak/src/main/doc # security
branches: HEAD
# extensions
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index 82d0865..97a6138 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -88,15 +88,6 @@ content:
start_path: core/security/src/main/doc # security
branches: HEAD
- url: .
- start_path: security/bypass/src/main/doc # security
- branches: HEAD
- - url: .
- start_path: security/shiro/src/main/doc # security
- branches: HEAD
- - url: .
- start_path: security/keycloak/src/main/doc # security
- branches: HEAD
- - url: .
start_path: core/testsupport/unittestsupport/src/main/doc # testing
branches: HEAD
- url: .
@@ -183,6 +174,17 @@ content:
start_path: mavendeps/src/main/doc # toc
branches: HEAD
+# security
+ - url: .
+ start_path: security/bypass/src/main/doc # security
+ branches: HEAD
+ - url: .
+ start_path: security/shiro/src/main/doc # security
+ branches: HEAD
+ - url: .
+ start_path: security/keycloak/src/main/doc # security
+ branches: HEAD
+
# starters
- url: .
start_path: starters/src/main/doc # toc
diff --git a/api/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java b/api/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java
index b30efbe..e5ed87a 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerCompositeTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class ExceptionRecognizerCompositeTest {
diff --git a/api/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java b/api/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java
index 77b354b..0f6defe 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/services/i18n/TranslatableStringTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class TranslatableStringTest {
diff --git a/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_compareTo.java b/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_compareTo.java
index 77be22e..dc545f2 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_compareTo.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_compareTo.java
@@ -20,7 +20,7 @@ import java.util.List;
import org.junit.Before;
-import org.apache.isis.unittestsupport.comparable.ComparableContractTest_compareTo;
+import org.apache.isis.core.unittestsupport.comparable.ComparableContractTest_compareTo;
public class ObjectContractsTest_compareTo extends ComparableContractTest_compareTo<InvoiceItem> {
diff --git a/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java b/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
index 61363dc..3b2d109 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/util/ObjectContractsTest_equals_and_hashCode.java
@@ -21,7 +21,7 @@ import java.util.List;
import org.junit.Before;
import org.apache.isis.core.commons.internal.collections._Lists;
-import org.apache.isis.unittestsupport.value.ValueTypeContractTestAbstract;
+import org.apache.isis.core.unittestsupport.value.ValueTypeContractTestAbstract;
public class ObjectContractsTest_equals_and_hashCode extends ValueTypeContractTestAbstract<InvoiceItem3> {
diff --git a/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java b/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java
index 1ca795c..8e0283f 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_Test.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.schema.cmd.v1.MapDto;
import org.apache.isis.schema.common.v1.ValueDto;
import org.apache.isis.schema.common.v1.ValueType;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class CommonDtoUtils_Test {
diff --git a/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java b/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java
index 83c8e44..7f4cfdf 100644
--- a/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java
+++ b/api/applib/src/test/java/org/apache/isis/applib/util/schema/CommonDtoUtils_setValueOn_Test.java
@@ -35,7 +35,7 @@ import org.apache.isis.schema.common.v1.BlobDto;
import org.apache.isis.schema.common.v1.ClobDto;
import org.apache.isis.schema.common.v1.ValueDto;
import org.apache.isis.schema.common.v1.ValueType;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class CommonDtoUtils_setValueOn_Test {
diff --git a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_createSubsetTest.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_createSubsetTest.java
index f5620df..46d5b3f 100644
--- a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_createSubsetTest.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_createSubsetTest.java
@@ -23,8 +23,8 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
import lombok.val;
diff --git a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_primingTest.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_primingTest.java
index 93828cb..14d7eda 100644
--- a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_primingTest.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_primingTest.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
import lombok.val;
diff --git a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_specialCharTest.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_specialCharTest.java
index 5eb81ed..94e7ddb 100644
--- a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_specialCharTest.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_specialCharTest.java
@@ -23,8 +23,8 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
class IsisConfiguration_specialCharTest {
diff --git a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_whitespaceTest.java b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_whitespaceTest.java
index 9ce8be5..314d13f 100644
--- a/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_whitespaceTest.java
+++ b/core/config/src/test/java/org/apache/isis/core/config/IsisConfiguration_whitespaceTest.java
@@ -23,8 +23,8 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
class IsisConfiguration_whitespaceTest {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
similarity index 96%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
index cee8c6a..920cfed 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAll.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
import org.apache.isis.core.commons.internal.collections._Maps;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/ChildDomainObject.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/ChildDomainObject.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/ChildDomainObject.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/ChildDomainObject.java
index 1fa96f8..5623f49 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/ChildDomainObject.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/ChildDomainObject.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
import javax.jdo.annotations.PersistenceCapable;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/InstantiatorForChildDomainObject.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorForChildDomainObject.java
similarity index 96%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/InstantiatorForChildDomainObject.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorForChildDomainObject.java
index fc5f695..af050f0 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/InstantiatorForChildDomainObject.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorForChildDomainObject.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
import java.util.SortedSet;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/ParentDomainObject.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/ParentDomainObject.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/ParentDomainObject.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/ParentDomainObject.java
index 1ac5d89..11fe5c7 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/ParentDomainObject.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/ParentDomainObject.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
import java.util.SortedSet;
import java.util.TreeSet;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/PeerDomainObject.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObject.java
similarity index 98%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/PeerDomainObject.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObject.java
index 5672906..103ef2e 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/PeerDomainObject.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObject.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
import javax.jdo.annotations.PersistenceCapable;
import javax.jdo.annotations.Persistent;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/PeerDomainObjectForTesting.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObjectForTesting.java
similarity index 94%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/PeerDomainObjectForTesting.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObjectForTesting.java
index 1aa2143..2fa0e7d 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/bidir/PeerDomainObjectForTesting.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/bidir/PeerDomainObjectForTesting.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
public class PeerDomainObjectForTesting extends PeerDomainObject {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObject.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObject.java
similarity index 96%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObject.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObject.java
index e0cf993..291960f 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObject.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObject.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.comparable;
+package org.apache.isis.core.unittestsupport.comparable;
import static org.apache.isis.core.commons.internal.base._NullSafe.compareNullsFirst;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
similarity index 96%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
index 3548fcc..01a9048 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/comparable/CategorizedDomainObjectComparableContractTest_compareTo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.comparable;
+package org.apache.isis.core.unittestsupport.comparable;
import java.util.List;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/files/FilesTest_deleteFiles.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java
similarity index 98%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/files/FilesTest_deleteFiles.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java
index 7469231..ae1490d 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/files/FilesTest_deleteFiles.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/files/FilesTest_deleteFiles.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.files;
+package org.apache.isis.core.unittestsupport.files;
import java.io.File;
import java.io.IOException;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java
similarity index 95%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java
index 0bac6b5..62efadc 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAll.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.inject;
+package org.apache.isis.core.unittestsupport.inject;
public class InjectServiceMethodMustBeFinalContractTestAll extends InjectServiceMethodMustBeFinalContractTestAbstract {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/inject/SomeDomainObject.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/SomeDomainObject.java
similarity index 94%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/inject/SomeDomainObject.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/SomeDomainObject.java
index 071f913..0e5c1e7 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/inject/SomeDomainObject.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/SomeDomainObject.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.inject;
+package org.apache.isis.core.unittestsupport.inject;
import javax.jdo.annotations.PersistenceCapable;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/inject/SomeService.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/SomeService.java
similarity index 94%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/inject/SomeService.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/SomeService.java
index 61a1bc8..f42fdf9 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/inject/SomeService.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/inject/SomeService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.inject;
+package org.apache.isis.core.unittestsupport.inject;
public interface SomeService {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/CollaboratingUsingConstructorInjection.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingConstructorInjection.java
similarity index 95%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/CollaboratingUsingConstructorInjection.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingConstructorInjection.java
index 46c90b6..d065771 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/CollaboratingUsingConstructorInjection.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingConstructorInjection.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
public class CollaboratingUsingConstructorInjection {
final Collaborator collaborator;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/CollaboratingUsingSetterInjection.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingSetterInjection.java
similarity index 95%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/CollaboratingUsingSetterInjection.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingSetterInjection.java
index 68efd8a..496b4d6 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/CollaboratingUsingSetterInjection.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/CollaboratingUsingSetterInjection.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
public class CollaboratingUsingSetterInjection {
Collaborator collaborator;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/Collaborator.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/Collaborator.java
similarity index 94%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/Collaborator.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/Collaborator.java
index 24998bf..06b626b 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/Collaborator.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/Collaborator.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
public interface Collaborator {
public void doOtherStuff();
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
similarity index 99%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
index 4ba68a5..c249165 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserTestUsingCodegenPlugin.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
similarity index 98%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
index f5e4627..db6bdea 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/IsisActionsTest_returnNewTransientInstance.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JMockActionsTest_returnArgument.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
index 1f09a5b..66c1596 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnArgument.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JMockActionsTest_returnEach.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JMockActionsTest_returnEach.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java
index 8916a61..b95eafb 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JMockActionsTest_returnEach.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JMockActionsTest_returnEach.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java
similarity index 96%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java
index 3248802..8b83738 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
index 395e5d1..eddf0ee 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_constructorInjection_happyCase.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.auto.Mock;
import org.junit.Rule;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
similarity index 96%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
index 68170f6..efdea13 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_noClassUnderTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.auto.Mock;
import org.junit.Rule;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
index fc6593d..601a9d9 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_sadCase_twoClassesUnderTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.auto.Mock;
import org.junit.Ignore;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
index 59e21d3..f31fb63 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_autoWiring_setterInjection_happyCase.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.auto.Mock;
import org.junit.Rule;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
index 53d2bb0..05b8183 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithAllowing.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.auto.Mock;
import org.junit.Rule;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
index ff307ec..e22055e 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithChecking.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.auto.Mock;
import org.junit.Rule;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
index d6cdb16..afed4e2 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithIgnoring.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.auto.Mock;
import org.junit.Rule;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
index a3b2b72..d7953f9 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_happyCase.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.auto.Mock;
import org.junit.Rule;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
index 048d6be..b6aa7f8 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithNever_sadCase.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.auto.Mock;
import org.junit.Rule;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
index 4705799..3e11207 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_happyCase.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.auto.Mock;
import org.junit.Rule;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
similarity index 97%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
index 8413acf..61f3a1d 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2Test_mockAnnotatedWithOne_sadCase.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.auto.Mock;
import org.junit.Ignore;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/sortedsets/SomeDomainObject.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SomeDomainObject.java
similarity index 95%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/sortedsets/SomeDomainObject.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SomeDomainObject.java
index 8d6f3df..82ece30 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/sortedsets/SomeDomainObject.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SomeDomainObject.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.sortedsets;
+package org.apache.isis.core.unittestsupport.sortedsets;
import java.util.SortedSet;
import java.util.TreeSet;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAll.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java
similarity index 94%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAll.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java
index bf19c7c..d3e1faa 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAll.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAll.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.sortedsets;
+package org.apache.isis.core.unittestsupport.sortedsets;
public class SortedSetsContractTestAll extends SortedSetsContractTestAbstract {
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java
similarity index 96%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java
index 39bf280..6904757 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_BigIntegerTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.value;
+package org.apache.isis.core.unittestsupport.value;
import java.math.BigInteger;
import java.util.Arrays;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java
similarity index 96%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java
index 7a4deea..f6e2bcf 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_ColorTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.value;
+package org.apache.isis.core.unittestsupport.value;
import java.awt.Color;
import java.util.Arrays;
diff --git a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java
similarity index 96%
rename from core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java
rename to core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java
index c1fc569..d29be31 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract_StringTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.value;
+package org.apache.isis.core.unittestsupport.value;
import java.util.Arrays;
import java.util.List;
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
index cf55824..b44b832 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
@@ -39,8 +39,8 @@ import org.apache.isis.core.metamodel.facets.all.named.NamedFacetAbstract;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectActionDefault;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ObjectActionLayoutXmlDefaultTest {
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
index e3109e2..c7154f8 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
@@ -44,8 +44,8 @@ import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.OneToManyAssociationDefault;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class OneToManyAssociationDefaultTest {
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoReaderTest.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoReaderTest.java
index 6c95e79..4b18dd9 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoReaderTest.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoReaderTest.java
@@ -36,7 +36,7 @@ import org.apache.isis.applib.services.i18n.LocaleProvider;
import org.apache.isis.applib.services.i18n.TranslationsResolver;
import org.apache.isis.core.commons.collections.Can;
import org.apache.isis.core.commons.internal.collections._Lists;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class PoReaderTest {
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefaultTest.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
index ac075c1..eb3c2f7 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
@@ -33,7 +33,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrappingObject;
import org.apache.isis.core.commons.internal.plugins.codegen.ProxyFactoryService;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import lombok.RequiredArgsConstructor;
diff --git a/core/unittestsupport/src/main/doc/modules/unit-test-support/partials/module-nav.adoc b/core/unittestsupport/src/main/doc/modules/unit-test-support/partials/module-nav.adoc
deleted file mode 100644
index 3cdcf2c..0000000
--- a/core/unittestsupport/src/main/doc/modules/unit-test-support/partials/module-nav.adoc
+++ /dev/null
@@ -1 +0,0 @@
-* xref:testing:unit-test-support:about.adoc[Unit Test Support]
diff --git a/core/unittestsupport/src/main/doc/modules/unit-test-support/nav.adoc b/core/unittestsupport/src/main/doc/modules/unittestsupport/nav.adoc
similarity index 100%
rename from core/unittestsupport/src/main/doc/modules/unit-test-support/nav.adoc
rename to core/unittestsupport/src/main/doc/modules/unittestsupport/nav.adoc
diff --git a/core/unittestsupport/src/main/doc/modules/unit-test-support/pages/about.adoc b/core/unittestsupport/src/main/doc/modules/unittestsupport/pages/about.adoc
similarity index 76%
rename from core/unittestsupport/src/main/doc/modules/unit-test-support/pages/about.adoc
rename to core/unittestsupport/src/main/doc/modules/unittestsupport/pages/about.adoc
index 298e586..3391ac5 100644
--- a/core/unittestsupport/src/main/doc/modules/unit-test-support/pages/about.adoc
+++ b/core/unittestsupport/src/main/doc/modules/unittestsupport/pages/about.adoc
@@ -3,7 +3,7 @@
Apache Isis provides a number of unit test helpers for you to use (if you wish) to unit test your domain objects.
-include::unit-test-support/contract-tests.adoc[leveloffset=+1]
-include::unit-test-support/jmock-extensions.adoc[leveloffset=+1]
-include::unit-test-support/soap-fake-server-junit-rule.adoc[leveloffset=+1]
-include::unit-test-support/maven-configuration.adoc[leveloffset=+1]
+include::unittestsupport/contract-tests.adoc[leveloffset=+1]
+include::unittestsupport/jmock-extensions.adoc[leveloffset=+1]
+include::unittestsupport/soap-fake-server-junit-rule.adoc[leveloffset=+1]
+include::unittestsupport/maven-configuration.adoc[leveloffset=+1]
diff --git a/core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/contract-tests.adoc b/core/unittestsupport/src/main/doc/modules/unittestsupport/pages/unit-test-support/contract-tests.adoc
similarity index 100%
rename from core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/contract-tests.adoc
rename to core/unittestsupport/src/main/doc/modules/unittestsupport/pages/unit-test-support/contract-tests.adoc
diff --git a/core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/jmock-extensions.adoc b/core/unittestsupport/src/main/doc/modules/unittestsupport/pages/unit-test-support/jmock-extensions.adoc
similarity index 100%
rename from core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/jmock-extensions.adoc
rename to core/unittestsupport/src/main/doc/modules/unittestsupport/pages/unit-test-support/jmock-extensions.adoc
diff --git a/core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/maven-configuration.adoc b/core/unittestsupport/src/main/doc/modules/unittestsupport/pages/unit-test-support/maven-configuration.adoc
similarity index 100%
rename from core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/maven-configuration.adoc
rename to core/unittestsupport/src/main/doc/modules/unittestsupport/pages/unit-test-support/maven-configuration.adoc
diff --git a/core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/soap-fake-server-junit-rule.adoc b/core/unittestsupport/src/main/doc/modules/unittestsupport/pages/unit-test-support/soap-fake-server-junit-rule.adoc
similarity index 100%
rename from core/unittestsupport/src/main/doc/modules/unit-test-support/pages/unit-test-support/soap-fake-server-junit-rule.adoc
rename to core/unittestsupport/src/main/doc/modules/unittestsupport/pages/unit-test-support/soap-fake-server-junit-rule.adoc
diff --git a/core/unittestsupport/src/main/doc/modules/unittestsupport/partials/module-nav.adoc b/core/unittestsupport/src/main/doc/modules/unittestsupport/partials/module-nav.adoc
new file mode 100644
index 0000000..241ce16
--- /dev/null
+++ b/core/unittestsupport/src/main/doc/modules/unittestsupport/partials/module-nav.adoc
@@ -0,0 +1 @@
+* xref:testing:unittestsupport:about.adoc[Unit Test Support]
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/AbstractApplyToAllContractTest.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/AbstractApplyToAllContractTest.java
similarity index 96%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/AbstractApplyToAllContractTest.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/AbstractApplyToAllContractTest.java
index d61e48d..bfbe7cd 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/AbstractApplyToAllContractTest.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/AbstractApplyToAllContractTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport;
+package org.apache.isis.core.unittestsupport;
import java.io.PrintStream;
import java.io.PrintWriter;
@@ -29,7 +29,7 @@ import java.util.TreeSet;
import org.junit.Test;
import org.apache.isis.core.commons.internal._Constants;
-import org.apache.isis.unittestsupport.utils.IndentPrinter;
+import org.apache.isis.core.unittestsupport.utils.IndentPrinter;
/**
* Provides some basic infrastructure to iterate over all entity types and
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
similarity index 96%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
index dcc6900..31123c8 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/BidirectionalRelationshipContractTestAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
@@ -35,20 +35,17 @@ import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.Matchers.greaterThan;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.AbstractApplyToAllContractTest;
-import org.apache.isis.unittestsupport.utils.CollectUtils;
-import org.apache.isis.unittestsupport.utils.ReflectUtils;
-import org.apache.isis.unittestsupport.utils.StringUtils;
+import org.apache.isis.core.unittestsupport.AbstractApplyToAllContractTest;
+import org.apache.isis.core.unittestsupport.utils.CollectUtils;
+import org.apache.isis.core.unittestsupport.utils.ReflectUtils;
+import org.apache.isis.core.unittestsupport.utils.StringUtils;
import static org.apache.isis.core.commons.internal.collections._Collections.toHashSet;
import static org.apache.isis.core.commons.internal.reflection._Reflect.streamAllFields;
import static org.apache.isis.core.commons.internal.reflection._Reflect.streamAllMethods;
import static org.apache.isis.core.commons.internal.reflection._Reflect.withMethodParametersCount;
import static org.apache.isis.core.commons.internal.reflection._Reflect.withName;
-import static org.apache.isis.unittestsupport.utils.ReflectUtils.withEntityParameter;
-import static org.apache.isis.unittestsupport.utils.ReflectUtils.withParametersAssignableFrom;
-import static org.apache.isis.unittestsupport.utils.ReflectUtils.withReturnTypeAssignableFrom;
-import static org.apache.isis.unittestsupport.utils.ReflectUtils.withTypeAssignableFrom;
+import static org.apache.isis.core.unittestsupport.utils.ReflectUtils.withParametersAssignableFrom;
public abstract class BidirectionalRelationshipContractTestAbstract extends AbstractApplyToAllContractTest implements Instantiators {
@@ -105,7 +102,7 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
final Set<Method> addToMethods = streamAllMethods(p.entityType, true)
.filter(withConcreteMethodNamed(addToMethod))
.filter(withMethodParametersCount(1))
- .filter(withEntityParameter())
+ .filter(ReflectUtils.withEntityParameter())
.collect(toHashSet());
if(addToMethods.size() != 1) {
@@ -120,7 +117,7 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
final Set<Method> removeFromMethods = streamAllMethods(p.entityType, true)
.filter(withConcreteMethodNamed(removeFromMethod))
.filter(withMethodParametersCount(1))
- .filter(withEntityParameter())
+ .filter(ReflectUtils.withEntityParameter())
.collect(toHashSet());
if(removeFromMethods.size() != 1) {
@@ -145,7 +142,7 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
final Set<Method> modifyMethods = streamAllMethods(p.entityType, true)
.filter(withConcreteMethodNamed(modifyMethod))
.filter(withMethodParametersCount(1))
- .filter(withEntityParameter())
+ .filter(ReflectUtils.withEntityParameter())
.collect(toHashSet());
if(modifyMethods.size() != 1) {
@@ -225,7 +222,7 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
// mappedBy field
final Set<Field> parentFields = streamAllFields(c.entityType, true)
.filter(withName(p.mappedBy))
- .filter(withTypeAssignableFrom(p.entityType))
+ .filter(ReflectUtils.withTypeAssignableFrom(p.entityType))
.collect(toHashSet());
assertThat(c.entityType.getName()+ ": could not locate '" + p.mappedBy + "' field, returning supertype of " + p.entityType.getSimpleName() +", (as per @Persistent(mappedBy=...) in parent "+ p.entityType.getSimpleName()+")", parentFields.size(), is(1));
@@ -236,7 +233,7 @@ public abstract class BidirectionalRelationshipContractTestAbstract extends Abst
final Set<Method> getterMethods = streamAllMethods(c.entityType, true)
.filter(withConcreteMethodNamed(getterMethod))
.filter(withMethodParametersCount(0))
- .filter(withReturnTypeAssignableFrom(p.entityType))
+ .filter(ReflectUtils.withReturnTypeAssignableFrom(p.entityType))
.collect(toHashSet());
assertThat(p.descRel(c) +": could not locate getter " + getterMethod + "() returning supertype of " + p.entityType.getSimpleName(), getterMethods.size(), is(1));
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Child.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Child.java
similarity index 96%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Child.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Child.java
index 6e91018..5ac8b81 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Child.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Child.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiator.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Instantiator.java
similarity index 95%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiator.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Instantiator.java
index 058bc65..75bf086 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiator.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Instantiator.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
public interface Instantiator {
Instantiator NOOP = new Instantiator() {
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorMap.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorMap.java
similarity index 97%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorMap.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorMap.java
index 6ea9bd2..2ff11ee 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorMap.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorMap.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
import java.util.HashMap;
import java.util.Map;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorSimple.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorSimple.java
similarity index 95%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorSimple.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorSimple.java
index 554c1ea..13caa5e 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/InstantiatorSimple.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/InstantiatorSimple.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
public class InstantiatorSimple implements Instantiator {
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiators.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Instantiators.java
similarity index 94%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiators.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Instantiators.java
index 3ba90e8..16e9bbd 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Instantiators.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Instantiators.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
interface Instantiators {
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Parent.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Parent.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Parent.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Parent.java
index 4fa518c..a8b9003 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/bidir/Parent.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/bidir/Parent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.bidir;
+package org.apache.isis.core.unittestsupport.bidir;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTest_compareTo.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTest_compareTo.java
similarity index 96%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTest_compareTo.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTest_compareTo.java
index b65591b..f948a39 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTest_compareTo.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTest_compareTo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.comparable;
+package org.apache.isis.core.unittestsupport.comparable;
import java.util.Arrays;
import java.util.List;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTester.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTester.java
similarity index 97%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTester.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTester.java
index 6e81365..1fc4316 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/comparable/ComparableContractTester.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/comparable/ComparableContractTester.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.comparable;
+package org.apache.isis.core.unittestsupport.comparable;
import java.util.List;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/IsisConfigurationLegacy.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/IsisConfigurationLegacy.java
similarity index 99%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/IsisConfigurationLegacy.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/IsisConfigurationLegacy.java
index 68e6d70..280af75 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/IsisConfigurationLegacy.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/IsisConfigurationLegacy.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.config;
+package org.apache.isis.core.unittestsupport.config;
import java.awt.Color;
import java.awt.Font;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config.java
similarity index 96%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config.java
index 5fc8941..4aa4c99 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.config.internal;
+package org.apache.isis.core.unittestsupport.config.internal;
import java.util.Map;
import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.core.commons.internal.context._Context;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
import lombok.val;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Instance.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Instance.java
similarity index 97%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Instance.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Instance.java
index 5a3033b..75edf17 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Instance.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Instance.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.config.internal;
+package org.apache.isis.core.unittestsupport.config.internal;
import java.awt.Color;
import java.awt.Font;
@@ -28,7 +28,7 @@ import javax.annotation.Nullable;
import org.apache.isis.core.commons.internal._Constants;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.commons.internal.collections._Maps;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
import static org.apache.isis.core.commons.internal.base._With.computeIfAbsent;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_LifecycleResource.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_LifecycleResource.java
similarity index 96%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_LifecycleResource.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_LifecycleResource.java
index 3f34afa..648c83a 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_LifecycleResource.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_LifecycleResource.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.config.internal;
+package org.apache.isis.core.unittestsupport.config.internal;
import java.util.Map;
import java.util.Optional;
import org.apache.isis.core.commons.internal.base._Lazy;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
import static org.apache.isis.core.commons.internal.base._With.requires;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Parsers.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Parsers.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Parsers.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Parsers.java
index 6e3de62..8b16995 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_Parsers.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_Parsers.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.config.internal;
+package org.apache.isis.core.unittestsupport.config.internal;
import java.awt.Color;
import java.awt.Font;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_trim.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_trim.java
similarity index 95%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_trim.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_trim.java
index 4955507..6fdf7e1 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/config/internal/_Config_trim.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/config/internal/_Config_trim.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.config.internal;
+package org.apache.isis.core.unittestsupport.config.internal;
import java.util.Map;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/files/Files.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/files/Files.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/files/Files.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/files/Files.java
index 9c99b0a..a71376a 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/files/Files.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/files/Files.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.files;
+package org.apache.isis.core.unittestsupport.files;
import java.io.File;
import java.io.FileFilter;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
similarity index 95%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
index 2bdda44..35e1371 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/inject/InjectServiceMethodMustBeFinalContractTestAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.inject;
+package org.apache.isis.core.unittestsupport.inject;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -26,7 +26,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import org.apache.isis.core.commons.internal.reflection._Reflect;
-import org.apache.isis.unittestsupport.AbstractApplyToAllContractTest;
+import org.apache.isis.core.unittestsupport.AbstractApplyToAllContractTest;
import static org.apache.isis.core.commons.internal.collections._Collections.toHashSet;
import static org.apache.isis.core.commons.internal.reflection._Reflect.withPrefix;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jaxb/JaxbMatchers.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jaxb/JaxbMatchers.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jaxb/JaxbMatchers.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jaxb/JaxbMatchers.java
index 14c3a3d..e711fc0 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jaxb/JaxbMatchers.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jaxb/JaxbMatchers.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.jaxb;
+package org.apache.isis.core.unittestsupport.jaxb;
import java.io.CharArrayWriter;
import java.io.IOException;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
index 4e483c2..c5dd229 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/ImposteriserUsingCodegenPlugin.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/Imposterisers.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/Imposterisers.java
similarity index 95%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/Imposterisers.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/Imposterisers.java
index 3ecd44e..b2294ce 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/Imposterisers.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/Imposterisers.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.jmock.api.Imposteriser;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/InjectIntoJMockAction.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/InjectIntoJMockAction.java
similarity index 97%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/InjectIntoJMockAction.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/InjectIntoJMockAction.java
index 95f96f1..c887675 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/InjectIntoJMockAction.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/InjectIntoJMockAction.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import java.lang.reflect.Method;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/IsisActions.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/IsisActions.java
similarity index 97%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/IsisActions.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/IsisActions.java
index ce38e9c..7634764 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/IsisActions.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/IsisActions.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import org.hamcrest.Description;
import org.jmock.api.Action;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JMockActions.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JMockActions.java
similarity index 97%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JMockActions.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JMockActions.java
index 916fac1..4a5d50f 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JMockActions.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JMockActions.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import java.util.Arrays;
import java.util.Collection;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2.java
similarity index 99%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2.java
index a48b796..38f3fb8 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/JUnitRuleMockery2.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/JUnitRuleMockery2.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/MyMockomatic.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/MyMockomatic.java
similarity index 78%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/MyMockomatic.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/MyMockomatic.java
index e7d6b5d..d9f32d4 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/MyMockomatic.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/MyMockomatic.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import java.lang.reflect.Field;
import java.util.ArrayList;
@@ -27,13 +27,6 @@ import org.jmock.States;
import org.jmock.auto.Auto;
import org.jmock.auto.Mock;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Allowing;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Checking;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.ExpectationsOn;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Ignoring;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Never;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.One;
-
class MyMockomatic {
private final JUnitRuleMockery2 context;
@@ -57,28 +50,28 @@ class MyMockomatic {
}
final Object mock = context.mock(field.getType(), field.getName());
setAutoField(field, object, mock, "auto-mock field " + field.getName());
- if(field.isAnnotationPresent(Ignoring.class)) {
+ if(field.isAnnotationPresent(JUnitRuleMockery2.Ignoring.class)) {
context.ignoring(mock);
}
- if(field.isAnnotationPresent(Allowing.class)) {
+ if(field.isAnnotationPresent(JUnitRuleMockery2.Allowing.class)) {
context.allowing(mock);
}
- if(field.isAnnotationPresent(Never.class)) {
+ if(field.isAnnotationPresent(JUnitRuleMockery2.Never.class)) {
context.never(mock);
}
- if(field.isAnnotationPresent(One.class)) {
+ if(field.isAnnotationPresent(JUnitRuleMockery2.One.class)) {
context.oneOf(mock);
}
- if(field.isAnnotationPresent(Checking.class)) {
+ if(field.isAnnotationPresent(JUnitRuleMockery2.Checking.class)) {
checking(field, mock);
}
mocks.add(mock);
}
private <T> void checking(final Field field, final T mock) {
- Checking checking = field.getAnnotation(Checking.class);
+ JUnitRuleMockery2.Checking checking = field.getAnnotation(JUnitRuleMockery2.Checking.class);
@SuppressWarnings("unchecked")
- Class<? extends ExpectationsOn<T>> expectationsOnClass = (Class<? extends ExpectationsOn<T>>) checking.value();
+ Class<? extends JUnitRuleMockery2.ExpectationsOn<T>> expectationsOnClass = (Class<? extends JUnitRuleMockery2.ExpectationsOn<T>>) checking.value();
context.checking(mock, expectationsOnClass);
}
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/PostponedAction.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/PostponedAction.java
similarity index 96%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/PostponedAction.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/PostponedAction.java
index b2fa43c..52e9297 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/jmocking/PostponedAction.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/jmocking/PostponedAction.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.jmocking;
+package org.apache.isis.core.unittestsupport.jmocking;
import java.util.function.Supplier;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/PublishedEndpoints.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/PublishedEndpoints.java
similarity index 97%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/PublishedEndpoints.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/PublishedEndpoints.java
index 2c85600..99c5e8b 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/PublishedEndpoints.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/PublishedEndpoints.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.soap;
+package org.apache.isis.core.unittestsupport.soap;
import java.util.List;
import java.util.Map;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpoint.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpoint.java
similarity index 97%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpoint.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpoint.java
index 1979db0..76522f4 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpoint.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpoint.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.soap;
+package org.apache.isis.core.unittestsupport.soap;
import javax.xml.ws.Endpoint;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointPublishingRule.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointPublishingRule.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointPublishingRule.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointPublishingRule.java
index 1e7b55b..f9bedd2 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointPublishingRule.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointPublishingRule.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.soap;
+package org.apache.isis.core.unittestsupport.soap;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointSpec.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointSpec.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointSpec.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointSpec.java
index 2fb0d66..d96ef78 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/soap/SoapEndpointSpec.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/soap/SoapEndpointSpec.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.soap;
+package org.apache.isis.core.unittestsupport.soap;
import java.util.function.Supplier;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
similarity index 95%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
index e1b18d3..f1b8545 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/sortedsets/SortedSetsContractTestAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.sortedsets;
+package org.apache.isis.core.unittestsupport.sortedsets;
import java.lang.reflect.Field;
import java.util.Collection;
@@ -27,7 +27,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import org.apache.isis.core.commons.internal.reflection._Reflect;
-import org.apache.isis.unittestsupport.AbstractApplyToAllContractTest;
+import org.apache.isis.core.unittestsupport.AbstractApplyToAllContractTest;
import static org.apache.isis.core.commons.internal.collections._Collections.toHashSet;
import static org.apache.isis.core.commons.internal.reflection._Reflect.withTypeAssignableTo;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/streams/NullPrintStream.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/streams/NullPrintStream.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/streams/NullPrintStream.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/streams/NullPrintStream.java
index a9d9b8c..41be8c2 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/streams/NullPrintStream.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/streams/NullPrintStream.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.streams;
+package org.apache.isis.core.unittestsupport.streams;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/CollectUtils.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/CollectUtils.java
similarity index 94%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/CollectUtils.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/CollectUtils.java
index a0f5b5f..5b84644 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/CollectUtils.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/CollectUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.utils;
+package org.apache.isis.core.unittestsupport.utils;
import java.util.Set;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/IndentPrinter.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/IndentPrinter.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/IndentPrinter.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/IndentPrinter.java
index f0aa523..24b0aff 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/IndentPrinter.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/IndentPrinter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.utils;
+package org.apache.isis.core.unittestsupport.utils;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/ReflectUtils.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/ReflectUtils.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/ReflectUtils.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/ReflectUtils.java
index 4c27595..b4cc3ab 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/ReflectUtils.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/ReflectUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.utils;
+package org.apache.isis.core.unittestsupport.utils;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/StringUtils.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/StringUtils.java
similarity index 96%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/StringUtils.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/StringUtils.java
index 69570a7..97f7b1d 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/utils/StringUtils.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/utils/StringUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.utils;
+package org.apache.isis.core.unittestsupport.utils;
import java.lang.reflect.Field;
diff --git a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract.java b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract.java
similarity index 98%
rename from core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract.java
rename to core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract.java
index 792ad08..4734fcc 100644
--- a/core/unittestsupport/src/main/java/org/apache/isis/unittestsupport/value/ValueTypeContractTestAbstract.java
+++ b/core/unittestsupport/src/main/java/org/apache/isis/core/unittestsupport/value/ValueTypeContractTestAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.unittestsupport.value;
+package org.apache.isis.core.unittestsupport.value;
import java.util.List;
diff --git a/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java b/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
index 0a8257b..e3b93f3 100644
--- a/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
+++ b/legacy/extensions/core/metamodel/src/test/java/org/apache/isis/legacy/metamodel/facets/value/PercentageValueSemanticsProviderTest.java
@@ -30,7 +30,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContextAware;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
import org.apache.isis.core.metamodel.facets.value.ValueSemanticsProviderAbstractTestCase;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
public class PercentageValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase {
private PercentageValueSemanticsProvider adapter;
diff --git a/legacy/mappings/restclient/src/test/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodTest_setUp.java b/legacy/mappings/restclient/src/test/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodTest_setUp.java
index bb13e41..b8269db 100644
--- a/legacy/mappings/restclient/src/test/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodTest_setUp.java
+++ b/legacy/mappings/restclient/src/test/java/org/apache/isis/legacy/restclient/lib/RestfulHttpMethodTest_setUp.java
@@ -26,10 +26,8 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.legacy.restclient.lib.ClientRequestConfigurer;
-import org.apache.isis.legacy.restclient.lib.RestfulHttpMethodHelper;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
public class RestfulHttpMethodTest_setUp {
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
index d333fb6..d46c666 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
@@ -33,8 +33,8 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class PojoAdapterTest {
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
index 70ecc46..0ba63d9 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
@@ -64,8 +64,8 @@ import org.apache.isis.core.runtime.persistence.objectstore.transaction.PojoAdap
import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class ObjectMemberAbstractTest {
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
index 588b248..2b37416 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
@@ -73,9 +73,9 @@ import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.schema.cmd.v1.CommandDto;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import org.apache.isis.security.api.authentication.standard.SimpleSession;
-import org.apache.isis.unittestsupport.config.internal._Config;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
index 447a7de..c8aeca0 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
@@ -67,10 +67,10 @@ import org.apache.isis.core.runtimeservices.wrapper.dom.employees.Employee;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import org.apache.isis.security.api.authentication.standard.SimpleSession;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
-import static org.apache.isis.unittestsupport.jmocking.PostponedAction.returnValuePostponed;
+import static org.apache.isis.core.unittestsupport.jmocking.PostponedAction.returnValuePostponed;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
index 8376728..7231d46 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/exceprecog/ExceptionRecognizerCompositeForJdoObjectStoreTest.java
@@ -25,7 +25,7 @@ import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.unittestsupport.config.internal._Config;
+import org.apache.isis.core.unittestsupport.config.internal._Config;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
index 290296d..75236c4 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/version/JdoVersionAnnotationFacetFactoryTest_refineMetaModel.java
@@ -37,8 +37,8 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorAbstract;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidatorVisiting.Visitor;
import org.apache.isis.core.metamodel.specloader.validator.ValidationFailures;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import lombok.val;
diff --git a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
index 827a62e..739fbb3 100644
--- a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
+++ b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_authenticate.java
@@ -41,8 +41,8 @@ import org.apache.isis.security.api.authentication.AuthenticationRequestPassword
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.shiro.authentication.AuthenticatorShiro;
import org.apache.isis.security.shiro.authorization.AuthorizorShiro;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import lombok.val;
diff --git a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
index 96f01f9..2d1b94f 100644
--- a/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
+++ b/security/shiro/src/test/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizorTest_isVisibleInAnyRole.java
@@ -39,9 +39,9 @@ import org.apache.isis.security.api.authentication.AuthenticationRequest;
import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
import org.apache.isis.security.shiro.authentication.AuthenticatorShiro;
import org.apache.isis.security.shiro.authorization.AuthorizorShiro;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import lombok.val;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByCodeContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByCodeContractTester.java
index 9bbfda0..232a4cc 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByCodeContractTester.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByCodeContractTester.java
@@ -8,7 +8,7 @@ import com.google.common.collect.Lists;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
+import org.apache.isis.core.unittestsupport.comparable.ComparableContractTester;
public class ComparableByCodeContractTester<T extends WithCodeComparable<T>> {
protected final Class<T> cls;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByDescriptionContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByDescriptionContractTester.java
index 1a31874..d80b707 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByDescriptionContractTester.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByDescriptionContractTester.java
@@ -8,7 +8,7 @@ import com.google.common.collect.Lists;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
+import org.apache.isis.core.unittestsupport.comparable.ComparableContractTester;
public class ComparableByDescriptionContractTester<T extends WithDescriptionComparable<T>> {
protected final Class<T> cls;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByNameContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByNameContractTester.java
index 5fed387..eb29bd5 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByNameContractTester.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByNameContractTester.java
@@ -8,7 +8,7 @@ import com.google.common.collect.Lists;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
+import org.apache.isis.core.unittestsupport.comparable.ComparableContractTester;
public class ComparableByNameContractTester<T extends WithNameComparable<T>> {
protected final Class<T> cls;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByReferenceContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByReferenceContractTester.java
index f13d1d6..58c0385 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByReferenceContractTester.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByReferenceContractTester.java
@@ -8,7 +8,7 @@ import com.google.common.collect.Lists;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
+import org.apache.isis.core.unittestsupport.comparable.ComparableContractTester;
public class ComparableByReferenceContractTester<T extends WithReferenceComparable<T>> {
protected final Class<T> cls;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByTitleContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByTitleContractTester.java
index e50f07f..3a61693 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByTitleContractTester.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/ComparableByTitleContractTester.java
@@ -8,7 +8,7 @@ import com.google.common.collect.Lists;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.comparable.ComparableContractTester;
+import org.apache.isis.core.unittestsupport.comparable.ComparableContractTester;
public class ComparableByTitleContractTester<T extends WithTitleComparable<T>> {
protected final Class<T> cls;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByCode.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByCode.java
index fc26dd8..ac287a9 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByCode.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByCode.java
@@ -1,6 +1,6 @@
package org.apache.isis.subdomains.base.applib.with;
-import org.apache.isis.unittestsupport.bidir.Instantiator;
+import org.apache.isis.core.unittestsupport.bidir.Instantiator;
public class InstantiatorForComparableByCode implements Instantiator {
public final Class<? extends WithCodeComparable<?>> cls;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByDescription.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByDescription.java
index 51ba406..9111b54 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByDescription.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByDescription.java
@@ -1,7 +1,7 @@
package org.apache.isis.subdomains.base.applib.with;
-import org.apache.isis.unittestsupport.bidir.Instantiator;
+import org.apache.isis.core.unittestsupport.bidir.Instantiator;
public class InstantiatorForComparableByDescription implements Instantiator {
public final Class<? extends WithDescriptionComparable<?>> cls;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByName.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByName.java
index b5bb7a6..742913e 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByName.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByName.java
@@ -1,7 +1,7 @@
package org.apache.isis.subdomains.base.applib.with;
-import org.apache.isis.unittestsupport.bidir.Instantiator;
+import org.apache.isis.core.unittestsupport.bidir.Instantiator;
public class InstantiatorForComparableByName implements Instantiator {
public final Class<? extends WithNameComparable<?>> cls;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByReference.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByReference.java
index 10b1dd5..4122272 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByReference.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForComparableByReference.java
@@ -1,7 +1,7 @@
package org.apache.isis.subdomains.base.applib.with;
-import org.apache.isis.unittestsupport.bidir.Instantiator;
+import org.apache.isis.core.unittestsupport.bidir.Instantiator;
public class InstantiatorForComparableByReference implements Instantiator {
public final Class<? extends WithReferenceComparable<?>> cls;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForWithStartDate.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForWithStartDate.java
index f8fe5c9..ef2c808 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForWithStartDate.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/InstantiatorForWithStartDate.java
@@ -2,7 +2,7 @@ package org.apache.isis.subdomains.base.applib.with;
import org.joda.time.LocalDate;
-import org.apache.isis.unittestsupport.bidir.Instantiator;
+import org.apache.isis.core.unittestsupport.bidir.Instantiator;
public class InstantiatorForWithStartDate implements Instantiator {
public final Class<? extends WithStartDate> cls;
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/WithIntervalMutableContractTestAbstract_changeDates.java b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/WithIntervalMutableContractTestAbstract_changeDates.java
index b4cef04..748aad3 100644
--- a/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/WithIntervalMutableContractTestAbstract_changeDates.java
+++ b/subdomains/base/applib/src/test/java/org/apache/isis/subdomains/base/applib/with/WithIntervalMutableContractTestAbstract_changeDates.java
@@ -10,7 +10,7 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public abstract class WithIntervalMutableContractTestAbstract_changeDates<T extends WithIntervalMutable<T>> {
@Rule
diff --git a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java
index e41ccf6..c6df8d8 100644
--- a/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java
+++ b/subdomains/xdocreport/applib/src/test/java/org/apache/isis/subdomains/xdocreport/applib/service/XDocReportServiceTest.java
@@ -12,12 +12,10 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.apache.isis.subdomains.xdocreport.applib.service.OutputType;
-import org.apache.isis.subdomains.xdocreport.applib.service.XDocReportService;
import org.apache.isis.subdomains.xdocreport.applib.service.example.models.Developer;
import org.apache.isis.subdomains.xdocreport.applib.service.example.models.Project;
import org.apache.isis.subdomains.xdocreport.applib.service.example.models.ProjectDevelopersModel;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import fr.opensagres.xdocreport.core.io.IOUtils;
diff --git a/testing/fakedata/applib/src/test/java/org/apache/isis/testing/fakedata/applib/services/FakeDataServiceTest.java b/testing/fakedata/applib/src/test/java/org/apache/isis/testing/fakedata/applib/services/FakeDataServiceTest.java
index ea3499a..4942ee9 100644
--- a/testing/fakedata/applib/src/test/java/org/apache/isis/testing/fakedata/applib/services/FakeDataServiceTest.java
+++ b/testing/fakedata/applib/src/test/java/org/apache/isis/testing/fakedata/applib/services/FakeDataServiceTest.java
@@ -28,7 +28,7 @@ import org.apache.isis.applib.value.Clob;
import org.apache.isis.applib.value.Password;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.collections._Sets;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class FakeDataServiceTest {
diff --git a/testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/abstract-class.adoc b/testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/abstract-class.adoc
index e02109d..185ed4d 100644
--- a/testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/abstract-class.adoc
+++ b/testing/integtestsupport/src/main/doc/modules/integ-test-support/pages/integ-test-support/abstract-class.adoc
@@ -64,7 +64,7 @@ public ExceptionRecognizerTranslate exceptionRecognizerTranslations = // <4>
ExceptionRecognizerTranslate.create();
----
<1> ensures an Apache Isis session/transaction running for each test
-<2> sets up a JMock context (using Apache Isis' extension to JMock as described in xref:testing:unit-test-support:about.adoc#jmock-extensions[JMock Extensions].
+<2> sets up a JMock context (using Apache Isis' extension to JMock as described in xref:testing:unittestsupport:about.adoc#jmock-extensions[JMock Extensions].
<3> standard JUnit rule for writing tests that throw exceptions
<4> to capture messages that require translation, as described in xref:userguide:btb:i18n.adoc[i18 support].
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/AbstractBeanPropertiesTest.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/AbstractBeanPropertiesTest.java
index fc5ff21..1a093af 100644
--- a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/AbstractBeanPropertiesTest.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/AbstractBeanPropertiesTest.java
@@ -4,7 +4,7 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.apache.isis.applib.services.repository.RepositoryService;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public abstract class AbstractBeanPropertiesTest {
diff --git a/testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc b/testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc
index 1c0f3d4..d5df2eb 100644
--- a/testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc
+++ b/testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc
@@ -1,3 +1,3 @@
-* xref:testing:unit-test-support-ext:about.adoc[Unit Test Support (extension)]
+* xref:testing:unittestsupport-ext:about.adoc[Unit Test Support (extension)]
diff --git a/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
index 38c91cb..6e8da50 100644
--- a/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
+++ b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_appendValueAndFormat.java
@@ -39,7 +39,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
public class JsonValueEncoderTest_appendValueAndFormat {
diff --git a/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
index 72bee80..04062e7 100644
--- a/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
+++ b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asAdapter.java
@@ -49,7 +49,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import lombok.val;
diff --git a/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java
index d266418..e45fd91 100644
--- a/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java
+++ b/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoderTest_asObject.java
@@ -37,7 +37,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class JsonValueEncoderTest_asObject {
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index e7dc74f..3f9d291 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
@@ -46,8 +46,8 @@ import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
index f647b22..73c18c4 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
@@ -44,9 +44,9 @@ import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
-import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.config.IsisConfigurationLegacy;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulRequest.RequestParameter;
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
index fdf002f..ca24e3b 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/mappers/RestfulObjectsApplicationExceptionMapper_Test_Contract.java
@@ -31,7 +31,7 @@ import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.restfulobjects.applib.util.JsonMapper;
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
index 244dc16..9f2da79 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter_lookupPassThru_Test.java
@@ -31,7 +31,7 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
public class IsisRestfulObjectsSessionFilter_lookupPassThru_Test {
diff --git a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
index d884afb..48d5d2d 100644
--- a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
+++ b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/EntityModel_hintsTest.java
@@ -33,7 +33,7 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
import lombok.val;
diff --git a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
index d7a45df..948bae0 100644
--- a/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
+++ b/viewers/wicket/model/src/test/java/org/apache/isis/viewer/wicket/model/models/ScalarModel_isScalarSubtypingAnyOf_Test.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
import org.apache.isis.webapp.context.memento.ObjectMementoService;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
index cfb4534..dcca4dc 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/collection/selector/CollectionContentsSelectorDropdownPanelTest.java
@@ -31,8 +31,8 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.CollectionContentsAsAjaxTablePanelFactory;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java
index a3b098a..91e5cfb 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaSqlDateTest.java
@@ -27,8 +27,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
public class DateConverterForJavaSqlDateTest {
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java
index a42d9db..21c771f 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/DateConverterForJavaUtilDateTest.java
@@ -29,8 +29,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
public class DateConverterForJavaUtilDateTest {
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java
index 2dcb666..b1b7b94 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaDateTimeTest.java
@@ -28,8 +28,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
public class DateConverterForJodaDateTimeTest {
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java
index 6ecf31f..28b307f 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTest.java
@@ -28,8 +28,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
public class DateConverterForJodaLocalDateTest {
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java
index 532d1c1..1a121de 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/DateConverterForJodaLocalDateTimeTest.java
@@ -28,8 +28,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
public class DateConverterForJodaLocalDateTimeTest {
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java
index 319adf7..7802a55 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTest.java
@@ -29,8 +29,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.ui.components.scalars.jdk8time.DateConverterForJdk8LocalDate;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java
index 1ca1c83..49529ac 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8LocalDateTimeTest.java
@@ -29,8 +29,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.ui.components.scalars.jdk8time.DateConverterForJdk8LocalDateTime;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java
index 2534c2a..3d60b86 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/jdk8time/DateConverterForJdk8OffsetDateTimeTest.java
@@ -29,8 +29,8 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.ui.components.scalars.jdk8time.DateConverterForJdk8OffsetDateTime;
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
index 55dc85d..cd8049e 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ObjectAdapterMementoProviderForValueChoicesTest.java
@@ -35,7 +35,7 @@ import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.ObjectAdapterMementoProviderForValueChoices;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
index c46b029..345fbaa 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
@@ -44,7 +44,7 @@ import org.apache.isis.security.api.authentication.manager.AuthenticationManager
import org.apache.isis.security.api.authentication.standard.Authenticator;
import org.apache.isis.security.api.authentication.standard.RandomCodeGeneratorDefault;
import org.apache.isis.security.api.authentication.standard.SimpleSession;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
public class AuthenticatedWebSessionForIsis_Authenticate {
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Instantiation.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Instantiation.java
index 0c543db..0fbed87 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Instantiation.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Instantiation.java
@@ -27,8 +27,8 @@ import org.jmock.auto.Mock;
import org.junit.Rule;
import org.junit.Test;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
public class AuthenticatedWebSessionForIsis_Instantiation {
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
index 8925bee..7590839 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
@@ -41,7 +41,7 @@ import org.apache.isis.security.api.authentication.AuthenticationRequestPassword
import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
import org.apache.isis.security.api.authentication.standard.Authenticator;
import org.apache.isis.security.api.authentication.standard.RandomCodeGeneratorDefault;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
public class AuthenticatedWebSessionForIsis_SignIn {
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
index 4b68189..f1731f3 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
@@ -31,8 +31,8 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
public abstract class AuthenticatedWebSessionForIsis_TestAbstract {
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java
index a965311..c44913b 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Defaults.java
@@ -33,8 +33,8 @@ import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertThat;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.viewer.integration.AuthenticatedWebSessionForIsis;
import org.apache.isis.webapp.context.memento.ObjectMemento;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Pages.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Pages.java
index 63e94e2..111fb09 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Pages.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication_Pages.java
@@ -29,8 +29,8 @@ import org.junit.Test;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2;
+import org.apache.isis.core.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.isis.viewer.wicket.ui.pages.home.HomePage;
[isis] 10/14: ISIS-2259: more fixes to unit tests (string literals)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e2cb0f9a3e7d64ca1c95e4bae97ba1fafa5dec41
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 17:25:01 2020 +0000
ISIS-2259: more fixes to unit tests (string literals)
---
.../isis-configurations-and-modules.pptx | Bin 49796 -> 49903 bytes
api/applib/pom.xml | 6 -----
core/commons/pom.xml | 6 -----
core/config/pom.xml | 6 -----
core/detached-tests/pom.xml | 27 +++++----------------
.../commons/internal/reflection/ReflectTest.java | 8 +++---
core/metamodel/pom.xml | 6 -----
core/pom.xml | 8 ++++++
core/security/pom.xml | 6 -----
core/unittestsupport/pom.xml | 6 -----
10 files changed, 18 insertions(+), 61 deletions(-)
diff --git a/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx b/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx
index 05aebce..17f9f60 100644
Binary files a/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx and b/antora/components/core/modules/archdesign/attachments/isis-configurations-and-modules.pptx differ
diff --git a/api/applib/pom.xml b/api/applib/pom.xml
index 66e1058..44d7207 100644
--- a/api/applib/pom.xml
+++ b/api/applib/pom.xml
@@ -91,12 +91,6 @@
<artifactId>annotations</artifactId>
</dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>provided</scope>
- </dependency>
-
<!-- TESTS -->
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/core/commons/pom.xml b/core/commons/pom.xml
index 3126113..6db6ed6 100644
--- a/core/commons/pom.xml
+++ b/core/commons/pom.xml
@@ -65,12 +65,6 @@
</dependency>
<dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
diff --git a/core/config/pom.xml b/core/config/pom.xml
index dbbdcfc..9f7318e 100644
--- a/core/config/pom.xml
+++ b/core/config/pom.xml
@@ -93,12 +93,6 @@
<type>test-jar</type>
</dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>provided</scope>
- </dependency>
-
</dependencies>
diff --git a/core/detached-tests/pom.xml b/core/detached-tests/pom.xml
index d2d7664..6fdbad7 100644
--- a/core/detached-tests/pom.xml
+++ b/core/detached-tests/pom.xml
@@ -24,8 +24,8 @@
<name>Apache Isis Core - Detached Tests</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.detachedtests</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/detachedtests</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.core.detachedtests</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/core/detachedtests</git-plugin.propertiesDir>
<!-- to support the ParameterNameFacet Test -->
<compiler-plugin.compilerArgument>-parameters</compiler-plugin.compilerArgument>
@@ -86,27 +86,12 @@
<scope>test</scope>
</dependency>
-<!--
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- </dependency>
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit-legacy.version}</version>
- <scope>compile</scope>
- <optional>true</optional>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-unittestsupport</artifactId>
+ <scope>test</scope>
</dependency>
--->
+
<dependency>
<groupId>org.picocontainer</groupId>
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java b/core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java
index 993bb45..fb4d6b8 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/commons/internal/reflection/ReflectTest.java
@@ -55,7 +55,7 @@ class ReflectTest {
.collect(Collectors.joining(",\n"));
assertEquals(""
- + "UserServiceDefault$SudoServiceSpi,\n"
+ + "org.apache.isis.core.metamodel.services.user.UserServiceDefault$SudoServiceSpi,\n"
+ "java.lang.Object",
typeListLiteral);
@@ -71,7 +71,7 @@ class ReflectTest {
.collect(Collectors.joining(",\n"));
assertEquals(
- "UserServiceDefault$SudoServiceSpi,\n"
+ "org.apache.isis.core.metamodel.services.user.UserServiceDefault$SudoServiceSpi,\n"
+ "org.apache.isis.applib.services.sudo.SudoService$Spi,\n"
+ "java.lang.Object",
typeListLiteral);
@@ -91,8 +91,8 @@ class ReflectTest {
assertEquals(""
+ "public abstract void org.apache.isis.applib.services.sudo.SudoService$Spi.releaseRunAs(),\n"
+ "public abstract void org.apache.isis.applib.services.sudo.SudoService$Spi.runAs(java.lang.String,java.util.List),\n"
- + "public void UserServiceDefault$SudoServiceSpi.releaseRunAs(),\n"
- + "public void UserServiceDefault$SudoServiceSpi.runAs(java.lang.String,java.util.List)"
+ + "public void org.apache.isis.core.metamodel.services.user.UserServiceDefault$SudoServiceSpi.releaseRunAs(),\n"
+ + "public void org.apache.isis.core.metamodel.services.user.UserServiceDefault$SudoServiceSpi.runAs(java.lang.String,java.util.List)"
,
typeListLiteral);
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index b21692c..1721f76 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -134,12 +134,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>provided</scope>
- </dependency>
-
</dependencies>
diff --git a/core/pom.xml b/core/pom.xml
index 0da70c9..bc27fc1 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1559,6 +1559,14 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<profiles>
<profile>
<id>apache-release</id>
diff --git a/core/security/pom.xml b/core/security/pom.xml
index 3492f17..0072bdb 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -77,12 +77,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>provided</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index 0189f69..03b9a29 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -179,12 +179,6 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <scope>provided</scope>
- </dependency>
-
</dependencies>
<profiles>
[isis] 09/14: ISIS-2259: fixes unit tests (incorrect class literals)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 59dc863c7c250c1387f264a8ff236fd36511b061
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 17:00:23 2020 +0000
ISIS-2259: fixes unit tests (incorrect class literals)
---
.../object/defaults/DefaultedFacetFactoryTest.java | 6 +++---
.../facets/FacetsFacetAnnotationFactoryTest.java | 4 ++--
...eFacetAnnotationOrConfigurationFactoryTest.java | 22 +++++++++++-----------
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
index 00a0ff3..7fea461 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/defaults/DefaultedFacetFactoryTest.java
@@ -74,7 +74,7 @@ public class DefaultedFacetFactoryTest extends AbstractFacetFactoryTest {
}
- @Defaulted(defaultsProviderName = "DefaultedFacetFactoryTest$MyDefaultedUsingDefaultsProvider")
+ @Defaulted(defaultsProviderName = "org.apache.isis.core.metamodel.facets.object.defaults.DefaultedFacetFactoryTest$MyDefaultedUsingDefaultsProvider")
public static class MyDefaultedUsingDefaultsProvider extends DefaultsProviderNoop<MyDefaultedUsingDefaultsProvider> {
/**
@@ -185,7 +185,7 @@ public class DefaultedFacetFactoryTest extends AbstractFacetFactoryTest {
public void testDefaultedProviderNameCanBePickedUpFromConfiguration() {
- final String className = "DefaultedFacetFactoryTest$MyDefaultedWithDefaultsProviderSpecifiedUsingConfiguration";
+ final String className = "org.apache.isis.core.metamodel.facets.object.defaults.DefaultedFacetFactoryTest$MyDefaultedWithDefaultsProviderSpecifiedUsingConfiguration";
_Config.clear();
_Config.put(DefaultsProviderUtil.DEFAULTS_PROVIDER_NAME_KEY_PREFIX + canonical(className) + DefaultsProviderUtil.DEFAULTS_PROVIDER_NAME_KEY_SUFFIX, className);
@@ -211,7 +211,7 @@ public class DefaultedFacetFactoryTest extends AbstractFacetFactoryTest {
public void testNonAnnotatedDefaultedCanBePickedUpFromConfiguration() {
- final String className = "DefaultedFacetFactoryTest$NonAnnotatedDefaultedDefaultsProviderSpecifiedUsingConfiguration";
+ final String className = "org.apache.isis.core.metamodel.facets.object.defaults.DefaultedFacetFactoryTest$NonAnnotatedDefaultedDefaultsProviderSpecifiedUsingConfiguration";
_Config.clear();
_Config.put(DefaultsProviderUtil.DEFAULTS_PROVIDER_NAME_KEY_PREFIX + canonical(className) + DefaultsProviderUtil.DEFAULTS_PROVIDER_NAME_KEY_SUFFIX, className);
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/facets/FacetsFacetAnnotationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/facets/FacetsFacetAnnotationFactoryTest.java
index 0443edc..d6e9f00 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/facets/FacetsFacetAnnotationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/facets/FacetsFacetAnnotationFactoryTest.java
@@ -86,7 +86,7 @@ public class FacetsFacetAnnotationFactoryTest extends AbstractFacetFactoryTest {
}
public void testFacetsFactoryNames() {
- @Facets(facetFactoryNames = { "FacetsFacetAnnotationFactoryTest$CustomerFacetFactory", "FacetsFacetAnnotationFactoryTest$CustomerNotAFacetFactory" })
+ @Facets(facetFactoryNames = { "org.apache.isis.core.metamodel.facets.object.facets.FacetsFacetAnnotationFactoryTest$CustomerFacetFactory", "FacetsFacetAnnotationFactoryTest$CustomerNotAFacetFactory" })
class Customer {
}
@@ -123,7 +123,7 @@ public class FacetsFacetAnnotationFactoryTest extends AbstractFacetFactoryTest {
}
public void testFacetsFactoryNameAndClass() {
- @Facets(facetFactoryNames = { "FacetsFacetAnnotationFactoryTest$CustomerFacetFactory" }, facetFactoryClasses = { FacetsFacetAnnotationFactoryTest.CustomerFacetFactory2.class })
+ @Facets(facetFactoryNames = { "org.apache.isis.core.metamodel.facets.object.facets.FacetsFacetAnnotationFactoryTest$CustomerFacetFactory" }, facetFactoryClasses = { FacetsFacetAnnotationFactoryTest.CustomerFacetFactory2.class })
class Customer {
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
index bef8f2c..ad818f7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/object/value/ValueFacetAnnotationOrConfigurationFactoryTest.java
@@ -55,7 +55,7 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
super.tearDown();
}
- @Value(semanticsProviderName = "ValueFacetAnnotationOrConfigurationFactoryTest$MyParseableUsingParserName2")
+ @Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.object.value.ValueFacetAnnotationOrConfigurationFactoryTest$MyParseableUsingParserName2")
public static class MyParseableUsingParserName2 extends AbstractValueSemanticsProvider<MyValueSemanticsProviderUsingSemanticsProviderName> {
/**
@@ -90,7 +90,7 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
assertNoMethodsRemoved();
}
- @Value(semanticsProviderName = "ValueFacetAnnotationOrConfigurationFactoryTest$MyValueSemanticsProviderUsingSemanticsProviderName")
+ @Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.object.value.ValueFacetAnnotationOrConfigurationFactoryTest$MyValueSemanticsProviderUsingSemanticsProviderName")
public static class MyValueSemanticsProviderUsingSemanticsProviderName extends AbstractValueSemanticsProvider<MyValueSemanticsProviderUsingSemanticsProviderName> {
/**
@@ -176,7 +176,7 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
assertNull(facetedMethod.getFacet(ParseableFacet.class));
}
- @Value(semanticsProviderName = "ValueFacetAnnotationOrConfigurationFactoryTest$MyValueSemanticsProviderThatIsAParser")
+ @Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.object.value.ValueFacetAnnotationOrConfigurationFactoryTest$MyValueSemanticsProviderThatIsAParser")
public static class MyValueSemanticsProviderThatIsAParser extends AbstractValueSemanticsProvider<MyValueSemanticsProviderThatIsAParser> implements Parser<MyValueSemanticsProviderThatIsAParser> {
/**
@@ -233,7 +233,7 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
assertNull(facetedMethod.getFacet(DefaultedFacet.class));
}
- @Value(semanticsProviderName = "ValueFacetAnnotationOrConfigurationFactoryTest$MyValueSemanticsProviderThatIsADefaultsProvider")
+ @Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.object.value.ValueFacetAnnotationOrConfigurationFactoryTest$MyValueSemanticsProviderThatIsADefaultsProvider")
public static class MyValueSemanticsProviderThatIsADefaultsProvider extends AbstractValueSemanticsProvider<MyValueSemanticsProviderThatIsADefaultsProvider> implements DefaultsProvider<MyValueSemanticsProviderThatIsADefaultsProvider> {
/**
@@ -260,7 +260,7 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
assertNull(facetedMethod.getFacet(EncodableFacet.class));
}
- @Value(semanticsProviderName = "ValueFacetAnnotationOrConfigurationFactoryTest$MyValueSemanticsProviderThatIsAnEncoderDecoder")
+ @Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.object.value.ValueFacetAnnotationOrConfigurationFactoryTest$MyValueSemanticsProviderThatIsAnEncoderDecoder")
public static class MyValueSemanticsProviderThatIsAnEncoderDecoder extends AbstractValueSemanticsProvider<MyValueSemanticsProviderThatIsAnEncoderDecoder> implements EncoderDecoder<MyValueSemanticsProviderThatIsAnEncoderDecoder> {
/**
@@ -299,7 +299,7 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
assertNotNull(facet);
}
- @Value(semanticsProviderName = "ValueFacetAnnotationOrConfigurationFactoryTest$MyValueSemanticsProviderThatSpecifiesImmutableSemantic")
+ @Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.object.value.ValueFacetAnnotationOrConfigurationFactoryTest$MyValueSemanticsProviderThatSpecifiesImmutableSemantic")
public static class MyValueSemanticsProviderThatSpecifiesImmutableSemantic extends AbstractValueSemanticsProvider<MyValueSemanticsProviderThatSpecifiesImmutableSemantic> {
/**
@@ -318,7 +318,7 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
assertNotNull(facet);
}
- @Value(semanticsProviderName = "ValueFacetAnnotationOrConfigurationFactoryTest$MyValueSemanticsProviderThatSpecifiesNotImmutableSemantic")
+ @Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.object.value.ValueFacetAnnotationOrConfigurationFactoryTest$MyValueSemanticsProviderThatSpecifiesNotImmutableSemantic")
public static class MyValueSemanticsProviderThatSpecifiesNotImmutableSemantic extends AbstractValueSemanticsProvider<MyValueSemanticsProviderThatSpecifiesNotImmutableSemantic> {
/**
@@ -349,7 +349,7 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
assertNotNull(facet);
}
- @Value(semanticsProviderName = "ValueFacetAnnotationOrConfigurationFactoryTest$MyValueSemanticsProviderThatSpecifiesEqualByContentSemantic")
+ @Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.object.value.ValueFacetAnnotationOrConfigurationFactoryTest$MyValueSemanticsProviderThatSpecifiesEqualByContentSemantic")
public static class MyValueSemanticsProviderThatSpecifiesEqualByContentSemantic extends AbstractValueSemanticsProvider<MyValueSemanticsProviderThatSpecifiesEqualByContentSemantic> {
/**
@@ -368,7 +368,7 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
assertNotNull(facet);
}
- @Value(semanticsProviderName = "ValueFacetAnnotationOrConfigurationFactoryTest$MyValueSemanticsProviderThatSpecifiesNotEqualByContentSemantic")
+ @Value(semanticsProviderName = "org.apache.isis.core.metamodel.facets.object.value.ValueFacetAnnotationOrConfigurationFactoryTest$MyValueSemanticsProviderThatSpecifiesNotEqualByContentSemantic")
public static class MyValueSemanticsProviderThatSpecifiesNotEqualByContentSemantic extends AbstractValueSemanticsProvider<MyValueSemanticsProviderThatSpecifiesNotEqualByContentSemantic> {
/**
@@ -427,7 +427,7 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
public void testSemanticsProviderNameCanBePickedUpFromConfiguration() {
// given
- final String className = "ValueFacetAnnotationOrConfigurationFactoryTest$MyValueWithSemanticsProviderSpecifiedUsingConfiguration";
+ final String className = "org.apache.isis.core.metamodel.facets.object.value.ValueFacetAnnotationOrConfigurationFactoryTest$MyValueWithSemanticsProviderSpecifiedUsingConfiguration";
_Config.clear();
_Config.put(ValueSemanticsProviderUtil.SEMANTICS_PROVIDER_NAME_KEY_PREFIX + canonical(className) + ValueSemanticsProviderUtil.SEMANTICS_PROVIDER_NAME_KEY_SUFFIX, className);
@@ -481,7 +481,7 @@ public class ValueFacetAnnotationOrConfigurationFactoryTest extends AbstractFace
public void testNonAnnotatedValueCanPickUpSemanticsProviderFromConfiguration() {
// given
- final String className = "ValueFacetAnnotationOrConfigurationFactoryTest$NonAnnotatedValueSemanticsProviderSpecifiedUsingConfiguration";
+ final String className = "org.apache.isis.core.metamodel.facets.object.value.ValueFacetAnnotationOrConfigurationFactoryTest$NonAnnotatedValueSemanticsProviderSpecifiedUsingConfiguration";
_Config.clear();
_Config.put(ValueSemanticsProviderUtil.SEMANTICS_PROVIDER_NAME_KEY_PREFIX + canonical(className) + ValueSemanticsProviderUtil.SEMANTICS_PROVIDER_NAME_KEY_SUFFIX, className);
[isis] 11/14: ISIS-2259: search-n-replace for
org.apache.isis.runtime -> core,
integtestsupport -> testing.integtestsupport.applib
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 976e961cca7aec53a4fdd51c9456230643b85892
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 17:25:38 2020 +0000
ISIS-2259: search-n-replace for org.apache.isis.runtime -> core, integtestsupport -> testing.integtestsupport.applib
---
.../mn-1.16.0-to-2.0.0-M1_other-changes.adoc | 2 +-
.../modules/applib-ant/examples/annotation/Defaulted.java | 2 +-
.../doc/modules/applib-ant/examples/annotation/Value.java | 2 +-
.../modules/applib-cm/examples/domain/DomainObjectList.java | 2 +-
.../examples/events/domain/AbstractDomainEvent.java | 4 ++--
.../applib-cm/examples/events/domain/EventObjectBase.java | 4 ++--
.../applib-cm/examples/events/ui/AbstractUiEvent.java | 2 +-
.../examples/layout/component/CollectionLayoutData.java | 2 +-
.../applib-cm/examples/layout/component/FieldSet.java | 2 +-
.../examples/layout/component/PropertyLayoutData.java | 2 +-
.../modules/applib-cm/examples/layout/grid/GridAbstract.java | 4 ++--
.../applib-cm/examples/layout/grid/bootstrap3/BS3Col.java | 2 +-
.../applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java | 4 ++--
.../applib-cm/examples/layout/grid/bootstrap3/BS3Row.java | 2 +-
.../applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java | 2 +-
.../examples/layout/grid/bootstrap3/BS3TabGroup.java | 2 +-
.../applib-cm/examples/layout/menubars/MenuBarsAbstract.java | 2 +-
.../examples/layout/menubars/bootstrap3/BS3Menu.java | 2 +-
.../examples/layout/menubars/bootstrap3/BS3MenuBar.java | 2 +-
.../examples/layout/menubars/bootstrap3/BS3MenuBars.java | 2 +-
.../examples/layout/menubars/bootstrap3/BS3MenuSection.java | 2 +-
.../applib-cm/examples/mixins/dto/DtoMappingHelper.java | 2 +-
.../applib-cm/examples/mixins/dto/Dto_downloadXsd.java | 2 +-
.../applib-cm/examples/spec/AbstractSpecification2.java | 2 +-
.../doc/modules/applib-cm/examples/tree/LazyTreeNode.java | 4 ++--
.../main/doc/modules/applib-cm/examples/tree/TreeNode.java | 2 +-
.../src/main/doc/modules/applib-cm/examples/util/Enums.java | 2 +-
.../main/doc/modules/applib-cm/examples/util/Equality.java | 4 ++--
.../main/doc/modules/applib-cm/examples/util/Hashing.java | 2 +-
.../doc/modules/applib-cm/examples/util/JaxbAdapters.java | 4 ++--
.../main/doc/modules/applib-cm/examples/util/JaxbUtil.java | 6 +++---
.../applib-cm/examples/util/ObjectContract_Parser.java | 4 ++--
.../doc/modules/applib-cm/examples/util/ObjectContracts.java | 4 ++--
.../doc/modules/applib-cm/examples/util/ReasonBuffer2.java | 2 +-
.../doc/modules/applib-cm/examples/util/TitleBuffer.java | 2 +-
.../main/doc/modules/applib-cm/examples/util/ToString.java | 2 +-
.../applib-cm/examples/util/schema/ChangesDtoUtils.java | 2 +-
.../applib-cm/examples/util/schema/CommandDtoUtils.java | 2 +-
.../applib-cm/examples/util/schema/CommonDtoUtils.java | 12 ++++++------
.../applib-cm/examples/util/schema/InteractionDtoUtils.java | 6 +++---
.../examples/util/schema/MemberExecutionDtoUtils.java | 2 +-
.../modules/applib-cm/examples/value/BlobClobFactory.java | 2 +-
.../examples/services/appfeat/ApplicationMemberType.java | 2 +-
.../applib-svc/examples/services/bookmark/Bookmark.java | 4 ++--
.../examples/services/bookmark/BookmarkService.java | 6 +++---
.../examples/services/confview/ConfigurationProperty.java | 2 +-
.../examples/services/conmap/ContentMappingService.java | 2 +-
.../services/exceprecog/ExceptionRecognizerAbstract.java | 4 ++--
.../services/exceprecog/ExceptionRecognizerComposite.java | 2 +-
.../services/exceprecog/ExceptionRecognizerForType.java | 6 +++---
.../examples/services/i18n/TranslatableString.java | 2 +-
.../applib-svc/examples/services/iactn/Interaction.java | 4 ++--
.../services/jaxb/CatalogingSchemaOutputResolver.java | 4 ++--
.../applib-svc/examples/services/jaxb/JaxbService.java | 6 +++---
.../examples/services/layout/LayoutServiceMenu.java | 2 +-
.../examples/services/metamodel/MetaModelService.java | 4 ++--
.../examples/services/metamodel/MetaModelServicesMenu.java | 6 +++---
.../services/queryresultscache/QueryResultsCacheDefault.java | 6 +++---
.../examples/services/registry/ServiceRegistry.java | 12 ++++++------
.../applib-svc/examples/services/scratchpad/Scratchpad.java | 2 +-
.../examples/services/urlencoding/UrlEncodingService.java | 4 ++--
.../UrlEncodingServiceUsingBaseEncodingAbstract.java | 4 ++--
.../urlencoding/UrlEncodingServiceWithCompression.java | 4 ++--
.../domainmodel/DomainModelTest_usingBadDomain.java | 2 +-
.../DomainModelTest_usingBadDomain_noActionEnforced.java | 2 +-
.../domainmodel/DomainModelTest_usingGoodDomain.java | 2 +-
extensions/pom.xml | 8 ++++++++
incubator/pom.xml | 8 ++++++++
.../commons/internal/threadpool/ThreadPoolSupport.java | 2 +-
legacy/pom.xml | 8 ++++++++
.../spring/IsisMavenPlugin_SpringContextConfig.java | 2 +-
.../spring/IsisMavenPlugin_SpringContextLauncher.java | 4 ++--
mappings/pom.xml | 8 ++++++++
.../jdo/applib/fixturestate/FixturesInstalledFlag.java | 2 +-
.../persistence/jdo/applib/fixturestate/package-info.java | 2 +-
.../excel/integtests/ExcelModuleIntegTestAbstract.java | 2 +-
subdomains/pom.xml | 8 ++++++++
.../fakedata/integtests/FakeDataModuleIntegTestAbstract.java | 2 +-
.../applib/IsisIntegrationTestAbstractWithFixtures.java | 2 +-
.../applib/fixturescripts/BuilderScriptAbstract.java | 2 +-
.../fixtures/applib/fixturescripts/ExecutionParameters.java | 6 +++---
.../fixtures/applib/fixturescripts/FixtureResultList.java | 6 +++---
.../fixtures/applib/fixturescripts/FixtureScript.java | 10 +++++-----
.../fixtures/applib/fixturescripts/FixtureScripts.java | 4 ++--
.../fixtures/applib/legacy/setup/PersonaEnumPersistAll.java | 2 +-
.../applib/legacy/teardown/TeardownFixtureAbstract.java | 2 +-
.../fixtures/applib/services/FixturesLifecycleService.java | 4 ++--
testing/pom.xml | 8 ++++++++
valuetypes/pom.xml | 8 ++++++++
.../service/swagger/internal/ClassExcluderDefault.java | 2 +-
.../viewer/integration/AuthenticatedWebSessionForIsis.java | 2 +-
91 files changed, 192 insertions(+), 136 deletions(-)
diff --git a/antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_other-changes.adoc b/antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_other-changes.adoc
index 3841770..814cace 100644
--- a/antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_other-changes.adoc
+++ b/antora/components/toc/modules/mignotes/pages/mn-1.16.0-to-2.0.0-M1/mn-1.16.0-to-2.0.0-M1_other-changes.adoc
@@ -55,7 +55,7 @@ Because these are not API, they should not be used by application code, _even th
To help prevent accidental usage:
-* the package is `org.apache.isis.commons.internal`
+* the package is `org.apache.isis.core.commons.internal`
* all of the types in this module are prefixed "_".
For example, `o.a.i.commons.internal.resources._Resource` provides utilities for loading static resources from the classpath.
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Defaulted.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Defaulted.java
index f01d66b..eaff20c 100644
--- a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Defaulted.java
+++ b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Defaulted.java
@@ -26,7 +26,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.apache.isis.applib.adapters.DefaultsProvider;
-import org.apache.isis.commons.internal.encoding.Encodable;
+import org.apache.isis.core.commons.internal.encoding.Encodable;
/**
* Indicates that the class should have a default, by providing a link to a
diff --git a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Value.java b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Value.java
index 36269fa..2b4eec0 100644
--- a/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Value.java
+++ b/api/applib/src/main/doc/modules/applib-ant/examples/annotation/Value.java
@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
import org.apache.isis.applib.adapters.EncoderDecoder;
import org.apache.isis.applib.adapters.ValueSemanticsProvider;
-import org.apache.isis.commons.internal.encoding.Encodable;
+import org.apache.isis.core.commons.internal.encoding.Encodable;
/**
* Indicates that the class has value semantics.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/domain/DomainObjectList.java b/api/applib/src/main/doc/modules/applib-cm/examples/domain/DomainObjectList.java
index 5d64609..866c114 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/domain/DomainObjectList.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/domain/DomainObjectList.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.jaxbadapters.PersistentEntitiesAdapter;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
@XmlRootElement(name = "list")
@XmlType(
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java
index b3bfd81..55b7e38 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/AbstractDomainEvent.java
@@ -25,8 +25,8 @@ import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.util.ObjectContracts;
import org.apache.isis.applib.util.ToString;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
public abstract class AbstractDomainEvent<S> extends EventObjectBase<S> {
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/EventObjectBase.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/EventObjectBase.java
index 6668e33..06a9edb 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/EventObjectBase.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/events/domain/EventObjectBase.java
@@ -20,9 +20,9 @@ package org.apache.isis.applib.events.domain;
import javax.annotation.Nullable;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
/**
* @since 2.0
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java b/api/applib/src/main/doc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java
index a6ecf17..e3a6731 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/events/ui/AbstractUiEvent.java
@@ -21,7 +21,7 @@ package org.apache.isis.applib.events.ui;
import java.util.Map;
import org.apache.isis.applib.events.domain.EventObjectBase;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
public abstract class AbstractUiEvent<S> extends EventObjectBase<S> {
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
index 40fed23..e2df05c 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/CollectionLayoutData.java
@@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.links.Link;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
/**
* Describes the layout of a single collection, broadly corresponds to the {@link org.apache.isis.applib.annotation.CollectionLayout} annotation.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSet.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSet.java
index 52a90f7..68d9d6d 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSet.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/FieldSet.java
@@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.layout.grid.bootstrap3.BS3Col;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
/**
* A {@link MemberRegion region} of the page containing a set of
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
index 6c66a32..3e1d623 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/component/PropertyLayoutData.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.annotation.RenderDay;
import org.apache.isis.applib.annotation.Repainting;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.layout.links.Link;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
/**
* Describes the layout of a single property, broadly corresponds to the {@link org.apache.isis.applib.annotation.PropertyLayout} annotation.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/GridAbstract.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/GridAbstract.java
index 7c6dfb7..0846eb9 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/GridAbstract.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/GridAbstract.java
@@ -33,8 +33,8 @@ import org.apache.isis.applib.layout.component.FieldSetOwner;
import org.apache.isis.applib.layout.component.PropertyLayoutData;
import org.apache.isis.applib.layout.grid.bootstrap3.BS3Grid;
import org.apache.isis.applib.services.layout.LayoutService;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
/**
* All top-level page layout classes should implement this interface.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
index 141549d..91017a9 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Col.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
import org.apache.isis.applib.layout.component.DomainObjectLayoutDataOwner;
import org.apache.isis.applib.layout.component.FieldSet;
import org.apache.isis.applib.layout.component.FieldSetOwner;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
/**
* A column within a row which, depending on its {@link #getSpan()}, could be as narrow as 1/12th of the page's width, all the way up to spanning the entire page.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java
index 9db5cd2..b7a3d21 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Grid.java
@@ -36,8 +36,8 @@ import org.apache.isis.applib.layout.component.PropertyLayoutData;
import org.apache.isis.applib.layout.grid.Grid;
import org.apache.isis.applib.layout.grid.GridAbstract;
import org.apache.isis.applib.mixins.dto.Dto;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
/**
* This is the top-level for rendering the domain object's properties, collections and actions. It simply consists
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java
index 77b5f70..ba2a6bd 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Row.java
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
/**
* Contains a row of content, either on the top-level {@link BS3Grid page} or at any other lower-level element that can
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java
index ec54b10..70e5a89 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3Tab.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.layout.component.ActionLayoutData;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
import org.apache.isis.applib.layout.component.DomainObjectLayoutData;
import org.apache.isis.applib.layout.component.PropertyLayoutData;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
/**
* Represents a tab within a {@link BS3TabGroup tab group}.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java
index 9ff4a2c..ce896d6 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/grid/bootstrap3/BS3TabGroup.java
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
/**
* Represents a tab group containing one or more {@link BS3Tab tab}s.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java
index a99eb21..7bf65cf 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/MenuBarsAbstract.java
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlTransient;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
import lombok.val;
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java
index f35be92..3c7e8ce 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3Menu.java
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.layout.menubars.Menu;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
import lombok.ToString;
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java
index c46e29f..04df142 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBar.java
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.layout.menubars.MenuBar;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
/**
* Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information of {@link org.apache.isis.applib.annotation.DomainServiceLayout} that have the same value of {@link DomainServiceLayout#named()}.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBars.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBars.java
index d52e577..cd8341f 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBars.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuBars.java
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainServiceLayout;
import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
import org.apache.isis.applib.layout.menubars.MenuBars;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
/**
* Describes the collection of domain services into menubars, broadly corresponding to the aggregation of information within {@link org.apache.isis.applib.annotation.DomainServiceLayout}.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java
index 451805d..d3370c2 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/layout/menubars/bootstrap3/BS3MenuSection.java
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.layout.component.ServiceActionLayoutData;
import org.apache.isis.applib.layout.component.ServiceActionLayoutDataOwner;
import org.apache.isis.applib.layout.menubars.MenuSection;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
/**
* Corresponds to a domain service that contributes its serviceActions under a particular {@link BS3MenuBar}.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/DtoMappingHelper.java b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/DtoMappingHelper.java
index 81eb614..e46d79c 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/DtoMappingHelper.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/DtoMappingHelper.java
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.schema.common.v1.BookmarkObjectState;
import org.apache.isis.schema.common.v1.OidDto;
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java
index f297601..9c72d26 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/mixins/dto/Dto_downloadXsd.java
@@ -34,7 +34,7 @@ import org.apache.isis.applib.mixins.MixinConstants;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.value.BlobClobFactory;
-import org.apache.isis.commons.compression.ZipWriter;
+import org.apache.isis.core.commons.compression.ZipWriter;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/spec/AbstractSpecification2.java b/api/applib/src/main/doc/modules/applib-cm/examples/spec/AbstractSpecification2.java
index 110e6fc..7bd193f 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/spec/AbstractSpecification2.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/spec/AbstractSpecification2.java
@@ -22,7 +22,7 @@ package org.apache.isis.applib.spec;
import java.lang.reflect.Method;
import org.apache.isis.applib.services.i18n.TranslatableString;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
/**
* Adapter to make it easy to write {@link Specification}s.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/tree/LazyTreeNode.java b/api/applib/src/main/doc/modules/applib-cm/examples/tree/LazyTreeNode.java
index bf39556..673d3d1 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/tree/LazyTreeNode.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/tree/LazyTreeNode.java
@@ -23,8 +23,8 @@ import java.util.concurrent.atomic.LongAdder;
import java.util.stream.Stream;
import org.apache.isis.applib.annotation.Value;
-import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Lazy;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
@Value(semanticsProviderName="org.apache.isis.core.metamodel.facets.value.treenode.TreeNodeValueSemanticsProvider")
public class LazyTreeNode<T> implements TreeNode<T> {
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode.java b/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode.java
index 760bde1..927ad3b 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/tree/TreeNode.java
@@ -28,7 +28,7 @@ import java.util.stream.StreamSupport;
import javax.annotation.Nullable;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
public interface TreeNode<T> {
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/Enums.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/Enums.java
index 2e5f185..d2d3129 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/Enums.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/util/Enums.java
@@ -21,7 +21,7 @@ package org.apache.isis.applib.util;
import java.util.stream.Collectors;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
public final class Enums {
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/Equality.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/Equality.java
index a8509fd..c4610ca 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/Equality.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/util/Equality.java
@@ -22,8 +22,8 @@ import java.util.List;
import java.util.Objects;
import java.util.function.Function;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.collections._Lists;
/**
* Fluent Object Equality Composition.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/Hashing.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/Hashing.java
index 1a393a4..5754570 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/Hashing.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/util/Hashing.java
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Objects;
import java.util.function.Function;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
/**
* Fluent Object Hash Code Composition.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/JaxbAdapters.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/JaxbAdapters.java
index b0f2f10..67a142e 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/JaxbAdapters.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/util/JaxbAdapters.java
@@ -30,8 +30,8 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Markup;
-import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Bytes;
+import org.apache.isis.core.commons.internal.base._Strings;
/**
* Provides JAXB XmlAdapters for Java built-in temporal types.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/JaxbUtil.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/JaxbUtil.java
index db7b1a3..ae8f8a1 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/JaxbUtil.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/util/JaxbUtil.java
@@ -30,9 +30,9 @@ import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.resources._Resources;
import lombok.val;
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Parser.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Parser.java
index 9120f11..e8d9aab 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Parser.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContract_Parser.java
@@ -32,8 +32,8 @@ import java.util.stream.Collectors;
import javax.annotation.Nullable;
import org.apache.isis.applib.util.ObjectContracts.ObjectContract;
-import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal._Constants;
+import org.apache.isis.core.commons.internal.base._Strings;
/**
* Package private parser for ObjectContract.<br/><br/>
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContracts.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContracts.java
index 2be0ad6..0a209c0 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContracts.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/util/ObjectContracts.java
@@ -22,8 +22,8 @@ import java.util.Comparator;
import java.util.Objects;
import java.util.function.Function;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._NullSafe;
import lombok.extern.log4j.Log4j2;
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/ReasonBuffer2.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/ReasonBuffer2.java
index c10f0ba..b3cd010 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/ReasonBuffer2.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/util/ReasonBuffer2.java
@@ -23,7 +23,7 @@ import java.util.Objects;
import java.util.Optional;
import java.util.stream.Collectors;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
/**
* Extension to applib's {@link ReasonBuffer}.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/TitleBuffer.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/TitleBuffer.java
index 1219e34..edd02cc 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/TitleBuffer.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/util/TitleBuffer.java
@@ -22,7 +22,7 @@ package org.apache.isis.applib.util;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import org.apache.isis.commons.internal._Constants;
+import org.apache.isis.core.commons.internal._Constants;
/**
* Title buffer is a utility class to help produce titles for objects without
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/ToString.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/ToString.java
index 129c52d..a11a431 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/ToString.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/util/ToString.java
@@ -24,7 +24,7 @@ import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
/**
* Fluent Object to String Composition.
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/ChangesDtoUtils.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/ChangesDtoUtils.java
index 7412d5f..78043f8 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/ChangesDtoUtils.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/ChangesDtoUtils.java
@@ -32,7 +32,7 @@ import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import org.apache.isis.applib.util.JaxbUtil;
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.internal.resources._Resources;
import org.apache.isis.schema.chg.v1.ChangesDto;
public final class ChangesDtoUtils {
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommandDtoUtils.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommandDtoUtils.java
index 07373ba..820a995 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommandDtoUtils.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommandDtoUtils.java
@@ -31,7 +31,7 @@ import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import org.apache.isis.applib.util.JaxbUtil;
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.internal.resources._Resources;
import org.apache.isis.schema.cmd.v1.ActionDto;
import org.apache.isis.schema.cmd.v1.CommandDto;
import org.apache.isis.schema.cmd.v1.MapDto;
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java
index 4bb592d..c80b435 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/CommonDtoUtils.java
@@ -36,11 +36,11 @@ import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.context._Context;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.schema.cmd.v1.MapDto;
import org.apache.isis.schema.cmd.v1.ParamDto;
import org.apache.isis.schema.common.v1.BlobDto;
@@ -57,7 +57,7 @@ import org.apache.isis.schema.jaxbadapters.JodaLocalDateTimeXMLGregorianCalendar
import org.apache.isis.schema.jaxbadapters.JodaLocalDateXMLGregorianCalendarAdapter;
import org.apache.isis.schema.jaxbadapters.JodaLocalTimeXMLGregorianCalendarAdapter;
-import static org.apache.isis.commons.internal.collections._Maps.entry;
+import static org.apache.isis.core.commons.internal.collections._Maps.entry;
public final class CommonDtoUtils {
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/InteractionDtoUtils.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/InteractionDtoUtils.java
index 75d5ffa..a6fc9e2 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/InteractionDtoUtils.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/InteractionDtoUtils.java
@@ -38,9 +38,9 @@ import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.iactn.Interaction;
import org.apache.isis.applib.util.JaxbUtil;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.resources._Resources;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.resources._Resources;
import org.apache.isis.schema.cmd.v1.ParamDto;
import org.apache.isis.schema.cmd.v1.ParamsDto;
import org.apache.isis.schema.common.v1.InteractionType;
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/MemberExecutionDtoUtils.java b/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/MemberExecutionDtoUtils.java
index 7b4d236..999af94 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/MemberExecutionDtoUtils.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/util/schema/MemberExecutionDtoUtils.java
@@ -30,7 +30,7 @@ import javax.xml.namespace.QName;
import javax.xml.transform.stream.StreamSource;
import org.apache.isis.applib.util.JaxbUtil;
-import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.schema.common.v1.DifferenceDto;
import org.apache.isis.schema.common.v1.PeriodDto;
import org.apache.isis.schema.ixn.v1.MemberExecutionDto;
diff --git a/api/applib/src/main/doc/modules/applib-cm/examples/value/BlobClobFactory.java b/api/applib/src/main/doc/modules/applib-cm/examples/value/BlobClobFactory.java
index 2930be7..1c031c2 100644
--- a/api/applib/src/main/doc/modules/applib-cm/examples/value/BlobClobFactory.java
+++ b/api/applib/src/main/doc/modules/applib-cm/examples/value/BlobClobFactory.java
@@ -21,7 +21,7 @@ package org.apache.isis.applib.value;
import javax.activation.MimeType;
import javax.activation.MimeTypeParseException;
-import static org.apache.isis.commons.internal.base._Strings.asFileNameWithExtension;
+import static org.apache.isis.core.commons.internal.base._Strings.asFileNameWithExtension;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/ApplicationMemberType.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/ApplicationMemberType.java
index c831be8..78267b8 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/ApplicationMemberType.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/services/appfeat/ApplicationMemberType.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.applib.services.appfeat;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
public enum ApplicationMemberType {
PROPERTY,
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/Bookmark.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/Bookmark.java
index c685ba0..ec03bb3 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/Bookmark.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/Bookmark.java
@@ -23,8 +23,8 @@ import java.util.Iterator;
import java.util.Objects;
import org.apache.isis.applib.annotation.Value;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.schema.common.v1.BookmarkObjectState;
import org.apache.isis.schema.common.v1.OidDto;
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkService.java
index da05d27..cdb0bda 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkService.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/services/bookmark/BookmarkService.java
@@ -20,10 +20,10 @@ package org.apache.isis.applib.services.bookmark;
import javax.annotation.Nullable;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import static org.apache.isis.commons.internal.base._With.requires;
+import static org.apache.isis.core.commons.internal.base._With.requires;
import lombok.val;
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.java
index 631c0ec..de0e952 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/services/confview/ConfigurationProperty.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Title;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
@XmlRootElement(name = "configurationProperty")
@XmlType(
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/ContentMappingService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/ContentMappingService.java
index 9d26dfc..5a6a016 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/ContentMappingService.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/services/conmap/ContentMappingService.java
@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
import javax.ws.rs.core.MediaType;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.base._NullSafe;
public interface ContentMappingService {
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerAbstract.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerAbstract.java
index 53048b3..1a2c5dc 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerAbstract.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerAbstract.java
@@ -29,8 +29,8 @@ import javax.inject.Inject;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationService;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import lombok.extern.log4j.Log4j2;
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerComposite.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerComposite.java
index 4e0e7ed..d8ef200 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerComposite.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerComposite.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
/**
* Convenience implementation of {@link ExceptionRecognizer} that loops through a list of
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerForType.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerForType.java
index 7ace8f5..0cb2674 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerForType.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/services/exceprecog/ExceptionRecognizerForType.java
@@ -23,10 +23,10 @@ import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Stream;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import static org.apache.isis.commons.internal.exceptions._Exceptions.containsAnyOfTheseMessages;
-import static org.apache.isis.commons.internal.exceptions._Exceptions.getCausalChain;
+import static org.apache.isis.core.commons.internal.exceptions._Exceptions.containsAnyOfTheseMessages;
+import static org.apache.isis.core.commons.internal.exceptions._Exceptions.getCausalChain;
import lombok.val;
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslatableString.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslatableString.java
index 28b2d9e..8f8f1f9 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslatableString.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/services/i18n/TranslatableString.java
@@ -26,7 +26,7 @@ import java.util.regex.Pattern;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.Value;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
@Value
public final class TranslatableString {
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/iactn/Interaction.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/iactn/Interaction.java
index d53e822..378c702 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/iactn/Interaction.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/services/iactn/Interaction.java
@@ -38,8 +38,8 @@ import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.applib.services.metrics.MetricsService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.util.schema.MemberExecutionDtoUtils;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.schema.common.v1.DifferenceDto;
import org.apache.isis.schema.common.v1.InteractionType;
import org.apache.isis.schema.common.v1.PeriodDto;
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/CatalogingSchemaOutputResolver.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/CatalogingSchemaOutputResolver.java
index 09a7375..820314c 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/CatalogingSchemaOutputResolver.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/CatalogingSchemaOutputResolver.java
@@ -41,8 +41,8 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
/**
* An implementation of {@link SchemaOutputResolver} that keeps track of all the schemas for which it has
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/JaxbService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/JaxbService.java
index a6a98a3..c2d626b 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/JaxbService.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/services/jaxb/JaxbService.java
@@ -36,9 +36,9 @@ import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.mixins.dto.Dto_downloadXsd;
import org.apache.isis.applib.util.JaxbUtil;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Maps;
public interface JaxbService {
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/layout/LayoutServiceMenu.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/layout/LayoutServiceMenu.java
index 7f973e8..9d2cf55 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/layout/LayoutServiceMenu.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/services/layout/LayoutServiceMenu.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.menu.MenuBarsService;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
@Named("isisApplib.LayoutServiceMenu")
@DomainService(objectType = "isisApplib.LayoutServiceMenu")
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelService.java
index b1e5778..01b9723 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelService.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelService.java
@@ -27,8 +27,8 @@ import org.springframework.boot.autoconfigure.data.web.SpringDataWebProperties.S
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.applib.services.command.CommandDtoProcessor;
-import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.commons.internal.ioc.BeanSort;
+import org.apache.isis.core.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.ioc.BeanSort;
import org.apache.isis.schema.metamodel.v1.MetamodelDto;
import lombok.val;
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelServicesMenu.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelServicesMenu.java
index 8b103c8..77a0ad5 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelServicesMenu.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/services/metamodel/MetaModelServicesMenu.java
@@ -42,9 +42,9 @@ import org.apache.isis.applib.annotation.RestrictTo;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.value.Clob;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Sets;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Sets;
import org.apache.isis.schema.metamodel.v1.MetamodelDto;
@Named("isisApplib.MetaModelServicesMenu")
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCacheDefault.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCacheDefault.java
index 61908de..869e486 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCacheDefault.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/services/queryresultscache/QueryResultsCacheDefault.java
@@ -32,9 +32,9 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.WithTransactionScope;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._NullSafe;
+import org.apache.isis.core.commons.internal.collections._Maps;
import lombok.extern.log4j.Log4j2;
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/registry/ServiceRegistry.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/registry/ServiceRegistry.java
index 43ed4a4..bdadaaf 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/registry/ServiceRegistry.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/services/registry/ServiceRegistry.java
@@ -27,12 +27,12 @@ import java.util.stream.Stream;
import javax.annotation.Priority;
-import org.apache.isis.commons.collections.Can;
-import org.apache.isis.commons.internal._Constants;
-import org.apache.isis.commons.internal.base._Reduction;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.commons.internal.ioc.ManagedBeanAdapter;
-import org.apache.isis.commons.internal.reflection._Reflect;
+import org.apache.isis.core.commons.collections.Can;
+import org.apache.isis.core.commons.internal._Constants;
+import org.apache.isis.core.commons.internal.base._Reduction;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
+import org.apache.isis.core.commons.internal.reflection._Reflect;
import lombok.val;
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/scratchpad/Scratchpad.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/scratchpad/Scratchpad.java
index 7e33a95..79f817b 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/scratchpad/Scratchpad.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/services/scratchpad/Scratchpad.java
@@ -29,7 +29,7 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.collections._Maps;
/**
* This service (API and implementation) provides a mechanism to interchange information between multiple objects invoked in the same
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingService.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingService.java
index 8f2749d..19be5e2 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingService.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingService.java
@@ -21,8 +21,8 @@ package org.apache.isis.applib.services.urlencoding;
import java.nio.charset.StandardCharsets;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.memento._Mementos.EncoderDecoder;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.memento._Mementos.EncoderDecoder;
public interface UrlEncodingService extends EncoderDecoder {
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
index 8bc0dd2..bedd2b1 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceUsingBaseEncodingAbstract.java
@@ -20,8 +20,8 @@ package org.apache.isis.applib.services.urlencoding;
import java.nio.charset.StandardCharsets;
-import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Bytes;
+import org.apache.isis.core.commons.internal.base._Strings;
/**
* to use, subclass and annotated with:
diff --git a/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceWithCompression.java b/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceWithCompression.java
index b7f753b..21b5d53 100644
--- a/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceWithCompression.java
+++ b/api/applib/src/main/doc/modules/applib-svc/examples/services/urlencoding/UrlEncodingServiceWithCompression.java
@@ -28,8 +28,8 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Bytes;
+import org.apache.isis.core.commons.internal.base._Strings;
@Service
@Named("isisApplib.UrlEncodingServiceWithCompression")
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
index 46fd00e..bb2ffee 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.metamodel.specloader.IntrospectionMode;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
+import org.apache.isis.testing.integtestsupport.applib.validate.ValidateDomainModel;
import org.apache.isis.core.metamodel.spec.DomainModelException;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.testdomain.Smoketest;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java
index 5e9782e..0526698 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingBadDomain_noActionEnforced.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.config.metamodel.specloader.IntrospectionMode;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
+import org.apache.isis.testing.integtestsupport.applib.validate.ValidateDomainModel;
import org.apache.isis.core.metamodel.spec.DomainModelException;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.testdomain.Smoketest;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
index 1b11c16..aef5013 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/domainmodel/DomainModelTest_usingGoodDomain.java
@@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.metamodel.MetaModelService;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.integtestsupport.validate.ValidateDomainModel;
+import org.apache.isis.testing.integtestsupport.applib.validate.ValidateDomainModel;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.IntrospectionState;
import org.apache.isis.schema.metamodel.v1.DomainClassDto;
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 573882c..be16c86 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -137,6 +137,14 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<modules>
<module>security/secman</module>
<module>security/shiro-realm-ldap</module>
diff --git a/incubator/pom.xml b/incubator/pom.xml
index 055ffa8..df0ac17 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -81,6 +81,14 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<modules>
<module>extensions/core/model</module>
<module>extensions/core/microprofile</module>
diff --git a/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupport.java b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupport.java
index 53d69eb..2afa188 100644
--- a/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupport.java
+++ b/legacy/extensions/core/commons/src/main/java/org/apache/isis/legacy/commons/internal/threadpool/ThreadPoolSupport.java
@@ -59,7 +59,7 @@ import lombok.extern.log4j.Log4j2;
* Implementation Note: ThreadPoolSupport::close is triggered by _Context.clear()
* when application shuts down.
*
- * @deprecated in favor of the {@code org.apache.isis.commons.internal.concurrent} API
+ * @deprecated in favor of the {@code org.apache.isis.core.commons.internal.concurrent} API
*/
@Deprecated
@Log4j2
diff --git a/legacy/pom.xml b/legacy/pom.xml
index a1dc7ed..7fd2850 100644
--- a/legacy/pom.xml
+++ b/legacy/pom.xml
@@ -91,6 +91,14 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<modules>
<module>extensions/core/applib</module>
<module>extensions/core/commons</module>
diff --git a/legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java b/legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java
index 95453a5..ca54053 100644
--- a/legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java
+++ b/legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextConfig.java
@@ -21,7 +21,7 @@ package org.apache.isis.mavenplugin.spring;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.runtime.spring.IsisBoot;
+import org.apache.isis.core.runtime.spring.IsisBoot;
import org.apache.isis.security.bypass.IsisBootSecurityBypass;
/**
diff --git a/legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java b/legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java
index 492ecfd..309c185 100644
--- a/legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java
+++ b/legacy/testing/mavenplugin/src/main/java/org/apache/isis/mavenplugin/spring/IsisMavenPlugin_SpringContextLauncher.java
@@ -35,8 +35,8 @@ import java.util.Set;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.apache.isis.commons.internal.collections._Arrays;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Arrays;
+import org.apache.isis.core.commons.internal.collections._Lists;
import lombok.extern.log4j.Log4j2;
diff --git a/mappings/pom.xml b/mappings/pom.xml
index 6dc7097..4b241fb 100644
--- a/mappings/pom.xml
+++ b/mappings/pom.xml
@@ -85,6 +85,14 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<modules>
<module>jaxrsclient/api</module>
<module>restclient</module>
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledFlag.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledFlag.java
index c7102f2..3bdf9fc 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledFlag.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/FixturesInstalledFlag.java
@@ -20,7 +20,7 @@
package org.apache.isis.persistence.jdo.applib.fixturestate;
/**
- * For {@link org.apache.isis.runtime.system.persistence.PersistenceSessionFactory}
+ * For {@link org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory}
* implementations that can cache the
* {@link PersistenceSession#isFixturesInstalled()} so is only called once per
* application scope.
diff --git a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/package-info.java b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/package-info.java
index 44b134c..91b66a1 100644
--- a/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/package-info.java
+++ b/persistence/jdo/applib/src/main/java/org/apache/isis/persistence/jdo/applib/fixturestate/package-info.java
@@ -38,7 +38,7 @@
*
* <p>
* Note that the {@link PersistenceSession} both extends a number of superinterfaces as well as uses implementations of
- * various helpers (for example {@link org.apache.isis.ServicesInjector.services.ServicesInjector} and {@link org.apache.isis.runtime.system.persistence.runtime.persistence.oidgenerator.OidGenerator}).
+ * various helpers (for example {@link org.apache.isis.ServicesInjector.services.ServicesInjector} and {@link org.apache.isis.core.runtime.system.persistence.runtime.persistence.oidgenerator.OidGenerator}).
* These superinterfaces and helper interfaces are not normally implemented directly, and it is the
* responsibility of the {@link PersistenceMechanismInstaller} to ensure that the correct helper objects
* are passed to the {@link PersistenceSession} implementation.
diff --git a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
index cc3b797..d53c135 100644
--- a/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
+++ b/subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains/excel/integtests/ExcelModuleIntegTestAbstract.java
@@ -13,7 +13,7 @@ import org.apache.isis.subdomains.excel.fixtures.IsisModuleSubExcelFixtures;
import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
import org.apache.isis.jdo.IsisBootDataNucleus;
-import org.apache.isis.runtime.spring.IsisBoot;
+import org.apache.isis.core.runtime.spring.IsisBoot;
import org.apache.isis.security.bypass.IsisBootSecurityBypass;
@SpringBootTest(
diff --git a/subdomains/pom.xml b/subdomains/pom.xml
index a4004b9..49ef0f9 100644
--- a/subdomains/pom.xml
+++ b/subdomains/pom.xml
@@ -143,6 +143,14 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<modules>
<module>base</module>
diff --git a/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
index d9784a0..a26f069 100644
--- a/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
+++ b/testing/fakedata/integtests/src/test/java/org/apache/isis/testing/fakedata/integtests/FakeDataModuleIntegTestAbstract.java
@@ -13,7 +13,7 @@ import org.apache.isis.config.IsisPresets;
import org.apache.isis.extensions.fixtures.IsisExtFixturesModule;
import org.apache.isis.testing.fixtures.applib.IsisIntegrationTestAbstractWithFixtures;
import org.apache.isis.jdo.IsisBootDataNucleus;
-import org.apache.isis.runtime.spring.IsisBoot;
+import org.apache.isis.core.runtime.spring.IsisBoot;
import org.apache.isis.security.bypass.IsisBootSecurityBypass;
import org.isisaddons.module.fakedata.fixture.FakeDataFixturesModule;
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisIntegrationTestAbstractWithFixtures.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisIntegrationTestAbstractWithFixtures.java
index b3520fc..7ed91c9 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisIntegrationTestAbstractWithFixtures.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/IsisIntegrationTestAbstractWithFixtures.java
@@ -30,7 +30,7 @@ import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testing.fixtures.applib.legacy.FixtureClock;
import org.apache.isis.testing.fixtures.applib.legacy.TickingFixtureClock;
-import org.apache.isis.integtestsupport.IsisIntegrationTestAbstract;
+import org.apache.isis.testing.integtestsupport.applib.IsisIntegrationTestAbstract;
public abstract class IsisIntegrationTestAbstractWithFixtures extends IsisIntegrationTestAbstract {
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptAbstract.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptAbstract.java
index 5d5f3b7..545258d 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptAbstract.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/BuilderScriptAbstract.java
@@ -21,7 +21,7 @@ package org.apache.isis.testing.fixtures.applib.fixturescripts;
import java.util.List;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.testing.fixtures.applib.api.FixtureScriptWithExecutionStrategy;
import org.apache.isis.testing.fixtures.applib.api.PersonaWithBuilderScript;
import org.apache.isis.testing.fixtures.applib.api.PersonaWithFinder;
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters.java
index e0b95ca..bf9330c 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/ExecutionParameters.java
@@ -30,9 +30,9 @@ import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
import org.joda.time.format.ISODateTimeFormat;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Maps;
public class ExecutionParameters {
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResultList.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResultList.java
index 3703149..3d4da3f 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResultList.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResultList.java
@@ -23,9 +23,9 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
/**
* Collecting parameter.
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScript.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScript.java
index 63db2a3..2d1da8b 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScript.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScript.java
@@ -45,11 +45,11 @@ import org.apache.isis.applib.services.sessmgmt.SessionManagementService;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.base._Strings;
-import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Maps;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.testing.fixtures.applib.api.FixtureScriptWithExecutionStrategy;
import org.apache.isis.testing.fixtures.applib.api.PersonaWithBuilderScript;
import org.apache.isis.testing.fixtures.applib.api.WithPrereqs;
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
index b5fddf2..777a019 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
@@ -53,8 +53,8 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.title.TitleService;
import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.commons.internal.base._Casts;
-import org.apache.isis.commons.internal.exceptions._Exceptions;
+import org.apache.isis.core.commons.internal.base._Casts;
+import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.testing.fixtures.applib.api.PersonaWithBuilderScript;
import org.apache.isis.testing.fixtures.applib.events.FixturesInstalledEvent;
import org.apache.isis.testing.fixtures.applib.events.FixturesInstallingEvent;
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/setup/PersonaEnumPersistAll.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/setup/PersonaEnumPersistAll.java
index d71d045..5a71c0a 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/setup/PersonaEnumPersistAll.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/setup/PersonaEnumPersistAll.java
@@ -21,7 +21,7 @@ package org.apache.isis.testing.fixtures.applib.legacy.setup;
import java.util.List;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.collections._Lists;
+import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.testing.fixtures.applib.api.FixtureScriptWithExecutionStrategy;
import org.apache.isis.testing.fixtures.applib.api.PersonaWithBuilderScript;
import org.apache.isis.testing.fixtures.applib.fixturescripts.BuilderScriptAbstract;
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/teardown/TeardownFixtureAbstract.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/teardown/TeardownFixtureAbstract.java
index 16e186c..ca2678e 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/teardown/TeardownFixtureAbstract.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/legacy/teardown/TeardownFixtureAbstract.java
@@ -27,7 +27,7 @@ import javax.jdo.metadata.InheritanceMetadata;
import javax.jdo.metadata.TypeMetadata;
import org.apache.isis.applib.annotation.Programmatic;
-import org.apache.isis.commons.internal.base._Strings;
+import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.persistence.jdo.applib.services.IsisJdoSupport;
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java
index 23283e2..f6aeb76 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/services/FixturesLifecycleService.java
@@ -30,9 +30,9 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.clock.Clock;
-import org.apache.isis.commons.internal.environment.IsisSystemEnvironment;
+import org.apache.isis.core.commons.internal.environment.IsisSystemEnvironment;
import org.apache.isis.testing.fixtures.applib.legacy.FixtureClock;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
@Service
@Named("isisTstFixtures.FixturesLifecycleService")
diff --git a/testing/pom.xml b/testing/pom.xml
index a5facdc..3c39dc9 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -125,6 +125,14 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<modules>
<module>fakedata</module>
<module>fixtures</module>
diff --git a/valuetypes/pom.xml b/valuetypes/pom.xml
index 38a46f3..4a5a9d6 100644
--- a/valuetypes/pom.xml
+++ b/valuetypes/pom.xml
@@ -110,6 +110,14 @@
</dependencies>
</dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<modules>
<module>asciidoc</module>
<module>markdown</module>
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java
index 0139757..40d30c3 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Component;
public class ClassExcluderDefault extends ClassExcluderAbstract {
public ClassExcluderDefault() {
- ignorePackage("org.apache.isis.commons.internal");
+ ignorePackage("org.apache.isis.core.commons.internal");
}
}
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
index 53ba371..4c5dbad 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
@@ -117,7 +117,7 @@ implements BreadcrumbModelProvider, BookmarkedPagesModelProvider, IsisWebAppComm
// org.apache.shiro.mgt.DefaultSecurityManager.logout(DefaultSecurityManager.java:547)
// org.apache.shiro.subject.support.DelegatingSubject.logout(DelegatingSubject.java:363)
// org.apache.isis.security.shiro.ShiroAuthenticatorOrAuthorizor.logout(ShiroAuthenticatorOrAuthorizor.java:179)
- // org.apache.isis.runtime.authentication.standard.AuthenticationManagerStandard.closeSession(AuthenticationManagerStandard.java:141)
+ // org.apache.isis.core.runtime.authentication.standard.AuthenticationManagerStandard.closeSession(AuthenticationManagerStandard.java:141)
getAuthenticationManager().closeSession(getAuthenticationSession());
getIsisSessionFactory().closeSession();
[isis] 02/14: ISIS-2259: fixes up package name for isis-core-runtime
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 7c42bbcbd026e81d3232b8ffcf815ffd87e1d5c0
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 15:28:57 2020 +0000
ISIS-2259: fixes up package name for isis-core-runtime
---
.../runtime/IsisCoreModuleRuntime.java} | 18 ++++++++--------
.../{ => core}/runtime/context/IsisContext.java | 8 ++++----
.../runtime/context/session/AppLifecycleEvent.java | 2 +-
.../runtime/context/session/RuntimeContext.java | 2 +-
.../context/session/RuntimeContextBase.java | 4 ++--
.../context/session/RuntimeEventService.java | 4 ++--
.../session/RuntimeEventSupport_Spring.java | 2 +-
.../context/session/SessionLifecycleEvent.java | 4 ++--
.../persistence/adapter/ObjectAdapterForBean.java | 2 +-
.../runtime/persistence/adapter/PojoAdapter.java | 4 ++--
.../persistence/session/PersistenceSession.java | 2 +-
.../session/PersistenceSessionFactory.java | 2 +-
.../session/events/PersistenceEventService.java | 2 +-
.../events/PersistenceEventService_Spring.java | 2 +-
.../persistence/session/events/PostStoreEvent.java | 2 +-
.../persistence/session/events/PreStoreEvent.java | 2 +-
.../session/events/TimestampService.java | 2 +-
.../transaction/AdapterAndProperty.java | 2 +-
.../transaction/AuditerDispatchService.java | 2 +-
.../transaction/ChangedObjectsService.java | 2 +-
.../transaction/IsisTransactionAspectSupport.java | 2 +-
.../transaction/IsisTransactionFlushException.java | 2 +-
.../IsisTransactionManagerException.java | 2 +-
.../transaction/IsisTransactionObject.java | 2 +-
.../transaction/IsisTransactionPlaceholder.java | 2 +-
.../persistence/transaction/PreAndPostValues.java | 2 +-
.../events/TransactionAfterBeginEvent.java | 4 ++--
.../events/TransactionAfterCommitEvent.java | 4 ++--
.../events/TransactionAfterRollbackEvent.java | 4 ++--
.../events/TransactionBeforeBeginEvent.java | 4 ++--
.../events/TransactionBeforeCommitEvent.java | 4 ++--
.../events/TransactionBeforeRollbackEvent.java | 4 ++--
.../events/TransactionEventAbstract.java | 4 ++--
.../runtime/session/IsisRequestCycle.java | 4 ++--
.../{ => core}/runtime/session/IsisSession.java | 8 ++++----
.../runtime/session/IsisSessionFactory.java | 4 ++--
.../runtime/session/IsisSessionFactoryDefault.java | 8 ++++----
.../runtime/session/SessionFactoryException.java | 2 +-
.../session/init/InitialisationSession.java | 2 +-
.../session/init/IsisLocaleInitializer.java | 2 +-
.../session/init/IsisTimeZoneInitializer.java | 2 +-
.../template/AbstractIsisSessionTemplate.java | 8 ++++----
.../adapterfactory/pojo/RuntimeTestPojo.java | 2 +-
.../isis/{ => core}/runtime/system/Interface1.java | 2 +-
.../runtime/system/JavaActionTestObject.java | 2 +-
.../JavaObjectWithBasicProgramConventions.java | 2 +-
.../system/JavaObjectWithOneToOneAssociations.java | 2 +-
.../runtime/system/JavaReferencedObject.java | 2 +-
.../system/ObjectActionLayoutXmlDefaultTest.java | 2 +-
.../system/OneToManyAssociationDefaultTest.java | 2 +-
.../{ => core}/runtime/system/RuntimeTestPojo.java | 2 +-
.../runtime/system/TestDomainObject.java | 2 +-
.../isis/{ => core}/runtime/system/TestObject.java | 2 +-
.../runtime/system/TestObjectAsAggregated.java | 2 +-
.../runtime/system/TestObjectAsService.java | 2 +-
.../runtime/system/TestObjectWithCollection.java | 2 +-
.../system/TypeExtractorMethodReturnTest.java | 8 +++-----
.../system/TypeExtractorMethodsParametersTest.java | 2 +-
.../fixture/budget/SomeServiceToInclude.java | 2 +-
.../budgetassignment/SomeServiceNotToInclude.java | 2 +-
.../runtimeservices/IsisModuleRuntimeServices.java | 2 +-
.../auth/AuthenticationSessionProviderDefault.java | 4 ++--
.../background/CommandExecutionAbstract.java | 2 +-
.../command/CommandExecutorServiceDefault.java | 6 +++---
.../factory/FactoryServiceDefault.java | 2 +-
.../message/MessageServiceDefault.java | 2 +-
.../publish/PublisherDispatchServiceDefault.java | 2 +-
.../repository/RepositoryServiceDefault.java | 2 +-
.../sessmgmt/SessionManagementServiceDefault.java | 4 ++--
.../runtimeservices/wrapper/AsyncWrapDefault.java | 4 ++--
.../wrapper/WrapperFactoryDefault.java | 2 +-
.../xactn/TransactionServiceSpring.java | 4 ++--
.../changes/PreAndPostValues_shouldAudit_Test.java | 4 ++--
.../org/apache/isis/webapp/IsisModuleWebapp.java | 2 +-
.../webapp/context/IsisWebAppCommonContext.java | 2 +-
.../secman/jdo/seed/SeedSecurityModuleService.java | 2 +-
.../shiro/IsisModuleExtSecmanShiroRealm.java | 2 +-
.../jee_support/IsisCDIBeanScanInterceptor.java | 2 +-
.../services/javax.enterprise.inject.spi.Extension | 2 +-
.../datanucleus5/IsisModuleJdoDataNucleus5.java | 2 +-
.../datanucleus/DataNucleusLifeCycleHelper.java | 2 +-
.../commands/DataNucleusCreateObjectCommand.java | 2 +-
.../service/JdoPersistenceLifecycleService.java | 10 ++++-----
.../datanucleus5/jdosupport/IsisJdoSupportDN5.java | 2 +-
.../JdoStoreLifecycleListenerForIsis.java | 6 +++---
.../JdoPersistenceCapableFacetAbstract.java | 2 +-
.../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 | 4 ++--
...ObjectAdapterContext_ObjectAdapterProvider.java | 2 +-
.../ObjectAdapterContext_ObjectCreation.java | 2 +-
.../DataNucleusApplicationComponents5.java | 2 +-
.../persistence/IsisPersistenceSessionJdo.java | 2 +-
.../persistence/IsisPersistenceSessionJdoBase.java | 2 +-
.../IsisPlatformTransactionManagerForJdo.java | 24 +++++++++++-----------
.../persistence/IsisTransactionJdo.java | 8 ++++----
.../persistence/IsisTransactionManagerJdo.java | 6 +++---
.../persistence/PersistenceSessionFactory5.java | 4 ++--
.../adapterfactory/pojo/PojoAdapterTest.java | 4 ++--
.../transaction/PojoAdapterBuilder.java | 4 ++--
.../runtime/system/ObjectMemberAbstractTest.java | 9 ++++----
.../WrapperFactoryDefault_wrappedObject_Test.java | 2 +-
...actoryDefault_wrappedObject_transient_Test.java | 2 +-
.../excel/applib/dom/util/ExcelServiceImpl.java | 4 ++--
.../applib/ExceptionRecognizerTranslate.java | 2 +-
.../applib/IsisIntegrationTestAbstract.java | 2 +-
.../sse/ui/services/SseServiceDefault.java | 4 ++--
.../IsisModuleRestfulObjectsRendering.java | 2 +-
.../viewer/context/ResourceContext.java | 2 +-
.../viewer/resources/ResourceAbstract.java | 4 ++--
.../viewer/resources/SwaggerSpecResource.java | 2 +-
.../webmodule/IsisRestfulObjectsSessionFilter.java | 3 +--
..._ensureCompatibleAcceptHeader_ContractTest.java | 6 +++---
.../context/ResourceContext_getArg_Test.java | 6 +++---
.../ajaxtable/PrototypingMessageProvider.java | 2 +-
.../scalars/ScalarPanelTextFieldAbstract.java | 2 +-
.../isisapplib/IsisBlobOrClobPanelAbstract.java | 2 +-
.../components/scalars/primitive/BooleanPanel.java | 2 +-
.../widgets/breadcrumbs/BreadcrumbPanel.java | 2 +-
.../widgets/themepicker/ThemeChooser.java | 2 +-
.../isis/viewer/wicket/ui/pages/WebPageBase.java | 2 +-
.../ui/pages/accmngt/EmailAvailableValidator.java | 2 +-
.../pages/accmngt/UsernameAvailableValidator.java | 2 +-
.../ui/pages/accmngt/register/RegisterPanel.java | 2 +-
.../isis/viewer/wicket/ui/pages/home/HomePage.java | 2 +-
.../wicket/ui/pages/login/IsisSignInPanel.java | 2 +-
.../wicket/ui/panels/FormExecutorDefault.java | 4 ++--
.../isis/viewer/wicket/ui/panels/PanelBase.java | 2 +-
.../AuthenticatedWebSessionForIsis.java | 2 +-
.../viewer/integration/LocalizerForIsis.java | 4 ++--
.../viewer/integration/WebRequestCycleForIsis.java | 8 ++++----
.../services/mementos/ObjectUnmarshaller.java | 4 ++--
...uthenticatedWebSessionForIsis_Authenticate.java | 2 +-
.../AuthenticatedWebSessionForIsis_SignIn.java | 2 +-
...uthenticatedWebSessionForIsis_TestAbstract.java | 2 +-
139 files changed, 225 insertions(+), 229 deletions(-)
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/IsisModuleRuntime.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisCoreModuleRuntime.java
similarity index 68%
rename from core/runtime/src/main/java/org/apache/isis/runtime/IsisModuleRuntime.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/IsisCoreModuleRuntime.java
index 0e4e32d..5f6c635 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/IsisModuleRuntime.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/IsisCoreModuleRuntime.java
@@ -16,20 +16,20 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime;
+package org.apache.isis.core.runtime;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.core.metamodel.IsisModuleMetamodel;
-import org.apache.isis.runtime.context.session.RuntimeEventService;
-import org.apache.isis.runtime.context.session.RuntimeEventSupport_Spring;
-import org.apache.isis.runtime.persistence.session.events.PersistenceEventService;
-import org.apache.isis.runtime.persistence.session.events.PersistenceEventService_Spring;
-import org.apache.isis.runtime.persistence.session.events.TimestampService;
-import org.apache.isis.runtime.persistence.transaction.AuditerDispatchService;
-import org.apache.isis.runtime.persistence.transaction.ChangedObjectsService;
-import org.apache.isis.runtime.session.IsisSessionFactoryDefault;
+import org.apache.isis.core.runtime.context.session.RuntimeEventService;
+import org.apache.isis.core.runtime.context.session.RuntimeEventSupport_Spring;
+import org.apache.isis.core.runtime.persistence.session.events.PersistenceEventService;
+import org.apache.isis.core.runtime.persistence.session.events.PersistenceEventService_Spring;
+import org.apache.isis.core.runtime.persistence.session.events.TimestampService;
+import org.apache.isis.core.runtime.persistence.transaction.AuditerDispatchService;
+import org.apache.isis.core.runtime.persistence.transaction.ChangedObjectsService;
+import org.apache.isis.core.runtime.session.IsisSessionFactoryDefault;
@Configuration
@Import({
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java
similarity index 93%
rename from core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContext.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java
index d1797e5..455e914 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/context/IsisContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/IsisContext.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.context;
+package org.apache.isis.core.runtime.context;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
@@ -24,9 +24,9 @@ import java.util.function.Supplier;
import org.apache.isis.core.commons.internal.context._Context;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
-import org.apache.isis.runtime.session.IsisSession;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
/**
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/AppLifecycleEvent.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/AppLifecycleEvent.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/runtime/context/session/AppLifecycleEvent.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/AppLifecycleEvent.java
index b60078c..afc19ad 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/AppLifecycleEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/AppLifecycleEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.context.session;
+package org.apache.isis.core.runtime.context.session;
import lombok.Getter;
import lombok.Value;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContext.java
similarity index 97%
rename from core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContext.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContext.java
index e14ecb0..68b742d 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContext.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.context.session;
+package org.apache.isis.core.runtime.context.session;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.registry.ServiceRegistry;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContextBase.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContextBase.java
similarity index 97%
rename from core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContextBase.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContextBase.java
index b719d6f..e7c3b34 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeContextBase.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeContextBase.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.context.session;
+package org.apache.isis.core.runtime.context.session;
import java.util.function.Supplier;
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.services.homepage.HomePageAction;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeEventService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeEventService.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeEventService.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeEventService.java
index f3f5f18..f6c9f21 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeEventService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeEventService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.context.session;
+package org.apache.isis.core.runtime.context.session;
import javax.inject.Inject;
import javax.inject.Named;
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.eventbus.EventBusService;
-import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSession;
/**
*
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeEventSupport_Spring.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeEventSupport_Spring.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeEventSupport_Spring.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeEventSupport_Spring.java
index fe51944..b72fd7b 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/RuntimeEventSupport_Spring.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/RuntimeEventSupport_Spring.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.context.session;
+package org.apache.isis.core.runtime.context.session;
import javax.enterprise.event.Event;
import javax.inject.Named;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/SessionLifecycleEvent.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/SessionLifecycleEvent.java
similarity index 91%
rename from core/runtime/src/main/java/org/apache/isis/runtime/context/session/SessionLifecycleEvent.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/SessionLifecycleEvent.java
index afe76f4..06435f3 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/context/session/SessionLifecycleEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/context/session/SessionLifecycleEvent.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.context.session;
+package org.apache.isis.core.runtime.context.session;
-import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSession;
import lombok.Getter;
import lombok.ToString;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/ObjectAdapterForBean.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/ObjectAdapterForBean.java
similarity index 97%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/ObjectAdapterForBean.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/ObjectAdapterForBean.java
index 3c8437d..14b8134 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/ObjectAdapterForBean.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/ObjectAdapterForBean.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.adapter;
+package org.apache.isis.core.runtime.persistence.adapter;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.commons.internal.ioc.ManagedBeanAdapter;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/PojoAdapter.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
similarity index 98%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/PojoAdapter.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
index 1d6d486..27bb912 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/adapter/PojoAdapter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.persistence.adapter;
+package org.apache.isis.core.runtime.persistence.adapter;
import java.io.Serializable;
import java.util.Objects;
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.commons.ToString;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSession;
import static org.apache.isis.core.commons.internal.base._With.requires;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSession.java
similarity index 98%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceSession.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSession.java
index 070f45a..4bc5c02 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSession.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.session;
+package org.apache.isis.core.runtime.persistence.session;
import java.util.List;
import java.util.Map;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSessionFactory.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceSessionFactory.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSessionFactory.java
index 9e2acaa..84200a2 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/PersistenceSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/PersistenceSessionFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.session;
+package org.apache.isis.core.runtime.persistence.session;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.security.api.authentication.AuthenticationSession;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PersistenceEventService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/PersistenceEventService.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PersistenceEventService.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/PersistenceEventService.java
index 2bd1dfd..78cbc78 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PersistenceEventService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/PersistenceEventService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.session.events;
+package org.apache.isis.core.runtime.persistence.session.events;
import javax.enterprise.event.Event;
import javax.inject.Inject;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PersistenceEventService_Spring.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/PersistenceEventService_Spring.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PersistenceEventService_Spring.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/PersistenceEventService_Spring.java
index 8a0a5ab..f347311 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PersistenceEventService_Spring.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/PersistenceEventService_Spring.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.session.events;
+package org.apache.isis.core.runtime.persistence.session.events;
import javax.enterprise.event.Event;
import javax.inject.Named;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PostStoreEvent.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/PostStoreEvent.java
similarity index 93%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PostStoreEvent.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/PostStoreEvent.java
index 9319aa9..a883dad 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PostStoreEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/PostStoreEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.session.events;
+package org.apache.isis.core.runtime.persistence.session.events;
import lombok.Value;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PreStoreEvent.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/PreStoreEvent.java
similarity index 93%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PreStoreEvent.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/PreStoreEvent.java
index 70f36f8..e523748 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/PreStoreEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/PreStoreEvent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.session.events;
+package org.apache.isis.core.runtime.persistence.session.events;
import lombok.Value;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/TimestampService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/TimestampService.java
similarity index 97%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/TimestampService.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/TimestampService.java
index c1f62ed..15b84be 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/session/events/TimestampService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/session/events/TimestampService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.session.events;
+package org.apache.isis.core.runtime.persistence.session.events;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AdapterAndProperty.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AdapterAndProperty.java
similarity index 98%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AdapterAndProperty.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AdapterAndProperty.java
index 4b5cdf6..0f70227 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AdapterAndProperty.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AdapterAndProperty.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction;
+package org.apache.isis.core.runtime.persistence.transaction;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AuditerDispatchService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AuditerDispatchService.java
similarity index 98%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AuditerDispatchService.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AuditerDispatchService.java
index 975bb8c..b03767d 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/AuditerDispatchService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/AuditerDispatchService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction;
+package org.apache.isis.core.runtime.persistence.transaction;
import java.util.List;
import java.util.Map;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/ChangedObjectsService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/ChangedObjectsService.java
similarity index 99%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/ChangedObjectsService.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/ChangedObjectsService.java
index 6e8a0eb..6ff275d 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/ChangedObjectsService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/ChangedObjectsService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction;
+package org.apache.isis.core.runtime.persistence.transaction;
import java.util.Collections;
import java.util.Map;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionAspectSupport.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionAspectSupport.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionAspectSupport.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionAspectSupport.java
index a317dbd..cbdb9a4 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionAspectSupport.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionAspectSupport.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction;
+package org.apache.isis.core.runtime.persistence.transaction;
import java.util.Optional;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionFlushException.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionFlushException.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionFlushException.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionFlushException.java
index 87dac67..7c58f4a 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionFlushException.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionFlushException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction;
+package org.apache.isis.core.runtime.persistence.transaction;
import org.apache.isis.core.commons.exceptions.IsisException;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionManagerException.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionManagerException.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionManagerException.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionManagerException.java
index bdcc1d7..daaa739 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionManagerException.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionManagerException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction;
+package org.apache.isis.core.runtime.persistence.transaction;
import org.apache.isis.core.commons.exceptions.IsisException;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionObject.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionObject.java
similarity index 97%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionObject.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionObject.java
index 82fabc3..a94ef72 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionObject.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionObject.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction;
+package org.apache.isis.core.runtime.persistence.transaction;
import java.util.concurrent.CountDownLatch;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionPlaceholder.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionPlaceholder.java
similarity index 94%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionPlaceholder.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionPlaceholder.java
index 7d31ea4..2fb3081 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/IsisTransactionPlaceholder.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/IsisTransactionPlaceholder.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction;
+package org.apache.isis.core.runtime.persistence.transaction;
/**
*
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/PreAndPostValues.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/PreAndPostValues.java
similarity index 98%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/PreAndPostValues.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/PreAndPostValues.java
index 6022a32..4012167 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/PreAndPostValues.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/PreAndPostValues.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction;
+package org.apache.isis.core.runtime.persistence.transaction;
import java.util.Map;
import java.util.Objects;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterBeginEvent.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionAfterBeginEvent.java
similarity index 87%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterBeginEvent.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionAfterBeginEvent.java
index 3585252..42ffcf9 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterBeginEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionAfterBeginEvent.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction.events;
+package org.apache.isis.core.runtime.persistence.transaction.events;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject;
public class TransactionAfterBeginEvent extends TransactionEventAbstract {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterCommitEvent.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionAfterCommitEvent.java
similarity index 87%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterCommitEvent.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionAfterCommitEvent.java
index c60a448..314c03c 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterCommitEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionAfterCommitEvent.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction.events;
+package org.apache.isis.core.runtime.persistence.transaction.events;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject;
public class TransactionAfterCommitEvent extends TransactionEventAbstract {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterRollbackEvent.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionAfterRollbackEvent.java
similarity index 87%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterRollbackEvent.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionAfterRollbackEvent.java
index 5aef274..672ed01 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionAfterRollbackEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionAfterRollbackEvent.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction.events;
+package org.apache.isis.core.runtime.persistence.transaction.events;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject;
public class TransactionAfterRollbackEvent extends TransactionEventAbstract {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeBeginEvent.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionBeforeBeginEvent.java
similarity index 87%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeBeginEvent.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionBeforeBeginEvent.java
index 738a2e3..bfadb72 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeBeginEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionBeforeBeginEvent.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction.events;
+package org.apache.isis.core.runtime.persistence.transaction.events;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject;
public class TransactionBeforeBeginEvent extends TransactionEventAbstract {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeCommitEvent.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionBeforeCommitEvent.java
similarity index 87%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeCommitEvent.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionBeforeCommitEvent.java
index 871f2b1..575bf1b 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeCommitEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionBeforeCommitEvent.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction.events;
+package org.apache.isis.core.runtime.persistence.transaction.events;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject;
public class TransactionBeforeCommitEvent extends TransactionEventAbstract {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeRollbackEvent.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionBeforeRollbackEvent.java
similarity index 87%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeRollbackEvent.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionBeforeRollbackEvent.java
index 24e17c0..425a295 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionBeforeRollbackEvent.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionBeforeRollbackEvent.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction.events;
+package org.apache.isis.core.runtime.persistence.transaction.events;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject;
public class TransactionBeforeRollbackEvent extends TransactionEventAbstract {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionEventAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionEventAbstract.java
similarity index 91%
rename from core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionEventAbstract.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionEventAbstract.java
index ae1d15b..bd1d62b 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/persistence/transaction/events/TransactionEventAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/transaction/events/TransactionEventAbstract.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.transaction.events;
+package org.apache.isis.core.runtime.persistence.transaction.events;
import java.util.EventObject;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject;
import lombok.Getter;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisRequestCycle.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisRequestCycle.java
similarity index 95%
rename from core/runtime/src/main/java/org/apache/isis/runtime/session/IsisRequestCycle.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisRequestCycle.java
index 98bde3b..535a6e6 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisRequestCycle.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisRequestCycle.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.session;
+package org.apache.isis.core.runtime.session;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionTemplate;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.RequiredArgsConstructor;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSession.java
similarity index 94%
rename from core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSession.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSession.java
index 230e4bb..1f4fd96 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSession.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.session;
+package org.apache.isis.core.runtime.session;
import java.util.Optional;
@@ -26,9 +26,9 @@ import org.apache.isis.applib.services.xactn.TransactionState;
import org.apache.isis.core.commons.internal.context._Context;
import org.apache.isis.core.metamodel.commons.ToString;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.runtime.context.session.RuntimeContextBase;
-import org.apache.isis.runtime.context.session.RuntimeEventService;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.context.session.RuntimeContextBase;
+import org.apache.isis.core.runtime.context.session.RuntimeEventService;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.api.authentication.MessageBroker;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactory.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactory.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactory.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactory.java
index 01fb3e5..e27f672 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactory.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactory.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.isis.runtime.session;
+package org.apache.isis.core.runtime.session;
import java.util.concurrent.Callable;
import javax.inject.Inject;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.runtime.session.init.InitialisationSession;
+import org.apache.isis.core.runtime.session.init.InitialisationSession;
import org.apache.isis.security.api.authentication.AuthenticationSession;
/**
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactoryDefault.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactoryDefault.java
index 5c3a074..378e729 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/IsisSessionFactoryDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/IsisSessionFactoryDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.session;
+package org.apache.isis.core.runtime.session;
import java.io.File;
import java.util.Set;
@@ -45,9 +45,9 @@ import org.apache.isis.core.commons.internal.context._Context;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.context.session.RuntimeEventService;
-import org.apache.isis.runtime.session.init.IsisLocaleInitializer;
-import org.apache.isis.runtime.session.init.IsisTimeZoneInitializer;
+import org.apache.isis.core.runtime.context.session.RuntimeEventService;
+import org.apache.isis.core.runtime.session.init.IsisLocaleInitializer;
+import org.apache.isis.core.runtime.session.init.IsisTimeZoneInitializer;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/session/SessionFactoryException.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/SessionFactoryException.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/session/SessionFactoryException.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/session/SessionFactoryException.java
index e6aa9bd..24985ef 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/SessionFactoryException.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/SessionFactoryException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.session;
+package org.apache.isis.core.runtime.session;
public class SessionFactoryException extends Exception {
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/session/init/InitialisationSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/InitialisationSession.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/session/init/InitialisationSession.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/InitialisationSession.java
index 0ef81aa..3f04fc4 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/init/InitialisationSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/InitialisationSession.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.session.init;
+package org.apache.isis.core.runtime.session.init;
import java.io.IOException;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisLocaleInitializer.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/IsisLocaleInitializer.java
similarity index 97%
rename from core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisLocaleInitializer.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/IsisLocaleInitializer.java
index 310de6b..694eeb3 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisLocaleInitializer.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/IsisLocaleInitializer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.session.init;
+package org.apache.isis.core.runtime.session.init;
import java.util.Locale;
import java.util.Optional;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisTimeZoneInitializer.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/IsisTimeZoneInitializer.java
similarity index 96%
rename from core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisTimeZoneInitializer.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/IsisTimeZoneInitializer.java
index 6d18158..0ad0960 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/init/IsisTimeZoneInitializer.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/init/IsisTimeZoneInitializer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.session.init;
+package org.apache.isis.core.runtime.session.init;
import java.util.TimeZone;
diff --git a/core/runtime/src/main/java/org/apache/isis/runtime/session/template/AbstractIsisSessionTemplate.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/template/AbstractIsisSessionTemplate.java
similarity index 91%
rename from core/runtime/src/main/java/org/apache/isis/runtime/session/template/AbstractIsisSessionTemplate.java
rename to core/runtime/src/main/java/org/apache/isis/core/runtime/session/template/AbstractIsisSessionTemplate.java
index 6defee3..b6ffe3a 100644
--- a/core/runtime/src/main/java/org/apache/isis/runtime/session/template/AbstractIsisSessionTemplate.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/session/template/AbstractIsisSessionTemplate.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.session.template;
+package org.apache.isis.core.runtime.session.template;
import javax.inject.Inject;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.runtime.session.IsisSession;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
public abstract class AbstractIsisSessionTemplate {
@@ -52,7 +52,7 @@ public abstract class AbstractIsisSessionTemplate {
* {@link #doExecuteWithTransaction(Object)}.
*
* <p>
- * This method is called within a current {@link org.apache.isis.runtime.session.IsisSession session},
+ * This method is called within a current {@link IsisSession session},
* but with no current transaction. The default implementation sets up a
* {@link org.apache.isis.jdo.persistence.IsisTransactionJdo transaction}
* and then calls {@link #doExecuteWithTransaction(Object)}. Override if you require more sophisticated
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/RuntimeTestPojo.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/RuntimeTestPojo.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/RuntimeTestPojo.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/RuntimeTestPojo.java
index 906bc74..00e2ca3 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/RuntimeTestPojo.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/RuntimeTestPojo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.persistence.adapterfactory.pojo;
+package org.apache.isis.core.runtime.persistence.adapterfactory.pojo;
public class RuntimeTestPojo {
private static int nextId;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/Interface1.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/Interface1.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/Interface1.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/Interface1.java
index 3e51c47..4b31145 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/Interface1.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/Interface1.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
public interface Interface1 {
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaActionTestObject.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaActionTestObject.java
similarity index 97%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/JavaActionTestObject.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaActionTestObject.java
index 7dc4aa9..7080ee8 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaActionTestObject.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaActionTestObject.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
public class JavaActionTestObject {
private boolean actionCalled = false;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaObjectWithBasicProgramConventions.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithBasicProgramConventions.java
similarity index 99%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/JavaObjectWithBasicProgramConventions.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithBasicProgramConventions.java
index 656ac6e..acce270 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaObjectWithBasicProgramConventions.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithBasicProgramConventions.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaObjectWithOneToOneAssociations.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithOneToOneAssociations.java
similarity index 97%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/JavaObjectWithOneToOneAssociations.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithOneToOneAssociations.java
index 480708c..c47e15d 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaObjectWithOneToOneAssociations.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaObjectWithOneToOneAssociations.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
public class JavaObjectWithOneToOneAssociations {
boolean available = false;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaReferencedObject.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaReferencedObject.java
similarity index 96%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/JavaReferencedObject.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaReferencedObject.java
index 2f06185..696458f 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/JavaReferencedObject.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/JavaReferencedObject.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
public class JavaReferencedObject {
private static int next;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
similarity index 98%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
index 0ceb3dd..cf55824 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/ObjectActionLayoutXmlDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectActionLayoutXmlDefaultTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
similarity index 99%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
index 05fde56..e3109e2 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/OneToManyAssociationDefaultTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/OneToManyAssociationDefaultTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/RuntimeTestPojo.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/RuntimeTestPojo.java
similarity index 97%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/RuntimeTestPojo.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/RuntimeTestPojo.java
index 50d5cda..e542b1d 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/RuntimeTestPojo.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/RuntimeTestPojo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
public class RuntimeTestPojo {
private static int nextId;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/TestDomainObject.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestDomainObject.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/TestDomainObject.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestDomainObject.java
index 59a3f54..6ac2004 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/TestDomainObject.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestDomainObject.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
public class TestDomainObject {
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObject.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObject.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/TestObject.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObject.java
index ad75c93..9d20f20 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObject.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObject.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
public class TestObject {
}
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectAsAggregated.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsAggregated.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectAsAggregated.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsAggregated.java
index e211d13..05896f7 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectAsAggregated.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsAggregated.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
// import org.apache.isis.applib.Aggregated;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectAsService.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsService.java
similarity index 95%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectAsService.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsService.java
index 17e7b67..05d0667 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectAsService.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectAsService.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
public class TestObjectAsService {
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectWithCollection.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectWithCollection.java
similarity index 98%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectWithCollection.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectWithCollection.java
index 3f5921f..28bbbc0 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/TestObjectWithCollection.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TestObjectWithCollection.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
import java.util.Vector;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodReturnTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodReturnTest.java
similarity index 87%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodReturnTest.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodReturnTest.java
index 2e1fc55..3f8f76b 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodReturnTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodReturnTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
import java.lang.reflect.Method;
import java.util.List;
@@ -30,8 +30,6 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.core.metamodel.specloader.traverser.TypeExtractorMethodReturn;
-import static org.apache.isis.runtime.system.TypeExtractorMethodsParametersTest.containsElementThat;
-
public class TypeExtractorMethodReturnTest {
@Test
@@ -53,8 +51,8 @@ public class TypeExtractorMethodReturnTest {
final List<Class<?>> classes = extractor.getClasses();
assertThat(classes.size(), is(2));
- assertThat(classes, containsElementThat(equalTo((Class<?>)java.util.List.class)));
- assertThat(classes, containsElementThat(equalTo((Class<?>)Customer.class)));
+ assertThat(classes, TypeExtractorMethodsParametersTest.containsElementThat(equalTo((Class<?>)java.util.List.class)));
+ assertThat(classes, TypeExtractorMethodsParametersTest.containsElementThat(equalTo((Class<?>)Customer.class)));
}
@Test
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodsParametersTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodsParametersTest.java
similarity index 98%
rename from core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodsParametersTest.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodsParametersTest.java
index 1b9694c..5c3c994 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/system/TypeExtractorMethodsParametersTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/TypeExtractorMethodsParametersTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
import java.lang.reflect.Method;
import java.util.List;
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/systemusinginstallers/fixture/budget/SomeServiceToInclude.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budget/SomeServiceToInclude.java
similarity index 92%
rename from core/runtime/src/test/java/org/apache/isis/runtime/systemusinginstallers/fixture/budget/SomeServiceToInclude.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budget/SomeServiceToInclude.java
index 24e2c6b..34e14d8 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/systemusinginstallers/fixture/budget/SomeServiceToInclude.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budget/SomeServiceToInclude.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.systemusinginstallers.fixture.budget;
+package org.apache.isis.core.runtime.systemusinginstallers.fixture.budget;
public class SomeServiceToInclude {
}
diff --git a/core/runtime/src/test/java/org/apache/isis/runtime/systemusinginstallers/fixture/budgetassignment/SomeServiceNotToInclude.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budgetassignment/SomeServiceNotToInclude.java
similarity index 91%
rename from core/runtime/src/test/java/org/apache/isis/runtime/systemusinginstallers/fixture/budgetassignment/SomeServiceNotToInclude.java
rename to core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budgetassignment/SomeServiceNotToInclude.java
index 7fec8ee..c17e740 100644
--- a/core/runtime/src/test/java/org/apache/isis/runtime/systemusinginstallers/fixture/budgetassignment/SomeServiceNotToInclude.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/systemusinginstallers/fixture/budgetassignment/SomeServiceNotToInclude.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.systemusinginstallers.fixture.budgetassignment;
+package org.apache.isis.core.runtime.systemusinginstallers.fixture.budgetassignment;
public class SomeServiceNotToInclude {
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
index 9aa1f11..c7cdcbe 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
@@ -22,7 +22,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.core.codegen.bytebuddy.IsisModuleCoreCodegenByteBuddy;
-import org.apache.isis.runtime.IsisModuleRuntime;
+import org.apache.isis.core.runtime.IsisModuleRuntime;
import org.apache.isis.runtimeservices.auth.AuthenticationSessionProviderDefault;
import org.apache.isis.runtimeservices.bookmarks.BookmarkServiceInternalDefault;
import org.apache.isis.runtimeservices.command.CommandDtoServiceInternalDefault;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java
index d0d4d7f..64ded5d 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java
@@ -28,8 +28,8 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.core.metamodel.services.user.UserServiceDefault;
-import org.apache.isis.runtime.session.IsisSession;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import org.apache.isis.security.api.authentication.standard.SimpleSession;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/background/CommandExecutionAbstract.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/background/CommandExecutionAbstract.java
index dfe64eb..15ffeb0 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/background/CommandExecutionAbstract.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/background/CommandExecutionAbstract.java
@@ -23,7 +23,7 @@ import javax.inject.Inject;
import org.apache.isis.applib.services.command.CommandExecutorService;
import org.apache.isis.applib.services.command.CommandWithDto;
import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.runtime.session.template.AbstractIsisSessionTemplate;
+import org.apache.isis.core.runtime.session.template.AbstractIsisSessionTemplate;
/**
*/
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java
index 985ab7a..8795977 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java
@@ -57,9 +57,9 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.context.IsisContext;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.schema.cmd.v1.ActionDto;
import org.apache.isis.schema.cmd.v1.CommandDto;
import org.apache.isis.schema.cmd.v1.MemberDto;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java
index dc7a108..0bd2811 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java
@@ -41,7 +41,7 @@ import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import static org.apache.isis.core.commons.internal.base._With.requires;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java
index 181ca15..887ddff 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java
@@ -31,7 +31,7 @@ import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.i18n.TranslatableString;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.MessageBroker;
@Service
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java
index ec458ca..6758cf5 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java
@@ -50,7 +50,7 @@ import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.object.publishedobject.PublishedObjectFacet;
import org.apache.isis.core.metamodel.services.publishing.PublisherDispatchService;
-import org.apache.isis.runtime.persistence.transaction.ChangedObjectsService;
+import org.apache.isis.core.runtime.persistence.transaction.ChangedObjectsService;
/**
* Wrapper around {@link PublisherService}. Is a no-op if there is no injected service.
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
index e426396..e0b19ed 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
@@ -45,7 +45,7 @@ import org.apache.isis.core.commons.internal.base._NullSafe;
import org.apache.isis.core.config.IsisConfiguration;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import lombok.val;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
index 27356bc..b667ccf 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
@@ -29,8 +29,8 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.sessmgmt.SessionManagementService;
-import org.apache.isis.runtime.session.IsisSession;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import lombok.val;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/AsyncWrapDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/AsyncWrapDefault.java
index e94d599..6e96995 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/AsyncWrapDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/AsyncWrapDefault.java
@@ -31,8 +31,8 @@ import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.runtime.context.IsisContext;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java
index f59c470..a1e4c13 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java
@@ -68,7 +68,7 @@ import org.apache.isis.runtimeservices.wrapper.dispatchers.InteractionEventDispa
import org.apache.isis.runtimeservices.wrapper.dispatchers.InteractionEventDispatcherTypeSafe;
import org.apache.isis.runtimeservices.wrapper.handlers.ProxyContextHandler;
import org.apache.isis.runtimeservices.wrapper.proxy.ProxyCreator;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xactn/TransactionServiceSpring.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xactn/TransactionServiceSpring.java
index aacc68a..55a1873 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xactn/TransactionServiceSpring.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xactn/TransactionServiceSpring.java
@@ -39,8 +39,8 @@ import org.apache.isis.applib.services.xactn.TransactionId;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.applib.services.xactn.TransactionState;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionAspectSupport;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionAspectSupport;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java b/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
index 779b6c7..0608a8a 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
@@ -23,8 +23,8 @@ import org.junit.Test;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionPlaceholder;
-import org.apache.isis.runtime.persistence.transaction.PreAndPostValues;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionPlaceholder;
+import org.apache.isis.core.runtime.persistence.transaction.PreAndPostValues;
public class PreAndPostValues_shouldAudit_Test {
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java b/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java
index d2aebed..1ac3dec 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/IsisModuleWebapp.java
@@ -21,7 +21,7 @@ package org.apache.isis.webapp;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.runtime.IsisModuleRuntime;
+import org.apache.isis.core.runtime.IsisModuleRuntime;
import org.apache.isis.webapp.health.HealthIndicatorUsingHealthCheckService;
import org.apache.isis.webapp.modules.logonlog.WebModuleLogOnExceptionLogger;
import org.apache.isis.webapp.modules.templresources.WebModuleTemplateResources;
diff --git a/core/webapp/src/main/java/org/apache/isis/webapp/context/IsisWebAppCommonContext.java b/core/webapp/src/main/java/org/apache/isis/webapp/context/IsisWebAppCommonContext.java
index d2d2df2..54e1b94 100644
--- a/core/webapp/src/main/java/org/apache/isis/webapp/context/IsisWebAppCommonContext.java
+++ b/core/webapp/src/main/java/org/apache/isis/webapp/context/IsisWebAppCommonContext.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.webapp.context.memento.ObjectMemento;
import org.apache.isis.webapp.context.memento.ObjectMementoService;
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
index a2fa6f7..0a4ad86 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/seed/SeedSecurityModuleService.java
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
-import org.apache.isis.runtime.context.session.AppLifecycleEvent;
+import org.apache.isis.core.runtime.context.session.AppLifecycleEvent;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java
index ca65bc0..7135598 100644
--- a/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java
+++ b/extensions/security/secman/shiro-realm/src/main/java/org/apache/isis/extensions/secman/shiro/IsisModuleExtSecmanShiroRealm.java
@@ -46,7 +46,7 @@ import org.apache.isis.extensions.secman.api.encryption.PasswordEncryptionServic
import org.apache.isis.extensions.secman.api.user.AccountType;
import org.apache.isis.extensions.secman.api.user.ApplicationUserRepository;
import org.apache.isis.extensions.secman.shiro.util.ShiroUtils;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authorization.standard.Authorizor;
import lombok.Getter;
diff --git a/incubator/extensions/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java b/incubator/extensions/core/microprofile/src/main/java/org/apache/isis/core/runtime/jee_support/IsisCDIBeanScanInterceptor.java
similarity index 98%
rename from incubator/extensions/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java
rename to incubator/extensions/core/microprofile/src/main/java/org/apache/isis/core/runtime/jee_support/IsisCDIBeanScanInterceptor.java
index 5d2fe5c..82f55e9 100644
--- a/incubator/extensions/core/microprofile/src/main/java/org/apache/isis/runtime/jee_support/IsisCDIBeanScanInterceptor.java
+++ b/incubator/extensions/core/microprofile/src/main/java/org/apache/isis/core/runtime/jee_support/IsisCDIBeanScanInterceptor.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.jee_support;
+package org.apache.isis.core.runtime.jee_support;
import java.util.List;
import java.util.function.Predicate;
diff --git a/incubator/extensions/core/microprofile/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/incubator/extensions/core/microprofile/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
index 9e45182..2f1450f 100644
--- a/incubator/extensions/core/microprofile/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
+++ b/incubator/extensions/core/microprofile/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
@@ -1 +1 @@
-org.apache.isis.runtime.jee_support.IsisCDIBeanScanInterceptor
\ No newline at end of file
+org.apache.isis.core.runtime.jee_support.IsisCDIBeanScanInterceptor
\ No newline at end of file
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java
index 4bc18fc..9aecb35 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/IsisModuleJdoDataNucleus5.java
@@ -39,7 +39,7 @@ import org.apache.isis.persistence.jdo.datanucleus5.metamodel.JdoProgrammingMode
import org.apache.isis.persistence.jdo.datanucleus5.metrics.MetricsServiceDefault;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPlatformTransactionManagerForJdo;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.PersistenceSessionFactory5;
-import org.apache.isis.runtime.IsisModuleRuntime;
+import org.apache.isis.core.runtime.IsisModuleRuntime;
@Configuration
@Import({
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusLifeCycleHelper.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusLifeCycleHelper.java
index f8fb935..deee65e 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusLifeCycleHelper.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/DataNucleusLifeCycleHelper.java
@@ -22,7 +22,7 @@ import javax.jdo.PersistenceManagerFactory;
import org.datanucleus.enhancer.EnhancementHelper;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
/**
*
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
index b0a18d2..66e22b6 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
@@ -22,7 +22,7 @@ import javax.jdo.PersistenceManager;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.command.CreateObjectCommand;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
index d76ca5e..11c3c69 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/datanucleus/service/JdoPersistenceLifecycleService.java
@@ -33,11 +33,11 @@ import org.apache.isis.core.commons.internal.context._Context;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.config.beans.IsisBeanTypeRegistryHolder;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.runtime.context.session.AppLifecycleEvent;
-import org.apache.isis.runtime.context.session.SessionLifecycleEvent;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
-import org.apache.isis.runtime.persistence.session.PersistenceSessionFactory;
-import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.context.session.AppLifecycleEvent;
+import org.apache.isis.core.runtime.context.session.SessionLifecycleEvent;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSession;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
index d3c43c6..947235c 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/jdosupport/IsisJdoSupportDN5.java
@@ -48,7 +48,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.ObjectPersistenceException;
import org.apache.isis.persistence.jdo.applib.services.IsisJdoSupport_v3_2;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPersistenceSessionJdo;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/lifecycles/JdoStoreLifecycleListenerForIsis.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/lifecycles/JdoStoreLifecycleListenerForIsis.java
index 03e4a81..b48b386 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/lifecycles/JdoStoreLifecycleListenerForIsis.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/lifecycles/JdoStoreLifecycleListenerForIsis.java
@@ -22,9 +22,9 @@ import javax.inject.Inject;
import javax.jdo.listener.InstanceLifecycleEvent;
import org.apache.isis.persistence.jdo.datanucleus5.metamodel.JdoMetamodelUtil;
-import org.apache.isis.runtime.persistence.session.events.PersistenceEventService;
-import org.apache.isis.runtime.persistence.session.events.PostStoreEvent;
-import org.apache.isis.runtime.persistence.session.events.PreStoreEvent;
+import org.apache.isis.core.runtime.persistence.session.events.PersistenceEventService;
+import org.apache.isis.core.runtime.persistence.session.events.PostStoreEvent;
+import org.apache.isis.core.runtime.persistence.session.events.PreStoreEvent;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
index 716558b..d93037e 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metamodel/facets/object/persistencecapable/JdoPersistenceCapableFacetAbstract.java
@@ -27,7 +27,7 @@ import org.apache.isis.core.metamodel.facetapi.FacetAbstract;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.entity.EntityFacet;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPersistenceSessionJdo;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
public abstract class JdoPersistenceCapableFacetAbstract
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceDefault.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceDefault.java
index 69ec3c0..fe801a4 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceDefault.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/metrics/MetricsServiceDefault.java
@@ -35,7 +35,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.WithTransactionScope;
import org.apache.isis.applib.services.metrics.MetricsService;
-import org.apache.isis.runtime.persistence.transaction.ChangedObjectsService;
+import org.apache.isis.core.runtime.persistence.transaction.ChangedObjectsService;
@Service
@Named("isisJdoDn5.MetricsServiceDefault")
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
index 896ad3e..ceec585 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext.java
@@ -38,8 +38,8 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.IsisPersistenceSessionJdo;
-import org.apache.isis.runtime.context.session.RuntimeContextBase;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.context.session.RuntimeContextBase;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.Getter;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_DependencyInjection.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_DependencyInjection.java
index a50730b..4e4e59c 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_DependencyInjection.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_DependencyInjection.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Modifier;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtime.context.session.RuntimeContext;
+import org.apache.isis.core.runtime.context.session.RuntimeContext;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_Factories.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_Factories.java
index 290c92b..6cbd5be 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_Factories.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_Factories.java
@@ -25,8 +25,8 @@ import org.apache.isis.core.metamodel.adapter.oid.ParentedOid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.persistence.jdo.datanucleus5.objectadapter.ObjectAdapterContext.ObjectAdapterFactories;
-import org.apache.isis.runtime.persistence.adapter.PojoAdapter;
-import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
+import org.apache.isis.core.runtime.session.IsisSession;
import static org.apache.isis.core.commons.internal.base._With.requires;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_LifecycleEventSupport.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_LifecycleEventSupport.java
index 48edabb..3af6a7e 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_LifecycleEventSupport.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_LifecycleEventSupport.java
@@ -23,7 +23,7 @@ import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.core.commons.internal.factory.InstanceUtil;
import org.apache.isis.core.metamodel.facets.object.callbacks.LifecycleEventFacet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.runtime.context.session.RuntimeContext;
+import org.apache.isis.core.runtime.context.session.RuntimeContext;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_NewIdentifier.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_NewIdentifier.java
index 938504e..86fb27c 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_NewIdentifier.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_NewIdentifier.java
@@ -23,7 +23,7 @@ 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.specloader.SpecificationLoader;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import lombok.RequiredArgsConstructor;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterByIdProvider.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterByIdProvider.java
index 2eb88d7..f830ce3 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterByIdProvider.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterByIdProvider.java
@@ -34,8 +34,8 @@ import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.context.session.RuntimeContext;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.context.session.RuntimeContext;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java
index 80037c3..9f8eba2 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectAdapterProvider.java
@@ -23,7 +23,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.context.session.RuntimeContext;
+import org.apache.isis.core.runtime.context.session.RuntimeContext;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectCreation.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectCreation.java
index 0f90d4d..3d09d08 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectCreation.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/objectadapter/ObjectAdapterContext_ObjectCreation.java
@@ -32,7 +32,7 @@ import org.apache.isis.core.metamodel.facets.object.viewmodel.ViewModelFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.Contributed;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.runtime.context.session.RuntimeContext;
+import org.apache.isis.core.runtime.context.session.RuntimeContext;
import lombok.extern.log4j.Log4j2;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
index 16d9b08..08c6de9 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/DataNucleusApplicationComponents5.java
@@ -45,7 +45,7 @@ import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.DataNucleusLifeC
import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.DataNucleusPropertiesAware;
import org.apache.isis.persistence.jdo.datanucleus5.metamodel.facets.object.query.JdoNamedQuery;
import org.apache.isis.persistence.jdo.datanucleus5.metamodel.facets.object.query.JdoQueryFacet;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
import static org.apache.isis.core.commons.internal.base._NullSafe.stream;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java
index 4f369e2..e3e4aad 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdo.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.isis.core.metamodel.adapter.ObjectAdapterProvider;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.command.PersistenceCommand;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
/**
*
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
index 76df67c..178092e 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPersistenceSessionJdoBase.java
@@ -43,7 +43,7 @@ import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.persistence.jdo.applib.fixturestate.FixturesInstalledStateHolder;
import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.persistence.queries.PersistenceQueryProcessor;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.query.PersistenceQueryFactory;
-import org.apache.isis.runtime.persistence.transaction.ChangedObjectsService;
+import org.apache.isis.core.runtime.persistence.transaction.ChangedObjectsService;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.Getter;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
index 3e788bd..5f8cf5a 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisPlatformTransactionManagerForJdo.java
@@ -33,18 +33,18 @@ import org.springframework.transaction.support.DefaultTransactionStatus;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionAspectSupport;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
-import org.apache.isis.runtime.persistence.transaction.events.TransactionAfterBeginEvent;
-import org.apache.isis.runtime.persistence.transaction.events.TransactionAfterCommitEvent;
-import org.apache.isis.runtime.persistence.transaction.events.TransactionAfterRollbackEvent;
-import org.apache.isis.runtime.persistence.transaction.events.TransactionBeforeBeginEvent;
-import org.apache.isis.runtime.persistence.transaction.events.TransactionBeforeCommitEvent;
-import org.apache.isis.runtime.persistence.transaction.events.TransactionBeforeRollbackEvent;
-import org.apache.isis.runtime.session.IsisSession;
-import org.apache.isis.runtime.session.IsisSessionFactory;
-import org.apache.isis.runtime.session.init.InitialisationSession;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionAspectSupport;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject;
+import org.apache.isis.core.runtime.persistence.transaction.events.TransactionAfterBeginEvent;
+import org.apache.isis.core.runtime.persistence.transaction.events.TransactionAfterCommitEvent;
+import org.apache.isis.core.runtime.persistence.transaction.events.TransactionAfterRollbackEvent;
+import org.apache.isis.core.runtime.persistence.transaction.events.TransactionBeforeBeginEvent;
+import org.apache.isis.core.runtime.persistence.transaction.events.TransactionBeforeCommitEvent;
+import org.apache.isis.core.runtime.persistence.transaction.events.TransactionBeforeRollbackEvent;
+import org.apache.isis.core.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.init.InitialisationSession;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
index 3b5de8c..fc4d474 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionJdo.java
@@ -38,10 +38,10 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.command.CreateObjectCommand;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.command.DestroyObjectCommand;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.command.PersistenceCommand;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
-import org.apache.isis.runtime.persistence.transaction.AuditerDispatchService;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionFlushException;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionManagerException;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.transaction.AuditerDispatchService;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionFlushException;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionManagerException;
import lombok.Getter;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
index 05a48da..a40dc28 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/IsisTransactionManagerJdo.java
@@ -28,9 +28,9 @@ import org.apache.isis.applib.services.iactn.InteractionContext;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.persistence.jdo.datanucleus5.persistence.command.PersistenceCommand;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionAspectSupport;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionManagerException;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionObject;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionAspectSupport;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionManagerException;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionObject;
import lombok.Getter;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
index 1f3042e..50792b4 100644
--- a/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
+++ b/persistence/jdo/datanucleus-5/src/main/java/org/apache/isis/persistence/jdo/datanucleus5/persistence/PersistenceSessionFactory5.java
@@ -49,8 +49,8 @@ import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.DataNucleusSetti
import org.apache.isis.persistence.jdo.datanucleus5.datanucleus.JDOStateManagerForIsis;
import org.apache.isis.persistence.jdo.datanucleus5.entities.JdoEntityTypeRegistry;
import org.apache.isis.persistence.jdo.datanucleus5.lifecycles.JdoStoreLifecycleListenerForIsis;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
-import org.apache.isis.runtime.persistence.session.PersistenceSessionFactory;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import lombok.Getter;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
similarity index 95%
rename from persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
index f8e6806..d333fb6 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/adapterfactory/pojo/PojoAdapterTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.persistence.adapterfactory.pojo;
+package org.apache.isis.core.runtime.persistence.adapterfactory.pojo;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
@@ -31,7 +31,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.persistence.adapter.PojoAdapter;
+import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
similarity index 97%
rename from persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
index f89f096..4f2ee90 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/transaction/PojoAdapterBuilder.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.persistence.objectstore.transaction;
+package org.apache.isis.core.runtime.persistence.objectstore.transaction;
import java.util.Iterator;
@@ -27,7 +27,7 @@ import org.apache.isis.core.metamodel.adapter.oid.Oid.Factory;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.persistence.adapter.PojoAdapter;
+import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
import lombok.val;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
similarity index 96%
rename from persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
index e0fe99f..70ecc46 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/system/ObjectMemberAbstractTest.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.system;
+package org.apache.isis.core.runtime.system;
import org.datanucleus.enhancement.Persistable;
import org.jmock.Expectations;
@@ -60,9 +60,8 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.ObjectMemberAbstract;
-import org.apache.isis.runtime.persistence.adapter.PojoAdapter;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PojoAdapterBuilder;
-import org.apache.isis.runtime.persistence.objectstore.transaction.PojoAdapterBuilder.Persistence;
+import org.apache.isis.core.runtime.persistence.objectstore.transaction.PojoAdapterBuilder;
+import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
@@ -107,7 +106,7 @@ public class ObjectMemberAbstractTest {
transientAdapter = PojoAdapterBuilder.create()
.with(mockSpecificationLoader)
- .with(Persistence.TRANSIENT)
+ .with(PojoAdapterBuilder.Persistence.TRANSIENT)
.withPojo(mockPersistable)
.build();
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
index 4e72ec7..e36b32d 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
@@ -69,7 +69,7 @@ import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificati
import org.apache.isis.runtimeservices.wrapper.dom.employees.Employee;
import org.apache.isis.runtimeservices.wrapper.dom.employees.EmployeeRepository;
import org.apache.isis.runtimeservices.wrapper.dom.employees.EmployeeRepositoryImpl;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.schema.cmd.v1.CommandDto;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import org.apache.isis.security.api.authentication.standard.SimpleSession;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
index 8c8ef95..435d911 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
@@ -64,7 +64,7 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
import org.apache.isis.runtimeservices.wrapper.dom.employees.Employee;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import org.apache.isis.security.api.authentication.standard.SimpleSession;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
diff --git a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/ExcelServiceImpl.java b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/ExcelServiceImpl.java
index 0b55d9e..f7d942f 100644
--- a/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/ExcelServiceImpl.java
+++ b/subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/dom/util/ExcelServiceImpl.java
@@ -22,8 +22,8 @@ import org.apache.isis.subdomains.excel.applib.dom.WorksheetContent;
import org.apache.isis.subdomains.excel.applib.dom.WorksheetSpec;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.context.session.RuntimeContextBase;
-import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.context.session.RuntimeContextBase;
+import org.apache.isis.core.runtime.session.IsisSession;
import lombok.SneakyThrows;
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/ExceptionRecognizerTranslate.java b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/ExceptionRecognizerTranslate.java
index e2aa4ee..ca0cab8 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/ExceptionRecognizerTranslate.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/ExceptionRecognizerTranslate.java
@@ -24,7 +24,7 @@ import org.junit.runners.model.Statement;
import org.apache.isis.applib.services.exceprecog.ExceptionRecognizer;
import org.apache.isis.applib.services.registry.ServiceRegistry;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import lombok.RequiredArgsConstructor;
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisIntegrationTestAbstract.java b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisIntegrationTestAbstract.java
index 4e51396..3824dbc 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisIntegrationTestAbstract.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/isis/testing/integtestsupport/applib/IsisIntegrationTestAbstract.java
@@ -35,7 +35,7 @@ import org.apache.isis.applib.services.sessmgmt.SessionManagementService;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.runtime.persistence.transaction.events.TransactionAfterBeginEvent;
+import org.apache.isis.core.runtime.persistence.transaction.events.TransactionAfterBeginEvent;
/**
* Convenient base class to extend for integration tests.
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/services/SseServiceDefault.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/services/SseServiceDefault.java
index c196f8e..eede37a 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/services/SseServiceDefault.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/services/SseServiceDefault.java
@@ -45,8 +45,8 @@ import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.valuetypes.sse.applib.service.SseChannel;
import org.apache.isis.valuetypes.sse.applib.service.SseService;
import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
-import org.apache.isis.runtime.persistence.transaction.IsisTransactionAspectSupport;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.persistence.transaction.IsisTransactionAspectSupport;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java
index 2ed2bb3..51b0874 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java
@@ -3,7 +3,7 @@ package org.apache.isis.viewer.restfulobjects.rendering;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.runtime.IsisModuleRuntime;
+import org.apache.isis.core.runtime.IsisModuleRuntime;
import org.apache.isis.viewer.restfulobjects.applib.IsisModuleRestfulObjectsApplib;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.JsonValueEncoder;
import org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationServiceContentNegotiator;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext.java
index 4901b65..f779c48 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext.java
@@ -38,7 +38,7 @@ import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.runtime.context.session.RuntimeContextBase;
+import org.apache.isis.core.runtime.context.session.RuntimeContextBase;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulRequest.DomainModel;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
index 983bafd..acd9b08 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/ResourceAbstract.java
@@ -39,8 +39,8 @@ import org.apache.isis.core.metamodel.consent.InteractionInitiatedBy;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.context.IsisContext;
-import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
import org.apache.isis.viewer.restfulobjects.applib.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplicationException;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java
index 9e0d3d4..edf02f2 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/SwaggerSpecResource.java
@@ -34,7 +34,7 @@ import javax.ws.rs.core.MediaType;
import org.springframework.stereotype.Component;
import org.apache.isis.applib.services.swagger.SwaggerService;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import lombok.RequiredArgsConstructor;
import lombok.val;
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
index d0575e4..90601c0 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/webmodule/IsisRestfulObjectsSessionFilter.java
@@ -29,7 +29,6 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import javax.inject.Inject;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -47,7 +46,7 @@ import org.apache.isis.core.commons.internal.factory.InstanceUtil;
import org.apache.isis.core.metamodel.commons.StringExtensions;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationSessionStrategy;
import org.apache.isis.viewer.restfulobjects.viewer.webmodule.auth.AuthenticationSessionStrategyDefault;
import org.apache.isis.webapp.modules.templresources.TemplateResourceCachingFilter;
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index d0667cc..e7dc74f 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
@@ -42,9 +42,9 @@ import org.apache.isis.core.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
-import org.apache.isis.runtime.session.IsisSession;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
diff --git a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
index 4a1dd3f..f647b22 100644
--- a/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
+++ b/viewers/restfulobjects/viewer/src/test/java/org/apache/isis/viewer/restfulobjects/viewer/context/ResourceContext_getArg_Test.java
@@ -40,9 +40,9 @@ import org.apache.isis.core.commons.internal.url.UrlDecoderUtil;
import org.apache.isis.core.metamodel.MetaModelContext_forTesting;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.persistence.session.PersistenceSession;
-import org.apache.isis.runtime.session.IsisSession;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.persistence.session.PersistenceSession;
+import org.apache.isis.core.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.unittestsupport.config.IsisConfigurationLegacy;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
index bfef163..223537c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/PrototypingMessageProvider.java
@@ -22,7 +22,7 @@ import java.util.Locale;
import org.apache.isis.core.commons.internal.base._Timing;
import org.apache.isis.core.commons.internal.base._Timing.StopWatch;
-import org.apache.isis.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.context.IsisContext;
/**
* Responsibility: produce additional info when in prototyping mode
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
index 355d72a..eaa2c2f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
@@ -43,7 +43,7 @@ import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.typicallen.TypicalLengthFacet;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
index 213d598..054824c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
@@ -47,7 +47,7 @@ import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.NamedWithMimeType;
import org.apache.isis.core.metamodel.commons.CloseableExtensions;
import org.apache.isis.core.metamodel.spec.ManagedObject;
-import org.apache.isis.runtime.persistence.adapter.PojoAdapter;
+import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract2;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
index e5ec4bb..99cb443 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
@@ -31,7 +31,7 @@ import org.apache.wicket.model.Model;
import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.core.metamodel.facets.objectvalue.labelat.LabelAtFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
-import org.apache.isis.runtime.persistence.adapter.PojoAdapter;
+import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract2;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
index ce1659d..d1feac7 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/breadcrumbs/BreadcrumbPanel.java
@@ -35,7 +35,7 @@ import org.wicketstuff.select2.Settings;
import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
-import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
index 6d94010..12394ee 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/ThemeChooser.java
@@ -32,7 +32,7 @@ import org.apache.wicket.util.cookies.CookieUtils;
import org.apache.wicket.util.string.Strings;
import org.apache.isis.core.config.IsisConfiguration;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import lombok.Getter;
import lombok.val;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
index d11baac..16c093e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/WebPageBase.java
@@ -23,7 +23,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
index 0d485ac..97a7200 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/EmailAvailableValidator.java
@@ -22,7 +22,7 @@ import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.ValidationError;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.ui.validation.ValidatorBase;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
index eafcd9e..9040699 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/UsernameAvailableValidator.java
@@ -22,7 +22,7 @@ import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.ValidationError;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.ui.validation.ValidatorBase;
import org.apache.isis.webapp.context.IsisWebAppCommonContext;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
index e850300..9cdbe0e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/accmngt/register/RegisterPanel.java
@@ -37,7 +37,7 @@ import org.apache.wicket.model.ResourceModel;
import org.apache.isis.applib.services.userreg.UserDetails;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
import org.apache.isis.applib.services.xactn.TransactionService;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.pages.accmngt.AccountConfirmationMap;
import org.apache.isis.viewer.wicket.ui.pages.accmngt.UsernameAvailableValidator;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
index 4dd6e16..a8e3f54 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/home/HomePage.java
@@ -23,7 +23,7 @@ import org.apache.wicket.authroles.authorization.strategies.role.annotations.Aut
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.isis.applib.services.message.MessageService;
-import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSession;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
index 42541fe..258bac2 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
@@ -32,7 +32,7 @@ import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.userreg.EmailNotificationService;
import org.apache.isis.applib.services.userreg.UserRegistrationService;
import org.apache.isis.core.commons.collections.Can;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.model.models.PageType;
import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
index 1a8f9f3..f63422b 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorDefault.java
@@ -48,8 +48,8 @@ import org.apache.isis.core.metamodel.facets.actions.redirect.RedirectFacet;
import org.apache.isis.core.metamodel.facets.properties.renderunchanged.UnchangingFacet;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.session.IsisRequestCycle;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisRequestCycle;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.api.authentication.MessageBroker;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
index 4c1a3fe..995c50a 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PanelBase.java
@@ -30,7 +30,7 @@ import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.applib.services.userreg.EmailNotificationService;
import org.apache.isis.core.config.viewer.wicket.WebAppConfiguration;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.MessageBroker;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.viewer.wicket.model.hints.UiHintContainer;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
index be11165..60a8662 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis.java
@@ -30,7 +30,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.isis.applib.clock.Clock;
import org.apache.isis.applib.services.session.SessionLoggingService;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationRequest;
import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
import org.apache.isis.security.api.authentication.AuthenticationSession;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/LocalizerForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/LocalizerForIsis.java
index 3bd9c1c..6c0cfc2 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/LocalizerForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/LocalizerForIsis.java
@@ -34,8 +34,8 @@ import org.apache.wicket.model.IModel;
import org.apache.isis.applib.services.i18n.TranslationService;
import org.apache.isis.core.commons.internal.base._Strings;
-import org.apache.isis.runtime.session.IsisSession;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.viewer.wicket.viewer.wicketapp.IsisWicketApplication;
/**
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
index 60f60fa..816edf4 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/WebRequestCycleForIsis.java
@@ -52,10 +52,10 @@ import org.apache.isis.core.commons.internal.collections._Lists;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.core.metamodel.specloader.validator.MetaModelInvalidException;
-import org.apache.isis.runtime.context.IsisContext;
-import org.apache.isis.runtime.session.IsisRequestCycle;
-import org.apache.isis.runtime.session.IsisSession;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.context.IsisContext;
+import org.apache.isis.core.runtime.session.IsisRequestCycle;
+import org.apache.isis.core.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSession;
import org.apache.isis.security.api.authentication.MessageBroker;
import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java
index fd94e09..5f22e6d 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectUnmarshaller.java
@@ -29,8 +29,8 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.runtime.persistence.adapter.PojoAdapter;
-import org.apache.isis.runtime.session.IsisSession;
+import org.apache.isis.core.runtime.persistence.adapter.PojoAdapter;
+import org.apache.isis.core.runtime.session.IsisSession;
import static org.apache.isis.core.commons.internal.functions._Predicates.not;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
index 52df0fd..c46b029 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_Authenticate.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationRequest;
import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
index d808615..8925bee 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_SignIn.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.assertThat;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationRequest;
import org.apache.isis.security.api.authentication.AuthenticationRequestPassword;
import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
diff --git a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
index 54de880..4b68189 100644
--- a/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
+++ b/viewers/wicket/viewer/src/test/java/org/apache/isis/viewer/wicket/viewer/integration/AuthenticatedWebSessionForIsis_TestAbstract.java
@@ -29,7 +29,7 @@ import org.junit.Rule;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.applib.services.session.SessionLoggingService;
-import org.apache.isis.runtime.session.IsisSessionFactory;
+import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.manager.AuthenticationManager;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2;
import org.apache.isis.unittestsupport.jmocking.JUnitRuleMockery2.Mode;
[isis] 13/14: ISIS-2259: some further unit tests being fixed.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f6ec8f9cc0b9aeba9f3c4b9009218369ba13be19
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 18:05:48 2020 +0000
ISIS-2259: some further unit tests being fixed.
---
.../isis/core/config/presets/IsisPresets.java | 28 +++++++++++-----------
.../demo/src/main/java/demoapp/utils/DemoStub.java | 2 +-
.../demoapp/utils/LibraryPreloadingService.java | 4 ++--
examples/smoketests/pom.xml | 6 +++++
4 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/core/config/presets/IsisPresets.java b/core/config/src/main/java/org/apache/isis/core/config/presets/IsisPresets.java
index 0221a90..ff8934a 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/presets/IsisPresets.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/presets/IsisPresets.java
@@ -26,33 +26,33 @@ package org.apache.isis.core.config.presets;
*/
public final class IsisPresets {
- public static final String NoTranslations = "classpath:/org/apache/isis/config/presets/NoTranslations.properties";
+ public static final String NoTranslations = "classpath:/org/apache/isis/core/config/presets/NoTranslations.properties";
- public static final String H2InMemory = "classpath:/org/apache/isis/config/presets/H2InMemory.properties";
+ public static final String H2InMemory = "classpath:/org/apache/isis/core/config/presets/H2InMemory.properties";
/** randomized (unique) database name, eg. to allow for concurrent testing */
- public static final String H2InMemory_withUniqueSchema = "classpath:/org/apache/isis/config/presets/H2InMemory_withUniqueSchema.properties";
+ public static final String H2InMemory_withUniqueSchema = "classpath:/org/apache/isis/core/config/presets/H2InMemory_withUniqueSchema.properties";
- public static final String HsqlDbInMemory = "classpath:/org/apache/isis/config/presets/HsqlDbInMemory.properties";
- public static final String DataNucleusAutoCreate = "classpath:/org/apache/isis/config/presets/DataNucleusAutoCreate.properties";
+ public static final String HsqlDbInMemory = "classpath:/org/apache/isis/core/config/presets/HsqlDbInMemory.properties";
+ public static final String DataNucleusAutoCreate = "classpath:/org/apache/isis/core/config/presets/DataNucleusAutoCreate.properties";
- public static final String DebugPersistence = "classpath:/org/apache/isis/config/presets/DebugPersistence.properties";
- public static final String DebugDiscovery = "classpath:/org/apache/isis/config/presets/DebugDiscovery.properties";
+ public static final String DebugPersistence = "classpath:/org/apache/isis/core/config/presets/DebugPersistence.properties";
+ public static final String DebugDiscovery = "classpath:/org/apache/isis/core/config/presets/DebugDiscovery.properties";
- public static final String DebugProgrammingModel = "classpath:/org/apache/isis/config/presets/DebugProgrammingModel.properties";
- public static final String SilenceProgrammingModel = "classpath:/org/apache/isis/config/presets/SilenceProgrammingModel.properties";
+ public static final String DebugProgrammingModel = "classpath:/org/apache/isis/core/config/presets/DebugProgrammingModel.properties";
+ public static final String SilenceProgrammingModel = "classpath:/org/apache/isis/core/config/presets/SilenceProgrammingModel.properties";
- public static final String DebugMetaModel = "classpath:/org/apache/isis/config/presets/DebugMetaModel.properties";
- public static final String SilenceMetaModel = "classpath:/org/apache/isis/config/presets/SilenceMetaModel.properties";
+ public static final String DebugMetaModel = "classpath:/org/apache/isis/core/config/presets/DebugMetaModel.properties";
+ public static final String SilenceMetaModel = "classpath:/org/apache/isis/core/config/presets/SilenceMetaModel.properties";
- public static final String SilenceWicket = "classpath:/org/apache/isis/config/presets/SilenceWicket.properties";
- public static final String UseLog4j2Test = "classpath:/org/apache/isis/config/presets/UseLog4j2Test.properties";
+ public static final String SilenceWicket = "classpath:/org/apache/isis/core/config/presets/SilenceWicket.properties";
+ public static final String UseLog4j2Test = "classpath:/org/apache/isis/core/config/presets/UseLog4j2Test.properties";
/**
* @deprecated seems no longer required anyway
*/
@Deprecated
- public static final String IsisIntegTest = "classpath:/org/apache/isis/config/presets/IsisIntegTest.properties";
+ public static final String IsisIntegTest = "classpath:/org/apache/isis/core/config/presets/IsisIntegTest.properties";
/**
* Use PROTOTYPING mode as the default. Does not override if the system-property
diff --git a/examples/demo/src/main/java/demoapp/utils/DemoStub.java b/examples/demo/src/main/java/demoapp/utils/DemoStub.java
index 2477957..7d536c9 100644
--- a/examples/demo/src/main/java/demoapp/utils/DemoStub.java
+++ b/examples/demo/src/main/java/demoapp/utils/DemoStub.java
@@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.extensions.asciidoc.applib.value.AsciiDoc;
+import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc;
import lombok.val;
diff --git a/examples/demo/src/main/java/demoapp/utils/LibraryPreloadingService.java b/examples/demo/src/main/java/demoapp/utils/LibraryPreloadingService.java
index 70df98e..3e7e8b3 100644
--- a/examples/demo/src/main/java/demoapp/utils/LibraryPreloadingService.java
+++ b/examples/demo/src/main/java/demoapp/utils/LibraryPreloadingService.java
@@ -25,7 +25,7 @@ import org.springframework.stereotype.Service;
import org.apache.isis.core.commons.internal.concurrent._ConcurrentContext;
import org.apache.isis.core.commons.internal.concurrent._ConcurrentTaskList;
-import org.apache.isis.extensions.asciidoc.applib.value.AsciiDoc;
+import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc;
import lombok.val;
@@ -36,7 +36,7 @@ public class LibraryPreloadingService {
@PostConstruct
public void preloadLibraries() {
val tasks = _ConcurrentTaskList.named("LibraryPreloading")
- .addRunnable("Preload JRuby for AsciiDoc", ()->AsciiDoc.valueOfAdoc("Dummy"));
+ .addRunnable("Preload JRuby for AsciiDoc", ()-> AsciiDoc.valueOfAdoc("Dummy"));
tasks.submit(_ConcurrentContext.forkJoin());
}
diff --git a/examples/smoketests/pom.xml b/examples/smoketests/pom.xml
index 31cd3c2..bc6fb0c 100644
--- a/examples/smoketests/pom.xml
+++ b/examples/smoketests/pom.xml
@@ -139,6 +139,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
[isis] 07/14: ISIS-2259: updates packages for core-webspringboot
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 95b84ba1b84de9f9ead9fa6d87b09e440ecfc9f5
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 15:55:44 2020 +0000
ISIS-2259: updates packages for core-webspringboot
---
core/pom.xml | 2 +-
.../core/webapp/{IsisModuleWebapp.java => IsisModuleCoreWebapp.java} | 2 +-
core/{webboot-springboot => webspringboot}/pom.xml | 0
core/{webboot-springboot => webspringboot}/src/main/doc/antora.yml | 0
.../src/main/doc/modules/webboot-springboot/nav.adoc | 0
.../src/main/doc/modules/webboot-springboot/pages/about.adoc | 0
.../src/main/doc/modules/webboot-springboot/partials/module-nav.adoc | 0
.../apache/isis/core/webspringboot/IsisModuleCoreWebSpringBoot.java} | 4 ++--
examples/demo/src/main/java/demoapp/webapp/DemoApp.java | 4 ++--
.../java/org/apache/isis/testdomain/conf/Configuration_headless.java | 4 ++--
.../java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java | 4 ++--
.../apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java | 4 ++--
.../org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java | 4 ++--
.../java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java | 4 ++--
.../isis/testing/h2console/ui/IsisModuleTestingH2ConsoleUi.java | 4 ++--
.../apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java | 4 ++--
.../viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java | 4 ++--
.../org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java | 4 ++--
18 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 77b57ed..0da70c9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1847,7 +1847,7 @@
<module>runtime</module>
<module>runtimeservices</module>
<module>webapp</module>
- <module>webboot-springboot</module>
+ <module>webspringboot</module>
<module>unittestsupport</module>
diff --git a/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleWebapp.java b/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleCoreWebapp.java
similarity index 97%
rename from core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleWebapp.java
rename to core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleCoreWebapp.java
index 19c3ff6..0d95e1d 100644
--- a/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleWebapp.java
+++ b/core/webapp/src/main/java/org/apache/isis/core/webapp/IsisModuleCoreWebapp.java
@@ -43,6 +43,6 @@ import org.apache.isis.core.webapp.webappctx.IsisWebAppContextInitializer;
IsisWebAppContextInitializer.class,
})
-public class IsisModuleWebapp {
+public class IsisModuleCoreWebapp {
}
diff --git a/core/webboot-springboot/pom.xml b/core/webspringboot/pom.xml
similarity index 100%
rename from core/webboot-springboot/pom.xml
rename to core/webspringboot/pom.xml
diff --git a/core/webboot-springboot/src/main/doc/antora.yml b/core/webspringboot/src/main/doc/antora.yml
similarity index 100%
rename from core/webboot-springboot/src/main/doc/antora.yml
rename to core/webspringboot/src/main/doc/antora.yml
diff --git a/core/webboot-springboot/src/main/doc/modules/webboot-springboot/nav.adoc b/core/webspringboot/src/main/doc/modules/webboot-springboot/nav.adoc
similarity index 100%
rename from core/webboot-springboot/src/main/doc/modules/webboot-springboot/nav.adoc
rename to core/webspringboot/src/main/doc/modules/webboot-springboot/nav.adoc
diff --git a/core/webboot-springboot/src/main/doc/modules/webboot-springboot/pages/about.adoc b/core/webspringboot/src/main/doc/modules/webboot-springboot/pages/about.adoc
similarity index 100%
rename from core/webboot-springboot/src/main/doc/modules/webboot-springboot/pages/about.adoc
rename to core/webspringboot/src/main/doc/modules/webboot-springboot/pages/about.adoc
diff --git a/core/webboot-springboot/src/main/doc/modules/webboot-springboot/partials/module-nav.adoc b/core/webspringboot/src/main/doc/modules/webboot-springboot/partials/module-nav.adoc
similarity index 100%
rename from core/webboot-springboot/src/main/doc/modules/webboot-springboot/partials/module-nav.adoc
rename to core/webspringboot/src/main/doc/modules/webboot-springboot/partials/module-nav.adoc
diff --git a/core/webboot-springboot/src/main/java/org/apache/isis/webboot/springboot/IsisModuleSpringBoot.java b/core/webspringboot/src/main/java/org/apache/isis/core/webspringboot/IsisModuleCoreWebSpringBoot.java
similarity index 93%
rename from core/webboot-springboot/src/main/java/org/apache/isis/webboot/springboot/IsisModuleSpringBoot.java
rename to core/webspringboot/src/main/java/org/apache/isis/core/webspringboot/IsisModuleCoreWebSpringBoot.java
index c4a9e41..939a349 100644
--- a/core/webboot-springboot/src/main/java/org/apache/isis/webboot/springboot/IsisModuleSpringBoot.java
+++ b/core/webspringboot/src/main/java/org/apache/isis/core/webspringboot/IsisModuleCoreWebSpringBoot.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.webboot.springboot;
+package org.apache.isis.core.webspringboot;
import javax.inject.Singleton;
@@ -36,7 +36,7 @@ import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
// modules
IsisModuleCoreRuntimeServices.class,
})
-public class IsisModuleSpringBoot implements ApplicationContextAware {
+public class IsisModuleCoreWebSpringBoot implements ApplicationContextAware {
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
diff --git a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
index 8130b27..aadac64 100644
--- a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
+++ b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
@@ -47,7 +47,7 @@ import org.apache.isis.valuetypes.asciidoc.ui.IsisModuleValAsciidocUi;
import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleRestfulObjectsJaxrsResteasy4;
import org.apache.isis.viewer.restfulobjects.viewer.IsisModuleRestfulObjectsViewer;
import org.apache.isis.viewer.wicket.viewer.IsisModuleWicketViewer;
-import org.apache.isis.webboot.springboot.IsisModuleSpringBoot;
+import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
import demoapp.dom.DemoModule;
import demoapp.utils.LibraryPreloadingService;
@@ -83,7 +83,7 @@ public class DemoApp extends SpringBootServletInitializer {
@PropertySource(IsisPresets.DataNucleusAutoCreate),
})
@Import({
- IsisModuleSpringBoot.class,
+ IsisModuleCoreWebSpringBoot.class,
IsisModuleSecurityShiro.class,
IsisModuleJdoDataNucleus5.class,
IsisModuleWicketViewer.class,
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
index 11d1cb0..218e563 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_headless.java
@@ -39,11 +39,11 @@ import org.apache.isis.applib.services.xactn.TransactionState;
import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.incubator.model.metamodel.IsisModuleIncModelMetaModel;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
-import org.apache.isis.webboot.springboot.IsisModuleSpringBoot;
+import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
@Configuration
@Import({
- IsisModuleSpringBoot.class,
+ IsisModuleCoreWebSpringBoot.class,
IsisModuleSecurityBypass.class,
IsisModuleIncModelMetaModel.class // @Model support
})
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
index 81a0773..95df259 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdo.java
@@ -29,11 +29,11 @@ import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
import org.apache.isis.security.bypass.IsisModuleSecurityBypass;
import org.apache.isis.testdomain.jdo.JdoTestDomainModule;
-import org.apache.isis.webboot.springboot.IsisModuleSpringBoot;
+import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
@Configuration
@Import({
- IsisModuleSpringBoot.class,
+ IsisModuleCoreWebSpringBoot.class,
IsisModuleSecurityBypass.class,
IsisModuleJdoDataNucleus5.class,
IsisModuleTstFixturesApplib.class
diff --git a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
index 075336e..9b7ade7 100644
--- a/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
+++ b/examples/smoketests/src/main/java/org/apache/isis/testdomain/conf/Configuration_usingJdoAndShiro.java
@@ -35,11 +35,11 @@ import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationSer
import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
import org.apache.isis.testdomain.jdo.JdoTestDomainModule;
-import org.apache.isis.webboot.springboot.IsisModuleSpringBoot;
+import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
@Configuration
@Import({
- IsisModuleSpringBoot.class,
+ IsisModuleCoreWebSpringBoot.class,
IsisModuleSecurityShiro.class,
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
index ad4455a..a1710cb 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
@@ -25,7 +25,7 @@ import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.security.keycloak.authentication.AuthenticatorKeycloak;
import org.apache.isis.security.keycloak.authorization.AuthorizorKeycloak;
import org.apache.isis.security.keycloak.webmodule.WebModuleKeycloak;
-import org.apache.isis.core.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleCoreWebapp;
/**
* Configuration Bean to support Isis Security using Shiro.
@@ -36,7 +36,7 @@ import org.apache.isis.core.webapp.IsisModuleWebapp;
@Import({
// modules
IsisModuleCoreRuntimeServices.class,
- IsisModuleWebapp.class,
+ IsisModuleCoreWebapp.class,
// @Service's
AuthenticatorKeycloak.class,
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
index 6057631..b109c0e 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
@@ -25,7 +25,7 @@ import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.security.shiro.authentication.AuthenticatorShiro;
import org.apache.isis.security.shiro.authorization.AuthorizorShiro;
import org.apache.isis.security.shiro.webmodule.WebModuleShiro;
-import org.apache.isis.core.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleCoreWebapp;
/**
* Configuration Bean to support Isis Security using Shiro.
@@ -36,7 +36,7 @@ import org.apache.isis.core.webapp.IsisModuleWebapp;
@Import({
// modules
IsisModuleCoreRuntimeServices.class,
- IsisModuleWebapp.class,
+ IsisModuleCoreWebapp.class,
// @Service's
AuthenticatorShiro.class,
diff --git a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/IsisModuleTestingH2ConsoleUi.java b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/IsisModuleTestingH2ConsoleUi.java
index 56e4272..bfe311e 100644
--- a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/IsisModuleTestingH2ConsoleUi.java
+++ b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/IsisModuleTestingH2ConsoleUi.java
@@ -22,11 +22,11 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.core.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleCoreWebapp;
@Configuration
@Import({
- IsisModuleWebapp.class
+ IsisModuleCoreWebapp.class
})
@ComponentScan
public class IsisModuleTestingH2ConsoleUi {
diff --git a/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java b/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java
index 70be418..5a6471e 100644
--- a/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java
+++ b/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/IsisModuleExtHsqldbMgr.java
@@ -22,11 +22,11 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.core.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleCoreWebapp;
@Configuration
@Import({
- IsisModuleWebapp.class
+ IsisModuleCoreWebapp.class
})
@ComponentScan
public class IsisModuleExtHsqldbMgr {
diff --git a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java
index f8a5ae6..a7cef34 100644
--- a/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java
+++ b/viewers/restfulobjects/viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/IsisModuleRestfulObjectsViewer.java
@@ -36,7 +36,7 @@ import org.apache.isis.viewer.restfulobjects.viewer.resources.MenuBarsResourceSe
import org.apache.isis.viewer.restfulobjects.viewer.resources.SwaggerSpecResource;
import org.apache.isis.viewer.restfulobjects.viewer.resources.UserResourceServerside;
import org.apache.isis.viewer.restfulobjects.viewer.resources.VersionResourceServerside;
-import org.apache.isis.core.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleCoreWebapp;
/**
*
@@ -45,7 +45,7 @@ import org.apache.isis.core.webapp.IsisModuleWebapp;
@Configuration
@Import({
// modules
- IsisModuleWebapp.class,
+ IsisModuleCoreWebapp.class,
IsisModuleRestfulObjectsRendering.class,
// @Component's
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java
index 05683d0..85ce320 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/IsisModuleWicketModel.java
@@ -3,12 +3,12 @@ package org.apache.isis.viewer.wicket.model;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.core.webapp.IsisModuleWebapp;
+import org.apache.isis.core.webapp.IsisModuleCoreWebapp;
@Configuration
@Import({
// modules
- IsisModuleWebapp.class,
+ IsisModuleCoreWebapp.class,
})
public class IsisModuleWicketModel {
}