You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/01/26 20:12:35 UTC

[isis] branch master updated: ISIS-2431: rationalizing extension namespaces

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

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


The following commit(s) were added to refs/heads/master by this push:
     new e50d8c7  ISIS-2431: rationalizing extension namespaces
e50d8c7 is described below

commit e50d8c751cc2e1c943d8f37f9ddcd5b22aa85881
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Jan 26 21:12:21 2021 +0100

    ISIS-2431: rationalizing extension namespaces
---
 .../isis/extensions/commandlog/impl/CommandSubscriberForJdo.java   | 2 +-
 .../org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java | 2 +-
 .../isis/extensions/commandlog/impl/jdo/CommandJdoRepository.java  | 2 +-
 .../isis/extensions/commandlog/impl/ui/CommandServiceMenu.java     | 4 ++--
 .../extensions/commandreplay/primary/config/PrimaryConfig.java     | 7 ++-----
 .../commandreplay/primary/restapi/CommandRetrievalService.java     | 4 ++--
 .../commandreplay/primary/spiimpl/CaptureResultOfCommand.java      | 2 +-
 .../commandreplay/primary/ui/CommandReplayOnPrimaryService.java    | 4 ++--
 .../secondary/analyser/CommandReplayAnalyserException.java         | 2 +-
 .../secondary/analyser/CommandReplayAnalyserResult.java            | 2 +-
 .../secondary/analysis/CommandReplayAnalysisService.java           | 2 +-
 .../commandreplay/secondary/clock/TickingClockService.java         | 2 +-
 .../extensions/commandreplay/secondary/config/SecondaryConfig.java | 2 +-
 .../secondary/executor/CommandExecutorServiceWithTime.java         | 2 +-
 .../extensions/commandreplay/secondary/fetch/CommandFetcher.java   | 2 +-
 .../secondary/ui/CommandReplayOnSecondaryService.java              | 4 ++--
 .../isis/testing/fixtures/applib/fixturescripts/FixtureResult.java | 2 +-
 .../testing/fixtures/applib/fixturescripts/FixtureScripts.java     | 2 +-
 .../apache/isis/testing/h2console/ui/services/H2ManagerMenu.java   | 2 +-
 .../isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java  | 2 +-
 .../rendering/service/swagger/internal/TaggerDefault.java          | 4 ++--
 21 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/CommandSubscriberForJdo.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/CommandSubscriberForJdo.java
index d38ebc1..60689be 100644
--- a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/CommandSubscriberForJdo.java
+++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/CommandSubscriberForJdo.java
@@ -37,7 +37,7 @@ import lombok.val;
 import lombok.extern.log4j.Log4j2;
 
 @Service
-@Named("isisExtensionsCommandLog.CommandCompletionHook")
+@Named("isis.ext.commandLog.CommandCompletionHook")
 @Order(OrderPrecedence.MIDPOINT) // after JdoPersistenceLifecycleService
 @Qualifier("Jdo")
 @Log4j2
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java
index 7c71cbc..fca41e9 100644
--- a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java
+++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdo.java
@@ -242,7 +242,7 @@ import lombok.val;
 //        @javax.jdo.annotations.Index(name = "CommandJdo__replayState__startedAt__completedAt_IDX", members = {"startedAt", "replayState", "completedAt"}),
 })
 @DomainObject(
-        objectType = "isisExtensionsCommandLog.Command",
+        objectType = "isis.ext.commandLog.Command",
         editing = Editing.DISABLED
 )
 @DomainObjectLayout(
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdoRepository.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdoRepository.java
index c7f5c8a..d737427 100644
--- a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdoRepository.java
+++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/jdo/CommandJdoRepository.java
@@ -61,7 +61,7 @@ import lombok.val;
  * {@link CommandJdo command} entities.
  */
 @Service
-@Named("isisExtensionsCommandLog.CommandJdoRepository")
+@Named("isis.ext.commandLog.CommandJdoRepository")
 @Order(OrderPrecedence.MIDPOINT)
 @Qualifier("Jdo")
 @RequiredArgsConstructor
diff --git a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/ui/CommandServiceMenu.java b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/ui/CommandServiceMenu.java
index 8b8de04..7d77af9 100644
--- a/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/ui/CommandServiceMenu.java
+++ b/extensions/core/command-log/impl/src/main/java/org/apache/isis/extensions/commandlog/impl/ui/CommandServiceMenu.java
@@ -52,14 +52,14 @@ import lombok.RequiredArgsConstructor;
 
 @DomainService(
     nature = NatureOfService.VIEW,
-    objectType = "isisExtensionsCommandLog.CommandServiceMenu"
+    objectType = "isis.ext.commandLog.CommandServiceMenu"
 )
 @DomainServiceLayout(
     named = "Activity",
     menuBar = DomainServiceLayout.MenuBar.SECONDARY
 )
 @Service
-@Named("isisExtensionsCommandLog.CommandServiceMenu")
+@Named("isis.ext.commandLog.CommandServiceMenu")
 @Order(OrderPrecedence.MIDPOINT)
 @Qualifier("Jdo")
 @RequiredArgsConstructor(onConstructor_ = { @Inject })
diff --git a/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/config/PrimaryConfig.java b/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/config/PrimaryConfig.java
index c0405c8..215919c 100644
--- a/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/config/PrimaryConfig.java
+++ b/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/config/PrimaryConfig.java
@@ -18,8 +18,6 @@
  */
 package org.apache.isis.extensions.commandreplay.primary.config;
 
-import java.util.List;
-
 import javax.inject.Named;
 import javax.validation.constraints.NotNull;
 
@@ -31,12 +29,11 @@ import org.apache.isis.core.config.IsisConfiguration;
 
 import lombok.Getter;
 import lombok.val;
-import lombok.extern.log4j.Log4j2;
 
 @Service
-@Named("isisExtensionsCommandReplayPrimary.PrimaryConfig")
+@Named("isis.ext.commandReplayPrimary.PrimaryConfig")
 @Order(OrderPrecedence.MIDPOINT)
-@Log4j2
+//@Log4j2
 public class PrimaryConfig {
 
     @Getter final String secondaryBaseUrlWicket;
diff --git a/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/restapi/CommandRetrievalService.java b/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/restapi/CommandRetrievalService.java
index ae5553f..f9efe7b 100644
--- a/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/restapi/CommandRetrievalService.java
+++ b/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/restapi/CommandRetrievalService.java
@@ -43,9 +43,9 @@ import lombok.extern.log4j.Log4j2;
 
 @DomainService(
     nature = NatureOfService.REST,
-    objectType = "isisExtensionsCommandReplayPrimary.CommandRetrievalService"
+    objectType = "isis.ext.commandReplayPrimary.CommandRetrievalService"
 )
-@Named("isisExtensionsCommandReplayPrimary.CommandRetrievalService")
+@Named("isis.ext.commandReplayPrimary.CommandRetrievalService")
 @Order(OrderPrecedence.MIDPOINT)
 @Log4j2
 public class CommandRetrievalService {
diff --git a/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/spiimpl/CaptureResultOfCommand.java b/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/spiimpl/CaptureResultOfCommand.java
index e1abaaf..1395a5b 100644
--- a/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/spiimpl/CaptureResultOfCommand.java
+++ b/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/spiimpl/CaptureResultOfCommand.java
@@ -42,7 +42,7 @@ import lombok.val;
  * Uses the SPI infrastructure to copy over standard properties from {@link Command} to {@link CommandDto}.
  */
 @Service
-@Named("isisExtensionsCommandReplayPrimary.CaptureResultOfCommand")
+@Named("isis.ext.commandReplayPrimary.CaptureResultOfCommand")
 // specify quite a high priority since custom processors will probably want to run after this one
 // (but can choose to run before if they wish)
 @Order(OrderPrecedence.EARLY)
diff --git a/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/ui/CommandReplayOnPrimaryService.java b/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/ui/CommandReplayOnPrimaryService.java
index 1b82229..bdf0516 100644
--- a/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/ui/CommandReplayOnPrimaryService.java
+++ b/extensions/core/command-replay/primary/src/main/java/org/apache/isis/extensions/commandreplay/primary/ui/CommandReplayOnPrimaryService.java
@@ -54,13 +54,13 @@ import lombok.extern.log4j.Log4j2;
 
 @DomainService(
     nature = NatureOfService.VIEW,
-    objectType = "isisExtensionsCommandReplayPrimary.CommandReplayOnPrimaryService"
+    objectType = "isis.ext.commandReplayPrimary.CommandReplayOnPrimaryService"
 )
 @DomainServiceLayout(
     named = "Activity",
     menuBar = DomainServiceLayout.MenuBar.SECONDARY
 )
-@Named("isisExtensionsCommandReplayPrimary.CommandReplayOnPrimaryService")
+@Named("isis.ext.commandReplayPrimary.CommandReplayOnPrimaryService")
 @Order(OrderPrecedence.MIDPOINT)
 @RequiredArgsConstructor
 @Log4j2
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java
index 5cca04e..c4e570d 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserException.java
@@ -38,7 +38,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.val;
 
 @Service
-@Named("isisExtensionsCommandReplaySecondary.CommandReplayAnalyserException")
+@Named("isis.ext.commandReplaySecondary.CommandReplayAnalyserException")
 @Order(OrderPrecedence.MIDPOINT)
 @RequiredArgsConstructor
 public class CommandReplayAnalyserException implements CommandReplayAnalyser {
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserResult.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserResult.java
index aa15be7..9ebfc22 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserResult.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analyser/CommandReplayAnalyserResult.java
@@ -37,7 +37,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.val;
 
 @Service
-@Named("isisExtensionsCommandReplaySecondary.CommandReplayAnalyserResult")
+@Named("isis.ext.commandReplaySecondary.CommandReplayAnalyserResult")
 @Order(OrderPrecedence.MIDPOINT)
 @RequiredArgsConstructor
 public class CommandReplayAnalyserResult implements CommandReplayAnalyser {
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analysis/CommandReplayAnalysisService.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analysis/CommandReplayAnalysisService.java
index 478a772..78c5c91 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analysis/CommandReplayAnalysisService.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/analysis/CommandReplayAnalysisService.java
@@ -34,7 +34,7 @@ import org.apache.isis.extensions.commandreplay.secondary.analyser.CommandReplay
 import lombok.extern.log4j.Log4j2;
 
 @Service
-@Named("isisExtensionsCommandReplaySecondary.CommandReplayAnalysisService")
+@Named("isis.ext.commandReplaySecondary.CommandReplayAnalysisService")
 @Order(OrderPrecedence.MIDPOINT)
 @Log4j2
 public class CommandReplayAnalysisService {
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/clock/TickingClockService.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/clock/TickingClockService.java
index a243141..b040814 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/clock/TickingClockService.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/clock/TickingClockService.java
@@ -54,7 +54,7 @@ import lombok.extern.log4j.Log4j2;
  * </p>
  */
 @Service()
-@Named("isisExtensionsCommandReplaySecondary.TickingClockService")
+@Named("isis.ext.commandReplaySecondary.TickingClockService")
 @Order(OrderPrecedence.MIDPOINT)
 @Log4j2
 @RequiredArgsConstructor
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/config/SecondaryConfig.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/config/SecondaryConfig.java
index edd0002..d5a243d 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/config/SecondaryConfig.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/config/SecondaryConfig.java
@@ -33,7 +33,7 @@ import lombok.Getter;
 import lombok.val;
 
 @Service
-@Named("isisExtensionsCommandReplaySecondary.SecondaryConfig")
+@Named("isis.ext.commandReplaySecondary.SecondaryConfig")
 @Order(OrderPrecedence.MIDPOINT)
 //@Log4j2
 public class SecondaryConfig {
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/executor/CommandExecutorServiceWithTime.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/executor/CommandExecutorServiceWithTime.java
index 9c65c5b..46e8df6 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/executor/CommandExecutorServiceWithTime.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/executor/CommandExecutorServiceWithTime.java
@@ -44,7 +44,7 @@ import lombok.extern.log4j.Log4j2;
  * </p>
  */
 @Service
-@Named("isisExtensionsCommandReplaySecondary.CommandExecutorServiceWithTime")
+@Named("isis.ext.commandReplaySecondary.CommandExecutorServiceWithTime")
 @Order(OrderPrecedence.MIDPOINT - 10) // before CommandExecutorServiceDefault
 @Qualifier("WithTime")
 @Log4j2
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/fetch/CommandFetcher.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/fetch/CommandFetcher.java
index 6544245..58790d6 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/fetch/CommandFetcher.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/fetch/CommandFetcher.java
@@ -48,7 +48,7 @@ import lombok.extern.log4j.Log4j2;
 
 
 @Service()
-@Named("isisExtensionsCommandReplaySecondary.CommandFetcher")
+@Named("isis.ext.commandReplaySecondary.CommandFetcher")
 @Order(OrderPrecedence.MIDPOINT)
 @Log4j2
 public class CommandFetcher {
diff --git a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/ui/CommandReplayOnSecondaryService.java b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/ui/CommandReplayOnSecondaryService.java
index e6a06e4..69c6aaf 100644
--- a/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/ui/CommandReplayOnSecondaryService.java
+++ b/extensions/core/command-replay/secondary/src/main/java/org/apache/isis/extensions/commandreplay/secondary/ui/CommandReplayOnSecondaryService.java
@@ -48,13 +48,13 @@ import lombok.extern.log4j.Log4j2;
 
 @DomainService(
     nature = NatureOfService.VIEW,
-    objectType = "isisExtensionsCommandReplaySecondary.CommandReplayOnSecondaryService"
+    objectType = "isis.ext.commandReplaySecondary.CommandReplayOnSecondaryService"
 )
 @DomainServiceLayout(
     named = "Activity",
     menuBar = DomainServiceLayout.MenuBar.SECONDARY
 )
-@Named("isisExtensionsCommandReplaySecondary.CommandReplayOnSecondaryService")
+@Named("isis.ext.commandReplaySecondary.CommandReplayOnSecondaryService")
 @Order(OrderPrecedence.MIDPOINT)
 @RequiredArgsConstructor
 @Log4j2
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResult.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResult.java
index ca1640d..5269e70 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResult.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureResult.java
@@ -42,7 +42,7 @@ import lombok.Setter;
 
 @DomainObject(
         nature = Nature.VIEW_MODEL,
-        objectType = "isisExtFixture.FixtureResult"
+        objectType = "isis.ext.fixtures.FixtureResult"
         )
 @DomainObjectLayout(paged=500)
 @XmlRootElement(name = "fixtureResult")
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
index dbb3d2b..b6dbf01 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/fixturescripts/FixtureScripts.java
@@ -66,7 +66,7 @@ import lombok.val;
 
 @DomainService(
         nature = NatureOfService.VIEW,
-        objectType = "isisExtFixtures.FixtureScripts"
+        objectType = "isis.ext.fixtures.FixtureScripts"
 )
 @DomainServiceLayout(
         named="Prototyping",
diff --git a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/services/H2ManagerMenu.java b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/services/H2ManagerMenu.java
index 263236e..ec98148 100644
--- a/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/services/H2ManagerMenu.java
+++ b/testing/h2console/ui/src/main/java/org/apache/isis/testing/h2console/ui/services/H2ManagerMenu.java
@@ -34,7 +34,7 @@ import org.apache.isis.testing.h2console.ui.webmodule.WebModuleH2Console;
 
 @DomainService(
         nature = NatureOfService.VIEW,
-        objectType = "isisExtH2Console.H2ManagerMenu"
+        objectType = "isis.ext.h2Console.H2ManagerMenu"
         )
 @DomainServiceLayout(
         named = "Prototyping",
diff --git a/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java b/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
index a9b4905..564344e 100644
--- a/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
+++ b/testing/hsqldbmgr/ui/src/main/java/org/apache/isis/extensions/hsqldbmgr/dom/services/HsqlDbManagerMenu.java
@@ -37,7 +37,7 @@ import org.apache.isis.core.config.IsisConfiguration;
 
 @DomainService(
         nature = NatureOfService.VIEW,
-        objectType = "isisExtHsqldbMgr.HsqlDbManagerMenu"
+        objectType = "isis.ext.hsqldbMgr.HsqlDbManagerMenu"
         )
 @DomainServiceLayout(
         named = "Prototyping",
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
index 41bf622..c5e0b1f 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
@@ -48,8 +48,8 @@ public class TaggerDefault implements Tagger {
         if (objType.startsWith("isis.applib.")) {
             return ". apache isis applib";
         }
-        if (objType.startsWith("isisExt.")) {
-            return ". apache isis extensions - " + partsOf(objType).skip(1).limit(1).collect(Collectors.joining("."));
+        if (objType.startsWith("isis.ext.")) {
+            return ". apache isis extensions - " + partsOf(objType).skip(2).limit(1).collect(Collectors.joining("."));
         }
         if (objType.startsWith("org.springframework.")) {
             return "> spring framework " + partsOf(objType).skip(2).limit(1).collect(Collectors.joining("."));