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 12:56:46 UTC
[isis] branch ISIS-2259 updated (c1c20d9 -> f0f62d5)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git.
from c1c20d9 ISIS-2259: reorg fixtures testing module.
new 86f80a7 ISIS-2259: removes some deprecated classes from base subdomain module's tests.
new 191f3f2 ISIS-2259: reorg specsupport module
new 5206d9c ISIS-2259: reorg unittestsupport module
new 270cb13 ISIS-2259; reorg asciidoctor modules
new 4ea1289 ISIS-2259: reorg markdown module
new aeef432 ISIS-2259: reorg sse module
add c4a6c14 ISIS-2158: removes static reference to WebModuleContext
add 437eea4 ISIS-2158: fixes cors build, fixes java doc, cleans up config's pom
new b89cf95 Merge remote-tracking branch 'origin/master' into ide
new 97092b9 ISIS-2259: fixes some compile issues
new b894414 ISIS-2259: renames isis-applib back to isis-core-applib
new 5c221e2 ISIS-2259: renames isis-codegen-bytebuddy to isis-core-codegen-bytebuddy
new 44b52d6 ISIS-2259: renames isis-commons to isis-core-commons
new bd70a9c ISIS-2259: renames isis-config to isis-core-config
new 861faaf ISIS-2259: renames isis-detached-tests to isis-core-detachedtests
new d192d56 ISIS-2259: renames isis-metamodel to isis-core-metamodel
new 87b6b5c ISIS-2259: renames isis-runtime to isis-core-runtime
new 16d6b5c ISIS-2259: moves runtime.services package to runtimeservices (to align packages with artifactId, avoid split packages).
new 44e526e ISIS-2259: renames isis-runtime-services to isis-core-runtimeservices
new 35ba537 ISIS-2259: renames isis-schema to isis-core-schema
new 2f4bbcc ISIS-2259: renames isis-webapp to isis-core-webapp
new f7ce11d ISIS-2259: renames isis-webboot-springboot to isis-core-webboot-springboot
new 2735499 ISIS-2259: renames core/runtime-services directory to core/runtimeservices
add 67c53cb ISIS-2158: fix WebModules getting discovered by CDI
add f3f291a ISIS-2158: fix WebModuleH2Console after previous commit broke it
new f0f62d5 Merge remote-tracking branch 'origin/master' into ide
The 22 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:
antora/playbooks/site-testing.yml | 2 +-
antora/playbooks/site.yml | 2 +-
core/applib/pom.xml | 6 +-
core/codegen-bytebuddy/pom.xml | 4 +-
core/commons/pom.xml | 2 +-
core/config/pom.xml | 26 ++----
core/detached-tests/pom.xml | 14 +--
.../proxy/ProxyCreatorTestUsingCodegenPlugin.java | 4 +-
core/metamodel/pom.xml | 8 +-
.../services/layout/LayoutServiceDefault.java | 2 +-
core/persistence/jdo/applib/pom.xml | 4 +-
core/persistence/jdo/datanucleus-5/pom.xml | 12 +--
.../WrapperFactoryDefault_wrappedObject_Test.java | 8 +-
...actoryDefault_wrappedObject_transient_Test.java | 4 +-
core/pom.xml | 38 ++++----
core/runtime/pom.xml | 8 +-
core/{runtime-services => runtimeservices}/pom.xml | 8 +-
.../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
.../src/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 | 2 +-
.../IsisModuleRuntimeServices.java | 54 +++++------
.../isis/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 +-
.../email/EmailServiceDefault.java | 2 +-
.../isis/runtimeservices}/error/EmailTicket.java | 2 +-
.../isis/runtimeservices}/error/SimpleTicket.java | 2 +-
.../eventbus/EventBusServiceSpring.java | 2 +-
.../factory/FactoryServiceDefault.java | 2 +-
.../homepage/HomePageResolverServiceDefault.java | 2 +-
.../isis/runtimeservices}/i18n/po/Block.java | 2 +-
.../runtimeservices}/i18n/po/ContextAndMsgId.java | 2 +-
.../isis/runtimeservices}/i18n/po/PoAbstract.java | 2 +-
.../isis/runtimeservices}/i18n/po/PoDisabled.java | 2 +-
.../isis/runtimeservices}/i18n/po/PoReader.java | 2 +-
.../isis/runtimeservices}/i18n/po/PoWriter.java | 2 +-
.../i18n/po/TranslationServicePo.java | 2 +-
.../i18n/po/TranslationServicePoMenu.java | 2 +-
.../apache/isis/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 | 12 +--
.../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 +-
core/schema/pom.xml | 4 +-
core/security/api/pom.xml | 4 +-
core/security/bypass/pom.xml | 2 +-
.../security/bypass/IsisModuleSecurityBypass.java | 2 +-
core/security/keycloak/pom.xml | 6 +-
.../keycloak/IsisModuleSecurityKeycloak.java | 2 +-
.../keycloak/webmodule/WebModuleKeycloak.java | 7 +-
core/security/shiro/pom.xml | 6 +-
.../security/shiro/IsisModuleSecurityShiro.java | 2 +-
.../security/shiro/webmodule/WebModuleShiro.java | 16 ++--
core/testsupport/integtestsupport/pom.xml | 8 +-
core/testsupport/unittestsupport/pom.xml | 4 +-
core/viewers/restfulobjects/applib/pom.xml | 4 +-
.../restfulobjects/jaxrs-resteasy-4/pom.xml | 2 +-
.../webmodule/WebModuleJaxrsResteasy4.java | 8 +-
core/viewers/restfulobjects/rendering/pom.xml | 2 +-
core/viewers/restfulobjects/viewer/pom.xml | 4 +-
core/viewers/wicket/model/pom.xml | 4 +-
core/viewers/wicket/ui/pom.xml | 2 +-
.../wicket/viewer/webmodule/WebModuleWicket.java | 8 +-
core/webapp/pom.xml | 6 +-
.../org/apache/isis/webapp/modules/WebModule.java | 24 ++---
.../isis/webapp/modules/WebModuleAbstract.java | 14 ++-
.../isis/webapp/modules/WebModuleContext.java | 50 +++-------
.../logonlog/WebModuleLogOnExceptionLogger.java | 9 +-
.../templresources/WebModuleTemplateResources.java | 7 +-
.../webappctx/IsisWebAppContextInitializer.java | 39 +++++---
core/webboot-springboot/pom.xml | 6 +-
.../webboot/springboot/IsisModuleSpringBoot.java | 2 +-
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 +-
.../demo/src/main/java/demoapp/webapp/DemoApp.java | 8 +-
.../SpringServiceInjectOrderTest.java | 2 +-
.../eventhandling/GenericEventPublishingTest.java | 2 +-
.../security/secman/encryption-jbcrypt/pom.xml | 2 +-
extensions/security/secman/model/pom.xml | 2 +-
extensions/security/secman/persistence-jdo/pom.xml | 2 +-
extensions/security/secman/pom.xml | 2 +-
extensions/security/secman/shiro-realm/pom.xml | 2 +-
extensions/vro/cors/impl/pom.xml | 4 +-
.../cors/impl/webmodule/WebModuleCors.java | 9 +-
extensions/vw/pdfjs/applib/pom.xml | 2 +-
extensions/vw/pdfjs/metamodel/pom.xml | 2 +-
incubator/extensions/core/microprofile/pom.xml | 2 +-
.../jee_support/IsisCDIBeanScanInterceptor.java | 2 +
incubator/extensions/core/model/pom.xml | 4 +-
legacy/extensions/core/applib/pom.xml | 4 +-
legacy/extensions/core/commons/pom.xml | 4 +-
legacy/extensions/core/metamodel/pom.xml | 6 +-
legacy/extensions/core/runtime/pom.xml | 4 +-
legacy/mappings/restclient/pom.xml | 2 +-
legacy/testing/mavenplugin/pom.xml | 6 +-
mappings/restclient/api/pom.xml | 4 +-
mavendeps/webapp/pom.xml | 6 +-
subdomains/base/applib/pom.xml | 4 +-
...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/docx/applib/pom.xml | 2 +-
subdomains/excel/applib/pom.xml | 4 +-
subdomains/excel/fixture/pom.xml | 2 +-
subdomains/freemarker/applib/pom.xml | 2 +-
subdomains/ognl/applib/pom.xml | 2 +-
subdomains/pdfbox/applib/pom.xml | 2 +-
subdomains/spring/applib/pom.xml | 4 +-
subdomains/xdocreport/applib/pom.xml | 2 +-
subdomains/zip/applib/pom.xml | 2 +-
testing/fakedata/applib/pom.xml | 2 +-
testing/fakedata/fixtures/pom.xml | 2 +-
testing/fixtures/applib/pom.xml | 2 +-
testing/h2console/ui/pom.xml | 2 +-
.../h2console/ui/webmodule/WebModuleH2Console.java | 7 +-
testing/hsqldbmgr/ui/pom.xml | 2 +-
testing/pom.xml | 9 +-
testing/specsupport/{ => applib}/pom.xml | 16 ++--
.../applib/IsisModuleTstSpecSupportAplib.java | 4 +
.../integration/ObjectFactoryForIntegration.java | 2 +-
.../isis/testing/specsupport/applib}/specs/V.java | 2 +-
testing/specsupport/pom.xml | 85 ++---------------
.../specsupport/IsisModuleExtSpecSupport.java | 4 -
testing/unittestsupport/{impl => applib}/pom.xml | 19 ++--
.../applib/IsisModuleTstUnitTestSupportApplib.java | 7 ++
.../applib}/bean/AbstractBeanPropertiesTest.java | 2 +-
.../bean/FixtureDatumFactoriesForAnyPojo.java | 2 +-
.../bean/FixtureDatumFactoriesForApplib.java | 2 +-
.../applib}/bean/FixtureDatumFactoriesForJoda.java | 2 +-
.../unittestsupport/applib}/bean/PojoTester.java | 2 +-
.../applib}/dom/assertions/Asserting.java | 2 +-
.../applib}/dom/matchers/IsisMatchers.java | 2 +-
.../dom/privatecons/PrivateConstructorTester.java | 2 +-
.../applib}/dom/reflect/ReflectUtils.java | 2 +-
.../applib}/dom/repo/FinderInteraction.java | 2 +-
.../unittestsupport/applib}/dom/valuetypes/VT.java | 2 +-
.../applib}/bean/PojoTesterTest_interference.java | 2 +-
.../dom/IsisModuleExtUnitTestSupport.java | 7 --
testing/unittestsupport/pom.xml | 24 +++++
.../{impl => }/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 | 0
.../spring => valuetypes/asciidoc}/applib/pom.xml | 20 ++--
.../applib/IsisModuleValAsciidocApplib.java} | 4 +-
.../asciidoc/applib/value/AsciiDoc.java | 5 +-
.../asciidoc/applib/value/Converter.java} | 4 +-
valuetypes/asciidoc/pom.xml | 102 +++------------------
valuetypes/asciidoc/{ => ui}/pom.xml | 23 +++--
.../asciidoc/ui/IsisModuleValAsciidocUi.java} | 10 +-
.../asciidoc/ui/components/AsciiDocComponent.java | 2 +-
.../AsciiDocPanelFactoriesForWicket.java | 2 +-
.../asciidoc}/ui/components/css/prism.css | 0
.../asciidoc}/ui/components/js/prism1.14.js | 0
.../impl => valuetypes/markdown/applib}/pom.xml | 25 +++--
.../applib/IsisModuleValMarkdownApplib.java | 7 ++
.../markdown/applib/value/Converter.java} | 4 +-
.../markdown/applib/value/Markdown.java | 5 +-
valuetypes/markdown/pom.xml | 48 +++-------
.../applib/IsisModuleExtMarkdownApplib.java | 7 --
valuetypes/markdown/{ => ui}/pom.xml | 22 +++--
.../markdown/ui/IsisModuleValMarkdownUi.java} | 10 +-
.../markdown/ui/components/MarkdownComponent.java | 2 +-
.../MarkdownPanelFactoriesForWicket.java | 4 +-
.../markdown}/ui/components/css/prism.css | 0
.../markdown}/ui/components/js/prism1.14.js | 0
valuetypes/pom.xml | 28 +++++-
valuetypes/sse/{ => applib}/pom.xml | 12 +--
.../sse/applib/IsisModuleValSseApplib.java} | 4 +-
.../sse/applib/annotations}/ServerSentEvents.java | 2 +-
.../sse/applib/annotations}/SseSource.java | 6 +-
.../extensions/sse/applib/service}/SseChannel.java | 4 +-
.../extensions/sse/applib/service}/SseService.java | 4 +-
.../sse/applib/value}/ListeningMarkup.java | 4 +-
.../applib => valuetypes/sse/metamodel}/pom.xml | 19 ++--
.../sse/metamodel/IsisModuleValSseMetaModel.java} | 17 ++--
.../facets/SseAnnotationFacetFactory.java | 19 +++-
.../sse/metamodel}/facets/SseObserveFacet.java | 4 +-
.../metamodel}/facets/SseObserveFacetAbstract.java | 4 +-
...eObserveFacetForServerSentEventsAnnotation.java | 6 +-
valuetypes/sse/pom.xml | 41 +++------
.../isis/extensions/sse/SseMetaModelPlugin.java | 38 --------
valuetypes/sse/{ => ui}/pom.xml | 21 +++--
.../extensions/sse/ui/IsisModuleValSseUi.java} | 15 +--
.../sse/ui}/markup/ListeningMarkupComponent.java | 2 +-
.../markup/ListeningMarkupComponent_observing.java | 2 +-
.../ListeningMarkupPanelFactoriesForWicket.java | 4 +-
.../sse/ui}/markup/js/ObservingComponent.js | 0
.../sse/ui}/services/SseServiceDefault.java | 8 +-
.../sse/ui}/webmodule/ServerSentEventsServlet.java | 10 +-
.../ui}/webmodule/WebModuleServerSentEvents.java | 9 +-
272 files changed, 686 insertions(+), 1189 deletions(-)
rename core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/{runtime/services => runtimeservices}/wrapper/WrapperFactoryDefault_wrappedObject_Test.java (98%)
rename core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/{runtime/services => runtimeservices}/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java (98%)
rename core/{runtime-services => runtimeservices}/pom.xml (93%)
rename core/{runtime-services => runtimeservices}/src/main/doc/antora.yml (100%)
rename core/{runtime-services => runtimeservices}/src/main/doc/modules/runtime-services/images/ContentNegotiationService/accept-json.png (100%)
rename core/{runtime-services => runtimeservices}/src/main/doc/modules/runtime-services/images/ContentNegotiationService/accept-xml.png (100%)
rename core/{runtime-services => runtimeservices}/src/main/doc/modules/runtime-services/images/ContentNegotiationService/facade-choices.png (100%)
rename core/{runtime-services => runtimeservices}/src/main/doc/modules/runtime-services/images/ContentNegotiationService/facade-choices.pptx (100%)
rename core/{runtime-services => runtimeservices}/src/main/doc/modules/runtime-services/images/RepresentationService/service-collaborations.png (100%)
rename core/{runtime-services => runtimeservices}/src/main/doc/modules/runtime-services/images/RepresentationService/service-collaborations.pptx (100%)
rename core/{runtime-services => runtimeservices}/src/main/doc/modules/runtime-services/nav.adoc (100%)
rename core/{runtime-services => runtimeservices}/src/main/doc/modules/runtime-services/pages/about.adoc (100%)
rename core/{runtime-services => runtimeservices}/src/main/doc/modules/runtime-services/pages/application-layer.adoc (100%)
rename core/{runtime-services => runtimeservices}/src/main/doc/modules/runtime-services/pages/application-layer/AuthenticationSessionProvider.adoc (100%)
rename core/{runtime-services => runtimeservices}/src/main/doc/modules/runtime-services/pages/application-layer/CommandDtoServiceInternal.adoc (100%)
rename core/{runtime-services => runtimeservices}/src/main/doc/modules/runtime-services/pages/application-layer/InteractionDtoServiceInternal.adoc (100%)
rename core/{runtime-services => runtimeservices}/src/main/doc/modules/runtime-services/pages/persistence-layer.adoc (100%)
rename core/{runtime-services => runtimeservices}/src/main/doc/modules/runtime-services/pages/persistence-layer/AuditingServiceInternal.adoc (100%)
rename core/{runtime-services => runtimeservices}/src/main/doc/modules/runtime-services/pages/persistence-layer/ChangedObjectsServiceInternal.adoc (100%)
rename core/{runtime-services => runtimeservices}/src/main/doc/modules/runtime-services/pages/persistence-layer/PersistenceSessionServiceInternal.adoc (100%)
rename core/{runtime-services => runtimeservices}/src/main/doc/modules/runtime-services/pages/persistence-layer/PublishingServiceInternal.adoc (100%)
rename core/{runtime-services => runtimeservices}/src/main/doc/modules/runtime-services/pages/presentation-layer.adoc (100%)
rename core/{runtime-services => runtimeservices}/src/main/doc/modules/runtime-services/pages/presentation-layer/ContentNegotiationService.adoc (100%)
rename core/{runtime-services => runtimeservices}/src/main/doc/modules/runtime-services/pages/presentation-layer/RepresentationService.adoc (100%)
rename core/{runtime-services => runtimeservices}/src/main/doc/modules/runtime-services/partials/module-nav.adoc (100%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/InitialisationException.java (97%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/IsisModuleRuntimeServices.java (54%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/ServiceException.java (96%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/auth/AuthenticationSessionProviderDefault.java (98%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/background/BackgroundCommandExecution.java (97%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/background/CommandExecutionAbstract.java (97%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/bookmarks/BookmarkServiceInternalDefault.java (99%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/command/CommandDtoServiceInternalDefault.java (99%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/command/CommandExecutorServiceDefault.java (99%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/command/CommandServiceDefault.java (97%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/confmenu/ConfigurationViewServiceDefault.java (99%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/email/EmailServiceDefault.java (99%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/error/EmailTicket.java (98%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/error/SimpleTicket.java (98%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/eventbus/EventBusServiceSpring.java (97%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/factory/FactoryServiceDefault.java (99%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/homepage/HomePageResolverServiceDefault.java (99%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/i18n/po/Block.java (98%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/i18n/po/ContextAndMsgId.java (98%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/i18n/po/PoAbstract.java (96%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/i18n/po/PoDisabled.java (96%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/i18n/po/PoReader.java (99%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/i18n/po/PoWriter.java (99%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/i18n/po/TranslationServicePo.java (99%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/i18n/po/TranslationServicePoMenu.java (98%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/i18n/po/Util.java (95%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/ixn/InteractionDtoServiceInternalDefault.java (99%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/menubars/MenuBarsLoaderServiceDefault.java (98%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/menubars/bootstrap3/MenuBarsServiceBS3.java (99%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/menubars/bootstrap3/ServiceAndAction.java (96%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/message/MessageServiceDefault.java (98%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/publish/PublishedObjectsDefault.java (99%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/publish/PublisherDispatchServiceDefault.java (99%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/repository/RepositoryServiceDefault.java (99%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/routing/RoutingServiceDefault.java (97%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/sessmgmt/SessionManagementServiceDefault.java (97%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/sudo/SudoServiceDefault.java (98%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/userprof/UserProfileServiceDefault.java (97%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/userreg/EmailNotificationServiceDefault.java (99%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/userreg/EmailVerificationTemplate.html (100%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/userreg/PasswordResetTemplate.html (100%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/wrapper/AsyncWrapDefault.java (99%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/wrapper/WrapperFactoryDefault.java (96%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/wrapper/dispatchers/InteractionEventDispatcher.java (94%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java (95%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/wrapper/handlers/AbstractCollectionInvocationHandler.java (98%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/wrapper/handlers/CollectionInvocationHandler.java (97%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/wrapper/handlers/DelegatingInvocationHandler.java (94%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/wrapper/handlers/DelegatingInvocationHandlerDefault.java (98%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/wrapper/handlers/DomainObjectInvocationHandler.java (99%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/wrapper/handlers/MapInvocationHandler.java (97%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/wrapper/handlers/ProxyContextHandler.java (96%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/wrapper/internal/util/MethodPrefixFinder.java (98%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/wrapper/proxy/ProxyCreator.java (96%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/xactn/TransactionServiceSpring.java (99%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/xmlsnapshot/XmlSnapshotBuilder.java (98%)
rename core/{runtime-services/src/main/java/org/apache/isis/runtime/services => runtimeservices/src/main/java/org/apache/isis/runtimeservices}/xmlsnapshot/XmlSnapshotServiceDefault.java (98%)
rename core/{runtime-services/src/test/java/org/apache/isis/runtime/services => runtimeservices/src/test/java/org/apache/isis/runtimeservices}/ServiceInstantiatorTest.java (96%)
rename core/{runtime-services/src/test/java/org/apache/isis/runtime/services => runtimeservices/src/test/java/org/apache/isis/runtimeservices}/changes/PreAndPostValues_shouldAudit_Test.java (97%)
rename core/{runtime-services/src/test/java/org/apache/isis/runtime/services => runtimeservices/src/test/java/org/apache/isis/runtimeservices}/email/EmailServiceDefaultTest_actually.java (97%)
rename core/{runtime-services/src/test/java/org/apache/isis/runtime/services => runtimeservices/src/test/java/org/apache/isis/runtimeservices}/email/EmailServiceDefaultTest_notEmpty.java (96%)
rename core/{runtime-services/src/test/java/org/apache/isis/runtime/services => runtimeservices/src/test/java/org/apache/isis/runtimeservices}/i18n/po/PoReaderTest.java (99%)
rename core/{runtime-services/src/test/java/org/apache/isis/runtime/services => runtimeservices/src/test/java/org/apache/isis/runtimeservices}/i18n/po/PoWriterTest_escape.java (96%)
rename core/{runtime-services/src/test/java/org/apache/isis/runtime/services => runtimeservices/src/test/java/org/apache/isis/runtimeservices}/wrapper/WrapperFactoryDefaultTest.java (98%)
rename core/{runtime-services/src/test/java/org/apache/isis/runtime/services => runtimeservices/src/test/java/org/apache/isis/runtimeservices}/wrapper/dom/claims/Approver.java (93%)
rename core/{runtime-services/src/test/java/org/apache/isis/runtime/services => runtimeservices/src/test/java/org/apache/isis/runtimeservices}/wrapper/dom/claims/Claimant.java (93%)
rename core/{runtime-services/src/test/java/org/apache/isis/runtime/services => runtimeservices/src/test/java/org/apache/isis/runtimeservices}/wrapper/dom/employees/Employee.java (92%)
rename core/{runtime-services/src/test/java/org/apache/isis/runtime/services => runtimeservices/src/test/java/org/apache/isis/runtimeservices}/wrapper/dom/employees/EmployeeRepository.java (93%)
rename core/{runtime-services/src/test/java/org/apache/isis/runtime/services => runtimeservices/src/test/java/org/apache/isis/runtimeservices}/wrapper/dom/employees/EmployeeRepositoryImpl.java (94%)
delete mode 100644 subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
delete mode 100644 subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTester.java
delete mode 100644 subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
delete mode 100644 subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTester.java
delete mode 100644 subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java
delete mode 100644 subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTester.java
delete mode 100644 subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
delete mode 100644 subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTester.java
delete mode 100644 subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
delete mode 100644 subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTester.java
delete mode 100644 subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByCode.java
delete mode 100644 subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByDescription.java
delete mode 100644 subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByName.java
delete mode 100644 subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByReference.java
delete mode 100644 subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForWithStartDate.java
delete mode 100644 subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java
delete mode 100644 subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
copy testing/specsupport/{ => applib}/pom.xml (87%)
create mode 100644 testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/IsisModuleTstSpecSupportAplib.java
rename testing/specsupport/{src/main/java/org/apache/isis/extensions/specsupport => applib/src/main/java/org/apache/isis/testing/specsupport/applib}/integration/ObjectFactoryForIntegration.java (97%)
rename testing/specsupport/{src/main/java/org/apache/isis/extensions/specsupport => applib/src/main/java/org/apache/isis/testing/specsupport/applib}/specs/V.java (99%)
delete mode 100644 testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/IsisModuleExtSpecSupport.java
rename testing/unittestsupport/{impl => applib}/pom.xml (60%)
create mode 100644 testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/IsisModuleTstUnitTestSupportApplib.java
rename testing/unittestsupport/{impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom => applib/src/main/java/org/apache/isis/testing/unittestsupport/applib}/bean/AbstractBeanPropertiesTest.java (94%)
rename testing/unittestsupport/{impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom => applib/src/main/java/org/apache/isis/testing/unittestsupport/applib}/bean/FixtureDatumFactoriesForAnyPojo.java (91%)
rename testing/unittestsupport/{impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom => applib/src/main/java/org/apache/isis/testing/unittestsupport/applib}/bean/FixtureDatumFactoriesForApplib.java (92%)
rename testing/unittestsupport/{impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom => applib/src/main/java/org/apache/isis/testing/unittestsupport/applib}/bean/FixtureDatumFactoriesForJoda.java (94%)
rename testing/unittestsupport/{impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom => applib/src/main/java/org/apache/isis/testing/unittestsupport/applib}/bean/PojoTester.java (99%)
rename testing/unittestsupport/{impl/src/main/java/org/apache/isis/extensions/unittestsupport => applib/src/main/java/org/apache/isis/testing/unittestsupport/applib}/dom/assertions/Asserting.java (87%)
rename testing/unittestsupport/{impl/src/main/java/org/apache/isis/extensions/unittestsupport => applib/src/main/java/org/apache/isis/testing/unittestsupport/applib}/dom/matchers/IsisMatchers.java (99%)
rename testing/unittestsupport/{impl/src/main/java/org/apache/isis/extensions/unittestsupport => applib/src/main/java/org/apache/isis/testing/unittestsupport/applib}/dom/privatecons/PrivateConstructorTester.java (84%)
rename testing/unittestsupport/{impl/src/main/java/org/apache/isis/extensions/unittestsupport => applib/src/main/java/org/apache/isis/testing/unittestsupport/applib}/dom/reflect/ReflectUtils.java (92%)
rename testing/unittestsupport/{impl/src/main/java/org/apache/isis/extensions/unittestsupport => applib/src/main/java/org/apache/isis/testing/unittestsupport/applib}/dom/repo/FinderInteraction.java (94%)
rename testing/unittestsupport/{impl/src/main/java/org/apache/isis/extensions/unittestsupport => applib/src/main/java/org/apache/isis/testing/unittestsupport/applib}/dom/valuetypes/VT.java (98%)
rename testing/unittestsupport/{impl/src/test/java/org/apache/isis/extensions/unittestsupport/dom => applib/src/test/java/org/apache/isis/testing/unittestsupport/applib}/bean/PojoTesterTest_interference.java (96%)
delete mode 100644 testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/IsisModuleExtUnitTestSupport.java
create mode 100644 testing/unittestsupport/pom.xml
rename testing/unittestsupport/{impl => }/src/main/doc/antora.yml (100%)
rename testing/unittestsupport/{impl => }/src/main/doc/modules/unit-test-support-ext/nav.adoc (100%)
rename testing/unittestsupport/{impl => }/src/main/doc/modules/unit-test-support-ext/pages/about.adoc (100%)
rename testing/unittestsupport/{impl => }/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc (100%)
copy {subdomains/spring => valuetypes/asciidoc}/applib/pom.xml (68%)
rename valuetypes/asciidoc/{src/main/java/org/apache/isis/extensions/asciidoc/applib/IsisModuleExtAsciidocApplib.java => applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/IsisModuleValAsciidocApplib.java} (90%)
rename valuetypes/asciidoc/{src/main/java/org/apache/isis/extensions => applib/src/main/java/org/apache/isis/valuetypes}/asciidoc/applib/value/AsciiDoc.java (87%)
rename valuetypes/asciidoc/{src/main/java/org/apache/isis/extensions/asciidoc/ui/converter/AsciiDocConverter.java => applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/Converter.java} (96%)
copy valuetypes/asciidoc/{ => ui}/pom.xml (86%)
copy valuetypes/asciidoc/{src/main/java/org/apache/isis/extensions/asciidoc/ui/IsisModuleExtAsciidocUi.java => ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/IsisModuleValAsciidocUi.java} (81%)
rename valuetypes/asciidoc/{src/main/java/org/apache/isis/extensions => ui/src/main/java/org/apache/isis/valuetypes}/asciidoc/ui/components/AsciiDocComponent.java (97%)
rename valuetypes/asciidoc/{src/main/java/org/apache/isis/extensions => ui/src/main/java/org/apache/isis/valuetypes}/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java (97%)
rename valuetypes/{markdown/src/main/java/org/apache/isis/extensions/markdown => asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc}/ui/components/css/prism.css (100%)
rename valuetypes/{markdown/src/main/java/org/apache/isis/extensions/markdown => asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc}/ui/components/js/prism1.14.js (100%)
copy {extensions/vro/cors/impl => valuetypes/markdown/applib}/pom.xml (67%)
create mode 100644 valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/IsisModuleValMarkdownApplib.java
rename valuetypes/markdown/{src/main/java/org/apache/isis/extensions/markdown/ui/converter/MarkdownConverter.java => applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Converter.java} (96%)
rename valuetypes/markdown/{src/main/java/org/apache/isis/extensions => applib/src/main/java/org/apache/isis/valuetypes}/markdown/applib/value/Markdown.java (87%)
delete mode 100644 valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/IsisModuleExtMarkdownApplib.java
copy valuetypes/markdown/{ => ui}/pom.xml (78%)
rename valuetypes/markdown/{src/main/java/org/apache/isis/extensions/markdown/ui/IsisModuleExtMarkdownUi.java => ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/IsisModuleValMarkdownUi.java} (53%)
rename valuetypes/markdown/{src/main/java/org/apache/isis/extensions => ui/src/main/java/org/apache/isis/valuetypes}/markdown/ui/components/MarkdownComponent.java (97%)
rename valuetypes/markdown/{src/main/java/org/apache/isis/extensions => ui/src/main/java/org/apache/isis/valuetypes}/markdown/ui/components/MarkdownPanelFactoriesForWicket.java (95%)
rename valuetypes/{asciidoc/src/main/java/org/apache/isis/extensions/asciidoc => markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown}/ui/components/css/prism.css (100%)
rename valuetypes/{asciidoc/src/main/java/org/apache/isis/extensions/asciidoc => markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown}/ui/components/js/prism1.14.js (100%)
copy valuetypes/sse/{ => applib}/pom.xml (84%)
copy valuetypes/sse/{src/main/java/org/apache/isis/extensions/sse/IsisModuleExtSse.java => applib/src/main/java/org/apache/isis/extensions/sse/applib/IsisModuleValSseApplib.java} (94%)
rename valuetypes/sse/{src/main/java/org/apache/isis/extensions/sse/api => applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations}/ServerSentEvents.java (95%)
rename valuetypes/sse/{src/main/java/org/apache/isis/extensions/sse/api => applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations}/SseSource.java (89%)
rename valuetypes/sse/{src/main/java/org/apache/isis/extensions/sse/api => applib/src/main/java/org/apache/isis/extensions/sse/applib/service}/SseChannel.java (91%)
rename valuetypes/sse/{src/main/java/org/apache/isis/extensions/sse/api => applib/src/main/java/org/apache/isis/extensions/sse/applib/service}/SseService.java (90%)
rename valuetypes/sse/{src/main/java/org/apache/isis/extensions/sse/markup => applib/src/main/java/org/apache/isis/extensions/sse/applib/value}/ListeningMarkup.java (84%)
copy {subdomains/spring/applib => valuetypes/sse/metamodel}/pom.xml (69%)
rename valuetypes/{asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/IsisModuleExtAsciidocUi.java => sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/IsisModuleValSseMetaModel.java} (70%)
rename valuetypes/sse/{src/main/java/org/apache/isis/extensions/sse => metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel}/facets/SseAnnotationFacetFactory.java (72%)
rename valuetypes/sse/{src/main/java/org/apache/isis/extensions/sse => metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel}/facets/SseObserveFacet.java (91%)
rename valuetypes/sse/{src/main/java/org/apache/isis/extensions/sse => metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel}/facets/SseObserveFacetAbstract.java (93%)
rename valuetypes/sse/{src/main/java/org/apache/isis/extensions/sse => metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel}/facets/SseObserveFacetForServerSentEventsAnnotation.java (89%)
delete mode 100644 valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/SseMetaModelPlugin.java
copy valuetypes/sse/{ => ui}/pom.xml (76%)
rename valuetypes/sse/{src/main/java/org/apache/isis/extensions/sse/IsisModuleExtSse.java => ui/src/main/java/org/apache/isis/extensions/sse/ui/IsisModuleValSseUi.java} (72%)
rename valuetypes/sse/{src/main/java/org/apache/isis/extensions/sse => ui/src/main/java/org/apache/isis/extensions/sse/ui}/markup/ListeningMarkupComponent.java (97%)
rename valuetypes/sse/{src/main/java/org/apache/isis/extensions/sse => ui/src/main/java/org/apache/isis/extensions/sse/ui}/markup/ListeningMarkupComponent_observing.java (98%)
rename valuetypes/sse/{src/main/java/org/apache/isis/extensions/sse => ui/src/main/java/org/apache/isis/extensions/sse/ui}/markup/ListeningMarkupPanelFactoriesForWicket.java (96%)
rename valuetypes/sse/{src/main/java/org/apache/isis/extensions/sse => ui/src/main/java/org/apache/isis/extensions/sse/ui}/markup/js/ObservingComponent.js (100%)
rename valuetypes/sse/{src/main/java/org/apache/isis/extensions/sse => ui/src/main/java/org/apache/isis/extensions/sse/ui}/services/SseServiceDefault.java (97%)
rename valuetypes/sse/{src/main/java/org/apache/isis/extensions/sse => ui/src/main/java/org/apache/isis/extensions/sse/ui}/webmodule/ServerSentEventsServlet.java (93%)
rename valuetypes/sse/{src/main/java/org/apache/isis/extensions/sse => ui/src/main/java/org/apache/isis/extensions/sse/ui}/webmodule/WebModuleServerSentEvents.java (89%)
[isis] 03/22: ISIS-2259: reorg unittestsupport module
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 5206d9c32c7484c7fb0dc45e098f0b72beaec897
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 11:31:49 2020 +0000
ISIS-2259: reorg unittestsupport module
---
antora/playbooks/site-testing.yml | 2 +-
antora/playbooks/site.yml | 2 +-
testing/pom.xml | 5 +++--
testing/unittestsupport/{impl => applib}/pom.xml | 17 +++++----------
.../applib/IsisModuleTstUnitTestSupportApplib.java | 7 +++++++
.../applib}/bean/AbstractBeanPropertiesTest.java | 2 +-
.../bean/FixtureDatumFactoriesForAnyPojo.java | 2 +-
.../bean/FixtureDatumFactoriesForApplib.java | 2 +-
.../applib}/bean/FixtureDatumFactoriesForJoda.java | 2 +-
.../unittestsupport/applib}/bean/PojoTester.java | 2 +-
.../applib}/dom/assertions/Asserting.java | 2 +-
.../applib}/dom/matchers/IsisMatchers.java | 2 +-
.../dom/privatecons/PrivateConstructorTester.java | 2 +-
.../applib}/dom/reflect/ReflectUtils.java | 2 +-
.../applib}/dom/repo/FinderInteraction.java | 2 +-
.../unittestsupport/applib}/dom/valuetypes/VT.java | 2 +-
.../applib}/bean/PojoTesterTest_interference.java | 2 +-
.../dom/IsisModuleExtUnitTestSupport.java | 7 -------
testing/unittestsupport/pom.xml | 24 ++++++++++++++++++++++
.../{impl => }/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 | 0
23 files changed, 53 insertions(+), 35 deletions(-)
diff --git a/antora/playbooks/site-testing.yml b/antora/playbooks/site-testing.yml
index 44128c5..58015c9 100644
--- a/antora/playbooks/site-testing.yml
+++ b/antora/playbooks/site-testing.yml
@@ -40,7 +40,7 @@ content:
start_path: testing/specsupport/src/main/doc # testing
branches: HEAD
- url: .
- start_path: testing/unittestsupport/impl/src/main/doc # testing
+ start_path: testing/unittestsupport/src/main/doc # testing
branches: HEAD
diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml
index dc1e417..56328e2 100644
--- a/antora/playbooks/site.yml
+++ b/antora/playbooks/site.yml
@@ -235,7 +235,7 @@ content:
start_path: testing/specsupport/src/main/doc # testing
branches: HEAD
- url: .
- start_path: testing/unittestsupport/impl/src/main/doc # testing
+ start_path: testing/unittestsupport/src/main/doc # testing
branches: HEAD
# valuetypes
diff --git a/testing/pom.xml b/testing/pom.xml
index d99dd36..eab6c4e 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -109,7 +109,7 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-unittestsupport-dom</artifactId>
+ <artifactId>isis-testing-unittestsupport-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -123,7 +123,8 @@
<module>hsqldbmgr</module>
<module>specsupport</module>
- <module>unittestsupport/impl</module>
+ <module>unittestsupport</module>
+ <module>unittestsupport/applib</module>
</modules>
<profiles>
diff --git a/testing/unittestsupport/impl/pom.xml b/testing/unittestsupport/applib/pom.xml
similarity index 63%
rename from testing/unittestsupport/impl/pom.xml
rename to testing/unittestsupport/applib/pom.xml
index 2f1f0d1..efc73cf 100644
--- a/testing/unittestsupport/impl/pom.xml
+++ b/testing/unittestsupport/applib/pom.xml
@@ -4,23 +4,16 @@
<parent>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing</artifactId>
+ <artifactId>isis-testing-unittestsupport</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-testing-unittestsupport-dom</artifactId>
-
- <packaging>jar</packaging>
-
- <name>Apache Isis Testing - Unit Test Support</name>
- <description>
- A module providing test utilities for unit testing of domain modules
- </description>
+ <artifactId>isis-testing-unittestsupport-applib</artifactId>
+ <name>Apache Isis Testing - Unit Test Support (applib)</name>
<properties>
- <jar-plugin.automaticModuleName>org.incode.platform.lib.unittestsupport</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/incode/platform/lib/unittestsupport</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.testing.unittestsupport.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/testing/unittestsupport/applib</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/IsisModuleTstUnitTestSupportApplib.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/IsisModuleTstUnitTestSupportApplib.java
new file mode 100644
index 0000000..a5318f6
--- /dev/null
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/IsisModuleTstUnitTestSupportApplib.java
@@ -0,0 +1,7 @@
+package org.apache.isis.testing.unittestsupport.applib;
+
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class IsisModuleTstUnitTestSupportApplib {
+}
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/AbstractBeanPropertiesTest.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/AbstractBeanPropertiesTest.java
similarity index 94%
rename from testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/AbstractBeanPropertiesTest.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/AbstractBeanPropertiesTest.java
index d920178..fc5ff21 100644
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/AbstractBeanPropertiesTest.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/AbstractBeanPropertiesTest.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.bean;
+package org.apache.isis.testing.unittestsupport.applib.bean;
import org.jmock.auto.Mock;
import org.junit.Rule;
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForAnyPojo.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForAnyPojo.java
similarity index 91%
rename from testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForAnyPojo.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForAnyPojo.java
index 0b5ddc9..46b6e40 100644
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForAnyPojo.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForAnyPojo.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.bean;
+package org.apache.isis.testing.unittestsupport.applib.bean;
public class FixtureDatumFactoriesForAnyPojo {
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForApplib.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForApplib.java
similarity index 92%
rename from testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForApplib.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForApplib.java
index 7c6344b..f13f1bf 100644
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForApplib.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForApplib.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.bean;
+package org.apache.isis.testing.unittestsupport.applib.bean;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.applib.value.Clob;
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForJoda.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForJoda.java
similarity index 94%
rename from testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForJoda.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForJoda.java
index 4acd954..b29947b 100644
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/FixtureDatumFactoriesForJoda.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/FixtureDatumFactoriesForJoda.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.bean;
+package org.apache.isis.testing.unittestsupport.applib.bean;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTester.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/PojoTester.java
similarity index 99%
rename from testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTester.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/PojoTester.java
index 331d074..0adb0c3 100644
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTester.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/bean/PojoTester.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.bean;
+package org.apache.isis.testing.unittestsupport.applib.bean;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/assertions/Asserting.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/assertions/Asserting.java
similarity index 87%
rename from testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/assertions/Asserting.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/assertions/Asserting.java
index a23a968..7c2c3b2 100644
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/assertions/Asserting.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/assertions/Asserting.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.assertions;
+package org.apache.isis.testing.unittestsupport.applib.dom.assertions;
public final class Asserting {
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/matchers/IsisMatchers.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/matchers/IsisMatchers.java
similarity index 99%
rename from testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/matchers/IsisMatchers.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/matchers/IsisMatchers.java
index 32c7f7d..1e28c33 100644
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/matchers/IsisMatchers.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/matchers/IsisMatchers.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.matchers;
+package org.apache.isis.testing.unittestsupport.applib.dom.matchers;
import java.io.File;
import java.io.IOException;
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/privatecons/PrivateConstructorTester.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/privatecons/PrivateConstructorTester.java
similarity index 84%
rename from testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/privatecons/PrivateConstructorTester.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/privatecons/PrivateConstructorTester.java
index 3e8e57b..7ad0214 100644
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/privatecons/PrivateConstructorTester.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/privatecons/PrivateConstructorTester.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.privatecons;
+package org.apache.isis.testing.unittestsupport.applib.dom.privatecons;
import java.lang.reflect.Constructor;
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/reflect/ReflectUtils.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/reflect/ReflectUtils.java
similarity index 92%
rename from testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/reflect/ReflectUtils.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/reflect/ReflectUtils.java
index 10b770b..8954df2 100644
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/reflect/ReflectUtils.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/reflect/ReflectUtils.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.reflect;
+package org.apache.isis.testing.unittestsupport.applib.dom.reflect;
import java.lang.reflect.Field;
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/repo/FinderInteraction.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/repo/FinderInteraction.java
similarity index 94%
rename from testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/repo/FinderInteraction.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/repo/FinderInteraction.java
index 69c6b9c..5b9a96d 100644
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/repo/FinderInteraction.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/repo/FinderInteraction.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.repo;
+package org.apache.isis.testing.unittestsupport.applib.dom.repo;
import java.util.Map;
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/valuetypes/VT.java b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/valuetypes/VT.java
similarity index 98%
rename from testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/valuetypes/VT.java
rename to testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/valuetypes/VT.java
index 1cd577a..a454635 100644
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/valuetypes/VT.java
+++ b/testing/unittestsupport/applib/src/main/java/org/apache/isis/testing/unittestsupport/applib/dom/valuetypes/VT.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.valuetypes;
+package org.apache.isis.testing.unittestsupport.applib.dom.valuetypes;
//import org.incode.module.base.dom.valuetypes.AbstractInterval;
//import org.incode.module.base.dom.valuetypes.LocalDateInterval;
diff --git a/testing/unittestsupport/impl/src/test/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTesterTest_interference.java b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/bean/PojoTesterTest_interference.java
similarity index 96%
rename from testing/unittestsupport/impl/src/test/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTesterTest_interference.java
rename to testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/bean/PojoTesterTest_interference.java
index 693b57f..1e12fd2 100644
--- a/testing/unittestsupport/impl/src/test/java/org/apache/isis/extensions/unittestsupport/dom/bean/PojoTesterTest_interference.java
+++ b/testing/unittestsupport/applib/src/test/java/org/apache/isis/testing/unittestsupport/applib/bean/PojoTesterTest_interference.java
@@ -1,4 +1,4 @@
-package org.apache.isis.extensions.unittestsupport.dom.bean;
+package org.apache.isis.testing.unittestsupport.applib.bean;
import org.junit.Rule;
import org.junit.Test;
diff --git a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/IsisModuleExtUnitTestSupport.java b/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/IsisModuleExtUnitTestSupport.java
deleted file mode 100644
index fda6961..0000000
--- a/testing/unittestsupport/impl/src/main/java/org/apache/isis/extensions/unittestsupport/dom/IsisModuleExtUnitTestSupport.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.apache.isis.extensions.unittestsupport.dom;
-
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class IsisModuleExtUnitTestSupport {
-}
diff --git a/testing/unittestsupport/pom.xml b/testing/unittestsupport/pom.xml
new file mode 100644
index 0000000..2bf6209
--- /dev/null
+++ b/testing/unittestsupport/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.testing</groupId>
+ <artifactId>isis-testing</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>isis-testing-unittestsupport</artifactId>
+
+ <name>Apache Isis Testing - Unit Test Support (parent)</name>
+ <description>
+ A module providing test utilities for unit testing of domain modules
+ </description>
+
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>applib</module>
+ </modules>
+
+</project>
diff --git a/testing/unittestsupport/impl/src/main/doc/antora.yml b/testing/unittestsupport/src/main/doc/antora.yml
similarity index 100%
rename from testing/unittestsupport/impl/src/main/doc/antora.yml
rename to testing/unittestsupport/src/main/doc/antora.yml
diff --git a/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/nav.adoc b/testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/nav.adoc
similarity index 100%
rename from testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/nav.adoc
rename to testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/nav.adoc
diff --git a/testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/pages/about.adoc b/testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/pages/about.adoc
similarity index 100%
rename from testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/pages/about.adoc
rename to testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/pages/about.adoc
diff --git a/testing/unittestsupport/impl/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
similarity index 100%
rename from testing/unittestsupport/impl/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc
rename to testing/unittestsupport/src/main/doc/modules/unit-test-support-ext/partials/module-nav.adoc
[isis] 08/22: ISIS-2259: fixes some compile issues
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 97092b991ce21a44eba96409bd494a1ab7f1c908
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 12:26:48 2020 +0000
ISIS-2259: fixes some compile issues
---
.../org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java | 2 +-
examples/demo/src/main/java/demoapp/webapp/DemoApp.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java
index 817080f..f4aa4c7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/services/layout/LayoutServiceDefault.java
@@ -38,7 +38,7 @@ import org.apache.isis.applib.services.grid.GridService;
import org.apache.isis.applib.services.jaxb.JaxbService;
import org.apache.isis.applib.services.layout.LayoutService;
import org.apache.isis.applib.services.menu.MenuBarsService;
-import org.apache.isis.commons.compression.ZipWriter;
+import org.apache.isis.applib.util.ZipWriter;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.metamodel.facets.object.grid.GridFacet;
diff --git a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
index 788c777..af7e674 100644
--- a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
+++ b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
@@ -31,7 +31,6 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.context.annotation.PropertySources;
import org.apache.isis.config.presets.IsisPresets;
-import org.apache.isis.extensions.asciidoc.ui.IsisModuleExtAsciidocUi;
import org.apache.isis.testing.fixtures.applib.IsisModuleTstFixturesApplib;
import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
@@ -44,6 +43,7 @@ import org.apache.isis.extensions.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;
+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;
[isis] 15/22: ISIS-2259: renames isis-runtime to 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 ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 87b6b5ccae7d8c624bbaf44c6653651d607eb4fa
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 12:38:47 2020 +0000
ISIS-2259: renames isis-runtime to isis-core-runtime
---
core/persistence/jdo/datanucleus-5/pom.xml | 4 ++--
core/pom.xml | 4 ++--
core/runtime-services/pom.xml | 4 ++--
core/runtime/pom.xml | 2 +-
core/security/keycloak/pom.xml | 2 +-
core/security/shiro/pom.xml | 2 +-
core/testsupport/integtestsupport/pom.xml | 2 +-
core/viewers/restfulobjects/rendering/pom.xml | 2 +-
core/webapp/pom.xml | 4 ++--
core/webboot-springboot/pom.xml | 2 +-
extensions/security/secman/encryption-jbcrypt/pom.xml | 2 +-
extensions/security/secman/model/pom.xml | 2 +-
extensions/security/secman/persistence-jdo/pom.xml | 2 +-
extensions/security/secman/shiro-realm/pom.xml | 2 +-
legacy/extensions/core/applib/pom.xml | 2 +-
legacy/extensions/core/commons/pom.xml | 2 +-
legacy/extensions/core/runtime/pom.xml | 2 +-
legacy/testing/mavenplugin/pom.xml | 2 +-
subdomains/excel/applib/pom.xml | 2 +-
subdomains/spring/applib/pom.xml | 2 +-
testing/fixtures/applib/pom.xml | 2 +-
testing/specsupport/applib/pom.xml | 2 +-
22 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/core/persistence/jdo/datanucleus-5/pom.xml b/core/persistence/jdo/datanucleus-5/pom.xml
index afed851..335875a 100644
--- a/core/persistence/jdo/datanucleus-5/pom.xml
+++ b/core/persistence/jdo/datanucleus-5/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
</dependency>
<dependency>
@@ -112,7 +112,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/core/pom.xml b/core/pom.xml
index fd938f0..5c0e710 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -762,12 +762,12 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/core/runtime-services/pom.xml b/core/runtime-services/pom.xml
index 2122685..f864e95 100644
--- a/core/runtime-services/pom.xml
+++ b/core/runtime-services/pom.xml
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 92a123a..23f9ad4 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -26,7 +26,7 @@
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
<name>Apache Isis Core - Runtime</name>
<properties>
diff --git a/core/security/keycloak/pom.xml b/core/security/keycloak/pom.xml
index 0bd61fe..2645fd8 100644
--- a/core/security/keycloak/pom.xml
+++ b/core/security/keycloak/pom.xml
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/core/security/shiro/pom.xml b/core/security/shiro/pom.xml
index f86d94b..35cc18a 100644
--- a/core/security/shiro/pom.xml
+++ b/core/security/shiro/pom.xml
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/core/testsupport/integtestsupport/pom.xml b/core/testsupport/integtestsupport/pom.xml
index 9638168..93ed072 100644
--- a/core/testsupport/integtestsupport/pom.xml
+++ b/core/testsupport/integtestsupport/pom.xml
@@ -148,7 +148,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
</dependency>
<dependency>
diff --git a/core/viewers/restfulobjects/rendering/pom.xml b/core/viewers/restfulobjects/rendering/pom.xml
index 24ec5f1..afa91a2 100644
--- a/core/viewers/restfulobjects/rendering/pom.xml
+++ b/core/viewers/restfulobjects/rendering/pom.xml
@@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/core/webapp/pom.xml b/core/webapp/pom.xml
index 23aea59..20537cc 100644
--- a/core/webapp/pom.xml
+++ b/core/webapp/pom.xml
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
</dependency>
<dependency>
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/core/webboot-springboot/pom.xml b/core/webboot-springboot/pom.xml
index 52ebaa7..2feea78 100644
--- a/core/webboot-springboot/pom.xml
+++ b/core/webboot-springboot/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/extensions/security/secman/encryption-jbcrypt/pom.xml b/extensions/security/secman/encryption-jbcrypt/pom.xml
index 76bdd86..4c6cca4 100644
--- a/extensions/security/secman/encryption-jbcrypt/pom.xml
+++ b/extensions/security/secman/encryption-jbcrypt/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/extensions/security/secman/model/pom.xml b/extensions/security/secman/model/pom.xml
index ef20120..a49b163 100644
--- a/extensions/security/secman/model/pom.xml
+++ b/extensions/security/secman/model/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/extensions/security/secman/persistence-jdo/pom.xml b/extensions/security/secman/persistence-jdo/pom.xml
index fa82fba..b8cd278 100644
--- a/extensions/security/secman/persistence-jdo/pom.xml
+++ b/extensions/security/secman/persistence-jdo/pom.xml
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/extensions/security/secman/shiro-realm/pom.xml b/extensions/security/secman/shiro-realm/pom.xml
index 85b05a9..7c83d36 100644
--- a/extensions/security/secman/shiro-realm/pom.xml
+++ b/extensions/security/secman/shiro-realm/pom.xml
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/legacy/extensions/core/applib/pom.xml b/legacy/extensions/core/applib/pom.xml
index 76ace71..cff156a 100644
--- a/legacy/extensions/core/applib/pom.xml
+++ b/legacy/extensions/core/applib/pom.xml
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
<scope>compile</scope>
</dependency>
diff --git a/legacy/extensions/core/commons/pom.xml b/legacy/extensions/core/commons/pom.xml
index abe18fd..68eff64 100644
--- a/legacy/extensions/core/commons/pom.xml
+++ b/legacy/extensions/core/commons/pom.xml
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
<scope>compile</scope>
</dependency>
diff --git a/legacy/extensions/core/runtime/pom.xml b/legacy/extensions/core/runtime/pom.xml
index 9135bb0..0cfe884 100644
--- a/legacy/extensions/core/runtime/pom.xml
+++ b/legacy/extensions/core/runtime/pom.xml
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
<scope>compile</scope>
</dependency>
diff --git a/legacy/testing/mavenplugin/pom.xml b/legacy/testing/mavenplugin/pom.xml
index 6bc2a66..dec430b 100644
--- a/legacy/testing/mavenplugin/pom.xml
+++ b/legacy/testing/mavenplugin/pom.xml
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
</dependency>
<dependency>
diff --git a/subdomains/excel/applib/pom.xml b/subdomains/excel/applib/pom.xml
index 4c99069..bb3d869 100644
--- a/subdomains/excel/applib/pom.xml
+++ b/subdomains/excel/applib/pom.xml
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
<!-- so as not to pollute the classpath of the domain model in the IDE -->
<optional>true</optional>
</dependency>
diff --git a/subdomains/spring/applib/pom.xml b/subdomains/spring/applib/pom.xml
index 505dd07..ee4d123 100644
--- a/subdomains/spring/applib/pom.xml
+++ b/subdomains/spring/applib/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/testing/fixtures/applib/pom.xml b/testing/fixtures/applib/pom.xml
index 8d1d173..aaaef79 100644
--- a/testing/fixtures/applib/pom.xml
+++ b/testing/fixtures/applib/pom.xml
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/testing/specsupport/applib/pom.xml b/testing/specsupport/applib/pom.xml
index 76a8258..94dc8ec 100644
--- a/testing/specsupport/applib/pom.xml
+++ b/testing/specsupport/applib/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
+ <artifactId>isis-core-runtime</artifactId>
</dependency>
<dependency>
[isis] 11/22: ISIS-2259: renames isis-commons to isis-core-commons
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 44b52d66985b535c3a91a25ec847eb3b4c3d69c3
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 12:31:23 2020 +0000
ISIS-2259: renames isis-commons to isis-core-commons
---
core/applib/pom.xml | 2 +-
core/codegen-bytebuddy/pom.xml | 2 +-
core/commons/pom.xml | 2 +-
core/config/pom.xml | 2 +-
core/detached-tests/pom.xml | 2 +-
core/persistence/jdo/applib/pom.xml | 2 +-
core/pom.xml | 2 +-
core/schema/pom.xml | 2 +-
core/testsupport/unittestsupport/pom.xml | 2 +-
legacy/mappings/restclient/pom.xml | 2 +-
mappings/restclient/api/pom.xml | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index a251ddf..a90f2cf 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-commons</artifactId>
+ <artifactId>isis-core-commons</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/core/codegen-bytebuddy/pom.xml b/core/codegen-bytebuddy/pom.xml
index eb23f1e..842f53d 100644
--- a/core/codegen-bytebuddy/pom.xml
+++ b/core/codegen-bytebuddy/pom.xml
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-commons</artifactId>
+ <artifactId>isis-core-commons</artifactId>
<scope>compile</scope>
</dependency>
diff --git a/core/commons/pom.xml b/core/commons/pom.xml
index 18f2723..61e5e00 100644
--- a/core/commons/pom.xml
+++ b/core/commons/pom.xml
@@ -20,7 +20,7 @@
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
- <artifactId>isis-commons</artifactId>
+ <artifactId>isis-core-commons</artifactId>
<name>Apache Isis Core - Commons</name>
<description>
diff --git a/core/config/pom.xml b/core/config/pom.xml
index bd02852..c2cad98 100644
--- a/core/config/pom.xml
+++ b/core/config/pom.xml
@@ -65,7 +65,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-commons</artifactId>
+ <artifactId>isis-core-commons</artifactId>
</dependency>
<dependency>
diff --git a/core/detached-tests/pom.xml b/core/detached-tests/pom.xml
index 3ead354..e9945bd 100644
--- a/core/detached-tests/pom.xml
+++ b/core/detached-tests/pom.xml
@@ -41,7 +41,7 @@
<!-- core plugin loading -->
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-commons</artifactId>
+ <artifactId>isis-core-commons</artifactId>
</dependency>
<dependency>
diff --git a/core/persistence/jdo/applib/pom.xml b/core/persistence/jdo/applib/pom.xml
index 3055ff0..1755124 100644
--- a/core/persistence/jdo/applib/pom.xml
+++ b/core/persistence/jdo/applib/pom.xml
@@ -75,7 +75,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-commons</artifactId>
+ <artifactId>isis-core-commons</artifactId>
</dependency>
<!-- JDO API (providing compile dependency) -->
diff --git a/core/pom.xml b/core/pom.xml
index 6ae147d..6640b71 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -689,7 +689,7 @@
<!-- for benefit of application developers, using scope=import, type=pom -->
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-commons</artifactId>
+ <artifactId>isis-core-commons</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index 39eb8da..db4083e 100644
--- a/core/schema/pom.xml
+++ b/core/schema/pom.xml
@@ -37,7 +37,7 @@
<!--
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-commons</artifactId>
+ <artifactId>isis-core-commons</artifactId>
</dependency>
-->
<dependency>
diff --git a/core/testsupport/unittestsupport/pom.xml b/core/testsupport/unittestsupport/pom.xml
index 723fe10..21ff876 100644
--- a/core/testsupport/unittestsupport/pom.xml
+++ b/core/testsupport/unittestsupport/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-commons</artifactId>
+ <artifactId>isis-core-commons</artifactId>
</dependency>
<dependency>
diff --git a/legacy/mappings/restclient/pom.xml b/legacy/mappings/restclient/pom.xml
index 0bef4c2..acbbe46 100644
--- a/legacy/mappings/restclient/pom.xml
+++ b/legacy/mappings/restclient/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-commons</artifactId>
+ <artifactId>isis-core-commons</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/mappings/restclient/api/pom.xml b/mappings/restclient/api/pom.xml
index 1cfd872..22ac477 100644
--- a/mappings/restclient/api/pom.xml
+++ b/mappings/restclient/api/pom.xml
@@ -38,7 +38,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-commons</artifactId>
+ <artifactId>isis-core-commons</artifactId>
<scope>provided</scope>
</dependency>
[isis] 10/22: ISIS-2259: renames isis-codegen-bytebuddy to
isis-core-codegen-bytebuddy
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 5c221e2ac9fbea4c7016afedc84bdb2334949ab6
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 12:30:17 2020 +0000
ISIS-2259: renames isis-codegen-bytebuddy to isis-core-codegen-bytebuddy
---
core/codegen-bytebuddy/pom.xml | 2 +-
core/detached-tests/pom.xml | 2 +-
core/pom.xml | 2 +-
core/runtime-services/pom.xml | 2 +-
core/testsupport/integtestsupport/pom.xml | 2 +-
core/testsupport/unittestsupport/pom.xml | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/core/codegen-bytebuddy/pom.xml b/core/codegen-bytebuddy/pom.xml
index c012841..eb23f1e 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>
- <artifactId>isis-codegen-bytebuddy</artifactId>
+ a<artifactId>isis-core-codegen-bytebuddy</artifactId>
<name>Apache Isis Core - Code Gen (ByteBuddy)</name>
<description>
diff --git a/core/detached-tests/pom.xml b/core/detached-tests/pom.xml
index cca451a..3ead354 100644
--- a/core/detached-tests/pom.xml
+++ b/core/detached-tests/pom.xml
@@ -83,7 +83,7 @@
<!-- core plugins required to run this module's own tests -->
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-codegen-bytebuddy</artifactId>
+ <artifactId>isis-core-codegen-bytebuddy</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/core/pom.xml b/core/pom.xml
index e24fbc9..6ae147d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -871,7 +871,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-codegen-bytebuddy</artifactId>
+ <artifactId>isis-core-codegen-bytebuddy</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/core/runtime-services/pom.xml b/core/runtime-services/pom.xml
index 8fcb49f..2122685 100644
--- a/core/runtime-services/pom.xml
+++ b/core/runtime-services/pom.xml
@@ -73,7 +73,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-codegen-bytebuddy</artifactId>
+ <artifactId>isis-core-codegen-bytebuddy</artifactId>
</dependency>
<dependency>
diff --git a/core/testsupport/integtestsupport/pom.xml b/core/testsupport/integtestsupport/pom.xml
index af793bd..9638168 100644
--- a/core/testsupport/integtestsupport/pom.xml
+++ b/core/testsupport/integtestsupport/pom.xml
@@ -72,7 +72,7 @@
<!-- framework default codegen for tests -->
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-codegen-bytebuddy</artifactId>
+ <artifactId>isis-core-codegen-bytebuddy</artifactId>
</dependency>
<dependency>
diff --git a/core/testsupport/unittestsupport/pom.xml b/core/testsupport/unittestsupport/pom.xml
index 7d1bc5d..723fe10 100644
--- a/core/testsupport/unittestsupport/pom.xml
+++ b/core/testsupport/unittestsupport/pom.xml
@@ -81,7 +81,7 @@
<!-- framework default codegen for tests -->
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-codegen-bytebuddy</artifactId>
+ <artifactId>isis-core-codegen-bytebuddy</artifactId>
</dependency>
<dependency>
[isis] 05/22: ISIS-2259: reorg markdown module
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 4ea128967bff70b5792d9a6d62f0de7cd792f26f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 11:56:00 2020 +0000
ISIS-2259: reorg markdown module
---
valuetypes/asciidoc/applib/pom.xml | 4 +-
valuetypes/asciidoc/pom.xml | 4 ++
valuetypes/asciidoc/ui/pom.xml | 2 +-
valuetypes/{asciidoc => markdown}/applib/pom.xml | 18 ++++----
.../applib/IsisModuleValMarkdownApplib.java | 7 ++++
.../markdown/applib/value/Converter.java} | 4 +-
.../markdown/applib/value/Markdown.java | 5 +--
valuetypes/markdown/pom.xml | 48 +++++-----------------
.../applib/IsisModuleExtMarkdownApplib.java | 7 ----
valuetypes/markdown/{ => ui}/pom.xml | 20 +++++----
.../markdown/ui/IsisModuleValMarkdownUi.java} | 10 ++---
.../markdown/ui/components/MarkdownComponent.java | 2 +-
.../MarkdownPanelFactoriesForWicket.java | 4 +-
.../markdown/ui/components/css/prism.css | 0
.../markdown/ui/components/js/prism1.14.js | 0
valuetypes/pom.xml | 13 ++++--
16 files changed, 68 insertions(+), 80 deletions(-)
diff --git a/valuetypes/asciidoc/applib/pom.xml b/valuetypes/asciidoc/applib/pom.xml
index 21dc281..6610333 100644
--- a/valuetypes/asciidoc/applib/pom.xml
+++ b/valuetypes/asciidoc/applib/pom.xml
@@ -21,7 +21,7 @@
</parent>
<artifactId>isis-valuetypes-asciidoc-applib</artifactId>
- <name>Apache Isis Val - Asciidoctor</name>
+ <name>Apache Isis Val - Asciidoctor (applib)</name>
<properties>
<jar-plugin.automaticModuleName>org.apache.isis.valuetypes.asciidoc.applib</jar-plugin.automaticModuleName>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj-api</artifactId>
- <version>2.1.0</version>
+ <version>${asciidoctorj.version}</version>
</dependency>
</dependencies>
diff --git a/valuetypes/asciidoc/pom.xml b/valuetypes/asciidoc/pom.xml
index e895e4a..389838c 100644
--- a/valuetypes/asciidoc/pom.xml
+++ b/valuetypes/asciidoc/pom.xml
@@ -28,6 +28,10 @@
<packaging>pom</packaging>
+ <properties>
+ <asciidoctorj.version>2.1.0</asciidoctorj.version>
+ </properties>
+
<modules>
<module>applib</module>
<module>ui</module>
diff --git a/valuetypes/asciidoc/ui/pom.xml b/valuetypes/asciidoc/ui/pom.xml
index 4805ea3..1e82885 100644
--- a/valuetypes/asciidoc/ui/pom.xml
+++ b/valuetypes/asciidoc/ui/pom.xml
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj</artifactId>
- <version>2.1.0</version>
+ <version>${asciidoctorj.version}</version>
<exclusions>
<!-- convergence issues -->
<exclusion>
diff --git a/valuetypes/asciidoc/applib/pom.xml b/valuetypes/markdown/applib/pom.xml
similarity index 72%
copy from valuetypes/asciidoc/applib/pom.xml
copy to valuetypes/markdown/applib/pom.xml
index 21dc281..1332a1f 100644
--- a/valuetypes/asciidoc/applib/pom.xml
+++ b/valuetypes/markdown/applib/pom.xml
@@ -16,16 +16,16 @@
<parent>
<groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-asciidoc</artifactId>
+ <artifactId>isis-valuetypes-markdown</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
- <artifactId>isis-valuetypes-asciidoc-applib</artifactId>
- <name>Apache Isis Val - Asciidoctor</name>
+ <artifactId>isis-valuetypes-markdown-applib</artifactId>
+ <name>Apache Isis Val - Markdown (applib)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.asciidoc.applib</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/valuetypes/asciidoc/applib</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.markdown.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/valuetypes/markdown/applib</git-plugin.propertiesDir>
</properties>
<dependencies>
@@ -36,9 +36,11 @@
</dependency>
<dependency>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctorj-api</artifactId>
- <version>2.1.0</version>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>flexmark-all</artifactId>
+ <version>${flexmark.version}</version>
+ <!-- avoid polluting the classpath -->
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/IsisModuleValMarkdownApplib.java b/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/IsisModuleValMarkdownApplib.java
new file mode 100644
index 0000000..3684c81
--- /dev/null
+++ b/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/IsisModuleValMarkdownApplib.java
@@ -0,0 +1,7 @@
+package org.apache.isis.valuetypes.markdown.applib;
+
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class IsisModuleValMarkdownApplib {
+}
diff --git a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/converter/MarkdownConverter.java b/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Converter.java
similarity index 96%
rename from valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/converter/MarkdownConverter.java
rename to valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Converter.java
index 11b1bf5..3b25de1 100644
--- a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/converter/MarkdownConverter.java
+++ b/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Converter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.markdown.ui.converter;
+package org.apache.isis.valuetypes.markdown.applib.value;
import java.util.Arrays;
@@ -26,7 +26,7 @@ import com.vladsch.flexmark.html.HtmlRenderer;
import com.vladsch.flexmark.parser.Parser;
import com.vladsch.flexmark.util.options.MutableDataSet;
-public final class MarkdownConverter {
+public final class Converter {
/**
* For syntax highlighting to work, the client/browser needs to load specific
diff --git a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/value/Markdown.java b/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Markdown.java
similarity index 87%
rename from valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/value/Markdown.java
rename to valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Markdown.java
index 931dde6..807ffec 100644
--- a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/value/Markdown.java
+++ b/valuetypes/markdown/applib/src/main/java/org/apache/isis/valuetypes/markdown/applib/value/Markdown.java
@@ -16,11 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.markdown.applib.value;
+package org.apache.isis.valuetypes.markdown.applib.value;
import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.value.Markup;
-import org.apache.isis.extensions.markdown.ui.converter.MarkdownConverter;
/**
* Immutable value type holding pre-rendered HTML.
@@ -33,7 +32,7 @@ public class Markdown extends Markup {
private static final long serialVersionUID = 1L;
public static Markdown valueOfMarkdown(String asciiDoc) {
- return valueOfHtml(MarkdownConverter.mdToHtml(asciiDoc));
+ return valueOfHtml(Converter.mdToHtml(asciiDoc));
}
public static Markdown valueOfHtml(String html) {
diff --git a/valuetypes/markdown/pom.xml b/valuetypes/markdown/pom.xml
index e3a879a..6b0d833 100644
--- a/valuetypes/markdown/pom.xml
+++ b/valuetypes/markdown/pom.xml
@@ -18,49 +18,23 @@
<groupId>org.apache.isis.valuetypes</groupId>
<artifactId>isis-valuetypes</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>isis-valuetypes-markdown</artifactId>
- <name>Apache Isis Val - Markdown</name>
- <description></description>
+ <name>Apache Isis Val - Markdown (parent)</name>
+ <description>
+ Markdown value type.
+ </description>
+
+ <packaging>pom</packaging>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.markdown</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/valuetypes/markdown</git-plugin.propertiesDir>
+ <flexmark.version>0.34.32</flexmark.version>
</properties>
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-viewer-wicket-ui</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- provides a markdown parser -->
- <dependency>
- <groupId>com.vladsch.flexmark</groupId>
- <artifactId>flexmark-all</artifactId>
- <version>0.34.32</version>
- <exclusions>
- <exclusion>
- <groupId>org.jsoup</groupId>
- <artifactId>jsoup</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jsoup</groupId>
- <artifactId>jsoup</artifactId>
- <version>1.10.2</version>
- </dependency>
-
- </dependencies>
+ <modules>
+ <module>applib</module>
+ <module>ui</module>
+ </modules>
</project>
diff --git a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/IsisModuleExtMarkdownApplib.java b/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/IsisModuleExtMarkdownApplib.java
deleted file mode 100644
index 5b16379..0000000
--- a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/applib/IsisModuleExtMarkdownApplib.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.apache.isis.extensions.markdown.applib;
-
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class IsisModuleExtMarkdownApplib {
-}
diff --git a/valuetypes/markdown/pom.xml b/valuetypes/markdown/ui/pom.xml
similarity index 80%
copy from valuetypes/markdown/pom.xml
copy to valuetypes/markdown/ui/pom.xml
index e3a879a..0a6928c 100644
--- a/valuetypes/markdown/pom.xml
+++ b/valuetypes/markdown/ui/pom.xml
@@ -16,23 +16,26 @@
<parent>
<groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes</artifactId>
+ <artifactId>isis-valuetypes-markdown</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>isis-valuetypes-markdown</artifactId>
- <name>Apache Isis Val - Markdown</name>
- <description></description>
+ <artifactId>isis-valuetypes-markdown-ui</artifactId>
+ <name>Apache Isis Val - Markdown (ui)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.markdown</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/valuetypes/markdown</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.markdown.ui</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/valuetypes/markdown/ui</git-plugin.propertiesDir>
</properties>
<dependencies>
<dependency>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-markdown-applib</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-metamodel</artifactId>
</dependency>
@@ -40,14 +43,13 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
- <scope>provided</scope>
</dependency>
<!-- provides a markdown parser -->
<dependency>
<groupId>com.vladsch.flexmark</groupId>
<artifactId>flexmark-all</artifactId>
- <version>0.34.32</version>
+ <version>${flexmark.version}</version>
<exclusions>
<exclusion>
<groupId>org.jsoup</groupId>
diff --git a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/IsisModuleExtMarkdownUi.java b/valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/IsisModuleValMarkdownUi.java
similarity index 53%
rename from valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/IsisModuleExtMarkdownUi.java
rename to valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/IsisModuleValMarkdownUi.java
index 4b6cbe8..dedd22d 100644
--- a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/IsisModuleExtMarkdownUi.java
+++ b/valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/IsisModuleValMarkdownUi.java
@@ -1,16 +1,16 @@
-package org.apache.isis.extensions.markdown.ui;
+package org.apache.isis.valuetypes.markdown.ui;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.markdown.applib.IsisModuleExtMarkdownApplib;
-import org.apache.isis.extensions.markdown.ui.components.MarkdownPanelFactoriesForWicket;
+import org.apache.isis.valuetypes.markdown.applib.IsisModuleValMarkdownApplib;
+import org.apache.isis.valuetypes.markdown.ui.components.MarkdownPanelFactoriesForWicket;
@Configuration
@Import({
- IsisModuleExtMarkdownApplib.class,
+ IsisModuleValMarkdownApplib.class,
MarkdownPanelFactoriesForWicket.Parented.class,
MarkdownPanelFactoriesForWicket.Standalone.class,
})
-public class IsisModuleExtMarkdownUi {
+public class IsisModuleValMarkdownUi {
}
diff --git a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownComponent.java b/valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/components/MarkdownComponent.java
similarity index 97%
rename from valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownComponent.java
rename to valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/components/MarkdownComponent.java
index 5abe54a..bb3cace 100644
--- a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownComponent.java
+++ b/valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/components/MarkdownComponent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.markdown.ui.components;
+package org.apache.isis.valuetypes.markdown.ui.components;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
diff --git a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownPanelFactoriesForWicket.java b/valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/components/MarkdownPanelFactoriesForWicket.java
similarity index 95%
rename from valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownPanelFactoriesForWicket.java
rename to valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/components/MarkdownPanelFactoriesForWicket.java
index 883b16e..a879e7e 100644
--- a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/MarkdownPanelFactoriesForWicket.java
+++ b/valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/components/MarkdownPanelFactoriesForWicket.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.isis.extensions.markdown.ui.components;
+package org.apache.isis.valuetypes.markdown.ui.components;
-import org.apache.isis.extensions.markdown.applib.value.Markdown;
+import org.apache.isis.valuetypes.markdown.applib.value.Markdown;
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/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/css/prism.css b/valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/components/css/prism.css
similarity index 100%
rename from valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/css/prism.css
rename to valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/components/css/prism.css
diff --git a/valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/js/prism1.14.js b/valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/components/js/prism1.14.js
similarity index 100%
rename from valuetypes/markdown/src/main/java/org/apache/isis/extensions/markdown/ui/components/js/prism1.14.js
rename to valuetypes/markdown/ui/src/main/java/org/apache/isis/valuetypes/markdown/ui/components/js/prism1.14.js
diff --git a/valuetypes/pom.xml b/valuetypes/pom.xml
index bc1f40b..996783e 100644
--- a/valuetypes/pom.xml
+++ b/valuetypes/pom.xml
@@ -74,11 +74,17 @@
<dependency>
<groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-markdown</artifactId>
+ <artifactId>isis-valuetypes-markdown-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-markdown-ui</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.valuetypes</groupId>
<artifactId>isis-valuetypes-sse</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -96,10 +102,11 @@
<modules>
<module>asciidoc</module>
- <module>asciidoc/applib</module>
- <module>asciidoc/ui</module>
<module>markdown</module>
+ <module>markdown/applib</module>
+ <module>markdown/ui</module>
+
<module>sse</module>
</modules>
[isis] 14/22: ISIS-2259: renames isis-metamodel to
isis-core-metamodel
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit d192d56b516bb36ee366bb71253ef5045627ae55
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 12:34:44 2020 +0000
ISIS-2259: renames isis-metamodel to isis-core-metamodel
---
core/detached-tests/pom.xml | 2 +-
core/metamodel/pom.xml | 2 +-
core/persistence/jdo/datanucleus-5/pom.xml | 2 +-
core/pom.xml | 4 ++--
core/runtime/pom.xml | 4 ++--
core/viewers/restfulobjects/applib/pom.xml | 2 +-
core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml | 2 +-
core/viewers/restfulobjects/viewer/pom.xml | 2 +-
core/viewers/wicket/model/pom.xml | 2 +-
core/viewers/wicket/ui/pom.xml | 2 +-
extensions/security/secman/pom.xml | 2 +-
extensions/vro/cors/impl/pom.xml | 2 +-
extensions/vw/pdfjs/metamodel/pom.xml | 2 +-
incubator/extensions/core/microprofile/pom.xml | 2 +-
incubator/extensions/core/model/pom.xml | 2 +-
legacy/extensions/core/metamodel/pom.xml | 4 ++--
subdomains/base/applib/pom.xml | 2 +-
valuetypes/asciidoc/ui/pom.xml | 2 +-
valuetypes/markdown/ui/pom.xml | 2 +-
valuetypes/sse/applib/pom.xml | 2 +-
valuetypes/sse/metamodel/pom.xml | 2 +-
valuetypes/sse/ui/pom.xml | 2 +-
22 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/core/detached-tests/pom.xml b/core/detached-tests/pom.xml
index 0599349..1cd09e3 100644
--- a/core/detached-tests/pom.xml
+++ b/core/detached-tests/pom.xml
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 9e68991..cda8e47 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -26,7 +26,7 @@
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
<name>Apache Isis Core - MetaModel</name>
<properties>
diff --git a/core/persistence/jdo/datanucleus-5/pom.xml b/core/persistence/jdo/datanucleus-5/pom.xml
index 5f046ba..afed851 100644
--- a/core/persistence/jdo/datanucleus-5/pom.xml
+++ b/core/persistence/jdo/datanucleus-5/pom.xml
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/core/pom.xml b/core/pom.xml
index bc848c2..fd938f0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -748,14 +748,14 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 980ce10..92a123a 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
</dependency>
<dependency>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/core/viewers/restfulobjects/applib/pom.xml b/core/viewers/restfulobjects/applib/pom.xml
index 1b9735c..de49c2c 100644
--- a/core/viewers/restfulobjects/applib/pom.xml
+++ b/core/viewers/restfulobjects/applib/pom.xml
@@ -51,7 +51,7 @@
<!-- TEST DEPENDENCIES -->
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
<scope>test</scope>
</dependency>
diff --git a/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml b/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
index a518bbf..0c15ed2 100644
--- a/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
+++ b/core/viewers/restfulobjects/jaxrs-resteasy-4/pom.xml
@@ -102,7 +102,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/core/viewers/restfulobjects/viewer/pom.xml b/core/viewers/restfulobjects/viewer/pom.xml
index 4edb94b..84f0a2e 100644
--- a/core/viewers/restfulobjects/viewer/pom.xml
+++ b/core/viewers/restfulobjects/viewer/pom.xml
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/core/viewers/wicket/model/pom.xml b/core/viewers/wicket/model/pom.xml
index 2224183..f5daa82 100644
--- a/core/viewers/wicket/model/pom.xml
+++ b/core/viewers/wicket/model/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/core/viewers/wicket/ui/pom.xml b/core/viewers/wicket/ui/pom.xml
index da89078..96f23ef 100644
--- a/core/viewers/wicket/ui/pom.xml
+++ b/core/viewers/wicket/ui/pom.xml
@@ -335,7 +335,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/extensions/security/secman/pom.xml b/extensions/security/secman/pom.xml
index d67c2e4..f6d00c0 100644
--- a/extensions/security/secman/pom.xml
+++ b/extensions/security/secman/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
</dependency>
<dependency>
diff --git a/extensions/vro/cors/impl/pom.xml b/extensions/vro/cors/impl/pom.xml
index 672894a..1166b52 100644
--- a/extensions/vro/cors/impl/pom.xml
+++ b/extensions/vro/cors/impl/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
</dependency>
<dependency>
diff --git a/extensions/vw/pdfjs/metamodel/pom.xml b/extensions/vw/pdfjs/metamodel/pom.xml
index 48c98b7..3b63f8b 100644
--- a/extensions/vw/pdfjs/metamodel/pom.xml
+++ b/extensions/vw/pdfjs/metamodel/pom.xml
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
</dependency>
<dependency>
diff --git a/incubator/extensions/core/microprofile/pom.xml b/incubator/extensions/core/microprofile/pom.xml
index cf448cf..a2fca77 100644
--- a/incubator/extensions/core/microprofile/pom.xml
+++ b/incubator/extensions/core/microprofile/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
</dependency>
</dependencies>
diff --git a/incubator/extensions/core/model/pom.xml b/incubator/extensions/core/model/pom.xml
index 75bc48b..14c2cba 100644
--- a/incubator/extensions/core/model/pom.xml
+++ b/incubator/extensions/core/model/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
</dependency>
<dependency>
diff --git a/legacy/extensions/core/metamodel/pom.xml b/legacy/extensions/core/metamodel/pom.xml
index 7562841..00072d3 100644
--- a/legacy/extensions/core/metamodel/pom.xml
+++ b/legacy/extensions/core/metamodel/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
<scope>compile</scope>
</dependency>
@@ -80,7 +80,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
diff --git a/subdomains/base/applib/pom.xml b/subdomains/base/applib/pom.xml
index 4973a6b..e165860 100644
--- a/subdomains/base/applib/pom.xml
+++ b/subdomains/base/applib/pom.xml
@@ -48,7 +48,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/valuetypes/asciidoc/ui/pom.xml b/valuetypes/asciidoc/ui/pom.xml
index 5658eac..d963318 100644
--- a/valuetypes/asciidoc/ui/pom.xml
+++ b/valuetypes/asciidoc/ui/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
</dependency>
<dependency>
diff --git a/valuetypes/markdown/ui/pom.xml b/valuetypes/markdown/ui/pom.xml
index 0a6928c..0de8750 100644
--- a/valuetypes/markdown/ui/pom.xml
+++ b/valuetypes/markdown/ui/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
</dependency>
<dependency>
diff --git a/valuetypes/sse/applib/pom.xml b/valuetypes/sse/applib/pom.xml
index 5be13fe..d1e6f1c 100644
--- a/valuetypes/sse/applib/pom.xml
+++ b/valuetypes/sse/applib/pom.xml
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
</dependency>
<dependency>
diff --git a/valuetypes/sse/metamodel/pom.xml b/valuetypes/sse/metamodel/pom.xml
index 4960f42..a210a21 100644
--- a/valuetypes/sse/metamodel/pom.xml
+++ b/valuetypes/sse/metamodel/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
</dependency>
</dependencies>
diff --git a/valuetypes/sse/ui/pom.xml b/valuetypes/sse/ui/pom.xml
index 48b8995..0fd9c4b 100644
--- a/valuetypes/sse/ui/pom.xml
+++ b/valuetypes/sse/ui/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <artifactId>isis-core-metamodel</artifactId>
</dependency>
<dependency>
[isis] 13/22: ISIS-2259: renames isis-detached-tests to
isis-core-detachedtests
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 861faaf337492e0f2f2a106c1cf85631d8ce5ede
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 12:33:50 2020 +0000
ISIS-2259: renames isis-detached-tests to isis-core-detachedtests
---
core/detached-tests/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/detached-tests/pom.xml b/core/detached-tests/pom.xml
index fef19f6..0599349 100644
--- a/core/detached-tests/pom.xml
+++ b/core/detached-tests/pom.xml
@@ -20,7 +20,7 @@
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
- <artifactId>isis-detached-tests</artifactId>
+ <artifactId>isis-core-detachedtests</artifactId>
<name>Apache Isis Core - Detached Tests</name>
<properties>
[isis] 18/22: ISIS-2259: renames isis-schema to isis-core-schema
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 35ba5375903f3eb7b67f586e9bf2808ff8cd30b4
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 12:44:47 2020 +0000
ISIS-2259: renames isis-schema to isis-core-schema
---
core/applib/pom.xml | 2 +-
core/pom.xml | 4 ++--
core/schema/pom.xml | 2 +-
mavendeps/webapp/pom.xml | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index a90f2cf..dd06976 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-schema</artifactId>
+ <artifactId>isis-core-schema</artifactId>
</dependency>
<dependency>
diff --git a/core/pom.xml b/core/pom.xml
index 0f583d0..d5728fc 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -734,14 +734,14 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-schema</artifactId>
+ <artifactId>isis-core-schema</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-schema</artifactId>
+ <artifactId>isis-core-schema</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/core/schema/pom.xml b/core/schema/pom.xml
index db4083e..5d03ca0 100644
--- a/core/schema/pom.xml
+++ b/core/schema/pom.xml
@@ -20,7 +20,7 @@
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
- <artifactId>isis-schema</artifactId>
+ <artifactId>isis-core-schema</artifactId>
<packaging>jar</packaging>
<name>Apache Isis Core - Schemas</name>
diff --git a/mavendeps/webapp/pom.xml b/mavendeps/webapp/pom.xml
index 3c90ea5..1df1c12 100644
--- a/mavendeps/webapp/pom.xml
+++ b/mavendeps/webapp/pom.xml
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-schema</artifactId>
+ <artifactId>isis-core-schema</artifactId>
<!--
excluded to make consistent with JDK11 where these have been removed from the JDK and must be explicitly included.
-->
[isis] 07/22: 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 ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b89cf95c41b6dbacfbc0aa334d0549867c3f7d5a
Merge: aeef432 437eea4
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 12:24:59 2020 +0000
Merge remote-tracking branch 'origin/master' into ide
core/config/pom.xml | 18 ++++------
.../org/apache/isis/webapp/modules/WebModule.java | 13 ++++----
.../isis/webapp/modules/WebModuleContext.java | 31 +++++++----------
.../logonlog/WebModuleLogOnExceptionLogger.java | 2 +-
.../webappctx/IsisWebAppContextInitializer.java | 39 +++++++++++++++-------
.../cors/impl/webmodule/WebModuleCors.java | 2 +-
6 files changed, 53 insertions(+), 52 deletions(-)
diff --cc core/config/pom.xml
index 77abda1,cb81d62..effe5eb
--- a/core/config/pom.xml
+++ b/core/config/pom.xml
@@@ -63,11 -63,12 +63,16 @@@
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-applib</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.validator</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ </dependency>
+
<!-- IDE support (optional) -->
<dependency>
<groupId>org.springframework.boot</groupId>
diff --cc extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java
index d9d47dc,0000000..6f35007
mode 100644,000000..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
@@@ -1,105 -1,0 +1,105 @@@
+/*
+ * 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.extensions.cors.impl.webmodule;
+
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletException;
+
+import org.ebaysf.web.cors.CORSFilter;
+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.webapp.modules.WebModuleAbstract;
+
+import lombok.Getter;
+
+/**
+ * WebModule providing support for CORS
+ *
+ * @since 2.0
+ */
+@Service
+@Named("isisMapCors.WebModuleServerCors")
+@Qualifier("CORS")
+@Order(OrderPrecedence.HIGH)
+public final class WebModuleCors extends WebModuleAbstract {
+
+ private final static String CORS_FILTER_NAME = "CORS Filter";
+
+ @Getter
+ private final String name = "CORS";
+
+ @Inject
+ public WebModuleCors(ServiceInjector serviceInjector) {
+ super(serviceInjector);
+ }
+
+
+
+ /*
+ <filter>
+ <filter-name>CORS Filter</filter-name>
+ <filter-class>org.ebaysf.web.cors.CORSFilter</filter-class>
+ <init-param>
+ <param-name>cors.allowed.origins</param-name>
+ <param-value>*</param-value>
+ </init-param>
+ <init-param>
+ <param-name>cors.allowed.headers</param-name>
+ <param-value>Content-Type,Accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers,Authorization,Cache-Control,If-Modified-Since,Pragma</param-value>
+ </init-param>
+ <init-param>
+ <param-name>cors.exposed.headers</param-name>
+ <param-value>Authorization</param-value>
+ </init-param>
+ </filter>
+ <filter-mapping>
+ <filter-name>CORS Filter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+ */
+ @Override
+ public List<ServletContextListener> init(ServletContext ctx) throws ServletException {
+
+ registerFilter(ctx, CORS_FILTER_NAME, CORSFilter.class)
+ .ifPresent(filterReg -> {
+ filterReg.setInitParameter("cors.allowed.origins", "*");
+ filterReg.setInitParameter("cors.allowed.headers", "Content-Type,Accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers,Authorization,Cache-Control,If-Modified-Since,Pragma");
+ filterReg.setInitParameter("cors.exposed.headers", "Authorization");
+
+ filterReg.addMappingForUrlPatterns(
+ null,
+ false,
- this.webModuleContext.getProtectedPaths());
++ this.webModuleContext.getProtectedPaths().toArray(String.class));
+
+ });
+
+ return null;
+ }
+
+
+}
[isis] 09/22: ISIS-2259: renames isis-applib back to
isis-core-applib
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b894414705d9055dceb5399eec233a68a9a58954
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 12:28:44 2020 +0000
ISIS-2259: renames isis-applib back to isis-core-applib
---
core/applib/pom.xml | 2 +-
core/config/pom.xml | 4 ++--
core/metamodel/pom.xml | 4 ++--
core/persistence/jdo/applib/pom.xml | 2 +-
core/pom.xml | 4 ++--
core/runtime/pom.xml | 2 +-
core/security/api/pom.xml | 2 +-
core/viewers/restfulobjects/applib/pom.xml | 2 +-
extensions/vw/pdfjs/applib/pom.xml | 2 +-
legacy/extensions/core/applib/pom.xml | 2 +-
legacy/extensions/core/commons/pom.xml | 2 +-
legacy/extensions/core/metamodel/pom.xml | 2 +-
legacy/extensions/core/runtime/pom.xml | 2 +-
mappings/restclient/api/pom.xml | 2 +-
mavendeps/webapp/pom.xml | 2 +-
subdomains/base/applib/pom.xml | 2 +-
subdomains/docx/applib/pom.xml | 2 +-
subdomains/excel/applib/pom.xml | 2 +-
subdomains/excel/fixture/pom.xml | 2 +-
subdomains/freemarker/applib/pom.xml | 2 +-
subdomains/ognl/applib/pom.xml | 2 +-
subdomains/pdfbox/applib/pom.xml | 2 +-
subdomains/spring/applib/pom.xml | 2 +-
subdomains/xdocreport/applib/pom.xml | 2 +-
subdomains/zip/applib/pom.xml | 2 +-
testing/fakedata/applib/pom.xml | 2 +-
testing/fakedata/fixtures/pom.xml | 2 +-
testing/unittestsupport/applib/pom.xml | 2 +-
valuetypes/asciidoc/applib/pom.xml | 2 +-
valuetypes/markdown/applib/pom.xml | 2 +-
30 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/core/applib/pom.xml b/core/applib/pom.xml
index 1e3e25d..a251ddf 100644
--- a/core/applib/pom.xml
+++ b/core/applib/pom.xml
@@ -26,7 +26,7 @@
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
<name>Apache Isis Core - AppLib</name>
<description>
diff --git a/core/config/pom.xml b/core/config/pom.xml
index effe5eb..bd02852 100644
--- a/core/config/pom.xml
+++ b/core/config/pom.xml
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
@@ -89,7 +89,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
<type>test-jar</type>
</dependency>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 5044b96..8cf9a09 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
<dependency>
@@ -117,7 +117,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/core/persistence/jdo/applib/pom.xml b/core/persistence/jdo/applib/pom.xml
index 7a378e7..3055ff0 100644
--- a/core/persistence/jdo/applib/pom.xml
+++ b/core/persistence/jdo/applib/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index 8dc60e6..e24fbc9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -706,14 +706,14 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index 63154c7..980ce10 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/core/security/api/pom.xml b/core/security/api/pom.xml
index df0767b..ca0a5ea 100644
--- a/core/security/api/pom.xml
+++ b/core/security/api/pom.xml
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/core/viewers/restfulobjects/applib/pom.xml b/core/viewers/restfulobjects/applib/pom.xml
index acb09bf..1b9735c 100644
--- a/core/viewers/restfulobjects/applib/pom.xml
+++ b/core/viewers/restfulobjects/applib/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
<dependency>
diff --git a/extensions/vw/pdfjs/applib/pom.xml b/extensions/vw/pdfjs/applib/pom.xml
index ff14ea4..f21a461 100644
--- a/extensions/vw/pdfjs/applib/pom.xml
+++ b/extensions/vw/pdfjs/applib/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
<dependency>
diff --git a/legacy/extensions/core/applib/pom.xml b/legacy/extensions/core/applib/pom.xml
index c08d24c..76ace71 100644
--- a/legacy/extensions/core/applib/pom.xml
+++ b/legacy/extensions/core/applib/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
<scope>compile</scope>
</dependency>
diff --git a/legacy/extensions/core/commons/pom.xml b/legacy/extensions/core/commons/pom.xml
index 20749aa..abe18fd 100644
--- a/legacy/extensions/core/commons/pom.xml
+++ b/legacy/extensions/core/commons/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
<scope>compile</scope>
</dependency>
diff --git a/legacy/extensions/core/metamodel/pom.xml b/legacy/extensions/core/metamodel/pom.xml
index 564f6d1..7562841 100644
--- a/legacy/extensions/core/metamodel/pom.xml
+++ b/legacy/extensions/core/metamodel/pom.xml
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
<scope>compile</scope>
</dependency>
diff --git a/legacy/extensions/core/runtime/pom.xml b/legacy/extensions/core/runtime/pom.xml
index 240a8e1..9135bb0 100644
--- a/legacy/extensions/core/runtime/pom.xml
+++ b/legacy/extensions/core/runtime/pom.xml
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
<scope>compile</scope>
</dependency>
diff --git a/mappings/restclient/api/pom.xml b/mappings/restclient/api/pom.xml
index 55d5901..1cfd872 100644
--- a/mappings/restclient/api/pom.xml
+++ b/mappings/restclient/api/pom.xml
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
diff --git a/mavendeps/webapp/pom.xml b/mavendeps/webapp/pom.xml
index 584ca91..3c90ea5 100644
--- a/mavendeps/webapp/pom.xml
+++ b/mavendeps/webapp/pom.xml
@@ -67,7 +67,7 @@
<!-- ISIS API -->
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
<dependency>
diff --git a/subdomains/base/applib/pom.xml b/subdomains/base/applib/pom.xml
index 6526e50..4973a6b 100644
--- a/subdomains/base/applib/pom.xml
+++ b/subdomains/base/applib/pom.xml
@@ -21,7 +21,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
<dependency>
diff --git a/subdomains/docx/applib/pom.xml b/subdomains/docx/applib/pom.xml
index 842f7b8..125836b 100644
--- a/subdomains/docx/applib/pom.xml
+++ b/subdomains/docx/applib/pom.xml
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
<!--
<dependency>
diff --git a/subdomains/excel/applib/pom.xml b/subdomains/excel/applib/pom.xml
index eaf0963..4c99069 100644
--- a/subdomains/excel/applib/pom.xml
+++ b/subdomains/excel/applib/pom.xml
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
<dependency>
diff --git a/subdomains/excel/fixture/pom.xml b/subdomains/excel/fixture/pom.xml
index 3c54576..88dd327 100644
--- a/subdomains/excel/fixture/pom.xml
+++ b/subdomains/excel/fixture/pom.xml
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
<dependency>
diff --git a/subdomains/freemarker/applib/pom.xml b/subdomains/freemarker/applib/pom.xml
index 13e506a..a58c59f 100644
--- a/subdomains/freemarker/applib/pom.xml
+++ b/subdomains/freemarker/applib/pom.xml
@@ -31,7 +31,7 @@
<dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
</dependencies>
diff --git a/subdomains/ognl/applib/pom.xml b/subdomains/ognl/applib/pom.xml
index c78194d..94b27b0 100644
--- a/subdomains/ognl/applib/pom.xml
+++ b/subdomains/ognl/applib/pom.xml
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
</dependencies>
diff --git a/subdomains/pdfbox/applib/pom.xml b/subdomains/pdfbox/applib/pom.xml
index 6b984b7..de98a7b 100644
--- a/subdomains/pdfbox/applib/pom.xml
+++ b/subdomains/pdfbox/applib/pom.xml
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
</dependencies>
diff --git a/subdomains/spring/applib/pom.xml b/subdomains/spring/applib/pom.xml
index 0277c01..505dd07 100644
--- a/subdomains/spring/applib/pom.xml
+++ b/subdomains/spring/applib/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
<dependency>
diff --git a/subdomains/xdocreport/applib/pom.xml b/subdomains/xdocreport/applib/pom.xml
index 5799bbe..8972b19 100644
--- a/subdomains/xdocreport/applib/pom.xml
+++ b/subdomains/xdocreport/applib/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
<dependency>
diff --git a/subdomains/zip/applib/pom.xml b/subdomains/zip/applib/pom.xml
index f7e2753..4db2045 100644
--- a/subdomains/zip/applib/pom.xml
+++ b/subdomains/zip/applib/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
<dependency>
diff --git a/testing/fakedata/applib/pom.xml b/testing/fakedata/applib/pom.xml
index e111f53..6eac325 100644
--- a/testing/fakedata/applib/pom.xml
+++ b/testing/fakedata/applib/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
<dependency>
<groupId>com.github.javafaker</groupId>
diff --git a/testing/fakedata/fixtures/pom.xml b/testing/fakedata/fixtures/pom.xml
index a1f9231..286261e 100644
--- a/testing/fakedata/fixtures/pom.xml
+++ b/testing/fakedata/fixtures/pom.xml
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
<dependency>
diff --git a/testing/unittestsupport/applib/pom.xml b/testing/unittestsupport/applib/pom.xml
index efc73cf..707cc99 100644
--- a/testing/unittestsupport/applib/pom.xml
+++ b/testing/unittestsupport/applib/pom.xml
@@ -20,7 +20,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
<dependency>
diff --git a/valuetypes/asciidoc/applib/pom.xml b/valuetypes/asciidoc/applib/pom.xml
index 6610333..ff569c1 100644
--- a/valuetypes/asciidoc/applib/pom.xml
+++ b/valuetypes/asciidoc/applib/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
<dependency>
diff --git a/valuetypes/markdown/applib/pom.xml b/valuetypes/markdown/applib/pom.xml
index 1332a1f..67ec557 100644
--- a/valuetypes/markdown/applib/pom.xml
+++ b/valuetypes/markdown/applib/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-applib</artifactId>
+ <artifactId>isis-core-applib</artifactId>
</dependency>
<dependency>
[isis] 19/22: ISIS-2259: renames isis-webapp to 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 ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 2f4bbccf9d13b3c527b21871c395f1edf384862a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 12:47:39 2020 +0000
ISIS-2259: renames isis-webapp to isis-core-webapp
---
core/pom.xml | 4 ++--
core/security/keycloak/pom.xml | 2 +-
core/security/shiro/pom.xml | 2 +-
core/viewers/restfulobjects/viewer/pom.xml | 2 +-
core/viewers/wicket/model/pom.xml | 2 +-
core/webapp/pom.xml | 2 +-
extensions/vro/cors/impl/pom.xml | 2 +-
incubator/extensions/core/model/pom.xml | 2 +-
testing/h2console/ui/pom.xml | 2 +-
testing/hsqldbmgr/ui/pom.xml | 2 +-
valuetypes/sse/applib/pom.xml | 2 +-
valuetypes/sse/ui/pom.xml | 2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index d5728fc..5d8ee47 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -798,12 +798,12 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webapp</artifactId>
+ <artifactId>isis-core-webapp</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webapp</artifactId>
+ <artifactId>isis-core-webapp</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/core/security/keycloak/pom.xml b/core/security/keycloak/pom.xml
index 37ceba4..845ec24 100644
--- a/core/security/keycloak/pom.xml
+++ b/core/security/keycloak/pom.xml
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webapp</artifactId>
+ <artifactId>isis-core-webapp</artifactId>
</dependency>
<dependency>
diff --git a/core/security/shiro/pom.xml b/core/security/shiro/pom.xml
index d365fb6..64cbb5b 100644
--- a/core/security/shiro/pom.xml
+++ b/core/security/shiro/pom.xml
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webapp</artifactId>
+ <artifactId>isis-core-webapp</artifactId>
</dependency>
<dependency>
diff --git a/core/viewers/restfulobjects/viewer/pom.xml b/core/viewers/restfulobjects/viewer/pom.xml
index 84f0a2e..dafbb1d 100644
--- a/core/viewers/restfulobjects/viewer/pom.xml
+++ b/core/viewers/restfulobjects/viewer/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webapp</artifactId>
+ <artifactId>isis-core-webapp</artifactId>
</dependency>
<dependency>
diff --git a/core/viewers/wicket/model/pom.xml b/core/viewers/wicket/model/pom.xml
index f5daa82..28877a5 100644
--- a/core/viewers/wicket/model/pom.xml
+++ b/core/viewers/wicket/model/pom.xml
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webapp</artifactId>
+ <artifactId>isis-core-webapp</artifactId>
</dependency>
<!-- TEST DEPENDENCIES -->
diff --git a/core/webapp/pom.xml b/core/webapp/pom.xml
index 20537cc..04110e9 100644
--- a/core/webapp/pom.xml
+++ b/core/webapp/pom.xml
@@ -26,7 +26,7 @@
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
- <artifactId>isis-webapp</artifactId>
+ <artifactId>isis-core-webapp</artifactId>
<name>Apache Isis Core - WebApp</name>
<description>
Bundles all the web specific classes a srequired by viewers.
diff --git a/extensions/vro/cors/impl/pom.xml b/extensions/vro/cors/impl/pom.xml
index 1166b52..d40d937 100644
--- a/extensions/vro/cors/impl/pom.xml
+++ b/extensions/vro/cors/impl/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webapp</artifactId>
+ <artifactId>isis-core-webapp</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/incubator/extensions/core/model/pom.xml b/incubator/extensions/core/model/pom.xml
index 14c2cba..f80b873 100644
--- a/incubator/extensions/core/model/pom.xml
+++ b/incubator/extensions/core/model/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webapp</artifactId>
+ <artifactId>isis-core-webapp</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/testing/h2console/ui/pom.xml b/testing/h2console/ui/pom.xml
index 6392408..fee82bf 100644
--- a/testing/h2console/ui/pom.xml
+++ b/testing/h2console/ui/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webapp</artifactId>
+ <artifactId>isis-core-webapp</artifactId>
</dependency>
<dependency>
diff --git a/testing/hsqldbmgr/ui/pom.xml b/testing/hsqldbmgr/ui/pom.xml
index 980322b..f3d90c7 100644
--- a/testing/hsqldbmgr/ui/pom.xml
+++ b/testing/hsqldbmgr/ui/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webapp</artifactId>
+ <artifactId>isis-core-webapp</artifactId>
</dependency>
<dependency>
diff --git a/valuetypes/sse/applib/pom.xml b/valuetypes/sse/applib/pom.xml
index d1e6f1c..e4b67a3 100644
--- a/valuetypes/sse/applib/pom.xml
+++ b/valuetypes/sse/applib/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webapp</artifactId>
+ <artifactId>isis-core-webapp</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/valuetypes/sse/ui/pom.xml b/valuetypes/sse/ui/pom.xml
index 0fd9c4b..bc1aa7a 100644
--- a/valuetypes/sse/ui/pom.xml
+++ b/valuetypes/sse/ui/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webapp</artifactId>
+ <artifactId>isis-core-webapp</artifactId>
<scope>provided</scope>
</dependency>
[isis] 21/22: ISIS-2259: renames core/runtime-services directory to
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 ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 2735499cd6f171055335be509586bd87d2df0e28
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 12:54:43 2020 +0000
ISIS-2259: renames core/runtime-services directory to core/runtimeservices
---
core/pom.xml | 2 +-
core/{runtime-services => runtimeservices}/pom.xml | 0
.../src/main/doc/antora.yml | 0
.../images/ContentNegotiationService/accept-json.png | Bin
.../images/ContentNegotiationService/accept-xml.png | Bin
.../images/ContentNegotiationService/facade-choices.png | Bin
.../images/ContentNegotiationService/facade-choices.pptx | Bin
.../images/RepresentationService/service-collaborations.png | Bin
.../RepresentationService/service-collaborations.pptx | Bin
.../src/main/doc/modules/runtime-services/nav.adoc | 0
.../src/main/doc/modules/runtime-services/pages/about.adoc | 0
.../modules/runtime-services/pages/application-layer.adoc | 0
.../application-layer/AuthenticationSessionProvider.adoc | 0
.../pages/application-layer/CommandDtoServiceInternal.adoc | 0
.../application-layer/InteractionDtoServiceInternal.adoc | 0
.../modules/runtime-services/pages/persistence-layer.adoc | 0
.../pages/persistence-layer/AuditingServiceInternal.adoc | 0
.../persistence-layer/ChangedObjectsServiceInternal.adoc | 0
.../PersistenceSessionServiceInternal.adoc | 0
.../pages/persistence-layer/PublishingServiceInternal.adoc | 0
.../modules/runtime-services/pages/presentation-layer.adoc | 0
.../pages/presentation-layer/ContentNegotiationService.adoc | 0
.../pages/presentation-layer/RepresentationService.adoc | 0
.../doc/modules/runtime-services/partials/module-nav.adoc | 0
.../isis/runtimeservices/InitialisationException.java | 0
.../isis/runtimeservices/IsisModuleRuntimeServices.java | 0
.../org/apache/isis/runtimeservices/ServiceException.java | 0
.../auth/AuthenticationSessionProviderDefault.java | 0
.../background/BackgroundCommandExecution.java | 0
.../background/CommandExecutionAbstract.java | 0
.../bookmarks/BookmarkServiceInternalDefault.java | 0
.../command/CommandDtoServiceInternalDefault.java | 0
.../command/CommandExecutorServiceDefault.java | 0
.../isis/runtimeservices/command/CommandServiceDefault.java | 0
.../confmenu/ConfigurationViewServiceDefault.java | 0
.../isis/runtimeservices/email/EmailServiceDefault.java | 0
.../org/apache/isis/runtimeservices/error/EmailTicket.java | 0
.../org/apache/isis/runtimeservices/error/SimpleTicket.java | 0
.../runtimeservices/eventbus/EventBusServiceSpring.java | 0
.../isis/runtimeservices/factory/FactoryServiceDefault.java | 0
.../homepage/HomePageResolverServiceDefault.java | 0
.../java/org/apache/isis/runtimeservices/i18n/po/Block.java | 0
.../isis/runtimeservices/i18n/po/ContextAndMsgId.java | 0
.../org/apache/isis/runtimeservices/i18n/po/PoAbstract.java | 0
.../org/apache/isis/runtimeservices/i18n/po/PoDisabled.java | 0
.../org/apache/isis/runtimeservices/i18n/po/PoReader.java | 0
.../org/apache/isis/runtimeservices/i18n/po/PoWriter.java | 0
.../isis/runtimeservices/i18n/po/TranslationServicePo.java | 0
.../runtimeservices/i18n/po/TranslationServicePoMenu.java | 0
.../java/org/apache/isis/runtimeservices/i18n/po/Util.java | 0
.../ixn/InteractionDtoServiceInternalDefault.java | 0
.../menubars/MenuBarsLoaderServiceDefault.java | 0
.../menubars/bootstrap3/MenuBarsServiceBS3.java | 0
.../menubars/bootstrap3/ServiceAndAction.java | 0
.../isis/runtimeservices/message/MessageServiceDefault.java | 0
.../runtimeservices/publish/PublishedObjectsDefault.java | 0
.../publish/PublisherDispatchServiceDefault.java | 0
.../repository/RepositoryServiceDefault.java | 0
.../isis/runtimeservices/routing/RoutingServiceDefault.java | 0
.../sessmgmt/SessionManagementServiceDefault.java | 0
.../isis/runtimeservices/sudo/SudoServiceDefault.java | 0
.../runtimeservices/userprof/UserProfileServiceDefault.java | 0
.../userreg/EmailNotificationServiceDefault.java | 0
.../runtimeservices/userreg/EmailVerificationTemplate.html | 0
.../isis/runtimeservices/userreg/PasswordResetTemplate.html | 0
.../isis/runtimeservices/wrapper/AsyncWrapDefault.java | 0
.../isis/runtimeservices/wrapper/WrapperFactoryDefault.java | 0
.../wrapper/dispatchers/InteractionEventDispatcher.java | 0
.../dispatchers/InteractionEventDispatcherTypeSafe.java | 0
.../handlers/AbstractCollectionInvocationHandler.java | 0
.../wrapper/handlers/CollectionInvocationHandler.java | 0
.../wrapper/handlers/DelegatingInvocationHandler.java | 0
.../handlers/DelegatingInvocationHandlerDefault.java | 0
.../wrapper/handlers/DomainObjectInvocationHandler.java | 0
.../wrapper/handlers/MapInvocationHandler.java | 0
.../wrapper/handlers/ProxyContextHandler.java | 0
.../wrapper/internal/util/MethodPrefixFinder.java | 0
.../isis/runtimeservices/wrapper/proxy/ProxyCreator.java | 0
.../runtimeservices/xactn/TransactionServiceSpring.java | 0
.../runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java | 0
.../xmlsnapshot/XmlSnapshotServiceDefault.java | 0
.../isis/runtimeservices/ServiceInstantiatorTest.java | 0
.../changes/PreAndPostValues_shouldAudit_Test.java | 0
.../email/EmailServiceDefaultTest_actually.java | 0
.../email/EmailServiceDefaultTest_notEmpty.java | 0
.../apache/isis/runtimeservices/i18n/po/PoReaderTest.java | 0
.../isis/runtimeservices/i18n/po/PoWriterTest_escape.java | 0
.../runtimeservices/wrapper/WrapperFactoryDefaultTest.java | 0
.../isis/runtimeservices/wrapper/dom/claims/Approver.java | 0
.../isis/runtimeservices/wrapper/dom/claims/Claimant.java | 0
.../runtimeservices/wrapper/dom/employees/Employee.java | 0
.../wrapper/dom/employees/EmployeeRepository.java | 0
.../wrapper/dom/employees/EmployeeRepositoryImpl.java | 0
93 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/pom.xml b/core/pom.xml
index 2ac244b..df572e7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1849,7 +1849,7 @@
<module>applib</module>
<module>metamodel</module>
<module>runtime</module>
- <module>runtime-services</module>
+ <module>runtimeservices</module>
<module>webapp</module>
<module>webboot-springboot</module>
diff --git a/core/runtime-services/pom.xml b/core/runtimeservices/pom.xml
similarity index 100%
rename from core/runtime-services/pom.xml
rename to core/runtimeservices/pom.xml
diff --git a/core/runtime-services/src/main/doc/antora.yml b/core/runtimeservices/src/main/doc/antora.yml
similarity index 100%
rename from core/runtime-services/src/main/doc/antora.yml
rename to core/runtimeservices/src/main/doc/antora.yml
diff --git a/core/runtime-services/src/main/doc/modules/runtime-services/images/ContentNegotiationService/accept-json.png b/core/runtimeservices/src/main/doc/modules/runtime-services/images/ContentNegotiationService/accept-json.png
similarity index 100%
rename from core/runtime-services/src/main/doc/modules/runtime-services/images/ContentNegotiationService/accept-json.png
rename to core/runtimeservices/src/main/doc/modules/runtime-services/images/ContentNegotiationService/accept-json.png
diff --git a/core/runtime-services/src/main/doc/modules/runtime-services/images/ContentNegotiationService/accept-xml.png b/core/runtimeservices/src/main/doc/modules/runtime-services/images/ContentNegotiationService/accept-xml.png
similarity index 100%
rename from core/runtime-services/src/main/doc/modules/runtime-services/images/ContentNegotiationService/accept-xml.png
rename to core/runtimeservices/src/main/doc/modules/runtime-services/images/ContentNegotiationService/accept-xml.png
diff --git a/core/runtime-services/src/main/doc/modules/runtime-services/images/ContentNegotiationService/facade-choices.png b/core/runtimeservices/src/main/doc/modules/runtime-services/images/ContentNegotiationService/facade-choices.png
similarity index 100%
rename from core/runtime-services/src/main/doc/modules/runtime-services/images/ContentNegotiationService/facade-choices.png
rename to core/runtimeservices/src/main/doc/modules/runtime-services/images/ContentNegotiationService/facade-choices.png
diff --git a/core/runtime-services/src/main/doc/modules/runtime-services/images/ContentNegotiationService/facade-choices.pptx b/core/runtimeservices/src/main/doc/modules/runtime-services/images/ContentNegotiationService/facade-choices.pptx
similarity index 100%
rename from core/runtime-services/src/main/doc/modules/runtime-services/images/ContentNegotiationService/facade-choices.pptx
rename to core/runtimeservices/src/main/doc/modules/runtime-services/images/ContentNegotiationService/facade-choices.pptx
diff --git a/core/runtime-services/src/main/doc/modules/runtime-services/images/RepresentationService/service-collaborations.png b/core/runtimeservices/src/main/doc/modules/runtime-services/images/RepresentationService/service-collaborations.png
similarity index 100%
rename from core/runtime-services/src/main/doc/modules/runtime-services/images/RepresentationService/service-collaborations.png
rename to core/runtimeservices/src/main/doc/modules/runtime-services/images/RepresentationService/service-collaborations.png
diff --git a/core/runtime-services/src/main/doc/modules/runtime-services/images/RepresentationService/service-collaborations.pptx b/core/runtimeservices/src/main/doc/modules/runtime-services/images/RepresentationService/service-collaborations.pptx
similarity index 100%
rename from core/runtime-services/src/main/doc/modules/runtime-services/images/RepresentationService/service-collaborations.pptx
rename to core/runtimeservices/src/main/doc/modules/runtime-services/images/RepresentationService/service-collaborations.pptx
diff --git a/core/runtime-services/src/main/doc/modules/runtime-services/nav.adoc b/core/runtimeservices/src/main/doc/modules/runtime-services/nav.adoc
similarity index 100%
rename from core/runtime-services/src/main/doc/modules/runtime-services/nav.adoc
rename to core/runtimeservices/src/main/doc/modules/runtime-services/nav.adoc
diff --git a/core/runtime-services/src/main/doc/modules/runtime-services/pages/about.adoc b/core/runtimeservices/src/main/doc/modules/runtime-services/pages/about.adoc
similarity index 100%
rename from core/runtime-services/src/main/doc/modules/runtime-services/pages/about.adoc
rename to core/runtimeservices/src/main/doc/modules/runtime-services/pages/about.adoc
diff --git a/core/runtime-services/src/main/doc/modules/runtime-services/pages/application-layer.adoc b/core/runtimeservices/src/main/doc/modules/runtime-services/pages/application-layer.adoc
similarity index 100%
rename from core/runtime-services/src/main/doc/modules/runtime-services/pages/application-layer.adoc
rename to core/runtimeservices/src/main/doc/modules/runtime-services/pages/application-layer.adoc
diff --git a/core/runtime-services/src/main/doc/modules/runtime-services/pages/application-layer/AuthenticationSessionProvider.adoc b/core/runtimeservices/src/main/doc/modules/runtime-services/pages/application-layer/AuthenticationSessionProvider.adoc
similarity index 100%
rename from core/runtime-services/src/main/doc/modules/runtime-services/pages/application-layer/AuthenticationSessionProvider.adoc
rename to core/runtimeservices/src/main/doc/modules/runtime-services/pages/application-layer/AuthenticationSessionProvider.adoc
diff --git a/core/runtime-services/src/main/doc/modules/runtime-services/pages/application-layer/CommandDtoServiceInternal.adoc b/core/runtimeservices/src/main/doc/modules/runtime-services/pages/application-layer/CommandDtoServiceInternal.adoc
similarity index 100%
rename from core/runtime-services/src/main/doc/modules/runtime-services/pages/application-layer/CommandDtoServiceInternal.adoc
rename to core/runtimeservices/src/main/doc/modules/runtime-services/pages/application-layer/CommandDtoServiceInternal.adoc
diff --git a/core/runtime-services/src/main/doc/modules/runtime-services/pages/application-layer/InteractionDtoServiceInternal.adoc b/core/runtimeservices/src/main/doc/modules/runtime-services/pages/application-layer/InteractionDtoServiceInternal.adoc
similarity index 100%
rename from core/runtime-services/src/main/doc/modules/runtime-services/pages/application-layer/InteractionDtoServiceInternal.adoc
rename to core/runtimeservices/src/main/doc/modules/runtime-services/pages/application-layer/InteractionDtoServiceInternal.adoc
diff --git a/core/runtime-services/src/main/doc/modules/runtime-services/pages/persistence-layer.adoc b/core/runtimeservices/src/main/doc/modules/runtime-services/pages/persistence-layer.adoc
similarity index 100%
rename from core/runtime-services/src/main/doc/modules/runtime-services/pages/persistence-layer.adoc
rename to core/runtimeservices/src/main/doc/modules/runtime-services/pages/persistence-layer.adoc
diff --git a/core/runtime-services/src/main/doc/modules/runtime-services/pages/persistence-layer/AuditingServiceInternal.adoc b/core/runtimeservices/src/main/doc/modules/runtime-services/pages/persistence-layer/AuditingServiceInternal.adoc
similarity index 100%
rename from core/runtime-services/src/main/doc/modules/runtime-services/pages/persistence-layer/AuditingServiceInternal.adoc
rename to core/runtimeservices/src/main/doc/modules/runtime-services/pages/persistence-layer/AuditingServiceInternal.adoc
diff --git a/core/runtime-services/src/main/doc/modules/runtime-services/pages/persistence-layer/ChangedObjectsServiceInternal.adoc b/core/runtimeservices/src/main/doc/modules/runtime-services/pages/persistence-layer/ChangedObjectsServiceInternal.adoc
similarity index 100%
rename from core/runtime-services/src/main/doc/modules/runtime-services/pages/persistence-layer/ChangedObjectsServiceInternal.adoc
rename to core/runtimeservices/src/main/doc/modules/runtime-services/pages/persistence-layer/ChangedObjectsServiceInternal.adoc
diff --git a/core/runtime-services/src/main/doc/modules/runtime-services/pages/persistence-layer/PersistenceSessionServiceInternal.adoc b/core/runtimeservices/src/main/doc/modules/runtime-services/pages/persistence-layer/PersistenceSessionServiceInternal.adoc
similarity index 100%
rename from core/runtime-services/src/main/doc/modules/runtime-services/pages/persistence-layer/PersistenceSessionServiceInternal.adoc
rename to core/runtimeservices/src/main/doc/modules/runtime-services/pages/persistence-layer/PersistenceSessionServiceInternal.adoc
diff --git a/core/runtime-services/src/main/doc/modules/runtime-services/pages/persistence-layer/PublishingServiceInternal.adoc b/core/runtimeservices/src/main/doc/modules/runtime-services/pages/persistence-layer/PublishingServiceInternal.adoc
similarity index 100%
rename from core/runtime-services/src/main/doc/modules/runtime-services/pages/persistence-layer/PublishingServiceInternal.adoc
rename to core/runtimeservices/src/main/doc/modules/runtime-services/pages/persistence-layer/PublishingServiceInternal.adoc
diff --git a/core/runtime-services/src/main/doc/modules/runtime-services/pages/presentation-layer.adoc b/core/runtimeservices/src/main/doc/modules/runtime-services/pages/presentation-layer.adoc
similarity index 100%
rename from core/runtime-services/src/main/doc/modules/runtime-services/pages/presentation-layer.adoc
rename to core/runtimeservices/src/main/doc/modules/runtime-services/pages/presentation-layer.adoc
diff --git a/core/runtime-services/src/main/doc/modules/runtime-services/pages/presentation-layer/ContentNegotiationService.adoc b/core/runtimeservices/src/main/doc/modules/runtime-services/pages/presentation-layer/ContentNegotiationService.adoc
similarity index 100%
rename from core/runtime-services/src/main/doc/modules/runtime-services/pages/presentation-layer/ContentNegotiationService.adoc
rename to core/runtimeservices/src/main/doc/modules/runtime-services/pages/presentation-layer/ContentNegotiationService.adoc
diff --git a/core/runtime-services/src/main/doc/modules/runtime-services/pages/presentation-layer/RepresentationService.adoc b/core/runtimeservices/src/main/doc/modules/runtime-services/pages/presentation-layer/RepresentationService.adoc
similarity index 100%
rename from core/runtime-services/src/main/doc/modules/runtime-services/pages/presentation-layer/RepresentationService.adoc
rename to core/runtimeservices/src/main/doc/modules/runtime-services/pages/presentation-layer/RepresentationService.adoc
diff --git a/core/runtime-services/src/main/doc/modules/runtime-services/partials/module-nav.adoc b/core/runtimeservices/src/main/doc/modules/runtime-services/partials/module-nav.adoc
similarity index 100%
rename from core/runtime-services/src/main/doc/modules/runtime-services/partials/module-nav.adoc
rename to core/runtimeservices/src/main/doc/modules/runtime-services/partials/module-nav.adoc
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/InitialisationException.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/InitialisationException.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/InitialisationException.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/InitialisationException.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/ServiceException.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/ServiceException.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/ServiceException.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/ServiceException.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/background/BackgroundCommandExecution.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/background/BackgroundCommandExecution.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/background/BackgroundCommandExecution.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/background/BackgroundCommandExecution.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/background/CommandExecutionAbstract.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/background/CommandExecutionAbstract.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/background/CommandExecutionAbstract.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/background/CommandExecutionAbstract.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/bookmarks/BookmarkServiceInternalDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/bookmarks/BookmarkServiceInternalDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/bookmarks/BookmarkServiceInternalDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/bookmarks/BookmarkServiceInternalDefault.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandDtoServiceInternalDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandDtoServiceInternalDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandDtoServiceInternalDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandDtoServiceInternalDefault.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandServiceDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandServiceDefault.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/error/EmailTicket.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/error/EmailTicket.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/error/EmailTicket.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/error/EmailTicket.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/error/SimpleTicket.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/error/SimpleTicket.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/error/SimpleTicket.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/error/SimpleTicket.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/eventbus/EventBusServiceSpring.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/eventbus/EventBusServiceSpring.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/eventbus/EventBusServiceSpring.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/eventbus/EventBusServiceSpring.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/Block.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/Block.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/Block.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/Block.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/ContextAndMsgId.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/ContextAndMsgId.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/ContextAndMsgId.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/ContextAndMsgId.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoAbstract.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoAbstract.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoAbstract.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoAbstract.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoDisabled.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoDisabled.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoDisabled.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoDisabled.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoReader.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoReader.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoReader.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoReader.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoWriter.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoWriter.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoWriter.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoWriter.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePoMenu.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePoMenu.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePoMenu.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePoMenu.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/Util.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/Util.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/Util.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/Util.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/ServiceAndAction.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/ServiceAndAction.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/ServiceAndAction.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/ServiceAndAction.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/publish/PublishedObjectsDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublishedObjectsDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/publish/PublishedObjectsDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublishedObjectsDefault.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/routing/RoutingServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/routing/RoutingServiceDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/routing/RoutingServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/routing/RoutingServiceDefault.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/sudo/SudoServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sudo/SudoServiceDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/sudo/SudoServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sudo/SudoServiceDefault.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userprof/UserProfileServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userprof/UserProfileServiceDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userprof/UserProfileServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userprof/UserProfileServiceDefault.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userreg/EmailNotificationServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userreg/EmailNotificationServiceDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userreg/EmailNotificationServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userreg/EmailNotificationServiceDefault.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userreg/EmailVerificationTemplate.html b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userreg/EmailVerificationTemplate.html
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userreg/EmailVerificationTemplate.html
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userreg/EmailVerificationTemplate.html
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userreg/PasswordResetTemplate.html b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userreg/PasswordResetTemplate.html
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userreg/PasswordResetTemplate.html
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userreg/PasswordResetTemplate.html
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/AsyncWrapDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/AsyncWrapDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/AsyncWrapDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/AsyncWrapDefault.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcher.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcher.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcher.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcher.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/AbstractCollectionInvocationHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/AbstractCollectionInvocationHandler.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/AbstractCollectionInvocationHandler.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/AbstractCollectionInvocationHandler.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/CollectionInvocationHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/CollectionInvocationHandler.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/CollectionInvocationHandler.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/CollectionInvocationHandler.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandler.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandler.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandler.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/MapInvocationHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/MapInvocationHandler.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/MapInvocationHandler.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/MapInvocationHandler.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/ProxyContextHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/ProxyContextHandler.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/ProxyContextHandler.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/ProxyContextHandler.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/internal/util/MethodPrefixFinder.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/internal/util/MethodPrefixFinder.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/internal/util/MethodPrefixFinder.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/internal/util/MethodPrefixFinder.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/proxy/ProxyCreator.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/proxy/ProxyCreator.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/proxy/ProxyCreator.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/proxy/ProxyCreator.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xactn/TransactionServiceSpring.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xactn/TransactionServiceSpring.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xactn/TransactionServiceSpring.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xactn/TransactionServiceSpring.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/ServiceInstantiatorTest.java b/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/ServiceInstantiatorTest.java
similarity index 100%
rename from core/runtime-services/src/test/java/org/apache/isis/runtimeservices/ServiceInstantiatorTest.java
rename to core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/ServiceInstantiatorTest.java
diff --git a/core/runtime-services/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
similarity index 100%
rename from core/runtime-services/src/test/java/org/apache/isis/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
rename to core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_actually.java b/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_actually.java
similarity index 100%
rename from core/runtime-services/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_actually.java
rename to core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_actually.java
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_notEmpty.java b/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_notEmpty.java
similarity index 100%
rename from core/runtime-services/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_notEmpty.java
rename to core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_notEmpty.java
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoReaderTest.java b/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoReaderTest.java
similarity index 100%
rename from core/runtime-services/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoReaderTest.java
rename to core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoReaderTest.java
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoWriterTest_escape.java b/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoWriterTest_escape.java
similarity index 100%
rename from core/runtime-services/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoWriterTest_escape.java
rename to core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoWriterTest_escape.java
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefaultTest.java b/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
similarity index 100%
rename from core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
rename to core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Approver.java b/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Approver.java
similarity index 100%
rename from core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Approver.java
rename to core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Approver.java
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Claimant.java b/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Claimant.java
similarity index 100%
rename from core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Claimant.java
rename to core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Claimant.java
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/Employee.java b/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/Employee.java
similarity index 100%
rename from core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/Employee.java
rename to core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/Employee.java
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepository.java b/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepository.java
similarity index 100%
rename from core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepository.java
rename to core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepository.java
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepositoryImpl.java b/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepositoryImpl.java
similarity index 100%
rename from core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepositoryImpl.java
rename to core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepositoryImpl.java
[isis] 06/22: ISIS-2259: reorg 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 ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit aeef432dc489d0bf881d4ee362a88f1ddccf664e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 12:22:51 2020 +0000
ISIS-2259: reorg sse module
---
examples/demo/pom.xml | 4 +--
.../demoapp/dom/actions/async/AsyncActionDemo.java | 8 ++---
.../java/demoapp/dom/actions/async/DemoTask.java | 4 +--
.../demo/src/main/java/demoapp/webapp/DemoApp.java | 6 ++--
valuetypes/asciidoc/ui/pom.xml | 2 +-
.../asciidoc/ui/IsisModuleValAsciidocUi.java | 4 +--
valuetypes/pom.xml | 16 ++++++---
valuetypes/sse/{ => applib}/pom.xml | 8 ++---
.../sse/applib/IsisModuleValSseApplib.java} | 4 +--
.../sse/applib/annotations}/ServerSentEvents.java | 2 +-
.../sse/applib/annotations}/SseSource.java | 6 ++--
.../extensions/sse/applib/service}/SseChannel.java | 4 ++-
.../extensions/sse/applib/service}/SseService.java | 4 ++-
.../sse/applib/value}/ListeningMarkup.java | 4 +--
valuetypes/sse/{ => metamodel}/pom.xml | 25 +++++--------
.../sse/metamodel/IsisModuleValSseMetaModel.java} | 17 +++++----
.../facets/SseAnnotationFacetFactory.java | 19 ++++++++--
.../sse/metamodel}/facets/SseObserveFacet.java | 4 +--
.../metamodel}/facets/SseObserveFacetAbstract.java | 4 +--
...eObserveFacetForServerSentEventsAnnotation.java | 6 ++--
valuetypes/sse/pom.xml | 41 +++++++---------------
.../isis/extensions/sse/SseMetaModelPlugin.java | 38 --------------------
valuetypes/sse/{ => ui}/pom.xml | 17 +++++----
.../extensions/sse/ui/IsisModuleValSseUi.java} | 15 ++++----
.../sse/ui}/markup/ListeningMarkupComponent.java | 2 +-
.../markup/ListeningMarkupComponent_observing.java | 2 +-
.../ListeningMarkupPanelFactoriesForWicket.java | 4 +--
.../sse/ui}/markup/js/ObservingComponent.js | 0
.../sse/ui}/services/SseServiceDefault.java | 8 ++---
.../sse/ui}/webmodule/ServerSentEventsServlet.java | 10 +++---
.../ui}/webmodule/WebModuleServerSentEvents.java | 2 +-
31 files changed, 131 insertions(+), 159 deletions(-)
diff --git a/examples/demo/pom.xml b/examples/demo/pom.xml
index 3767d13..eca3c8c 100644
--- a/examples/demo/pom.xml
+++ b/examples/demo/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-asciidoc-applib</artifactId>
+ <artifactId>isis-valuetypes-asciidoc-ui</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.incubator</groupId>
@@ -87,7 +87,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-sse</artifactId>
+ <artifactId>isis-valuetypes-sse-ui</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.extensions</groupId>
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 7b33d09..d3196b0 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.api.ServerSentEvents;
-import org.apache.isis.extensions.sse.api.SseService;
-import org.apache.isis.extensions.sse.api.SseService.ExecutionBehavior;
-import org.apache.isis.extensions.sse.markup.ListeningMarkup;
+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 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 98b82c1..750049a 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.api.SseChannel;
-import org.apache.isis.extensions.sse.api.SseSource;
+import org.apache.isis.extensions.sse.applib.service.SseChannel;
+import org.apache.isis.extensions.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 efd4df9..788c777 100644
--- a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
+++ b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
@@ -40,7 +40,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.IsisModuleExtSse;
+import org.apache.isis.extensions.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;
@@ -87,8 +87,8 @@ public class DemoApp extends SpringBootServletInitializer {
IsisModuleSecurityShiro.class,
IsisModuleJdoDataNucleus5.class,
IsisModuleWicketViewer.class,
- IsisModuleExtSse.class, // server sent events
- IsisModuleExtAsciidocUi.class, // ascii-doc rendering support
+ IsisModuleValSseApplib.class, // server sent events
+ IsisModuleValAsciidocUi.class, // ascii-doc rendering support
// REST
IsisModuleRestfulObjectsViewer.class,
diff --git a/valuetypes/asciidoc/ui/pom.xml b/valuetypes/asciidoc/ui/pom.xml
index 1e82885..5658eac 100644
--- a/valuetypes/asciidoc/ui/pom.xml
+++ b/valuetypes/asciidoc/ui/pom.xml
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-applib</artifactId>
+ <artifactId>isis-valuetypes-asciidoc-applib</artifactId>
</dependency>
<dependency>
diff --git a/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/IsisModuleValAsciidocUi.java b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/IsisModuleValAsciidocUi.java
index 76f5da0..ce1c446 100644
--- a/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/IsisModuleValAsciidocUi.java
+++ b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/IsisModuleValAsciidocUi.java
@@ -21,12 +21,12 @@ package org.apache.isis.valuetypes.asciidoc.ui;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.asciidoc.applib.IsisModuleExtAsciidocApplib;
+import org.apache.isis.valuetypes.asciidoc.applib.IsisModuleValAsciidocApplib;
import org.apache.isis.valuetypes.asciidoc.ui.components.AsciiDocPanelFactoriesForWicket;
@Configuration
@Import({
- IsisModuleExtAsciidocApplib.class,
+ IsisModuleValAsciidocApplib.class,
AsciiDocPanelFactoriesForWicket.Parented.class,
AsciiDocPanelFactoriesForWicket.Standalone.class
})
diff --git a/valuetypes/pom.xml b/valuetypes/pom.xml
index 996783e..38a46f3 100644
--- a/valuetypes/pom.xml
+++ b/valuetypes/pom.xml
@@ -85,7 +85,17 @@
<dependency>
<groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-sse</artifactId>
+ <artifactId>isis-valuetypes-sse-applib</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-sse-metamodel</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-sse-ui</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -102,11 +112,7 @@
<modules>
<module>asciidoc</module>
-
<module>markdown</module>
- <module>markdown/applib</module>
- <module>markdown/ui</module>
-
<module>sse</module>
</modules>
diff --git a/valuetypes/sse/pom.xml b/valuetypes/sse/applib/pom.xml
similarity index 88%
copy from valuetypes/sse/pom.xml
copy to valuetypes/sse/applib/pom.xml
index ebbfd1c..5be13fe 100644
--- a/valuetypes/sse/pom.xml
+++ b/valuetypes/sse/applib/pom.xml
@@ -18,16 +18,16 @@
<groupId>org.apache.isis.valuetypes</groupId>
<artifactId>isis-valuetypes</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>isis-valuetypes-sse</artifactId>
+ <artifactId>isis-valuetypes-sse-applib</artifactId>
<name>Apache Isis Val - Server Sent Events</name>
<description></description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.sse</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/valuetypes/sse</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.sse.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/valuetypes/sse/applib</git-plugin.propertiesDir>
</properties>
<dependencies>
diff --git a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/IsisModuleExtSse.java b/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/IsisModuleValSseApplib.java
similarity index 94%
copy from valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/IsisModuleExtSse.java
copy to valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/IsisModuleValSseApplib.java
index b62e7b4..dfd66cd 100644
--- a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/IsisModuleExtSse.java
+++ b/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/IsisModuleValSseApplib.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse;
+package org.apache.isis.extensions.sse.applib;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@@ -36,6 +36,6 @@ import org.apache.isis.extensions.sse.webmodule.WebModuleServerSentEvents;
SseServiceDefault.class,
WebModuleServerSentEvents.class
})
-public class IsisModuleExtSse {
+public class IsisModuleValSseApplib {
}
diff --git a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/ServerSentEvents.java b/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/ServerSentEvents.java
similarity index 95%
rename from valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/ServerSentEvents.java
rename to valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/ServerSentEvents.java
index 4d20df3..3d87bd1 100644
--- a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/ServerSentEvents.java
+++ b/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/ServerSentEvents.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.api;
+package org.apache.isis.extensions.sse.applib.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/SseSource.java b/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/SseSource.java
similarity index 89%
rename from valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/SseSource.java
rename to valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/SseSource.java
index aa00cbe..5c7756e 100644
--- a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/SseSource.java
+++ b/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/SseSource.java
@@ -17,7 +17,9 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.api;
+package org.apache.isis.extensions.sse.applib.annotations;
+
+import org.apache.isis.extensions.sse.applib.service.SseChannel;
/**
* Server-sent events.
@@ -37,7 +39,7 @@ public interface SseSource {
/**
* This class is the default for the
- * {@link ServerSentEvents#observe()} annotation attribute.
+ * {@link ServerSentEvents#observe()} annotation attribute.
*/
public static final class Noop implements SseSource {
diff --git a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/SseChannel.java b/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseChannel.java
similarity index 91%
rename from valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/SseChannel.java
rename to valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseChannel.java
index a8c3b19..fbc3689 100644
--- a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/SseChannel.java
+++ b/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseChannel.java
@@ -17,11 +17,13 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.api;
+package org.apache.isis.extensions.sse.applib.service;
import java.util.UUID;
import java.util.function.Predicate;
+import org.apache.isis.extensions.sse.applib.annotations.SseSource;
+
/**
* Server-sent events.
*
diff --git a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/SseService.java b/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseService.java
similarity index 90%
rename from valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/SseService.java
rename to valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseService.java
index c81c28c..caad878 100644
--- a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/api/SseService.java
+++ b/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseService.java
@@ -16,10 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.api;
+package org.apache.isis.extensions.sse.applib.service;
import java.util.Optional;
+import org.apache.isis.extensions.sse.applib.annotations.SseSource;
+
/**
* Server-sent events.
*
diff --git a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkup.java b/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/value/ListeningMarkup.java
similarity index 84%
rename from valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkup.java
rename to valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/value/ListeningMarkup.java
index d03eb45..848c36c 100644
--- a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkup.java
+++ b/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/value/ListeningMarkup.java
@@ -1,8 +1,8 @@
-package org.apache.isis.extensions.sse.markup;
+package org.apache.isis.extensions.sse.applib.value;
import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.value.Markup;
-import org.apache.isis.extensions.sse.api.ServerSentEvents;
+import org.apache.isis.extensions.sse.applib.annotations.ServerSentEvents;
/**
* Immutable value type holding pre-rendered HTML. Supports server sent events.
diff --git a/valuetypes/sse/pom.xml b/valuetypes/sse/metamodel/pom.xml
similarity index 71%
copy from valuetypes/sse/pom.xml
copy to valuetypes/sse/metamodel/pom.xml
index ebbfd1c..4960f42 100644
--- a/valuetypes/sse/pom.xml
+++ b/valuetypes/sse/metamodel/pom.xml
@@ -16,37 +16,28 @@
<parent>
<groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes</artifactId>
+ <artifactId>isis-valuetypes-sse</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>isis-valuetypes-sse</artifactId>
- <name>Apache Isis Val - Server Sent Events</name>
- <description></description>
+ <artifactId>isis-valuetypes-sse-metamodel</artifactId>
+ <name>Apache Isis Val - Server Sent Events (metamodel)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.sse</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/valuetypes/sse</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.sse.metamodel</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/valuetypes/sse/metamodel</git-plugin.propertiesDir>
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-sse-applib</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webapp</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-viewer-wicket-ui</artifactId>
- <scope>provided</scope>
+ <artifactId>isis-metamodel</artifactId>
</dependency>
</dependencies>
diff --git a/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/IsisModuleValAsciidocUi.java b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/IsisModuleValSseMetaModel.java
similarity index 70%
copy from valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/IsisModuleValAsciidocUi.java
copy to valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/IsisModuleValSseMetaModel.java
index 76f5da0..7c6a0f6 100644
--- a/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/IsisModuleValAsciidocUi.java
+++ b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/IsisModuleValSseMetaModel.java
@@ -16,19 +16,22 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.valuetypes.asciidoc.ui;
+package org.apache.isis.extensions.sse.metamodel;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.asciidoc.applib.IsisModuleExtAsciidocApplib;
-import org.apache.isis.valuetypes.asciidoc.ui.components.AsciiDocPanelFactoriesForWicket;
+import org.apache.isis.extensions.sse.applib.IsisModuleValSseApplib;
+import org.apache.isis.extensions.sse.metamodel.facets.SseAnnotationFacetFactory;
@Configuration
@Import({
- IsisModuleExtAsciidocApplib.class,
- AsciiDocPanelFactoriesForWicket.Parented.class,
- AsciiDocPanelFactoriesForWicket.Standalone.class
+ // module dependencies
+ IsisModuleValSseApplib.class,
+
+ // @Component's
+ SseAnnotationFacetFactory.Register.class,
})
-public class IsisModuleValAsciidocUi {
+public class IsisModuleValSseMetaModel {
+
}
diff --git a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseAnnotationFacetFactory.java b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java
similarity index 72%
rename from valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseAnnotationFacetFactory.java
rename to valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java
index dc110fe..c013ca9 100644
--- a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseAnnotationFacetFactory.java
+++ b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java
@@ -17,17 +17,32 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.facets;
+package org.apache.isis.extensions.sse.metamodel.facets;
-import org.apache.isis.extensions.sse.api.ServerSentEvents;
+import org.springframework.stereotype.Component;
+
+import org.apache.isis.extensions.sse.applib.annotations.ServerSentEvents;
import org.apache.isis.metamodel.facetapi.FacetUtil;
import org.apache.isis.metamodel.facetapi.FeatureType;
+import org.apache.isis.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.metamodel.facets.FacetFactoryAbstract;
+import org.apache.isis.metamodel.progmodel.ProgrammingModel;
import lombok.val;
public class SseAnnotationFacetFactory extends FacetFactoryAbstract {
+ @Component
+ public static class Register implements MetaModelRefiner {
+
+ @Override
+ public void refineProgrammingModel(ProgrammingModel programmingModel) {
+ programmingModel.addFactory(
+ ProgrammingModel.FacetProcessingOrder.Z2_AFTER_FINALLY,
+ SseAnnotationFacetFactory.class);
+ }
+ }
+
public SseAnnotationFacetFactory() {
super(FeatureType.PROPERTIES_ONLY);
}
diff --git a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacet.java b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacet.java
similarity index 91%
rename from valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacet.java
rename to valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacet.java
index 720f9ef..f359e3a 100644
--- a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacet.java
+++ b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacet.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.facets;
+package org.apache.isis.extensions.sse.metamodel.facets;
import org.apache.isis.applib.value.LocalResourcePath;
-import org.apache.isis.extensions.sse.api.SseSource;
+import org.apache.isis.extensions.sse.applib.annotations.SseSource;
import org.apache.isis.metamodel.facets.SingleClassValueFacet;
/**
diff --git a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetAbstract.java b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetAbstract.java
similarity index 93%
rename from valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetAbstract.java
rename to valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetAbstract.java
index 59bdc27..44051bf 100644
--- a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetAbstract.java
+++ b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetAbstract.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.facets;
+package org.apache.isis.extensions.sse.metamodel.facets;
import org.apache.isis.commons.internal.exceptions._Exceptions;
-import org.apache.isis.extensions.sse.api.SseSource;
+import org.apache.isis.extensions.sse.applib.annotations.SseSource;
import org.apache.isis.metamodel.facetapi.Facet;
import org.apache.isis.metamodel.facetapi.FacetHolder;
import org.apache.isis.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetForServerSentEventsAnnotation.java b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java
similarity index 89%
rename from valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetForServerSentEventsAnnotation.java
rename to valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java
index 67e6acb..3a75d44 100644
--- a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/facets/SseObserveFacetForServerSentEventsAnnotation.java
+++ b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.facets;
+package org.apache.isis.extensions.sse.metamodel.facets;
import java.util.Optional;
-import org.apache.isis.extensions.sse.api.ServerSentEvents;
-import org.apache.isis.extensions.sse.api.SseSource;
+import org.apache.isis.extensions.sse.applib.annotations.ServerSentEvents;
+import org.apache.isis.extensions.sse.applib.annotations.SseSource;
import org.apache.isis.metamodel.facetapi.FacetHolder;
/**
diff --git a/valuetypes/sse/pom.xml b/valuetypes/sse/pom.xml
index ebbfd1c..4f2d0a3 100644
--- a/valuetypes/sse/pom.xml
+++ b/valuetypes/sse/pom.xml
@@ -18,37 +18,20 @@
<groupId>org.apache.isis.valuetypes</groupId>
<artifactId>isis-valuetypes</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>isis-valuetypes-sse</artifactId>
- <name>Apache Isis Val - Server Sent Events</name>
- <description></description>
-
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.sse</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/valuetypes/sse</git-plugin.propertiesDir>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webapp</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-viewer-wicket-ui</artifactId>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
+ <name>Apache Isis Val - Server Sent Events (parent)</name>
+ <description>
+ Dynamically updating HTML markup
+ </description>
+
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>applib</module>
+ <module>metamodel</module>
+ <module>ui</module>
+ </modules>
</project>
diff --git a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/SseMetaModelPlugin.java b/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/SseMetaModelPlugin.java
deleted file mode 100644
index 1543476..0000000
--- a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/SseMetaModelPlugin.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.extensions.sse;
-
-import org.springframework.stereotype.Component;
-
-import org.apache.isis.extensions.sse.facets.SseAnnotationFacetFactory;
-import org.apache.isis.metamodel.facetapi.MetaModelRefiner;
-import org.apache.isis.metamodel.progmodel.ProgrammingModel;
-
-@Component
-public class SseMetaModelPlugin implements MetaModelRefiner {
-
- @Override
- public void refineProgrammingModel(ProgrammingModel programmingModel) {
- programmingModel.addFactory(
- ProgrammingModel.FacetProcessingOrder.Z2_AFTER_FINALLY,
- SseAnnotationFacetFactory.class,
- ProgrammingModel.Marker.INCUBATING);
- }
-
-}
diff --git a/valuetypes/sse/pom.xml b/valuetypes/sse/ui/pom.xml
similarity index 80%
copy from valuetypes/sse/pom.xml
copy to valuetypes/sse/ui/pom.xml
index ebbfd1c..48b8995 100644
--- a/valuetypes/sse/pom.xml
+++ b/valuetypes/sse/ui/pom.xml
@@ -16,23 +16,26 @@
<parent>
<groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes</artifactId>
+ <artifactId>isis-valuetypes-sse</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>isis-valuetypes-sse</artifactId>
- <name>Apache Isis Val - Server Sent Events</name>
- <description></description>
+ <artifactId>isis-valuetypes-sse-ui</artifactId>
+ <name>Apache Isis Val - Server Sent Events (ui)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.sse</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/valuetypes/sse</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.sse.ui</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/valuetypes/sse/ui</git-plugin.propertiesDir>
</properties>
<dependencies>
<dependency>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-sse-metamodel</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-metamodel</artifactId>
</dependency>
diff --git a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/IsisModuleExtSse.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/IsisModuleValSseUi.java
similarity index 72%
rename from valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/IsisModuleExtSse.java
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/IsisModuleValSseUi.java
index b62e7b4..c69d563 100644
--- a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/IsisModuleExtSse.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/IsisModuleValSseUi.java
@@ -16,19 +16,22 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse;
+package org.apache.isis.extensions.sse.ui;
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;
+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;
@Configuration
@Import({
+ // module dependencies
+ IsisModuleValSseMetaModel.class,
+
// @Component's
- SseMetaModelPlugin.class,
ListeningMarkupPanelFactoriesForWicket.Parented.class,
ListeningMarkupPanelFactoriesForWicket.Standalone.class,
@@ -36,6 +39,6 @@ import org.apache.isis.extensions.sse.webmodule.WebModuleServerSentEvents;
SseServiceDefault.class,
WebModuleServerSentEvents.class
})
-public class IsisModuleExtSse {
+public class IsisModuleValSseUi {
}
diff --git a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent.java
similarity index 97%
rename from valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent.java
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent.java
index 49df232..3565e12 100644
--- a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.markup;
+package org.apache.isis.extensions.sse.ui.markup;
import javax.inject.Inject;
diff --git a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent_observing.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent_observing.java
similarity index 98%
rename from valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent_observing.java
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent_observing.java
index 2c6da61..17bec7f 100644
--- a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupComponent_observing.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent_observing.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.markup;
+package org.apache.isis.extensions.sse.ui.markup;
import java.io.IOException;
import java.util.UUID;
diff --git a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupPanelFactoriesForWicket.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java
similarity index 96%
rename from valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupPanelFactoriesForWicket.java
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java
index d7b7079..84c0d3b 100644
--- a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/ListeningMarkupPanelFactoriesForWicket.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.markup;
+package org.apache.isis.extensions.sse.ui.markup;
import org.springframework.stereotype.Component;
import org.apache.isis.applib.value.LocalResourcePath;
-import org.apache.isis.extensions.sse.facets.SseObserveFacet;
+import org.apache.isis.extensions.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/src/main/java/org/apache/isis/extensions/sse/markup/js/ObservingComponent.js b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/js/ObservingComponent.js
similarity index 100%
rename from valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/markup/js/ObservingComponent.js
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/js/ObservingComponent.js
diff --git a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/services/SseServiceDefault.java
similarity index 97%
rename from valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/services/SseServiceDefault.java
index 0a9be80..2461da4 100644
--- a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/services/SseServiceDefault.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/services/SseServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.services;
+package org.apache.isis.extensions.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.commons.internal.collections._Lists;
-import org.apache.isis.extensions.sse.api.SseChannel;
-import org.apache.isis.extensions.sse.api.SseService;
-import org.apache.isis.extensions.sse.api.SseSource;
+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.runtime.persistence.transaction.IsisTransactionAspectSupport;
import org.apache.isis.runtime.session.IsisSessionFactory;
diff --git a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/ServerSentEventsServlet.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/webmodule/ServerSentEventsServlet.java
similarity index 93%
rename from valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/ServerSentEventsServlet.java
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/webmodule/ServerSentEventsServlet.java
index 585c20c..ce9f79d 100644
--- a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/ServerSentEventsServlet.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/webmodule/ServerSentEventsServlet.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.webmodule;
+package org.apache.isis.extensions.sse.ui.webmodule;
import java.io.IOException;
import java.util.Optional;
@@ -33,9 +33,9 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.isis.applib.util.JaxbAdapters;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.extensions.sse.api.SseChannel;
-import org.apache.isis.extensions.sse.api.SseService;
-import org.apache.isis.extensions.sse.markup.ListeningMarkup;
+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 static org.apache.isis.commons.internal.base._With.requires;
@@ -44,7 +44,7 @@ import lombok.val;
/**
* Server-sent events.
*
- * @see https://www.w3schools.com/html/html5_serversentevents.asp
+ * @see <a href="https://www.w3schools.com/html/html5_serversentevents.asp">Server Sent Events (@ w3schools)</a>
*
* @since 2.0
*
diff --git a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/webmodule/WebModuleServerSentEvents.java
similarity index 97%
rename from valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/webmodule/WebModuleServerSentEvents.java
index e0c03d1..66e3d8a 100644
--- a/valuetypes/sse/src/main/java/org/apache/isis/extensions/sse/webmodule/WebModuleServerSentEvents.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/webmodule/WebModuleServerSentEvents.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.webmodule;
+package org.apache.isis.extensions.sse.ui.webmodule;
import java.util.List;
[isis] 20/22: ISIS-2259: renames isis-webboot-springboot to
isis-core-webboot-springboot
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f7ce11d58ff30b010c27856290f8936dedc14bce
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 12:50:28 2020 +0000
ISIS-2259: renames isis-webboot-springboot to isis-core-webboot-springboot
---
core/detached-tests/pom.xml | 2 +-
core/persistence/jdo/datanucleus-5/pom.xml | 4 ++--
core/pom.xml | 4 ++--
core/testsupport/integtestsupport/pom.xml | 2 +-
core/webboot-springboot/pom.xml | 2 +-
legacy/testing/mavenplugin/pom.xml | 2 +-
mavendeps/webapp/pom.xml | 2 +-
testing/specsupport/applib/pom.xml | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/core/detached-tests/pom.xml b/core/detached-tests/pom.xml
index 251c58b..5ec207f 100644
--- a/core/detached-tests/pom.xml
+++ b/core/detached-tests/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webboot-springboot</artifactId>
+ <artifactId>isis-core-webboot-springboot</artifactId>
<scope>test</scope>
</dependency>
diff --git a/core/persistence/jdo/datanucleus-5/pom.xml b/core/persistence/jdo/datanucleus-5/pom.xml
index 55cbd9f..f1075de 100644
--- a/core/persistence/jdo/datanucleus-5/pom.xml
+++ b/core/persistence/jdo/datanucleus-5/pom.xml
@@ -104,7 +104,7 @@
<!--
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webboot-springboot</artifactId>
+ <artifactId>isis-core-webboot-springboot</artifactId>
</dependency>
-->
@@ -126,7 +126,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webboot-springboot</artifactId>
+ <artifactId>isis-core-webboot-springboot</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/core/pom.xml b/core/pom.xml
index 5d8ee47..2ac244b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -774,12 +774,12 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webboot-springboot</artifactId>
+ <artifactId>isis-core-webboot-springboot</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webboot-springboot</artifactId>
+ <artifactId>isis-core-webboot-springboot</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/core/testsupport/integtestsupport/pom.xml b/core/testsupport/integtestsupport/pom.xml
index f921bc5..73f0445 100644
--- a/core/testsupport/integtestsupport/pom.xml
+++ b/core/testsupport/integtestsupport/pom.xml
@@ -158,7 +158,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webboot-springboot</artifactId>
+ <artifactId>isis-core-webboot-springboot</artifactId>
</dependency>
</dependencies>
diff --git a/core/webboot-springboot/pom.xml b/core/webboot-springboot/pom.xml
index c2403a7..aee9ae3 100644
--- a/core/webboot-springboot/pom.xml
+++ b/core/webboot-springboot/pom.xml
@@ -26,7 +26,7 @@
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
- <artifactId>isis-webboot-springboot</artifactId>
+ <artifactId>isis-core-webboot-springboot</artifactId>
<name>Apache Isis Core - Web Boot using Spring Boot</name>
<description>
Defines the main Spring @Configuration, which transitively depends on the rest of core.
diff --git a/legacy/testing/mavenplugin/pom.xml b/legacy/testing/mavenplugin/pom.xml
index 26c43c1..6c53607 100644
--- a/legacy/testing/mavenplugin/pom.xml
+++ b/legacy/testing/mavenplugin/pom.xml
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webboot-springboot</artifactId>
+ <artifactId>isis-core-webboot-springboot</artifactId>
</dependency>
diff --git a/mavendeps/webapp/pom.xml b/mavendeps/webapp/pom.xml
index 1df1c12..6bc92d2 100644
--- a/mavendeps/webapp/pom.xml
+++ b/mavendeps/webapp/pom.xml
@@ -134,7 +134,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webboot-springboot</artifactId>
+ <artifactId>isis-core-webboot-springboot</artifactId>
</dependency>
</dependencies>
diff --git a/testing/specsupport/applib/pom.xml b/testing/specsupport/applib/pom.xml
index 94dc8ec..a0a4582 100644
--- a/testing/specsupport/applib/pom.xml
+++ b/testing/specsupport/applib/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webboot-springboot</artifactId>
+ <artifactId>isis-core-webboot-springboot</artifactId>
</dependency>
<!-- ISIS TESTING -->
[isis] 02/22: ISIS-2259: reorg specsupport module
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 191f3f297de2c39652bc244afb939fb3176a93f2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 11:25:34 2020 +0000
ISIS-2259: reorg specsupport module
---
testing/pom.xml | 4 +-
testing/specsupport/{ => applib}/pom.xml | 12 ++-
.../applib/IsisModuleTstSpecSupportAplib.java | 4 +
.../integration/ObjectFactoryForIntegration.java | 2 +-
.../isis/testing/specsupport/applib}/specs/V.java | 2 +-
testing/specsupport/pom.xml | 85 ++--------------------
.../specsupport/IsisModuleExtSpecSupport.java | 4 -
7 files changed, 21 insertions(+), 92 deletions(-)
diff --git a/testing/pom.xml b/testing/pom.xml
index 4158d04..d99dd36 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-specsupport</artifactId>
+ <artifactId>isis-testing-specsupport-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -119,10 +119,10 @@
<modules>
<module>fakedata</module>
<module>fixtures</module>
-
<module>h2console</module>
<module>hsqldbmgr</module>
<module>specsupport</module>
+
<module>unittestsupport/impl</module>
</modules>
diff --git a/testing/specsupport/pom.xml b/testing/specsupport/applib/pom.xml
similarity index 90%
copy from testing/specsupport/pom.xml
copy to testing/specsupport/applib/pom.xml
index b464493..76a8258 100644
--- a/testing/specsupport/pom.xml
+++ b/testing/specsupport/applib/pom.xml
@@ -16,18 +16,16 @@
<parent>
<groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing</artifactId>
+ <artifactId>isis-testing-specsupport</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>isis-testing-specsupport</artifactId>
- <name>Apache Isis Testing - Spec/Cucumber Support</name>
- <description></description>
+ <artifactId>isis-testing-specsupport-applib</artifactId>
+ <name>Apache Isis Testing - Spec/Cucumber (applib)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.testing.specsupport</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/testing/specsupport</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.testing.specsupport.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/testing/specsupport.applib</git-plugin.propertiesDir>
<cucumber.impl>io.cucumber</cucumber.impl>
<cucumber.version>4.8.0</cucumber.version>
diff --git a/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/IsisModuleTstSpecSupportAplib.java b/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/IsisModuleTstSpecSupportAplib.java
new file mode 100644
index 0000000..cd576b7
--- /dev/null
+++ b/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/IsisModuleTstSpecSupportAplib.java
@@ -0,0 +1,4 @@
+package org.apache.isis.testing.specsupport.applib;
+
+public class IsisModuleTstSpecSupportAplib {
+}
diff --git a/testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/integration/ObjectFactoryForIntegration.java b/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/integration/ObjectFactoryForIntegration.java
similarity index 97%
rename from testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/integration/ObjectFactoryForIntegration.java
rename to testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/integration/ObjectFactoryForIntegration.java
index 2ca5da2..1c6dcdc 100644
--- a/testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/integration/ObjectFactoryForIntegration.java
+++ b/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/integration/ObjectFactoryForIntegration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.specsupport.integration;
+package org.apache.isis.testing.specsupport.applib.integration;
import java.lang.reflect.Constructor;
import java.util.Map;
diff --git a/testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/specs/V.java b/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/specs/V.java
similarity index 99%
rename from testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/specs/V.java
rename to testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/specs/V.java
index 03eb0e4..9d42e46 100644
--- a/testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/specs/V.java
+++ b/testing/specsupport/applib/src/main/java/org/apache/isis/testing/specsupport/applib/specs/V.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.specsupport.specs;
+package org.apache.isis.testing.specsupport.applib.specs;
import org.joda.time.format.DateTimeFormat;
diff --git a/testing/specsupport/pom.xml b/testing/specsupport/pom.xml
index b464493..dc5f056 100644
--- a/testing/specsupport/pom.xml
+++ b/testing/specsupport/pom.xml
@@ -18,88 +18,19 @@
<groupId>org.apache.isis.testing</groupId>
<artifactId>isis-testing</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>isis-testing-specsupport</artifactId>
- <name>Apache Isis Testing - Spec/Cucumber Support</name>
- <description></description>
+ <name>Apache Isis Testing - Spec/Cucumber (parent)</name>
+ <description>
+ Allows Cucumber to be used to write BDD-style specifications, generally as an alternative to integration tests.
+ </description>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.testing.specsupport</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/testing/specsupport</git-plugin.propertiesDir>
+ <packaging>pom</packaging>
- <cucumber.impl>io.cucumber</cucumber.impl>
- <cucumber.version>4.8.0</cucumber.version>
-
- </properties>
+ <modules>
+ <module>applib</module>
+ </modules>
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-webboot-springboot</artifactId>
- </dependency>
-
- <!-- ISIS TESTING -->
-
- <dependency>
- <groupId>org.apache.isis.testing</groupId>
- <artifactId>isis-testing-fixtures-applib</artifactId>
- </dependency>
-
- <!-- TESTING -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-unittestsupport</artifactId>
- </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>org.jmock</groupId>
- <artifactId>jmock</artifactId>
- </dependency>
-
- <!-- CUCUMBER -->
- <dependency>
- <groupId>io.cucumber</groupId>
- <artifactId>cucumber-java</artifactId>
- <version>${cucumber.version}</version>
- </dependency>
- <dependency>
- <groupId>io.cucumber</groupId>
- <artifactId>cucumber-spring</artifactId>
- <version>${cucumber.version}</version>
- </dependency>
- <dependency>
- <groupId>io.cucumber</groupId>
- <artifactId>cucumber-junit</artifactId>
- <version>${cucumber.version}</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- </dependencies>
</project>
diff --git a/testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/IsisModuleExtSpecSupport.java b/testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/IsisModuleExtSpecSupport.java
deleted file mode 100644
index 6df376f..0000000
--- a/testing/specsupport/src/main/java/org/apache/isis/extensions/specsupport/IsisModuleExtSpecSupport.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.apache.isis.extensions.specsupport;
-
-public class IsisModuleExtSpecSupport {
-}
[isis] 22/22: 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 ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f0f62d5093da30e106e470c61513410356cc15d6
Merge: 2735499 f3f291a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 12:55:03 2020 +0000
Merge remote-tracking branch 'origin/master' into ide
.../keycloak/webmodule/WebModuleKeycloak.java | 7 +++----
.../security/shiro/webmodule/WebModuleShiro.java | 16 +++++++---------
.../webmodule/WebModuleJaxrsResteasy4.java | 8 +++-----
.../wicket/viewer/webmodule/WebModuleWicket.java | 8 +++-----
.../org/apache/isis/webapp/modules/WebModule.java | 11 +++++++----
.../isis/webapp/modules/WebModuleAbstract.java | 14 +++++++++++---
.../isis/webapp/modules/WebModuleContext.java | 21 +++------------------
.../logonlog/WebModuleLogOnExceptionLogger.java | 7 +++----
.../templresources/WebModuleTemplateResources.java | 7 +++----
.../cors/impl/webmodule/WebModuleCors.java | 7 +++----
.../jee_support/IsisCDIBeanScanInterceptor.java | 2 ++
.../h2console/ui/webmodule/WebModuleH2Console.java | 7 +++----
.../sse/ui/webmodule/WebModuleServerSentEvents.java | 7 +++----
13 files changed, 54 insertions(+), 68 deletions(-)
diff --cc extensions/vro/cors/impl/src/main/java/org/apache/isis/extensions/cors/impl/webmodule/WebModuleCors.java
index 6f35007,0000000..0d0b2d7
mode 100644,000000..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
@@@ -1,105 -1,0 +1,104 @@@
+/*
+ * 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.extensions.cors.impl.webmodule;
+
- import java.util.List;
-
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletException;
+
+import org.ebaysf.web.cors.CORSFilter;
+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.commons.collections.Can;
+import org.apache.isis.webapp.modules.WebModuleAbstract;
+
+import lombok.Getter;
+
+/**
+ * WebModule providing support for CORS
+ *
+ * @since 2.0
+ */
+@Service
+@Named("isisMapCors.WebModuleServerCors")
+@Qualifier("CORS")
+@Order(OrderPrecedence.HIGH)
+public final class WebModuleCors extends WebModuleAbstract {
+
+ private final static String CORS_FILTER_NAME = "CORS Filter";
+
+ @Getter
+ private final String name = "CORS";
+
+ @Inject
+ public WebModuleCors(ServiceInjector serviceInjector) {
+ super(serviceInjector);
+ }
+
+
+
+ /*
+ <filter>
+ <filter-name>CORS Filter</filter-name>
+ <filter-class>org.ebaysf.web.cors.CORSFilter</filter-class>
+ <init-param>
+ <param-name>cors.allowed.origins</param-name>
+ <param-value>*</param-value>
+ </init-param>
+ <init-param>
+ <param-name>cors.allowed.headers</param-name>
+ <param-value>Content-Type,Accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers,Authorization,Cache-Control,If-Modified-Since,Pragma</param-value>
+ </init-param>
+ <init-param>
+ <param-name>cors.exposed.headers</param-name>
+ <param-value>Authorization</param-value>
+ </init-param>
+ </filter>
+ <filter-mapping>
+ <filter-name>CORS Filter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+ */
+ @Override
- public List<ServletContextListener> init(ServletContext ctx) throws ServletException {
++ public Can<ServletContextListener> init(ServletContext ctx) throws ServletException {
+
+ registerFilter(ctx, CORS_FILTER_NAME, CORSFilter.class)
+ .ifPresent(filterReg -> {
+ filterReg.setInitParameter("cors.allowed.origins", "*");
+ filterReg.setInitParameter("cors.allowed.headers", "Content-Type,Accept,Origin,Access-Control-Request-Method,Access-Control-Request-Headers,Authorization,Cache-Control,If-Modified-Since,Pragma");
+ filterReg.setInitParameter("cors.exposed.headers", "Authorization");
+
+ filterReg.addMappingForUrlPatterns(
+ null,
+ false,
+ this.webModuleContext.getProtectedPaths().toArray(String.class));
+
+ });
+
- return null;
++ return Can.empty(); // registers no listeners
+ }
+
+
+}
diff --cc valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/webmodule/WebModuleServerSentEvents.java
index 66e3d8a,0000000..bcd74c0
mode 100644,000000..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/extensions/sse/ui/webmodule/WebModuleServerSentEvents.java
@@@ -1,74 -1,0 +1,73 @@@
+/*
+ * 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.extensions.sse.ui.webmodule;
+
- import java.util.List;
-
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletException;
+
+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.commons.collections.Can;
+import org.apache.isis.webapp.modules.WebModuleAbstract;
+
+import lombok.Getter;
+
+/**
+ * WebModule providing support for Server Sent Events.
+ *
+ * @since 2.0
+ */
+@Service
+@Named("isisValSse.WebModuleServerSentEvents")
+@Qualifier("ServerSentEvents")
+@Order(OrderPrecedence.MIDPOINT)
+public final class WebModuleServerSentEvents extends WebModuleAbstract {
+
+ private final static String SERVLET_NAME = "ServerSentEventsServlet";
+
+ @Getter
+ private final String name = "ServerSentEvents";
+
+ @Inject
+ public WebModuleServerSentEvents(ServiceInjector serviceInjector) {
+ super(serviceInjector);
+ }
+
+
+ @Override
- public List<ServletContextListener> init(ServletContext ctx) throws ServletException {
++ public Can<ServletContextListener> init(ServletContext ctx) throws ServletException {
+
+ registerServlet(ctx, SERVLET_NAME, ServerSentEventsServlet.class)
+ .ifPresent(servletReg -> {
+ servletReg.setAsyncSupported(true);
+ servletReg.addMapping("/sse");
+ });
+
- return null; // does not provide a listener
++ return Can.empty(); // registers no listeners
+ }
+
+
+}
[isis] 12/22: ISIS-2259: renames isis-config to isis-core-config
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit bd70a9c4ed7cc3f46857352b1ba7503f4a300082
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 12:32:30 2020 +0000
ISIS-2259: renames isis-config to isis-core-config
---
core/config/pom.xml | 2 +-
core/detached-tests/pom.xml | 2 +-
core/metamodel/pom.xml | 2 +-
core/pom.xml | 4 ++--
core/security/api/pom.xml | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/core/config/pom.xml b/core/config/pom.xml
index c2cad98..b670cbe 100644
--- a/core/config/pom.xml
+++ b/core/config/pom.xml
@@ -26,7 +26,7 @@
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
- <artifactId>isis-config</artifactId>
+ <artifactId>isis-core-config</artifactId>
<name>Apache Isis Core - Configuration</name>
<description>
diff --git a/core/detached-tests/pom.xml b/core/detached-tests/pom.xml
index e9945bd..fef19f6 100644
--- a/core/detached-tests/pom.xml
+++ b/core/detached-tests/pom.xml
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-config</artifactId>
+ <artifactId>isis-core-config</artifactId>
</dependency>
<dependency>
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 8cf9a09..9e68991 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-config</artifactId>
+ <artifactId>isis-core-config</artifactId>
</dependency>
<dependency>
diff --git a/core/pom.xml b/core/pom.xml
index 6640b71..bc848c2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -720,14 +720,14 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-config</artifactId>
+ <artifactId>isis-core-config</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-config</artifactId>
+ <artifactId>isis-core-config</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/core/security/api/pom.xml b/core/security/api/pom.xml
index ca0a5ea..b6c28a6 100644
--- a/core/security/api/pom.xml
+++ b/core/security/api/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-config</artifactId>
+ <artifactId>isis-core-config</artifactId>
</dependency>
<!-- TEST DEPENDENCIES -->
[isis] 17/22: ISIS-2259: renames isis-runtime-services to
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 ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 44e526e6f5f393136b115144dfd7a8e3b89539c3
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 12:43:46 2020 +0000
ISIS-2259: renames isis-runtime-services to isis-core-runtimeservices
---
core/detached-tests/pom.xml | 2 +-
core/persistence/jdo/datanucleus-5/pom.xml | 2 +-
core/pom.xml | 4 ++--
core/runtime-services/pom.xml | 2 +-
core/security/bypass/pom.xml | 2 +-
core/security/keycloak/pom.xml | 2 +-
core/security/shiro/pom.xml | 2 +-
core/testsupport/integtestsupport/pom.xml | 2 +-
core/webboot-springboot/pom.xml | 2 +-
legacy/testing/mavenplugin/pom.xml | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/core/detached-tests/pom.xml b/core/detached-tests/pom.xml
index 1cd09e3..251c58b 100644
--- a/core/detached-tests/pom.xml
+++ b/core/detached-tests/pom.xml
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime-services</artifactId>
+ <artifactId>isis-core-runtimeservices</artifactId>
<scope>test</scope>
</dependency>
diff --git a/core/persistence/jdo/datanucleus-5/pom.xml b/core/persistence/jdo/datanucleus-5/pom.xml
index 335875a..55cbd9f 100644
--- a/core/persistence/jdo/datanucleus-5/pom.xml
+++ b/core/persistence/jdo/datanucleus-5/pom.xml
@@ -119,7 +119,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime-services</artifactId>
+ <artifactId>isis-core-runtimeservices</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/core/pom.xml b/core/pom.xml
index 5c0e710..0f583d0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -786,12 +786,12 @@
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime-services</artifactId>
+ <artifactId>isis-core-runtimeservices</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime-services</artifactId>
+ <artifactId>isis-core-runtimeservices</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/core/runtime-services/pom.xml b/core/runtime-services/pom.xml
index f864e95..eb36738 100644
--- a/core/runtime-services/pom.xml
+++ b/core/runtime-services/pom.xml
@@ -26,7 +26,7 @@
<version>2.0.0-M3-SNAPSHOT</version>
</parent>
- <artifactId>isis-runtime-services</artifactId>
+ <artifactId>isis-core-runtimeservices</artifactId>
<name>Apache Isis Core - Runtime Services</name>
<description>Introduced to keep the 'runtime' package concise. Viewers don't have dependencies on this module.</description>
diff --git a/core/security/bypass/pom.xml b/core/security/bypass/pom.xml
index 379151c..a8c672e 100644
--- a/core/security/bypass/pom.xml
+++ b/core/security/bypass/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime-services</artifactId>
+ <artifactId>isis-core-runtimeservices</artifactId>
</dependency>
</dependencies>
diff --git a/core/security/keycloak/pom.xml b/core/security/keycloak/pom.xml
index 2645fd8..37ceba4 100644
--- a/core/security/keycloak/pom.xml
+++ b/core/security/keycloak/pom.xml
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime-services</artifactId>
+ <artifactId>isis-core-runtimeservices</artifactId>
</dependency>
<dependency>
diff --git a/core/security/shiro/pom.xml b/core/security/shiro/pom.xml
index 35cc18a..d365fb6 100644
--- a/core/security/shiro/pom.xml
+++ b/core/security/shiro/pom.xml
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime-services</artifactId>
+ <artifactId>isis-core-runtimeservices</artifactId>
</dependency>
<dependency>
diff --git a/core/testsupport/integtestsupport/pom.xml b/core/testsupport/integtestsupport/pom.xml
index 93ed072..f921bc5 100644
--- a/core/testsupport/integtestsupport/pom.xml
+++ b/core/testsupport/integtestsupport/pom.xml
@@ -153,7 +153,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime-services</artifactId>
+ <artifactId>isis-core-runtimeservices</artifactId>
</dependency>
<dependency>
diff --git a/core/webboot-springboot/pom.xml b/core/webboot-springboot/pom.xml
index 2feea78..c2403a7 100644
--- a/core/webboot-springboot/pom.xml
+++ b/core/webboot-springboot/pom.xml
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime-services</artifactId>
+ <artifactId>isis-core-runtimeservices</artifactId>
</dependency>
diff --git a/legacy/testing/mavenplugin/pom.xml b/legacy/testing/mavenplugin/pom.xml
index dec430b..26c43c1 100644
--- a/legacy/testing/mavenplugin/pom.xml
+++ b/legacy/testing/mavenplugin/pom.xml
@@ -89,7 +89,7 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
- <artifactId>isis-runtime-services</artifactId>
+ <artifactId>isis-core-runtimeservices</artifactId>
</dependency>
<dependency>
[isis] 01/22: ISIS-2259: removes some deprecated classes from base
subdomain module's tests.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 86f80a716009f573b630baeab002aab58b05122e
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 11:19:22 2020 +0000
ISIS-2259: removes some deprecated classes from base subdomain module's tests.
---
...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 -----------
17 files changed, 327 deletions(-)
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
deleted file mode 100644
index 73b947f..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTestAbstract_compareTo.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import com.google.common.collect.ImmutableMap;
-
-import org.apache.isis.subdomains.base.applib.with.WithCodeComparable;
-
-/**
- * Automatically tests all domain objects implementing {@link WithCodeComparable}.
- *
- * <p>
- * Any that cannot be instantiated are skipped; manually test using
- * {@link ComparableByCodeContractTester}.
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public abstract class ComparableByCodeContractTestAbstract_compareTo extends
- org.apache.isis.subdomains.base.applib.with.ComparableByCodeContractTestAbstract_compareTo {
-
- protected ComparableByCodeContractTestAbstract_compareTo(
- final String packagePrefix,
- final ImmutableMap<Class<?>, Class<?>> noninstantiableSubstitutes) {
- super(packagePrefix, noninstantiableSubstitutes);
- }
-
-}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTester.java
deleted file mode 100644
index f237abb..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByCodeContractTester.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import org.apache.isis.subdomains.base.applib.with.WithCodeComparable;
-
-/**
- * @deprecated - use superclass
- */
-@Deprecated
-public class ComparableByCodeContractTester<T extends WithCodeComparable<T>> extends
- org.apache.isis.subdomains.base.applib.with.ComparableByCodeContractTester<T> {
-
- public ComparableByCodeContractTester(Class<T> cls) {
- super(cls);
- }
-
-}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
deleted file mode 100644
index c51dd83..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTestAbstract_compareTo.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import com.google.common.collect.ImmutableMap;
-
-import org.apache.isis.subdomains.base.applib.with.WithDescriptionComparable;
-
-/**
- * Automatically tests all domain objects implementing {@link WithDescriptionComparable}.
- *
- * <p>
- * Any that cannot be instantiated are skipped; manually test using
- * {@link ComparableByDescriptionContractTester}.
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public abstract class ComparableByDescriptionContractTestAbstract_compareTo extends
- org.apache.isis.subdomains.base.applib.with.ComparableByDescriptionContractTestAbstract_compareTo {
-
- protected ComparableByDescriptionContractTestAbstract_compareTo(
- final String packagePrefix,
- final ImmutableMap<Class<?>, Class<?>> noninstantiableSubstitutes) {
- super(packagePrefix, noninstantiableSubstitutes);
- }
-
-}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTester.java
deleted file mode 100644
index 52a3ab2..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByDescriptionContractTester.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import org.apache.isis.subdomains.base.applib.with.WithDescriptionComparable;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public class ComparableByDescriptionContractTester<T extends WithDescriptionComparable<T>> extends
- org.apache.isis.subdomains.base.applib.with.ComparableByDescriptionContractTester<T> {
-
- public ComparableByDescriptionContractTester(Class<T> cls) {
- super(cls);
- }
-
-}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java
deleted file mode 100644
index e7f86d5..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTestAbstract_compareTo.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import com.google.common.collect.ImmutableMap;
-
-import org.apache.isis.subdomains.base.applib.with.WithNameComparable;
-
-/**
- * Automatically tests all domain objects implementing {@link WithNameComparable}.
- *
- * <p>
- * Any that cannot be instantiated are skipped; manually test using
- * {@link ComparableByNameContractTester}.
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public abstract class ComparableByNameContractTestAbstract_compareTo extends
- org.apache.isis.subdomains.base.applib.with.ComparableByNameContractTestAbstract_compareTo {
-
- protected ComparableByNameContractTestAbstract_compareTo(
- final String packagePrefix,
- final ImmutableMap<Class<?>, Class<?>> noninstantiableSubstitutes) {
- super(packagePrefix, noninstantiableSubstitutes);
- }
-
-}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTester.java
deleted file mode 100644
index 00a586f..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByNameContractTester.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import org.apache.isis.subdomains.base.applib.with.WithNameComparable;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public class ComparableByNameContractTester<T extends WithNameComparable<T>> extends
- org.apache.isis.subdomains.base.applib.with.ComparableByNameContractTester<T> {
-
- public ComparableByNameContractTester(Class<T> cls) {
- super(cls);
- }
-
-}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
deleted file mode 100644
index b466b30..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTestAbstract_compareTo.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import com.google.common.collect.ImmutableMap;
-
-import org.apache.isis.subdomains.base.applib.with.WithReferenceComparable;
-
-/**
- * Automatically tests all domain objects implementing {@link WithReferenceComparable}.
- *
- * <p>
- * Any that cannot be instantiated are skipped; manually test using
- * {@link ComparableByReferenceContractTester}.
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public abstract class ComparableByReferenceContractTestAbstract_compareTo extends
- org.apache.isis.subdomains.base.applib.with.ComparableByReferenceContractTestAbstract_compareTo {
-
- protected ComparableByReferenceContractTestAbstract_compareTo(
- final String packagePrefix,
- final ImmutableMap<Class<?>, Class<?>> noninstantiableSubstitutes) {
- super(packagePrefix, noninstantiableSubstitutes);
- }
-
-}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTester.java
deleted file mode 100644
index 20beecd..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByReferenceContractTester.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import org.apache.isis.subdomains.base.applib.with.WithReferenceComparable;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public class ComparableByReferenceContractTester<T extends WithReferenceComparable<T>> extends
- org.apache.isis.subdomains.base.applib.with.ComparableByReferenceContractTester<T> {
-
- public ComparableByReferenceContractTester(Class<T> cls) {
- super(cls);
- }
-
-}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
deleted file mode 100644
index b5a47cb..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTestAbstract_compareTo.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import com.google.common.collect.ImmutableMap;
-
-import org.apache.isis.subdomains.base.applib.with.WithTitleComparable;
-
-/**
- * Automatically tests all domain objects implementing {@link WithTitleComparable}.
- *
- * <p>
- * Any that cannot be instantiated are skipped; manually test using
- * {@link ComparableByTitleContractTester}.
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public abstract class ComparableByTitleContractTestAbstract_compareTo extends
- org.apache.isis.subdomains.base.applib.with.ComparableByTitleContractTestAbstract_compareTo {
-
- protected ComparableByTitleContractTestAbstract_compareTo(
- final String packagePrefix,
- final ImmutableMap<Class<?>, Class<?>> noninstantiableSubstitutes) {
- super(packagePrefix, noninstantiableSubstitutes);
- }
-
-}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTester.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTester.java
deleted file mode 100644
index 935c777..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/ComparableByTitleContractTester.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import org.apache.isis.subdomains.base.applib.with.WithTitleComparable;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public class ComparableByTitleContractTester<T extends WithTitleComparable<T>> extends
- org.apache.isis.subdomains.base.applib.with.ComparableByTitleContractTester<T> {
-
- public ComparableByTitleContractTester(Class<T> cls) {
- super(cls);
- }
-
-}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByCode.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByCode.java
deleted file mode 100644
index 7ec2559..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByCode.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import org.apache.isis.subdomains.base.applib.with.WithCodeComparable;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public class InstantiatorForComparableByCode extends org.apache.isis.subdomains.base.applib.with.InstantiatorForComparableByCode {
-
- public InstantiatorForComparableByCode(Class<? extends WithCodeComparable<?>> cls) {
- super(cls);
- }
-
-}
\ No newline at end of file
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByDescription.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByDescription.java
deleted file mode 100644
index e10baff..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByDescription.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import org.apache.isis.subdomains.base.applib.with.WithDescriptionComparable;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public class InstantiatorForComparableByDescription extends
- org.apache.isis.subdomains.base.applib.with.InstantiatorForComparableByDescription {
-
- public InstantiatorForComparableByDescription(Class<? extends WithDescriptionComparable<?>> cls) {
- super(cls);
- }
-
-}
\ No newline at end of file
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByName.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByName.java
deleted file mode 100644
index 0d0818a..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByName.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import org.apache.isis.subdomains.base.applib.with.WithNameComparable;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public class InstantiatorForComparableByName extends org.apache.isis.subdomains.base.applib.with.InstantiatorForComparableByName {
-
- public InstantiatorForComparableByName(Class<? extends WithNameComparable<?>> cls) {
- super(cls);
- }
-
-}
\ No newline at end of file
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByReference.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByReference.java
deleted file mode 100644
index 37cfc18..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForComparableByReference.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import org.apache.isis.subdomains.base.applib.with.WithReferenceComparable;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public class InstantiatorForComparableByReference extends
- org.apache.isis.subdomains.base.applib.with.InstantiatorForComparableByReference {
-
- public InstantiatorForComparableByReference(Class<? extends WithReferenceComparable<?>> cls) {
- super(cls);
- }
-
-}
\ No newline at end of file
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForWithStartDate.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForWithStartDate.java
deleted file mode 100644
index e33c04b..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/InstantiatorForWithStartDate.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import org.apache.isis.subdomains.base.applib.with.WithStartDate;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public class InstantiatorForWithStartDate extends org.apache.isis.subdomains.base.applib.with.InstantiatorForWithStartDate {
-
- public InstantiatorForWithStartDate(Class<? extends WithStartDate> cls) {
- super(cls);
- }
-
-}
\ No newline at end of file
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java
deleted file mode 100644
index ed84d72..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithFieldUniqueContractTestAllAbstract.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public abstract class WithFieldUniqueContractTestAllAbstract<T> extends
- org.apache.isis.subdomains.base.applib.with.WithFieldUniqueContractTestAllAbstract<T> {
-
- public WithFieldUniqueContractTestAllAbstract(
- final String prefix,
- final String fieldName,
- final Class<T> interfaceType) {
- super(prefix, fieldName, interfaceType);
- }
-
-}
diff --git a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java b/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
deleted file mode 100644
index a2d2533..0000000
--- a/subdomains/base/applib/src/test/java/org/apache/isis/extensions/base/unittestsupport/dom/with/WithIntervalMutableContractTestAbstract_changeDates.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.apache.isis.extensions.base.unittestsupport.dom.with;
-
-import org.apache.isis.subdomains.base.applib.with.WithIntervalMutable;
-
-/**
- *
- * @deprecated - use superclass
- */
-@Deprecated
-public abstract class WithIntervalMutableContractTestAbstract_changeDates<T extends WithIntervalMutable<T>> extends
- org.apache.isis.subdomains.base.applib.with.WithIntervalMutableContractTestAbstract_changeDates<T> {
-
-}
[isis] 04/22: ISIS-2259; reorg asciidoctor modules
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 270cb13a3637489b32242caccf3f616c872067d3
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 11:44:06 2020 +0000
ISIS-2259; reorg asciidoctor modules
---
examples/demo/pom.xml | 2 +-
valuetypes/asciidoc/applib/pom.xml | 46 ++++++++++
.../applib/IsisModuleValAsciidocApplib.java} | 4 +-
.../asciidoc/applib/value/AsciiDoc.java | 5 +-
.../asciidoc/applib/value/Converter.java} | 4 +-
valuetypes/asciidoc/pom.xml | 102 ++-------------------
valuetypes/asciidoc/{ => ui}/pom.xml | 19 ++--
.../asciidoc/ui/IsisModuleValAsciidocUi.java} | 6 +-
.../asciidoc/ui/components/AsciiDocComponent.java | 2 +-
.../AsciiDocPanelFactoriesForWicket.java | 2 +-
.../asciidoc/ui/components/css/prism.css | 0
.../asciidoc/ui/components/js/prism1.14.js | 0
valuetypes/pom.xml | 11 ++-
13 files changed, 88 insertions(+), 115 deletions(-)
diff --git a/examples/demo/pom.xml b/examples/demo/pom.xml
index 24a42b8..3767d13 100644
--- a/examples/demo/pom.xml
+++ b/examples/demo/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-asciidoc</artifactId>
+ <artifactId>isis-valuetypes-asciidoc-applib</artifactId>
</dependency>
<dependency>
<groupId>org.apache.isis.incubator</groupId>
diff --git a/valuetypes/asciidoc/applib/pom.xml b/valuetypes/asciidoc/applib/pom.xml
new file mode 100644
index 0000000..21dc281
--- /dev/null
+++ b/valuetypes/asciidoc/applib/pom.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-asciidoc</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>isis-valuetypes-asciidoc-applib</artifactId>
+ <name>Apache Isis Val - Asciidoctor</name>
+
+ <properties>
+ <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.asciidoc.applib</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/valuetypes/asciidoc/applib</git-plugin.propertiesDir>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-applib</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctorj-api</artifactId>
+ <version>2.1.0</version>
+ </dependency>
+
+ </dependencies>
+
+</project>
diff --git a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/IsisModuleExtAsciidocApplib.java b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/IsisModuleValAsciidocApplib.java
similarity index 90%
rename from valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/IsisModuleExtAsciidocApplib.java
rename to valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/IsisModuleValAsciidocApplib.java
index 482bd84..e209aeb 100644
--- a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/IsisModuleExtAsciidocApplib.java
+++ b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/IsisModuleValAsciidocApplib.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.asciidoc.applib;
+package org.apache.isis.valuetypes.asciidoc.applib;
import org.springframework.context.annotation.Configuration;
@Configuration
-public class IsisModuleExtAsciidocApplib {
+public class IsisModuleValAsciidocApplib {
}
diff --git a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/value/AsciiDoc.java b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/AsciiDoc.java
similarity index 87%
rename from valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/value/AsciiDoc.java
rename to valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/AsciiDoc.java
index c14469d..402dc4a 100644
--- a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/applib/value/AsciiDoc.java
+++ b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/AsciiDoc.java
@@ -16,11 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.asciidoc.applib.value;
+package org.apache.isis.valuetypes.asciidoc.applib.value;
import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.value.Markup;
-import org.apache.isis.extensions.asciidoc.ui.converter.AsciiDocConverter;
/**
* Immutable value type holding pre-rendered HTML.
@@ -33,7 +32,7 @@ public class AsciiDoc extends Markup {
private static final long serialVersionUID = 1L;
public static AsciiDoc valueOfAdoc(String asciiDoc) {
- return valueOfHtml(AsciiDocConverter.adocToHtml(asciiDoc));
+ return valueOfHtml(Converter.adocToHtml(asciiDoc));
}
public static AsciiDoc valueOfHtml(String html) {
diff --git a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/converter/AsciiDocConverter.java b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/Converter.java
similarity index 96%
rename from valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/converter/AsciiDocConverter.java
rename to valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/Converter.java
index a5dca0a..941e17c 100644
--- a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/converter/AsciiDocConverter.java
+++ b/valuetypes/asciidoc/applib/src/main/java/org/apache/isis/valuetypes/asciidoc/applib/value/Converter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.asciidoc.ui.converter;
+package org.apache.isis.valuetypes.asciidoc.applib.value;
import org.asciidoctor.Asciidoctor;
import org.asciidoctor.AttributesBuilder;
@@ -24,7 +24,7 @@ import org.asciidoctor.Options;
import org.asciidoctor.OptionsBuilder;
import org.asciidoctor.SafeMode;
-public final class AsciiDocConverter {
+final class Converter {
/**
* For syntax highlighting to work, the client/browser needs to load specific
diff --git a/valuetypes/asciidoc/pom.xml b/valuetypes/asciidoc/pom.xml
index dd50ae9..e895e4a 100644
--- a/valuetypes/asciidoc/pom.xml
+++ b/valuetypes/asciidoc/pom.xml
@@ -18,103 +18,19 @@
<groupId>org.apache.isis.valuetypes</groupId>
<artifactId>isis-valuetypes</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>isis-valuetypes-asciidoc</artifactId>
- <name>Apache Isis Val - Asciidoctor</name>
- <description></description>
+ <name>Apache Isis Val - Asciidoctor (parent)</name>
+ <description>
+ Asciidoc value type.
+ </description>
- <properties>
- <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.asciidoc</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/valuetypes/asciidoc</git-plugin.propertiesDir>
- </properties>
+ <packaging>pom</packaging>
- <dependencies>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-metamodel</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis-viewer-wicket-ui</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- provides a ASCII-DOC parser -->
- <dependency>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctorj</artifactId>
- <version>2.1.0</version>
- <exclusions>
- <!-- convergence issues -->
- <exclusion>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-constants</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-posix</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-enxio</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-ffi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.github.jnr</groupId>
- <artifactId>jffi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm-util</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-posix</artifactId>
- <version>3.0.49</version>
- <exclusions>
- <!-- convergence issues -->
- <exclusion>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-constants</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-ffi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-enxio</artifactId>
- <version>0.20</version>
- <exclusions>
- <!-- convergence issues -->
- <exclusion>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-constants</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-ffi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.github.jnr</groupId>
- <artifactId>jnr-constants</artifactId>
- <version>0.9.11</version>
- </dependency>
- <!-- END OF ASCII-DOC -->
-
- </dependencies>
+ <modules>
+ <module>applib</module>
+ <module>ui</module>
+ </modules>
</project>
diff --git a/valuetypes/asciidoc/pom.xml b/valuetypes/asciidoc/ui/pom.xml
similarity index 89%
copy from valuetypes/asciidoc/pom.xml
copy to valuetypes/asciidoc/ui/pom.xml
index dd50ae9..4805ea3 100644
--- a/valuetypes/asciidoc/pom.xml
+++ b/valuetypes/asciidoc/ui/pom.xml
@@ -16,27 +16,30 @@
<parent>
<groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes</artifactId>
+ <artifactId>isis-valuetypes-asciidoc</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>isis-valuetypes-asciidoc</artifactId>
- <name>Apache Isis Val - Asciidoctor</name>
- <description></description>
+ <artifactId>isis-valuetypes-asciidoc-ui</artifactId>
+ <name>Apache Isis Val - Asciidoctor (ui)</name>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.asciidoc</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/valuetypes/asciidoc</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.valuetypes.asciidoc.ui</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/valuetypes/asciidoc/ui</git-plugin.propertiesDir>
</properties>
<dependencies>
<dependency>
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-applib</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-metamodel</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-viewer-wicket-ui</artifactId>
diff --git a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/IsisModuleExtAsciidocUi.java b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/IsisModuleValAsciidocUi.java
similarity index 89%
rename from valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/IsisModuleExtAsciidocUi.java
rename to valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/IsisModuleValAsciidocUi.java
index 10f7790..76f5da0 100644
--- a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/IsisModuleExtAsciidocUi.java
+++ b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/IsisModuleValAsciidocUi.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.asciidoc.ui;
+package org.apache.isis.valuetypes.asciidoc.ui;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.extensions.asciidoc.applib.IsisModuleExtAsciidocApplib;
-import org.apache.isis.extensions.asciidoc.ui.components.AsciiDocPanelFactoriesForWicket;
+import org.apache.isis.valuetypes.asciidoc.ui.components.AsciiDocPanelFactoriesForWicket;
@Configuration
@Import({
@@ -30,5 +30,5 @@ import org.apache.isis.extensions.asciidoc.ui.components.AsciiDocPanelFactoriesF
AsciiDocPanelFactoriesForWicket.Parented.class,
AsciiDocPanelFactoriesForWicket.Standalone.class
})
-public class IsisModuleExtAsciidocUi {
+public class IsisModuleValAsciidocUi {
}
diff --git a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocComponent.java b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/AsciiDocComponent.java
similarity index 97%
rename from valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocComponent.java
rename to valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/AsciiDocComponent.java
index 08ef8db..ff94d27 100644
--- a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocComponent.java
+++ b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/AsciiDocComponent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.asciidoc.ui.components;
+package org.apache.isis.valuetypes.asciidoc.ui.components;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
diff --git a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java
similarity index 97%
rename from valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java
rename to valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java
index 8d4c078..caeec8c 100644
--- a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java
+++ b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/AsciiDocPanelFactoriesForWicket.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.extensions.asciidoc.ui.components;
+package org.apache.isis.valuetypes.asciidoc.ui.components;
import org.springframework.stereotype.Component;
diff --git a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/css/prism.css b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/css/prism.css
similarity index 100%
rename from valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/css/prism.css
rename to valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/css/prism.css
diff --git a/valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/js/prism1.14.js b/valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/js/prism1.14.js
similarity index 100%
rename from valuetypes/asciidoc/src/main/java/org/apache/isis/extensions/asciidoc/ui/components/js/prism1.14.js
rename to valuetypes/asciidoc/ui/src/main/java/org/apache/isis/valuetypes/asciidoc/ui/components/js/prism1.14.js
diff --git a/valuetypes/pom.xml b/valuetypes/pom.xml
index d984405..bc1f40b 100644
--- a/valuetypes/pom.xml
+++ b/valuetypes/pom.xml
@@ -63,11 +63,17 @@
<dependency>
<groupId>org.apache.isis.valuetypes</groupId>
- <artifactId>isis-valuetypes-asciidoc</artifactId>
+ <artifactId>isis-valuetypes-asciidoc-applib</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-asciidoc-ui</artifactId>
+ <version>2.0.0-M3-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.isis.valuetypes</groupId>
<artifactId>isis-valuetypes-markdown</artifactId>
<version>2.0.0-M3-SNAPSHOT</version>
</dependency>
@@ -90,6 +96,9 @@
<modules>
<module>asciidoc</module>
+ <module>asciidoc/applib</module>
+ <module>asciidoc/ui</module>
+
<module>markdown</module>
<module>sse</module>
</modules>
[isis] 16/22: ISIS-2259: moves runtime.services package to
runtimeservices (to align packages with artifactId, avoid split packages).
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2259
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 16d6b5cd02e09acf21a182b2b5e626447729988c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 12:41:12 2020 +0000
ISIS-2259: moves runtime.services package to runtimeservices (to align packages with artifactId, avoid split packages).
---
.../proxy/ProxyCreatorTestUsingCodegenPlugin.java | 4 +-
.../WrapperFactoryDefault_wrappedObject_Test.java | 8 ++--
...actoryDefault_wrappedObject_transient_Test.java | 4 +-
.../InitialisationException.java | 2 +-
.../IsisModuleRuntimeServices.java | 54 +++++++++++-----------
.../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 +-
.../email/EmailServiceDefault.java | 2 +-
.../error/EmailTicket.java | 2 +-
.../error/SimpleTicket.java | 2 +-
.../eventbus/EventBusServiceSpring.java | 2 +-
.../factory/FactoryServiceDefault.java | 2 +-
.../homepage/HomePageResolverServiceDefault.java | 2 +-
.../i18n/po/Block.java | 2 +-
.../i18n/po/ContextAndMsgId.java | 2 +-
.../i18n/po/PoAbstract.java | 2 +-
.../i18n/po/PoDisabled.java | 2 +-
.../i18n/po/PoReader.java | 2 +-
.../i18n/po/PoWriter.java | 2 +-
.../i18n/po/TranslationServicePo.java | 2 +-
.../i18n/po/TranslationServicePoMenu.java | 2 +-
.../services => 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 +-
.../sudo/SudoServiceDefault.java | 2 +-
.../userprof/UserProfileServiceDefault.java | 2 +-
.../userreg/EmailNotificationServiceDefault.java | 2 +-
.../userreg/EmailVerificationTemplate.html | 0
.../userreg/PasswordResetTemplate.html | 0
.../wrapper/AsyncWrapDefault.java | 2 +-
.../wrapper/WrapperFactoryDefault.java | 12 ++---
.../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 +-
.../ServiceInstantiatorTest.java | 2 +-
.../changes/PreAndPostValues_shouldAudit_Test.java | 2 +-
.../email/EmailServiceDefaultTest_actually.java | 2 +-
.../email/EmailServiceDefaultTest_notEmpty.java | 2 +-
.../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 +-
.../security/bypass/IsisModuleSecurityBypass.java | 2 +-
.../keycloak/IsisModuleSecurityKeycloak.java | 2 +-
.../security/shiro/IsisModuleSecurityShiro.java | 2 +-
.../webboot/springboot/IsisModuleSpringBoot.java | 2 +-
.../error/service/DemoErrorReportingService.java | 4 +-
.../SpringServiceInjectOrderTest.java | 2 +-
.../eventhandling/GenericEventPublishingTest.java | 2 +-
79 files changed, 118 insertions(+), 118 deletions(-)
diff --git a/core/detached-tests/src/test/java/org/apache/isis/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java b/core/detached-tests/src/test/java/org/apache/isis/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
index 50960e9..d950a77 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
@@ -27,8 +27,8 @@ import org.junit.Before;
import org.junit.Test;
import org.apache.isis.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
-import org.apache.isis.runtime.services.wrapper.handlers.DelegatingInvocationHandler;
-import org.apache.isis.runtime.services.wrapper.proxy.ProxyCreator;
+import org.apache.isis.runtimeservices.wrapper.handlers.DelegatingInvocationHandler;
+import org.apache.isis.runtimeservices.wrapper.proxy.ProxyCreator;
public class ProxyCreatorTestUsingCodegenPlugin {
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_Test.java b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
similarity index 98%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
rename to core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
index eec5c5a..eca3bef 100644
--- a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
+++ b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.wrapper;
+package org.apache.isis.runtimeservices.wrapper;
import java.lang.reflect.Method;
import java.util.Collections;
@@ -66,9 +66,9 @@ import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.specloader.specimpl.OneToOneAssociationDefault;
import org.apache.isis.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
-import org.apache.isis.runtime.services.wrapper.dom.employees.Employee;
-import org.apache.isis.runtime.services.wrapper.dom.employees.EmployeeRepository;
-import org.apache.isis.runtime.services.wrapper.dom.employees.EmployeeRepositoryImpl;
+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.schema.cmd.v1.CommandDto;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
diff --git a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
similarity index 98%
rename from core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
rename to core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
index c862c26..f3d9137 100644
--- a/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
+++ b/core/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.wrapper;
+package org.apache.isis.runtimeservices.wrapper;
import java.lang.reflect.Method;
import java.util.Arrays;
@@ -63,7 +63,7 @@ import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
import org.apache.isis.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
-import org.apache.isis.runtime.services.wrapper.dom.employees.Employee;
+import org.apache.isis.runtimeservices.wrapper.dom.employees.Employee;
import org.apache.isis.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import org.apache.isis.security.api.authentication.standard.SimpleSession;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/InitialisationException.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/InitialisationException.java
similarity index 97%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/InitialisationException.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/InitialisationException.java
index 5d18f92..599e89f 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/InitialisationException.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/InitialisationException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services;
+package org.apache.isis.runtimeservices;
import org.apache.isis.commons.exceptions.IsisException;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/IsisModuleRuntimeServices.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
similarity index 54%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/IsisModuleRuntimeServices.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
index 57ab7f9..0244366 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/IsisModuleRuntimeServices.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
@@ -16,39 +16,39 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services;
+package org.apache.isis.runtimeservices;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.codegen.bytebuddy.IsisModuleCodegenByteBuddy;
import org.apache.isis.runtime.IsisModuleRuntime;
-import org.apache.isis.runtime.services.auth.AuthenticationSessionProviderDefault;
-import org.apache.isis.runtime.services.bookmarks.BookmarkServiceInternalDefault;
-import org.apache.isis.runtime.services.command.CommandDtoServiceInternalDefault;
-import org.apache.isis.runtime.services.command.CommandExecutorServiceDefault;
-import org.apache.isis.runtime.services.command.CommandServiceDefault;
-import org.apache.isis.runtime.services.confmenu.ConfigurationViewServiceDefault;
-import org.apache.isis.runtime.services.email.EmailServiceDefault;
-import org.apache.isis.runtime.services.eventbus.EventBusServiceSpring;
-import org.apache.isis.runtime.services.factory.FactoryServiceDefault;
-import org.apache.isis.runtime.services.homepage.HomePageResolverServiceDefault;
-import org.apache.isis.runtime.services.i18n.po.TranslationServicePo;
-import org.apache.isis.runtime.services.i18n.po.TranslationServicePoMenu;
-import org.apache.isis.runtime.services.ixn.InteractionDtoServiceInternalDefault;
-import org.apache.isis.runtime.services.menubars.MenuBarsLoaderServiceDefault;
-import org.apache.isis.runtime.services.menubars.bootstrap3.MenuBarsServiceBS3;
-import org.apache.isis.runtime.services.message.MessageServiceDefault;
-import org.apache.isis.runtime.services.publish.PublisherDispatchServiceDefault;
-import org.apache.isis.runtime.services.repository.RepositoryServiceDefault;
-import org.apache.isis.runtime.services.routing.RoutingServiceDefault;
-import org.apache.isis.runtime.services.sessmgmt.SessionManagementServiceDefault;
-import org.apache.isis.runtime.services.sudo.SudoServiceDefault;
-import org.apache.isis.runtime.services.userprof.UserProfileServiceDefault;
-import org.apache.isis.runtime.services.userreg.EmailNotificationServiceDefault;
-import org.apache.isis.runtime.services.wrapper.WrapperFactoryDefault;
-import org.apache.isis.runtime.services.xactn.TransactionServiceSpring;
-import org.apache.isis.runtime.services.xmlsnapshot.XmlSnapshotServiceDefault;
+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;
@Configuration
@Import({
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/ServiceException.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/ServiceException.java
similarity index 96%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/ServiceException.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/ServiceException.java
index 3caeb87..d20a545 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/ServiceException.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/ServiceException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services;
+package org.apache.isis.runtimeservices;
import org.apache.isis.commons.exceptions.IsisException;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthenticationSessionProviderDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthenticationSessionProviderDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java
index 0ed138b..37bd600 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/auth/AuthenticationSessionProviderDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.auth;
+package org.apache.isis.runtimeservices.auth;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/BackgroundCommandExecution.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/background/BackgroundCommandExecution.java
similarity index 97%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/BackgroundCommandExecution.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/background/BackgroundCommandExecution.java
index 80ca677..0568e95 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/BackgroundCommandExecution.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/background/BackgroundCommandExecution.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.background;
+package org.apache.isis.runtimeservices.background;
import java.util.List;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/CommandExecutionAbstract.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/background/CommandExecutionAbstract.java
similarity index 97%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/CommandExecutionAbstract.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/background/CommandExecutionAbstract.java
index 805aae9..dfe64eb 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/background/CommandExecutionAbstract.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/background/CommandExecutionAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.background;
+package org.apache.isis.runtimeservices.background;
import javax.inject.Inject;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/bookmarks/BookmarkServiceInternalDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/bookmarks/BookmarkServiceInternalDefault.java
index dccfc2f..03a2a3c 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/bookmarks/BookmarkServiceInternalDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/bookmarks/BookmarkServiceInternalDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.bookmarks;
+package org.apache.isis.runtimeservices.bookmarks;
import java.io.Serializable;
import java.math.BigDecimal;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandDtoServiceInternalDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandDtoServiceInternalDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandDtoServiceInternalDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandDtoServiceInternalDefault.java
index 92d7842..ad108e5 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandDtoServiceInternalDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandDtoServiceInternalDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.command;
+package org.apache.isis.runtimeservices.command;
import java.util.List;
import java.util.UUID;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandExecutorServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandExecutorServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java
index 4be9b2d..35fce72 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandExecutorServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.command;
+package org.apache.isis.runtimeservices.command;
import java.sql.Timestamp;
import java.util.Collections;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandServiceDefault.java
similarity index 97%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandServiceDefault.java
index 185f6db..bcf00a9 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/command/CommandServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/command/CommandServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.command;
+package org.apache.isis.runtimeservices.command;
import javax.inject.Named;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
index 6b60725..1e96445 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/confmenu/ConfigurationViewServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.confmenu;
+package org.apache.isis.runtimeservices.confmenu;
import java.util.Map;
import java.util.Optional;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/email/EmailServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/email/EmailServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java
index 5914a94..29bd176 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/email/EmailServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.email;
+package org.apache.isis.runtimeservices.email;
import java.util.Collections;
import java.util.List;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/error/EmailTicket.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/error/EmailTicket.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/error/EmailTicket.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/error/EmailTicket.java
index 5deeec2..7a614d5 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/error/EmailTicket.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/error/EmailTicket.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.error;
+package org.apache.isis.runtimeservices.error;
import java.io.Serializable;
import java.util.List;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/error/SimpleTicket.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/error/SimpleTicket.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/error/SimpleTicket.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/error/SimpleTicket.java
index a853f04..6af43ad 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/error/SimpleTicket.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/error/SimpleTicket.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.error;
+package org.apache.isis.runtimeservices.error;
import java.io.Serializable;
import java.util.function.UnaryOperator;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/eventbus/EventBusServiceSpring.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/eventbus/EventBusServiceSpring.java
similarity index 97%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/eventbus/EventBusServiceSpring.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/eventbus/EventBusServiceSpring.java
index d6eb8c8..e77b40e 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/eventbus/EventBusServiceSpring.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/eventbus/EventBusServiceSpring.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.eventbus;
+package org.apache.isis.runtimeservices.eventbus;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java
index a8144c5..67cc20f 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/factory/FactoryServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.factory;
+package org.apache.isis.runtimeservices.factory;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/homepage/HomePageResolverServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/homepage/HomePageResolverServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java
index bf3cd28..04d5ab0 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/homepage/HomePageResolverServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.homepage;
+package org.apache.isis.runtimeservices.homepage;
import javax.enterprise.inject.Vetoed;
import javax.inject.Inject;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/Block.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/Block.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/Block.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/Block.java
index c721332..c018560 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/Block.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/Block.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.i18n.po;
+package org.apache.isis.runtimeservices.i18n.po;
import java.util.List;
import java.util.Map;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/ContextAndMsgId.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/ContextAndMsgId.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/ContextAndMsgId.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/ContextAndMsgId.java
index d423f66..b5d66f0 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/ContextAndMsgId.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/ContextAndMsgId.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.i18n.po;
+package org.apache.isis.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/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoAbstract.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoAbstract.java
similarity index 96%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoAbstract.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoAbstract.java
index 92ccd71..bd86875 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoAbstract.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.i18n.po;
+package org.apache.isis.runtimeservices.i18n.po;
import org.apache.isis.applib.services.i18n.TranslationService;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoDisabled.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoDisabled.java
similarity index 96%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoDisabled.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoDisabled.java
index 2d202a7..7111db8 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoDisabled.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoDisabled.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.i18n.po;
+package org.apache.isis.runtimeservices.i18n.po;
import org.apache.isis.applib.services.i18n.TranslationService;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoReader.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoReader.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoReader.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoReader.java
index bec4f5c..d6eb2db 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoReader.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoReader.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.i18n.po;
+package org.apache.isis.runtimeservices.i18n.po;
import java.util.Collections;
import java.util.List;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoWriter.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoWriter.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoWriter.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoWriter.java
index c5c33a1..b84ba12 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/PoWriter.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoWriter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.i18n.po;
+package org.apache.isis.runtimeservices.i18n.po;
import java.util.SortedMap;
import java.util.SortedSet;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePo.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePo.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java
index 79556a6..b7c9138 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePo.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.i18n.po;
+package org.apache.isis.runtimeservices.i18n.po;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePoMenu.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePoMenu.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePoMenu.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePoMenu.java
index 8c739e1..38950e4 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/TranslationServicePoMenu.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePoMenu.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.i18n.po;
+package org.apache.isis.runtimeservices.i18n.po;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/Util.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/Util.java
similarity index 95%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/Util.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/Util.java
index c712186..da2db3c 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/i18n/po/Util.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/i18n/po/Util.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.i18n.po;
+package org.apache.isis.runtimeservices.i18n.po;
class Util {
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/ixn/InteractionDtoServiceInternalDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java
index 4c6b716..6dddd4d 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/ixn/InteractionDtoServiceInternalDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.ixn;
+package org.apache.isis.runtimeservices.ixn;
import java.util.List;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
index 4d6f63c..878ca0d 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/MenuBarsLoaderServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.menubars;
+package org.apache.isis.runtimeservices.menubars;
import java.nio.charset.StandardCharsets;
import java.util.Optional;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
index dd2a14a..1dc15c9 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/MenuBarsServiceBS3.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.menubars.bootstrap3;
+package org.apache.isis.runtimeservices.menubars.bootstrap3;
import java.util.List;
import java.util.Map;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/ServiceAndAction.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/ServiceAndAction.java
similarity index 96%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/ServiceAndAction.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/ServiceAndAction.java
index 03a2268..1b360ce 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/menubars/bootstrap3/ServiceAndAction.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/ServiceAndAction.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.menubars.bootstrap3;
+package org.apache.isis.runtimeservices.menubars.bootstrap3;
import org.apache.isis.metamodel.spec.ManagedObject;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java
index 192335b..181ca15 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/message/MessageServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.message;
+package org.apache.isis.runtimeservices.message;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublishedObjectsDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/publish/PublishedObjectsDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublishedObjectsDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/publish/PublishedObjectsDefault.java
index 1647af4..0969202 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublishedObjectsDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/publish/PublishedObjectsDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.publish;
+package org.apache.isis.runtimeservices.publish;
import java.sql.Timestamp;
import java.util.Collection;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublisherDispatchServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublisherDispatchServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java
index 42e67c4..8f95fee 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/publish/PublisherDispatchServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.publish;
+package org.apache.isis.runtimeservices.publish;
import java.sql.Timestamp;
import java.util.HashMap;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
index 5abaf36..e4b7ba5 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/repository/RepositoryServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.repository;
+package org.apache.isis.runtimeservices.repository;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/routing/RoutingServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/routing/RoutingServiceDefault.java
similarity index 97%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/routing/RoutingServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/routing/RoutingServiceDefault.java
index 72ba62f..df25030 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/routing/RoutingServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/routing/RoutingServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.routing;
+package org.apache.isis.runtimeservices.routing;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
similarity index 97%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
index 9bc41b6..27356bc 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sessmgmt/SessionManagementServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.sessmgmt;
+package org.apache.isis.runtimeservices.sessmgmt;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sudo/SudoServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/sudo/SudoServiceDefault.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/sudo/SudoServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/sudo/SudoServiceDefault.java
index 3853366..84cf6a1 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/sudo/SudoServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/sudo/SudoServiceDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.sudo;
+package org.apache.isis.runtimeservices.sudo;
import java.util.List;
import java.util.concurrent.Callable;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userprof/UserProfileServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userprof/UserProfileServiceDefault.java
similarity index 97%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/userprof/UserProfileServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userprof/UserProfileServiceDefault.java
index 1ec4c69..977b668 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userprof/UserProfileServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userprof/UserProfileServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.userprof;
+package org.apache.isis.runtimeservices.userprof;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/EmailNotificationServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userreg/EmailNotificationServiceDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/EmailNotificationServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userreg/EmailNotificationServiceDefault.java
index 19554b8..9866800 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/EmailNotificationServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userreg/EmailNotificationServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.userreg;
+package org.apache.isis.runtimeservices.userreg;
import java.io.IOException;
import java.net.URL;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/EmailVerificationTemplate.html b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userreg/EmailVerificationTemplate.html
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/EmailVerificationTemplate.html
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userreg/EmailVerificationTemplate.html
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/PasswordResetTemplate.html b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userreg/PasswordResetTemplate.html
similarity index 100%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/userreg/PasswordResetTemplate.html
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/userreg/PasswordResetTemplate.html
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/AsyncWrapDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/AsyncWrapDefault.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/AsyncWrapDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/AsyncWrapDefault.java
index 24ec086..e24da35 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/AsyncWrapDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/AsyncWrapDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.wrapper;
+package org.apache.isis.runtimeservices.wrapper;
import java.util.EnumSet;
import java.util.concurrent.Callable;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java
similarity index 96%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java
index 91ea3b8..dc06598 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.wrapper;
+package org.apache.isis.runtimeservices.wrapper;
import java.util.ArrayList;
import java.util.Collections;
@@ -64,10 +64,10 @@ import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryService;
import org.apache.isis.metamodel.context.MetaModelContext;
-import org.apache.isis.runtime.services.wrapper.dispatchers.InteractionEventDispatcher;
-import org.apache.isis.runtime.services.wrapper.dispatchers.InteractionEventDispatcherTypeSafe;
-import org.apache.isis.runtime.services.wrapper.handlers.ProxyContextHandler;
-import org.apache.isis.runtime.services.wrapper.proxy.ProxyCreator;
+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.runtime.session.IsisSessionFactory;
import lombok.val;
@@ -93,7 +93,7 @@ public class WrapperFactoryDefault implements WrapperFactory {
@Inject protected ProxyFactoryService proxyFactoryService; // protected to allow JUnit test
private final List<InteractionListener> listeners = new ArrayList<InteractionListener>();
- private final Map<Class<? extends InteractionEvent>, InteractionEventDispatcher>
+ private final Map<Class<? extends InteractionEvent>, InteractionEventDispatcher>
dispatchersByEventClass =
new HashMap<Class<? extends InteractionEvent>, InteractionEventDispatcher>();
private ProxyContextHandler proxyContextHandler;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/dispatchers/InteractionEventDispatcher.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcher.java
similarity index 94%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/dispatchers/InteractionEventDispatcher.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcher.java
index 08189e8..3a083f1 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/dispatchers/InteractionEventDispatcher.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcher.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.wrapper.dispatchers;
+package org.apache.isis.runtimeservices.wrapper.dispatchers;
import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
similarity index 95%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
index 37704d4..defcce3 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.wrapper.dispatchers;
+package org.apache.isis.runtimeservices.wrapper.dispatchers;
import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
import org.apache.isis.commons.internal.base._Casts;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/AbstractCollectionInvocationHandler.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/AbstractCollectionInvocationHandler.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/AbstractCollectionInvocationHandler.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/AbstractCollectionInvocationHandler.java
index edc6bae..a66c54f 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/AbstractCollectionInvocationHandler.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/AbstractCollectionInvocationHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.wrapper.handlers;
+package org.apache.isis.runtimeservices.wrapper.handlers;
import java.lang.reflect.Method;
import java.util.List;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/CollectionInvocationHandler.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/CollectionInvocationHandler.java
similarity index 97%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/CollectionInvocationHandler.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/CollectionInvocationHandler.java
index df8c225..8c20a71 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/CollectionInvocationHandler.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/CollectionInvocationHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.wrapper.handlers;
+package org.apache.isis.runtimeservices.wrapper.handlers;
import java.util.Collection;
import java.util.List;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/DelegatingInvocationHandler.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandler.java
similarity index 94%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/DelegatingInvocationHandler.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandler.java
index 5918475..333028b 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/DelegatingInvocationHandler.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.wrapper.handlers;
+package org.apache.isis.runtimeservices.wrapper.handlers;
import java.lang.reflect.InvocationHandler;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/DelegatingInvocationHandlerDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/DelegatingInvocationHandlerDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java
index a336b9e..ee9a795 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/DelegatingInvocationHandlerDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.wrapper.handlers;
+package org.apache.isis.runtimeservices.wrapper.handlers;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/DomainObjectInvocationHandler.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/DomainObjectInvocationHandler.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
index c35e77f..933073d 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/DomainObjectInvocationHandler.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.wrapper.handlers;
+package org.apache.isis.runtimeservices.wrapper.handlers;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/MapInvocationHandler.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/MapInvocationHandler.java
similarity index 97%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/MapInvocationHandler.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/MapInvocationHandler.java
index 91cb05c..1596845 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/MapInvocationHandler.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/MapInvocationHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.wrapper.handlers;
+package org.apache.isis.runtimeservices.wrapper.handlers;
import java.util.Map;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/ProxyContextHandler.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/ProxyContextHandler.java
similarity index 96%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/ProxyContextHandler.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/ProxyContextHandler.java
index 3c678c1..c8fcd4e 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/handlers/ProxyContextHandler.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/ProxyContextHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.wrapper.handlers;
+package org.apache.isis.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.metamodel.context.MetaModelContext;
import org.apache.isis.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.runtime.services.wrapper.proxy.ProxyCreator;
+import org.apache.isis.runtimeservices.wrapper.proxy.ProxyCreator;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/internal/util/MethodPrefixFinder.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/internal/util/MethodPrefixFinder.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/internal/util/MethodPrefixFinder.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/internal/util/MethodPrefixFinder.java
index 3846a3b..42f33fd 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/internal/util/MethodPrefixFinder.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/internal/util/MethodPrefixFinder.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.wrapper.internal.util;
+package org.apache.isis.runtimeservices.wrapper.internal.util;
import java.util.Arrays;
import java.util.LinkedHashSet;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/proxy/ProxyCreator.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/proxy/ProxyCreator.java
similarity index 96%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/proxy/ProxyCreator.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/proxy/ProxyCreator.java
index d5b26c5..621b355 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/wrapper/proxy/ProxyCreator.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/wrapper/proxy/ProxyCreator.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.wrapper.proxy;
+package org.apache.isis.runtimeservices.wrapper.proxy;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
@@ -31,7 +31,7 @@ import org.apache.isis.commons.internal.collections._Arrays;
import org.apache.isis.commons.internal.plugins.codegen.ProxyFactory;
import org.apache.isis.commons.internal.plugins.codegen.ProxyFactoryService;
import org.apache.isis.metamodel.specloader.classsubstitutor.ProxyEnhanced;
-import org.apache.isis.runtime.services.wrapper.handlers.DelegatingInvocationHandler;
+import org.apache.isis.runtimeservices.wrapper.handlers.DelegatingInvocationHandler;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xactn/TransactionServiceSpring.java
similarity index 99%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xactn/TransactionServiceSpring.java
index b9f2e7b..bd15d3c 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xactn/TransactionServiceSpring.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xactn/TransactionServiceSpring.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.xactn;
+package org.apache.isis.runtimeservices.xactn;
import java.util.function.Supplier;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xmlsnapshot/XmlSnapshotBuilder.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/xmlsnapshot/XmlSnapshotBuilder.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java
index abcb347..5066eef 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xmlsnapshot/XmlSnapshotBuilder.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.xmlsnapshot;
+package org.apache.isis.runtimeservices.xmlsnapshot;
import java.util.List;
diff --git a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
similarity index 98%
rename from core/runtime-services/src/main/java/org/apache/isis/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
rename to core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
index d23696b..5b57ff1 100644
--- a/core/runtime-services/src/main/java/org/apache/isis/runtime/services/xmlsnapshot/XmlSnapshotServiceDefault.java
+++ b/core/runtime-services/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.xmlsnapshot;
+package org.apache.isis.runtimeservices.xmlsnapshot;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/ServiceInstantiatorTest.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/ServiceInstantiatorTest.java
similarity index 96%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/ServiceInstantiatorTest.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/ServiceInstantiatorTest.java
index 59d835d..8dbbb05 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/ServiceInstantiatorTest.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/ServiceInstantiatorTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services;
+package org.apache.isis.runtimeservices;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/changes/PreAndPostValues_shouldAudit_Test.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
similarity index 97%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/changes/PreAndPostValues_shouldAudit_Test.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
index f90e0c3..779b6c7 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/changes/PreAndPostValues_shouldAudit_Test.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.changes;
+package org.apache.isis.runtimeservices.changes;
import org.junit.Test;
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/email/EmailServiceDefaultTest_actually.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_actually.java
similarity index 97%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/email/EmailServiceDefaultTest_actually.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_actually.java
index 7a3fcf3..885ecbb 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/email/EmailServiceDefaultTest_actually.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_actually.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.email;
+package org.apache.isis.runtimeservices.email;
import org.junit.Test;
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/email/EmailServiceDefaultTest_notEmpty.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_notEmpty.java
similarity index 96%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/email/EmailServiceDefaultTest_notEmpty.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_notEmpty.java
index de36c41..c7a2141 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/email/EmailServiceDefaultTest_notEmpty.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_notEmpty.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.email;
+package org.apache.isis.runtimeservices.email;
import org.junit.Test;
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/i18n/po/PoReaderTest.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoReaderTest.java
similarity index 99%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/i18n/po/PoReaderTest.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoReaderTest.java
index 3507877..72a008d 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/i18n/po/PoReaderTest.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoReaderTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.i18n.po;
+package org.apache.isis.runtimeservices.i18n.po;
import java.util.List;
import java.util.Locale;
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/i18n/po/PoWriterTest_escape.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoWriterTest_escape.java
similarity index 96%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/i18n/po/PoWriterTest_escape.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoWriterTest_escape.java
index b0c17b7..f7902ec 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/i18n/po/PoWriterTest_escape.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoWriterTest_escape.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.i18n.po;
+package org.apache.isis.runtimeservices.i18n.po;
import org.junit.Test;
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
similarity index 98%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
index 1ff7e7f..082507e 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/WrapperFactoryDefaultTest.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtime.services.wrapper;
+package org.apache.isis.runtimeservices.wrapper;
import java.util.EnumSet;
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/claims/Approver.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Approver.java
similarity index 93%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/claims/Approver.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Approver.java
index ee917b4..16642f2 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/claims/Approver.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Approver.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.wrapper.dom.claims;
+package org.apache.isis.runtimeservices.wrapper.dom.claims;
public interface Approver {
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/claims/Claimant.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Claimant.java
similarity index 93%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/claims/Claimant.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Claimant.java
index 680da54..20046ae 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/claims/Claimant.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Claimant.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.wrapper.dom.claims;
+package org.apache.isis.runtimeservices.wrapper.dom.claims;
public interface Claimant {
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/employees/Employee.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/Employee.java
similarity index 92%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/employees/Employee.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/Employee.java
index b7ce646..d0032d3 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/employees/Employee.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/Employee.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.isis.runtime.services.wrapper.dom.employees;
+package org.apache.isis.runtimeservices.wrapper.dom.employees;
import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.runtime.services.wrapper.dom.claims.Approver;
-import org.apache.isis.runtime.services.wrapper.dom.claims.Claimant;
+import org.apache.isis.runtimeservices.wrapper.dom.claims.Approver;
+import org.apache.isis.runtimeservices.wrapper.dom.claims.Claimant;
public class Employee implements Claimant, Approver {
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/employees/EmployeeRepository.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepository.java
similarity index 93%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/employees/EmployeeRepository.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepository.java
index cf8b86c..b22e728 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/employees/EmployeeRepository.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepository.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.wrapper.dom.employees;
+package org.apache.isis.runtimeservices.wrapper.dom.employees;
import java.util.List;
diff --git a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/employees/EmployeeRepositoryImpl.java b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepositoryImpl.java
similarity index 94%
rename from core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/employees/EmployeeRepositoryImpl.java
rename to core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepositoryImpl.java
index e05cf4a..7c7a065 100644
--- a/core/runtime-services/src/test/java/org/apache/isis/runtime/services/wrapper/dom/employees/EmployeeRepositoryImpl.java
+++ b/core/runtime-services/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepositoryImpl.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtime.services.wrapper.dom.employees;
+package org.apache.isis.runtimeservices.wrapper.dom.employees;
import java.util.List;
diff --git a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java b/core/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java
index d2e3864..1e25327 100644
--- a/core/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java
+++ b/core/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.runtime.services.IsisModuleRuntimeServices;
+import org.apache.isis.runtimeservices.IsisModuleRuntimeServices;
import org.apache.isis.security.bypass.authentication.AuthenticatorBypass;
import org.apache.isis.security.bypass.authorization.AuthorizorBypass;
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
index 6e83e67..b5cd8be 100644
--- a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
+++ b/core/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.runtime.services.IsisModuleRuntimeServices;
+import org.apache.isis.runtimeservices.IsisModuleRuntimeServices;
import org.apache.isis.security.keycloak.authentication.AuthenticatorKeycloak;
import org.apache.isis.security.keycloak.authorization.AuthorizorKeycloak;
import org.apache.isis.security.keycloak.webmodule.WebModuleKeycloak;
diff --git a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java b/core/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
index 6ad9da3..63dc32f 100644
--- a/core/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
+++ b/core/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.runtime.services.IsisModuleRuntimeServices;
+import org.apache.isis.runtimeservices.IsisModuleRuntimeServices;
import org.apache.isis.security.shiro.authentication.AuthenticatorShiro;
import org.apache.isis.security.shiro.authorization.AuthorizorShiro;
import org.apache.isis.security.shiro.webmodule.WebModuleShiro;
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 1dfe1a6..a5b7c28 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,7 +29,7 @@ import org.springframework.context.annotation.Import;
import org.springframework.core.OrderComparator;
import org.springframework.core.annotation.AnnotationAwareOrderComparator;
-import org.apache.isis.runtime.services.IsisModuleRuntimeServices;
+import org.apache.isis.runtimeservices.IsisModuleRuntimeServices;
@Configuration
@Import({
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 1883115..2b96276 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.runtime.services.error.EmailTicket;
-import org.apache.isis.runtime.services.error.EmailTicket.MailTo;
+import org.apache.isis.runtimeservices.error.EmailTicket;
+import org.apache.isis.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 0e6d120..6ba2113 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.config.presets.IsisPresets;
-import org.apache.isis.runtime.services.message.MessageServiceDefault;
+import org.apache.isis.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 bd4afe0..54f6aea 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.runtime.services.eventbus.EventBusServiceSpring;
+import org.apache.isis.runtimeservices.eventbus.EventBusServiceSpring;
import lombok.Getter;
import lombok.Value;