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 2021/06/11 05:18:51 UTC
[isis] 02/06: ISIS-2726: moves SudoServiceDefault up to applib
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2726
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 90125aea16001ca0b5ebd043fc6c20d665759cbd
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jun 11 05:56:00 2021 +0100
ISIS-2726: moves SudoServiceDefault up to applib
---
.../src/main/java/org/apache/isis/applib/IsisModuleApplib.java | 10 ++++++----
.../apache/isis/applib/services}/sudo/SudoServiceDefault.java | 2 +-
.../core/runtimeservices/IsisModuleCoreRuntimeServices.java | 3 +--
.../isis/testdomain/bootstrapping/builtin-domain-services.list | 2 +-
.../isis/testdomain/bootstrapping/builtin-domain-services.list | 2 +-
5 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/IsisModuleApplib.java b/api/applib/src/main/java/org/apache/isis/applib/IsisModuleApplib.java
index fa7458d..fa05dfe 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/IsisModuleApplib.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/IsisModuleApplib.java
@@ -25,11 +25,11 @@ import org.apache.isis.applib.domain.DomainObjectList;
import org.apache.isis.applib.mixins.dto.Dto_downloadXml;
import org.apache.isis.applib.mixins.dto.Dto_downloadXsd;
import org.apache.isis.applib.mixins.layout.Object_downloadLayoutXml;
-import org.apache.isis.applib.mixins.rest.Object_openRestApi;
-import org.apache.isis.applib.mixins.metamodel.Object_rebuildMetamodel;
import org.apache.isis.applib.mixins.metamodel.Object_downloadMetamodelXml;
-import org.apache.isis.applib.mixins.metamodel.Object_objectIdentifier;
import org.apache.isis.applib.mixins.metamodel.Object_logicalTypeName;
+import org.apache.isis.applib.mixins.metamodel.Object_objectIdentifier;
+import org.apache.isis.applib.mixins.metamodel.Object_rebuildMetamodel;
+import org.apache.isis.applib.mixins.rest.Object_openRestApi;
import org.apache.isis.applib.services.appfeatui.ApplicationFeatureMenu;
import org.apache.isis.applib.services.appfeatui.ApplicationNamespace;
import org.apache.isis.applib.services.appfeatui.ApplicationType;
@@ -51,9 +51,10 @@ import org.apache.isis.applib.services.publishing.log.EntityChangesLogger;
import org.apache.isis.applib.services.publishing.log.EntityPropertyChangeLogger;
import org.apache.isis.applib.services.publishing.log.ExecutionLogger;
import org.apache.isis.applib.services.session.SessionLoggingServiceLogging;
+import org.apache.isis.applib.services.sudo.SudoServiceDefault;
+import org.apache.isis.applib.services.user.ImpersonateMenu;
import org.apache.isis.applib.services.user.RoleMemento;
import org.apache.isis.applib.services.user.UserMemento;
-import org.apache.isis.applib.services.user.ImpersonateMenu;
import org.apache.isis.schema.IsisModuleSchema;
/**
@@ -107,6 +108,7 @@ import org.apache.isis.schema.IsisModuleSchema;
EntityPropertyChangeLogger.class,
ExecutionLogger.class,
SessionLoggingServiceLogging.class,
+ SudoServiceDefault.class,
})
public class IsisModuleApplib {
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java b/api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoServiceDefault.java
similarity index 98%
rename from core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java
rename to api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoServiceDefault.java
index 58c14ea..2024e1b 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/sudo/SudoServiceDefault.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/sudo/SudoServiceDefault.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.core.runtimeservices.sudo;
+package org.apache.isis.applib.services.sudo;
import java.util.concurrent.Callable;
import java.util.function.UnaryOperator;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
index 4eef5f1..17c24c3 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/IsisModuleCoreRuntimeServices.java
@@ -55,7 +55,7 @@ import org.apache.isis.core.runtimeservices.repository.RepositoryServiceDefault;
import org.apache.isis.core.runtimeservices.routing.RoutingServiceDefault;
import org.apache.isis.core.runtimeservices.scratchpad.ScratchpadDefault;
import org.apache.isis.core.runtimeservices.session.InteractionServiceDefault;
-import org.apache.isis.core.runtimeservices.sudo.SudoServiceDefault;
+import org.apache.isis.applib.services.sudo.SudoServiceDefault;
import org.apache.isis.core.runtimeservices.transaction.TransactionServiceSpring;
import org.apache.isis.core.runtimeservices.urlencoding.UrlEncodingServiceWithCompression;
import org.apache.isis.core.runtimeservices.user.ImpersonateMenuAdvisorDefault;
@@ -99,7 +99,6 @@ import org.apache.isis.core.runtimeservices.xmlsnapshot.XmlSnapshotServiceDefaul
MessageServiceDefault.class,
QueryResultsCacheDefault.class,
ScratchpadDefault.class,
- SudoServiceDefault.class,
TransactionServiceSpring.class,
UrlEncodingServiceWithCompression.class,
UserServiceDefault.class,
diff --git a/regressiontests/stable-bootstrapping/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list b/regressiontests/stable-bootstrapping/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list
index d47e452..e155084 100644
--- a/regressiontests/stable-bootstrapping/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list
+++ b/regressiontests/stable-bootstrapping/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list
@@ -35,6 +35,6 @@ org.apache.isis.core.runtimeservices.confmenu.ConfigurationViewServiceDefault
org.apache.isis.core.runtimeservices.email.EmailServiceDefault
org.apache.isis.core.runtimeservices.i18n.po.TranslationServicePoMenu
org.apache.isis.core.runtimeservices.ixn.InteractionDtoServiceInternalDefault
-org.apache.isis.core.runtimeservices.sudo.SudoServiceDefault
+org.apache.isis.applib.services.sudo.SudoServiceDefault
org.apache.isis.core.runtimeservices.userprof.UserProfileServiceDefault
org.apache.isis.core.runtimeservices.userreg.EmailNotificationServiceDefault
diff --git a/regressiontests/stable-rest/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list b/regressiontests/stable-rest/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list
index d47e452..e155084 100644
--- a/regressiontests/stable-rest/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list
+++ b/regressiontests/stable-rest/src/test/resources/org/apache/isis/testdomain/bootstrapping/builtin-domain-services.list
@@ -35,6 +35,6 @@ org.apache.isis.core.runtimeservices.confmenu.ConfigurationViewServiceDefault
org.apache.isis.core.runtimeservices.email.EmailServiceDefault
org.apache.isis.core.runtimeservices.i18n.po.TranslationServicePoMenu
org.apache.isis.core.runtimeservices.ixn.InteractionDtoServiceInternalDefault
-org.apache.isis.core.runtimeservices.sudo.SudoServiceDefault
+org.apache.isis.applib.services.sudo.SudoServiceDefault
org.apache.isis.core.runtimeservices.userprof.UserProfileServiceDefault
org.apache.isis.core.runtimeservices.userreg.EmailNotificationServiceDefault