You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/10 18:35:29 UTC
[isis] 04/14: ISIS-2259: updates packages for
isis-core-runtimeservices.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 3a21a480fcee0f2c7b0319eaa1a044d19fb4b19b
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 15:35:20 2020 +0000
ISIS-2259: updates packages for isis-core-runtimeservices.
---
.../proxy/ProxyCreatorTestUsingCodegenPlugin.java | 3 +-
core/runtimeservices/pom.xml | 4 +-
.../runtimeservices/InitialisationException.java | 2 +-
.../IsisModuleCoreRuntimeServices.java} | 56 +++++++++++-----------
.../runtimeservices/ServiceException.java | 2 +-
.../auth/AuthenticationSessionProviderDefault.java | 2 +-
.../background/BackgroundCommandExecution.java | 2 +-
.../background/CommandExecutionAbstract.java | 2 +-
.../bookmarks/BookmarkServiceInternalDefault.java | 2 +-
.../command/CommandDtoServiceInternalDefault.java | 2 +-
.../command/CommandExecutorServiceDefault.java | 2 +-
.../command/CommandServiceDefault.java | 2 +-
.../confmenu/ConfigurationViewServiceDefault.java | 2 +-
.../runtimeservices/email/EmailServiceDefault.java | 2 +-
.../runtimeservices/error/EmailTicket.java | 2 +-
.../runtimeservices/error/SimpleTicket.java | 2 +-
.../eventbus/EventBusServiceSpring.java | 2 +-
.../factory/FactoryServiceDefault.java | 2 +-
.../homepage/HomePageResolverServiceDefault.java | 2 +-
.../{ => core}/runtimeservices/i18n/po/Block.java | 2 +-
.../runtimeservices/i18n/po/ContextAndMsgId.java | 2 +-
.../runtimeservices/i18n/po/PoAbstract.java | 2 +-
.../runtimeservices/i18n/po/PoDisabled.java | 2 +-
.../runtimeservices/i18n/po/PoReader.java | 2 +-
.../runtimeservices/i18n/po/PoWriter.java | 2 +-
.../i18n/po/TranslationServicePo.java | 2 +-
.../i18n/po/TranslationServicePoMenu.java | 2 +-
.../{ => core}/runtimeservices/i18n/po/Util.java | 2 +-
.../ixn/InteractionDtoServiceInternalDefault.java | 2 +-
.../menubars/MenuBarsLoaderServiceDefault.java | 2 +-
.../menubars/bootstrap3/MenuBarsServiceBS3.java | 2 +-
.../menubars/bootstrap3/ServiceAndAction.java | 2 +-
.../message/MessageServiceDefault.java | 2 +-
.../publish/PublishedObjectsDefault.java | 2 +-
.../publish/PublisherDispatchServiceDefault.java | 2 +-
.../repository/RepositoryServiceDefault.java | 2 +-
.../routing/RoutingServiceDefault.java | 2 +-
.../sessmgmt/SessionManagementServiceDefault.java | 2 +-
.../runtimeservices/sudo/SudoServiceDefault.java | 2 +-
.../userprof/UserProfileServiceDefault.java | 2 +-
.../userreg/EmailNotificationServiceDefault.java | 2 +-
.../userreg/EmailVerificationTemplate.html | 0
.../userreg/PasswordResetTemplate.html | 0
.../runtimeservices/wrapper/AsyncWrapDefault.java | 2 +-
.../wrapper/WrapperFactoryDefault.java | 10 ++--
.../dispatchers/InteractionEventDispatcher.java | 2 +-
.../InteractionEventDispatcherTypeSafe.java | 2 +-
.../AbstractCollectionInvocationHandler.java | 2 +-
.../handlers/CollectionInvocationHandler.java | 2 +-
.../handlers/DelegatingInvocationHandler.java | 2 +-
.../DelegatingInvocationHandlerDefault.java | 2 +-
.../handlers/DomainObjectInvocationHandler.java | 2 +-
.../wrapper/handlers/MapInvocationHandler.java | 2 +-
.../wrapper/handlers/ProxyContextHandler.java | 4 +-
.../wrapper/internal/util/MethodPrefixFinder.java | 2 +-
.../wrapper/proxy/ProxyCreator.java | 4 +-
.../xactn/TransactionServiceSpring.java | 2 +-
.../xmlsnapshot/XmlSnapshotBuilder.java | 2 +-
.../xmlsnapshot/XmlSnapshotServiceDefault.java | 2 +-
.../runtimeservices/ServiceInstantiatorTest.java | 2 +-
.../changes/PreAndPostValues_shouldAudit_Test.java | 2 +-
.../email/EmailServiceDefaultTest_actually.java | 2 +-
.../email/EmailServiceDefaultTest_notEmpty.java | 2 +-
.../runtimeservices/i18n/po/PoReaderTest.java | 2 +-
.../i18n/po/PoWriterTest_escape.java | 2 +-
.../wrapper/WrapperFactoryDefaultTest.java | 2 +-
.../wrapper/dom/claims/Approver.java | 2 +-
.../wrapper/dom/claims/Claimant.java | 2 +-
.../wrapper/dom/employees/Employee.java | 6 +--
.../wrapper/dom/employees/EmployeeRepository.java | 2 +-
.../dom/employees/EmployeeRepositoryImpl.java | 2 +-
.../webboot/springboot/IsisModuleSpringBoot.java | 4 +-
.../error/service/DemoErrorReportingService.java | 4 +-
.../SpringServiceInjectOrderTest.java | 2 +-
.../eventhandling/GenericEventPublishingTest.java | 2 +-
.../WrapperFactoryDefault_wrappedObject_Test.java | 8 ++--
...actoryDefault_wrappedObject_transient_Test.java | 4 +-
.../security/bypass/IsisModuleSecurityBypass.java | 4 +-
.../keycloak/IsisModuleSecurityKeycloak.java | 4 +-
.../security/shiro/IsisModuleSecurityShiro.java | 4 +-
80 files changed, 123 insertions(+), 124 deletions(-)
diff --git a/core/detached-tests/src/test/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java b/core/detached-tests/src/test/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
index 24ae0df..aba6655 100644
--- a/core/detached-tests/src/test/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
+++ b/core/detached-tests/src/test/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreatorTestUsingCodegenPlugin.java
@@ -27,8 +27,7 @@ import org.junit.Before;
import org.junit.Test;
import org.apache.isis.core.codegen.bytebuddy.services.ProxyFactoryServiceByteBuddy;
-import org.apache.isis.runtimeservices.wrapper.handlers.DelegatingInvocationHandler;
-import org.apache.isis.runtimeservices.wrapper.proxy.ProxyCreator;
+import org.apache.isis.core.runtimeservices.wrapper.handlers.DelegatingInvocationHandler;
public class ProxyCreatorTestUsingCodegenPlugin {
diff --git a/core/runtimeservices/pom.xml b/core/runtimeservices/pom.xml
index eeecb1a..d9e064e 100644
--- a/core/runtimeservices/pom.xml
+++ b/core/runtimeservices/pom.xml
@@ -31,8 +31,8 @@
<description>Introduced to keep the 'runtime' package concise. Viewers don't have dependencies on this module.</description>
<properties>
- <jar-plugin.automaticModuleName>org.apache.isis.runtime.services</jar-plugin.automaticModuleName>
- <git-plugin.propertiesDir>org/apache/isis/runtime/services</git-plugin.propertiesDir>
+ <jar-plugin.automaticModuleName>org.apache.isis.core.runtimeservices</jar-plugin.automaticModuleName>
+ <git-plugin.propertiesDir>org/apache/isis/core.runtimeservices</git-plugin.propertiesDir>
</properties>
<build>
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/InitialisationException.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/InitialisationException.java
similarity index 96%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/InitialisationException.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/InitialisationException.java
index fbf4e37..4a1aa52 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/InitialisationException.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/InitialisationException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices;
+package org.apache.isis.core.runtimeservices;
import org.apache.isis.core.commons.exceptions.IsisException;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
similarity index 53%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
index 9143047..3e63ffd 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/IsisModuleRuntimeServices.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
@@ -16,39 +16,39 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices;
+package org.apache.isis.core.runtimeservices;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.isis.core.codegen.bytebuddy.IsisModuleCoreCodegenByteBuddy;
import org.apache.isis.core.runtime.IsisCoreModuleRuntime;
-import org.apache.isis.runtimeservices.auth.AuthenticationSessionProviderDefault;
-import org.apache.isis.runtimeservices.bookmarks.BookmarkServiceInternalDefault;
-import org.apache.isis.runtimeservices.command.CommandDtoServiceInternalDefault;
-import org.apache.isis.runtimeservices.command.CommandExecutorServiceDefault;
-import org.apache.isis.runtimeservices.command.CommandServiceDefault;
-import org.apache.isis.runtimeservices.confmenu.ConfigurationViewServiceDefault;
-import org.apache.isis.runtimeservices.email.EmailServiceDefault;
-import org.apache.isis.runtimeservices.eventbus.EventBusServiceSpring;
-import org.apache.isis.runtimeservices.factory.FactoryServiceDefault;
-import org.apache.isis.runtimeservices.homepage.HomePageResolverServiceDefault;
-import org.apache.isis.runtimeservices.i18n.po.TranslationServicePo;
-import org.apache.isis.runtimeservices.i18n.po.TranslationServicePoMenu;
-import org.apache.isis.runtimeservices.ixn.InteractionDtoServiceInternalDefault;
-import org.apache.isis.runtimeservices.menubars.MenuBarsLoaderServiceDefault;
-import org.apache.isis.runtimeservices.menubars.bootstrap3.MenuBarsServiceBS3;
-import org.apache.isis.runtimeservices.message.MessageServiceDefault;
-import org.apache.isis.runtimeservices.publish.PublisherDispatchServiceDefault;
-import org.apache.isis.runtimeservices.repository.RepositoryServiceDefault;
-import org.apache.isis.runtimeservices.routing.RoutingServiceDefault;
-import org.apache.isis.runtimeservices.sessmgmt.SessionManagementServiceDefault;
-import org.apache.isis.runtimeservices.sudo.SudoServiceDefault;
-import org.apache.isis.runtimeservices.userprof.UserProfileServiceDefault;
-import org.apache.isis.runtimeservices.userreg.EmailNotificationServiceDefault;
-import org.apache.isis.runtimeservices.wrapper.WrapperFactoryDefault;
-import org.apache.isis.runtimeservices.xactn.TransactionServiceSpring;
-import org.apache.isis.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefault;
+import org.apache.isis.core.runtimeservices.auth.AuthenticationSessionProviderDefault;
+import org.apache.isis.core.runtimeservices.bookmarks.BookmarkServiceInternalDefault;
+import org.apache.isis.core.runtimeservices.command.CommandDtoServiceInternalDefault;
+import org.apache.isis.core.runtimeservices.command.CommandExecutorServiceDefault;
+import org.apache.isis.core.runtimeservices.command.CommandServiceDefault;
+import org.apache.isis.core.runtimeservices.confmenu.ConfigurationViewServiceDefault;
+import org.apache.isis.core.runtimeservices.factory.FactoryServiceDefault;
+import org.apache.isis.core.runtimeservices.homepage.HomePageResolverServiceDefault;
+import org.apache.isis.core.runtimeservices.i18n.po.TranslationServicePo;
+import org.apache.isis.core.runtimeservices.i18n.po.TranslationServicePoMenu;
+import org.apache.isis.core.runtimeservices.ixn.InteractionDtoServiceInternalDefault;
+import org.apache.isis.core.runtimeservices.menubars.MenuBarsLoaderServiceDefault;
+import org.apache.isis.core.runtimeservices.menubars.bootstrap3.MenuBarsServiceBS3;
+import org.apache.isis.core.runtimeservices.message.MessageServiceDefault;
+import org.apache.isis.core.runtimeservices.publish.PublisherDispatchServiceDefault;
+import org.apache.isis.core.runtimeservices.repository.RepositoryServiceDefault;
+import org.apache.isis.core.runtimeservices.routing.RoutingServiceDefault;
+import org.apache.isis.core.runtimeservices.sessmgmt.SessionManagementServiceDefault;
+import org.apache.isis.core.runtimeservices.userprof.UserProfileServiceDefault;
+import org.apache.isis.core.runtimeservices.userreg.EmailNotificationServiceDefault;
+import org.apache.isis.core.runtimeservices.wrapper.WrapperFactoryDefault;
+import org.apache.isis.core.runtimeservices.xactn.TransactionServiceSpring;
+import org.apache.isis.core.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefault;
+import org.apache.isis.core.runtimeservices.email.EmailServiceDefault;
+import org.apache.isis.core.runtimeservices.eventbus.EventBusServiceSpring;
+import org.apache.isis.core.runtimeservices.sudo.SudoServiceDefault;
@Configuration
@Import({
@@ -90,6 +90,6 @@ import org.apache.isis.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefault;
// @DomainService's
TranslationServicePoMenu.class,
})
-public class IsisModuleRuntimeServices {
+public class IsisModuleCoreRuntimeServices {
}
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/ServiceException.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/ServiceException.java
similarity index 96%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/ServiceException.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/ServiceException.java
index 74d343d..3d7d748 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/ServiceException.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/ServiceException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices;
+package org.apache.isis.core.runtimeservices;
import org.apache.isis.core.commons.exceptions.IsisException;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/auth/AuthenticationSessionProviderDefault.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/auth/AuthenticationSessionProviderDefault.java
index 64ded5d..8534674 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/auth/AuthenticationSessionProviderDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/auth/AuthenticationSessionProviderDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.auth;
+package org.apache.isis.core.runtimeservices.auth;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/background/BackgroundCommandExecution.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/background/BackgroundCommandExecution.java
similarity index 97%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/background/BackgroundCommandExecution.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/background/BackgroundCommandExecution.java
index 88322fb..392b4d6 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/background/BackgroundCommandExecution.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/background/BackgroundCommandExecution.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.background;
+package org.apache.isis.core.runtimeservices.background;
import java.util.List;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/background/CommandExecutionAbstract.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/background/CommandExecutionAbstract.java
similarity index 97%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/background/CommandExecutionAbstract.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/background/CommandExecutionAbstract.java
index 15ffeb0..6a25a22 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/background/CommandExecutionAbstract.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/background/CommandExecutionAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.background;
+package org.apache.isis.core.runtimeservices.background;
import javax.inject.Inject;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/bookmarks/BookmarkServiceInternalDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/bookmarks/BookmarkServiceInternalDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/bookmarks/BookmarkServiceInternalDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/bookmarks/BookmarkServiceInternalDefault.java
index ec38838..7467b23 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/bookmarks/BookmarkServiceInternalDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/bookmarks/BookmarkServiceInternalDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.bookmarks;
+package org.apache.isis.core.runtimeservices.bookmarks;
import java.io.Serializable;
import java.math.BigDecimal;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandDtoServiceInternalDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoServiceInternalDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandDtoServiceInternalDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoServiceInternalDefault.java
index 3892ab0..0a1fe10 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandDtoServiceInternalDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandDtoServiceInternalDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.command;
+package org.apache.isis.core.runtimeservices.command;
import java.util.List;
import java.util.UUID;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java
index 8795977..5d9051d 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandExecutorServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandExecutorServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.command;
+package org.apache.isis.core.runtimeservices.command;
import java.sql.Timestamp;
import java.util.Collections;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandServiceDefault.java
similarity index 97%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandServiceDefault.java
index bcf00a9..d9f3c00 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/command/CommandServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/command/CommandServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.command;
+package org.apache.isis.core.runtimeservices.command;
import javax.inject.Named;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
index 8b89cd6..64a7bc3 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/confmenu/ConfigurationViewServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.confmenu;
+package org.apache.isis.core.runtimeservices.confmenu;
import java.util.Map;
import java.util.Optional;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/email/EmailServiceDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/email/EmailServiceDefault.java
index 98a1a04..e3e48e8 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/email/EmailServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/email/EmailServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.email;
+package org.apache.isis.core.runtimeservices.email;
import java.util.Collections;
import java.util.List;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/error/EmailTicket.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/error/EmailTicket.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/error/EmailTicket.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/error/EmailTicket.java
index 2850342..dad42d3 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/error/EmailTicket.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/error/EmailTicket.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.error;
+package org.apache.isis.core.runtimeservices.error;
import java.io.Serializable;
import java.util.List;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/error/SimpleTicket.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/error/SimpleTicket.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/error/SimpleTicket.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/error/SimpleTicket.java
index 9ef3874..8a2741a 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/error/SimpleTicket.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/error/SimpleTicket.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.error;
+package org.apache.isis.core.runtimeservices.error;
import java.io.Serializable;
import java.util.function.UnaryOperator;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/eventbus/EventBusServiceSpring.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/eventbus/EventBusServiceSpring.java
similarity index 96%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/eventbus/EventBusServiceSpring.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/eventbus/EventBusServiceSpring.java
index e77b40e..4aaa2df 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/eventbus/EventBusServiceSpring.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/eventbus/EventBusServiceSpring.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.eventbus;
+package org.apache.isis.core.runtimeservices.eventbus;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/factory/FactoryServiceDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/factory/FactoryServiceDefault.java
index 0bd2811..c5a1506 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/factory/FactoryServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/factory/FactoryServiceDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.factory;
+package org.apache.isis.core.runtimeservices.factory;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/homepage/HomePageResolverServiceDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/homepage/HomePageResolverServiceDefault.java
index 9af5de3..d327af1 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/homepage/HomePageResolverServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/homepage/HomePageResolverServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.homepage;
+package org.apache.isis.core.runtimeservices.homepage;
import javax.enterprise.inject.Vetoed;
import javax.inject.Inject;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/Block.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/Block.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/Block.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/Block.java
index 851cac8..83cd3dd 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/Block.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/Block.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.i18n.po;
+package org.apache.isis.core.runtimeservices.i18n.po;
import java.util.List;
import java.util.Map;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/ContextAndMsgId.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/ContextAndMsgId.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/ContextAndMsgId.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/ContextAndMsgId.java
index b5d66f0..26aedc0 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/ContextAndMsgId.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/ContextAndMsgId.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.i18n.po;
+package org.apache.isis.core.runtimeservices.i18n.po;
/**
* The combination of a <tt>msgId</tt> and context (optionally null) that represents a key to a translatable resource.
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoAbstract.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoAbstract.java
similarity index 96%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoAbstract.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoAbstract.java
index bd86875..f041c71 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoAbstract.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.i18n.po;
+package org.apache.isis.core.runtimeservices.i18n.po;
import org.apache.isis.applib.services.i18n.TranslationService;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoDisabled.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoDisabled.java
similarity index 95%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoDisabled.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoDisabled.java
index 7111db8..77e9161 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoDisabled.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoDisabled.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.i18n.po;
+package org.apache.isis.core.runtimeservices.i18n.po;
import org.apache.isis.applib.services.i18n.TranslationService;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoReader.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoReader.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoReader.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoReader.java
index 534f742..6a62470 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoReader.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoReader.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.i18n.po;
+package org.apache.isis.core.runtimeservices.i18n.po;
import java.util.Collections;
import java.util.List;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoWriter.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoWriter.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoWriter.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoWriter.java
index 039abb9..9651285 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/PoWriter.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/PoWriter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.i18n.po;
+package org.apache.isis.core.runtimeservices.i18n.po;
import java.util.SortedMap;
import java.util.SortedSet;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/TranslationServicePo.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/TranslationServicePo.java
index 51b0301..2dbe112 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePo.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/TranslationServicePo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.i18n.po;
+package org.apache.isis.core.runtimeservices.i18n.po;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePoMenu.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/TranslationServicePoMenu.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePoMenu.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/TranslationServicePoMenu.java
index 38950e4..9b34db8 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/TranslationServicePoMenu.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/TranslationServicePoMenu.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.i18n.po;
+package org.apache.isis.core.runtimeservices.i18n.po;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/Util.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/Util.java
similarity index 95%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/Util.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/Util.java
index da2db3c..364ec88 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/i18n/po/Util.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/i18n/po/Util.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.i18n.po;
+package org.apache.isis.core.runtimeservices.i18n.po;
class Util {
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java
index c20bf5b..93c0027 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/ixn/InteractionDtoServiceInternalDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.ixn;
+package org.apache.isis.core.runtimeservices.ixn;
import java.util.List;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
index bdd7262..e553226 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.menubars;
+package org.apache.isis.core.runtimeservices.menubars;
import java.nio.charset.StandardCharsets;
import java.util.Optional;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
index 477a344..274530d 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.menubars.bootstrap3;
+package org.apache.isis.core.runtimeservices.menubars.bootstrap3;
import java.util.List;
import java.util.Map;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/ServiceAndAction.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/ServiceAndAction.java
similarity index 95%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/ServiceAndAction.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/ServiceAndAction.java
index 034647e..9598cf3 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/menubars/bootstrap3/ServiceAndAction.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/ServiceAndAction.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.menubars.bootstrap3;
+package org.apache.isis.core.runtimeservices.menubars.bootstrap3;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/message/MessageServiceDefault.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/message/MessageServiceDefault.java
index 887ddff..bce6d69 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/message/MessageServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/message/MessageServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.message;
+package org.apache.isis.core.runtimeservices.message;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublishedObjectsDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/PublishedObjectsDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublishedObjectsDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/PublishedObjectsDefault.java
index b5fe049..a8e71ad 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublishedObjectsDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/PublishedObjectsDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.publish;
+package org.apache.isis.core.runtimeservices.publish;
import java.sql.Timestamp;
import java.util.Collection;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/PublisherDispatchServiceDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/PublisherDispatchServiceDefault.java
index 6758cf5..51e617b 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/publish/PublisherDispatchServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/publish/PublisherDispatchServiceDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.publish;
+package org.apache.isis.core.runtimeservices.publish;
import java.sql.Timestamp;
import java.util.HashMap;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/repository/RepositoryServiceDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/repository/RepositoryServiceDefault.java
index e0b19ed..d8ae9b2 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/repository/RepositoryServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/repository/RepositoryServiceDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.repository;
+package org.apache.isis.core.runtimeservices.repository;
import java.util.ArrayList;
import java.util.List;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/routing/RoutingServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/routing/RoutingServiceDefault.java
similarity index 97%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/routing/RoutingServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/routing/RoutingServiceDefault.java
index aae393c..8040945 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/routing/RoutingServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/routing/RoutingServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.routing;
+package org.apache.isis.core.runtimeservices.routing;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
similarity index 97%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
index b667ccf..f5c63ed 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sessmgmt/SessionManagementServiceDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.sessmgmt;
+package org.apache.isis.core.runtimeservices.sessmgmt;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sudo/SudoServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sudo/SudoServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java
index 84cf6a1..d70f035 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/sudo/SudoServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.sudo;
+package org.apache.isis.core.runtimeservices.sudo;
import java.util.List;
import java.util.concurrent.Callable;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userprof/UserProfileServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userprof/UserProfileServiceDefault.java
similarity index 96%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userprof/UserProfileServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userprof/UserProfileServiceDefault.java
index 977b668..bb8b111 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userprof/UserProfileServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userprof/UserProfileServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.userprof;
+package org.apache.isis.core.runtimeservices.userprof;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userreg/EmailNotificationServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userreg/EmailNotificationServiceDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userreg/EmailNotificationServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userreg/EmailNotificationServiceDefault.java
index 31abbc8..fb57286 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userreg/EmailNotificationServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userreg/EmailNotificationServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.userreg;
+package org.apache.isis.core.runtimeservices.userreg;
import java.io.IOException;
import java.net.URL;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userreg/EmailVerificationTemplate.html b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userreg/EmailVerificationTemplate.html
similarity index 100%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userreg/EmailVerificationTemplate.html
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userreg/EmailVerificationTemplate.html
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userreg/PasswordResetTemplate.html b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userreg/PasswordResetTemplate.html
similarity index 100%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/userreg/PasswordResetTemplate.html
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/userreg/PasswordResetTemplate.html
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/AsyncWrapDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/AsyncWrapDefault.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/AsyncWrapDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/AsyncWrapDefault.java
index 6e96995..7dc9fcc 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/AsyncWrapDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/AsyncWrapDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper;
+package org.apache.isis.core.runtimeservices.wrapper;
import java.util.EnumSet;
import java.util.concurrent.Callable;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
similarity index 96%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
index a1e4c13..9277ecc 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper;
+package org.apache.isis.core.runtimeservices.wrapper;
import java.util.ArrayList;
import java.util.Collections;
@@ -64,10 +64,10 @@ import org.apache.isis.core.commons.internal.base._Casts;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.commons.internal.plugins.codegen.ProxyFactoryService;
import org.apache.isis.core.metamodel.context.MetaModelContext;
-import org.apache.isis.runtimeservices.wrapper.dispatchers.InteractionEventDispatcher;
-import org.apache.isis.runtimeservices.wrapper.dispatchers.InteractionEventDispatcherTypeSafe;
-import org.apache.isis.runtimeservices.wrapper.handlers.ProxyContextHandler;
-import org.apache.isis.runtimeservices.wrapper.proxy.ProxyCreator;
+import org.apache.isis.core.runtimeservices.wrapper.dispatchers.InteractionEventDispatcher;
+import org.apache.isis.core.runtimeservices.wrapper.dispatchers.InteractionEventDispatcherTypeSafe;
+import org.apache.isis.core.runtimeservices.wrapper.handlers.ProxyContextHandler;
+import org.apache.isis.core.runtimeservices.wrapper.proxy.ProxyCreator;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import lombok.val;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcher.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/dispatchers/InteractionEventDispatcher.java
similarity index 93%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcher.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/dispatchers/InteractionEventDispatcher.java
index 3a083f1..c164635 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcher.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/dispatchers/InteractionEventDispatcher.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.dispatchers;
+package org.apache.isis.core.runtimeservices.wrapper.dispatchers;
import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
similarity index 95%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
index 479229f..5c9889a 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/dispatchers/InteractionEventDispatcherTypeSafe.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.dispatchers;
+package org.apache.isis.core.runtimeservices.wrapper.dispatchers;
import org.apache.isis.applib.services.wrapper.events.InteractionEvent;
import org.apache.isis.core.commons.internal.base._Casts;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/AbstractCollectionInvocationHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/AbstractCollectionInvocationHandler.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/AbstractCollectionInvocationHandler.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/AbstractCollectionInvocationHandler.java
index 1e887f2..1f5ebbb 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/AbstractCollectionInvocationHandler.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/AbstractCollectionInvocationHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.handlers;
+package org.apache.isis.core.runtimeservices.wrapper.handlers;
import java.lang.reflect.Method;
import java.util.List;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/CollectionInvocationHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/CollectionInvocationHandler.java
similarity index 97%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/CollectionInvocationHandler.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/CollectionInvocationHandler.java
index 40eb86c..1c7491c 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/CollectionInvocationHandler.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/CollectionInvocationHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.handlers;
+package org.apache.isis.core.runtimeservices.wrapper.handlers;
import java.util.Collection;
import java.util.List;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DelegatingInvocationHandler.java
similarity index 94%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandler.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DelegatingInvocationHandler.java
index 333028b..6f3daac 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandler.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DelegatingInvocationHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.handlers;
+package org.apache.isis.core.runtimeservices.wrapper.handlers;
import java.lang.reflect.InvocationHandler;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java
index 352e131..74511e8 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DelegatingInvocationHandlerDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.handlers;
+package org.apache.isis.core.runtimeservices.wrapper.handlers;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
index ca0097e..03d463d 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/DomainObjectInvocationHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.handlers;
+package org.apache.isis.core.runtimeservices.wrapper.handlers;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/MapInvocationHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/MapInvocationHandler.java
similarity index 97%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/MapInvocationHandler.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/MapInvocationHandler.java
index fad80bf..e523558 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/MapInvocationHandler.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/MapInvocationHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.handlers;
+package org.apache.isis.core.runtimeservices.wrapper.handlers;
import java.util.Map;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/ProxyContextHandler.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/ProxyContextHandler.java
similarity index 95%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/ProxyContextHandler.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/ProxyContextHandler.java
index f60d287..95aa592 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/handlers/ProxyContextHandler.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/handlers/ProxyContextHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.handlers;
+package org.apache.isis.core.runtimeservices.wrapper.handlers;
import java.util.Collection;
import java.util.EnumSet;
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.isis.applib.services.wrapper.WrapperFactory.ExecutionMode;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
-import org.apache.isis.runtimeservices.wrapper.proxy.ProxyCreator;
+import org.apache.isis.core.runtimeservices.wrapper.proxy.ProxyCreator;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/internal/util/MethodPrefixFinder.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/internal/util/MethodPrefixFinder.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/internal/util/MethodPrefixFinder.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/internal/util/MethodPrefixFinder.java
index 7e7ff66..b3820f5 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/internal/util/MethodPrefixFinder.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/internal/util/MethodPrefixFinder.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.internal.util;
+package org.apache.isis.core.runtimeservices.wrapper.internal.util;
import java.util.Arrays;
import java.util.LinkedHashSet;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/proxy/ProxyCreator.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreator.java
similarity index 95%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/proxy/ProxyCreator.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreator.java
index eb5152d..cc32b30 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/wrapper/proxy/ProxyCreator.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/wrapper/proxy/ProxyCreator.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.proxy;
+package org.apache.isis.core.runtimeservices.wrapper.proxy;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
@@ -31,7 +31,7 @@ import org.apache.isis.core.commons.internal.collections._Arrays;
import org.apache.isis.core.commons.internal.plugins.codegen.ProxyFactory;
import org.apache.isis.core.commons.internal.plugins.codegen.ProxyFactoryService;
import org.apache.isis.core.metamodel.specloader.classsubstitutor.ProxyEnhanced;
-import org.apache.isis.runtimeservices.wrapper.handlers.DelegatingInvocationHandler;
+import org.apache.isis.core.runtimeservices.wrapper.handlers.DelegatingInvocationHandler;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xactn/TransactionServiceSpring.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xactn/TransactionServiceSpring.java
similarity index 99%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xactn/TransactionServiceSpring.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xactn/TransactionServiceSpring.java
index 55a1873..52f8935 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xactn/TransactionServiceSpring.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xactn/TransactionServiceSpring.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.xactn;
+package org.apache.isis.core.runtimeservices.xactn;
import java.util.function.Supplier;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java
index c34c59a..952c637 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotBuilder.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.xmlsnapshot;
+package org.apache.isis.core.runtimeservices.xmlsnapshot;
import java.util.List;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
rename to core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
index 67a83b3..21cf984 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.xmlsnapshot;
+package org.apache.isis.core.runtimeservices.xmlsnapshot;
import javax.inject.Inject;
import javax.inject.Named;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/ServiceInstantiatorTest.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/ServiceInstantiatorTest.java
similarity index 95%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/ServiceInstantiatorTest.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/ServiceInstantiatorTest.java
index 8dbbb05..133c167 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/ServiceInstantiatorTest.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/ServiceInstantiatorTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices;
+package org.apache.isis.core.runtimeservices;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
similarity index 97%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
index 0608a8a..6c582ad 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/changes/PreAndPostValues_shouldAudit_Test.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.changes;
+package org.apache.isis.core.runtimeservices.changes;
import org.junit.Test;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_actually.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/email/EmailServiceDefaultTest_actually.java
similarity index 97%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_actually.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/email/EmailServiceDefaultTest_actually.java
index 74f6d1b..4612c86 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_actually.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/email/EmailServiceDefaultTest_actually.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.email;
+package org.apache.isis.core.runtimeservices.email;
import org.junit.Test;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_notEmpty.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/email/EmailServiceDefaultTest_notEmpty.java
similarity index 96%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_notEmpty.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/email/EmailServiceDefaultTest_notEmpty.java
index c7a2141..2996687 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/email/EmailServiceDefaultTest_notEmpty.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/email/EmailServiceDefaultTest_notEmpty.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.email;
+package org.apache.isis.core.runtimeservices.email;
import org.junit.Test;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoReaderTest.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoReaderTest.java
similarity index 99%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoReaderTest.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoReaderTest.java
index b8645cd..6c95e79 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoReaderTest.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoReaderTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.i18n.po;
+package org.apache.isis.core.runtimeservices.i18n.po;
import java.util.List;
import java.util.Locale;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoWriterTest_escape.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoWriterTest_escape.java
similarity index 96%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoWriterTest_escape.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoWriterTest_escape.java
index f7902ec..f6b1c9f 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/i18n/po/PoWriterTest_escape.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/i18n/po/PoWriterTest_escape.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.i18n.po;
+package org.apache.isis.core.runtimeservices.i18n.po;
import org.junit.Test;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefaultTest.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
similarity index 98%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
index 9390360..ac075c1 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefaultTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper;
+package org.apache.isis.core.runtimeservices.wrapper;
import java.util.EnumSet;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Approver.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/claims/Approver.java
similarity index 92%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Approver.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/claims/Approver.java
index 16642f2..dd8b6dc 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Approver.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/claims/Approver.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.dom.claims;
+package org.apache.isis.core.runtimeservices.wrapper.dom.claims;
public interface Approver {
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Claimant.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/claims/Claimant.java
similarity index 93%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Claimant.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/claims/Claimant.java
index 20046ae..34cbb30 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/claims/Claimant.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/claims/Claimant.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.dom.claims;
+package org.apache.isis.core.runtimeservices.wrapper.dom.claims;
public interface Claimant {
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/Employee.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/employees/Employee.java
similarity index 92%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/Employee.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/employees/Employee.java
index d0032d3..98d2869 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/Employee.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/employees/Employee.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.dom.employees;
+package org.apache.isis.core.runtimeservices.wrapper.dom.employees;
import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.runtimeservices.wrapper.dom.claims.Approver;
-import org.apache.isis.runtimeservices.wrapper.dom.claims.Claimant;
+import org.apache.isis.core.runtimeservices.wrapper.dom.claims.Approver;
+import org.apache.isis.core.runtimeservices.wrapper.dom.claims.Claimant;
public class Employee implements Claimant, Approver {
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepository.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/employees/EmployeeRepository.java
similarity index 93%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepository.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/employees/EmployeeRepository.java
index b22e728..96756ee 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepository.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/employees/EmployeeRepository.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.dom.employees;
+package org.apache.isis.core.runtimeservices.wrapper.dom.employees;
import java.util.List;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepositoryImpl.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/employees/EmployeeRepositoryImpl.java
similarity index 94%
rename from core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepositoryImpl.java
rename to core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/employees/EmployeeRepositoryImpl.java
index 7c7a065..b79cc67 100644
--- a/core/runtimeservices/src/test/java/org/apache/isis/runtimeservices/wrapper/dom/employees/EmployeeRepositoryImpl.java
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/wrapper/dom/employees/EmployeeRepositoryImpl.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper.dom.employees;
+package org.apache.isis.core.runtimeservices.wrapper.dom.employees;
import java.util.List;
diff --git a/core/webboot-springboot/src/main/java/org/apache/isis/webboot/springboot/IsisModuleSpringBoot.java b/core/webboot-springboot/src/main/java/org/apache/isis/webboot/springboot/IsisModuleSpringBoot.java
index a5b7c28..c4a9e41 100644
--- a/core/webboot-springboot/src/main/java/org/apache/isis/webboot/springboot/IsisModuleSpringBoot.java
+++ b/core/webboot-springboot/src/main/java/org/apache/isis/webboot/springboot/IsisModuleSpringBoot.java
@@ -29,12 +29,12 @@ import org.springframework.context.annotation.Import;
import org.springframework.core.OrderComparator;
import org.springframework.core.annotation.AnnotationAwareOrderComparator;
-import org.apache.isis.runtimeservices.IsisModuleRuntimeServices;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
@Configuration
@Import({
// modules
- IsisModuleRuntimeServices.class,
+ IsisModuleCoreRuntimeServices.class,
})
public class IsisModuleSpringBoot implements ApplicationContextAware {
diff --git a/examples/demo/src/main/java/demoapp/dom/error/service/DemoErrorReportingService.java b/examples/demo/src/main/java/demoapp/dom/error/service/DemoErrorReportingService.java
index 2b96276..5dca219 100644
--- a/examples/demo/src/main/java/demoapp/dom/error/service/DemoErrorReportingService.java
+++ b/examples/demo/src/main/java/demoapp/dom/error/service/DemoErrorReportingService.java
@@ -27,8 +27,8 @@ import org.apache.isis.applib.services.error.ErrorDetails;
import org.apache.isis.applib.services.error.ErrorReportingService;
import org.apache.isis.applib.services.error.Ticket;
import org.apache.isis.applib.services.error.Ticket.StackTracePolicy;
-import org.apache.isis.runtimeservices.error.EmailTicket;
-import org.apache.isis.runtimeservices.error.EmailTicket.MailTo;
+import org.apache.isis.core.runtimeservices.error.EmailTicket;
+import org.apache.isis.core.runtimeservices.error.EmailTicket.MailTo;
import lombok.val;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
index 6abe21f..b037905 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/bootstrapping/SpringServiceInjectOrderTest.java
@@ -47,7 +47,7 @@ import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.runtimeservices.message.MessageServiceDefault;
+import org.apache.isis.core.runtimeservices.message.MessageServiceDefault;
import org.apache.isis.testdomain.Smoketest;
import org.apache.isis.testdomain.conf.Configuration_headless;
diff --git a/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/GenericEventPublishingTest.java b/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/GenericEventPublishingTest.java
index 54f6aea..9e6c306 100644
--- a/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/GenericEventPublishingTest.java
+++ b/examples/smoketests/src/test/java/org/apache/isis/testdomain/eventhandling/GenericEventPublishingTest.java
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Service;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.apache.isis.applib.services.eventbus.EventBusService;
-import org.apache.isis.runtimeservices.eventbus.EventBusServiceSpring;
+import org.apache.isis.core.runtimeservices.eventbus.EventBusServiceSpring;
import lombok.Getter;
import lombok.Value;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
similarity index 98%
rename from persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
index e36b32d..588b248 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_Test.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper;
+package org.apache.isis.core.runtimeservices.wrapper;
import java.lang.reflect.Method;
import java.util.Collections;
@@ -66,9 +66,9 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.OneToOneAssociationDefault;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
-import org.apache.isis.runtimeservices.wrapper.dom.employees.Employee;
-import org.apache.isis.runtimeservices.wrapper.dom.employees.EmployeeRepository;
-import org.apache.isis.runtimeservices.wrapper.dom.employees.EmployeeRepositoryImpl;
+import org.apache.isis.core.runtimeservices.wrapper.dom.employees.Employee;
+import org.apache.isis.core.runtimeservices.wrapper.dom.employees.EmployeeRepository;
+import org.apache.isis.core.runtimeservices.wrapper.dom.employees.EmployeeRepositoryImpl;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.schema.cmd.v1.CommandDto;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
diff --git a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
similarity index 98%
rename from persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
rename to persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
index 435d911..447a7de 100644
--- a/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
+++ b/persistence/jdo/datanucleus-5/src/test/java/org/apache/isis/core/runtimeservices/wrapper/WrapperFactoryDefault_wrappedObject_transient_Test.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.runtimeservices.wrapper;
+package org.apache.isis.core.runtimeservices.wrapper;
import java.lang.reflect.Method;
import java.util.Arrays;
@@ -63,7 +63,7 @@ import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.core.metamodel.specloader.specimpl.dflt.ObjectSpecificationDefault;
-import org.apache.isis.runtimeservices.wrapper.dom.employees.Employee;
+import org.apache.isis.core.runtimeservices.wrapper.dom.employees.Employee;
import org.apache.isis.core.runtime.session.IsisSessionFactory;
import org.apache.isis.security.api.authentication.AuthenticationSessionProvider;
import org.apache.isis.security.api.authentication.standard.SimpleSession;
diff --git a/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java b/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java
index 1e25327..710a0e7 100644
--- a/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java
+++ b/security/bypass/src/main/java/org/apache/isis/security/bypass/IsisModuleSecurityBypass.java
@@ -21,7 +21,7 @@ package org.apache.isis.security.bypass;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.runtimeservices.IsisModuleRuntimeServices;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.security.bypass.authentication.AuthenticatorBypass;
import org.apache.isis.security.bypass.authorization.AuthorizorBypass;
@@ -33,7 +33,7 @@ import org.apache.isis.security.bypass.authorization.AuthorizorBypass;
@Configuration
@Import({
// modules
- IsisModuleRuntimeServices.class,
+ IsisModuleCoreRuntimeServices.class,
// @Service's
AuthenticatorBypass.class,
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
index b5cd8be..886493d 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/IsisModuleSecurityKeycloak.java
@@ -21,7 +21,7 @@ package org.apache.isis.security.keycloak;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.runtimeservices.IsisModuleRuntimeServices;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.security.keycloak.authentication.AuthenticatorKeycloak;
import org.apache.isis.security.keycloak.authorization.AuthorizorKeycloak;
import org.apache.isis.security.keycloak.webmodule.WebModuleKeycloak;
@@ -35,7 +35,7 @@ import org.apache.isis.webapp.IsisModuleWebapp;
@Configuration
@Import({
// modules
- IsisModuleRuntimeServices.class,
+ IsisModuleCoreRuntimeServices.class,
IsisModuleWebapp.class,
// @Service's
diff --git a/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java b/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
index 63dc32f..7e1a9c1 100644
--- a/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
+++ b/security/shiro/src/main/java/org/apache/isis/security/shiro/IsisModuleSecurityShiro.java
@@ -21,7 +21,7 @@ package org.apache.isis.security.shiro;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.runtimeservices.IsisModuleRuntimeServices;
+import org.apache.isis.core.runtimeservices.IsisModuleCoreRuntimeServices;
import org.apache.isis.security.shiro.authentication.AuthenticatorShiro;
import org.apache.isis.security.shiro.authorization.AuthorizorShiro;
import org.apache.isis.security.shiro.webmodule.WebModuleShiro;
@@ -35,7 +35,7 @@ import org.apache.isis.webapp.IsisModuleWebapp;
@Configuration
@Import({
// modules
- IsisModuleRuntimeServices.class,
+ IsisModuleCoreRuntimeServices.class,
IsisModuleWebapp.class,
// @Service's