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/31 08:52:03 UTC
[isis] 02/02: ISIS-2511: rationalize viewer 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
commit b9364cdbe0a4a164804ee3a4c3d79cfc3e51ab38
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Jan 31 09:51:44 2021 +0100
ISIS-2511: rationalize viewer namespaces
---
.../apache/isis/testing/fakedata/applib/services/FakeDataService.java | 2 +-
.../jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java | 2 +-
.../viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java | 2 +-
.../rendering/service/RepresentationServiceContentNegotiator.java | 2 +-
.../rendering/service/acceptheader/AcceptHeaderServiceForRest.java | 2 +-
.../service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java | 2 +-
.../service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java | 2 +-
.../service/conneg/ContentNegotiationServiceOrgApacheIsisV2.java | 2 +-
.../service/conneg/ContentNegotiationServiceXRoDomainType.java | 2 +-
.../components/widgets/themepicker/IsisWicketThemeSupportDefault.java | 2 +-
.../viewer/registries/components/ComponentFactoryRegistrarDefault.java | 2 +-
.../viewer/registries/components/ComponentFactoryRegistryDefault.java | 2 +-
.../viewer/wicket/viewer/registries/pages/PageClassListDefault.java | 2 +-
.../viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java | 2 +-
.../wicket/viewer/registries/pages/PageNavigationServiceDefault.java | 2 +-
.../isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java | 2 +-
.../isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java | 2 +-
.../isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java | 2 +-
.../isis/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java | 2 +-
.../apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java | 2 +-
.../isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java | 2 +-
.../isis/viewer/wicket/viewer/services/WicketViewerSettingsDefault.java | 2 +-
.../wicket/viewer/services/mementos/ObjectMementoServiceWicket.java | 2 +-
.../org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java | 2 +-
24 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/FakeDataService.java b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/FakeDataService.java
index 08ec285..9a802fc 100644
--- a/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/FakeDataService.java
+++ b/testing/fakedata/applib/src/main/java/org/apache/isis/testing/fakedata/applib/services/FakeDataService.java
@@ -39,7 +39,7 @@ import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.repository.RepositoryService;
@Service
-@Named("isisTstFakeData.FakeDataService")
+@Named("isis.test.FakeDataService")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
index 9788561..5ae2c8a 100644
--- a/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
+++ b/viewers/restfulobjects/jaxrs-resteasy-4/src/main/java/org/apache/isis/viewer/restfulobjects/jaxrsresteasy4/webmodule/WebModuleJaxrsResteasy4.java
@@ -55,7 +55,7 @@ import lombok.val;
*
*/
@Service
-@Named("isisRoViewer.WebModuleJaxrsRestEasy4")
+@Named("isis.viewer.ro.WebModuleJaxrsRestEasy4")
@Order(OrderPrecedence.MIDPOINT - 80)
@Qualifier("JaxrsRestEasy4")
public final class WebModuleJaxrsResteasy4 extends WebModuleAbstract {
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
index a920b1c..05beeae 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/domainobjects/JsonValueEncoder.java
@@ -59,7 +59,7 @@ import lombok.val;
* primitives.
*/
@Service
-@Named("isisRoRendering.JsonValueEncoder")
+@Named("isis.viewer.ro.JsonValueEncoder")
@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("Default")
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
index eb8cd1e..dfabd35 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/RepresentationServiceContentNegotiator.java
@@ -46,7 +46,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisRoRendering.RepresentationServiceContentNegotiator")
+@Named("isis.viewer.ro.RepresentationServiceContentNegotiator")
@Order(OrderPrecedence.EARLY)
@Primary
@Qualifier("ContentNegotiator")
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
index 2d50479..b777844 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/acceptheader/AcceptHeaderServiceForRest.java
@@ -44,7 +44,7 @@ import org.apache.isis.applib.services.acceptheader.AcceptHeaderService;
import org.apache.isis.commons.internal.base._NullSafe;
@Service
-@Named("isisRoRendering.AcceptHeaderServiceForRest")
+@Named("isis.viewer.ro.AcceptHeaderServiceForRest")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("ForRest")
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
index 20bd3c5..90144a6 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceForRestfulObjectsV1_0.java
@@ -62,7 +62,7 @@ import org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationSer
import lombok.val;
@Service
-@Named("isisRoRendering.ContentNegotiationServiceForRestfulObjectsV1_0")
+@Named("isis.viewer.ro.ContentNegotiationServiceForRestfulObjectsV1_0")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("RestfulObjectsV1_0")
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
index e5778d2..01aa753 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV1.java
@@ -41,7 +41,7 @@ import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ObjectAndAc
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisRoRendering.ContentNegotiationServiceOrgApacheIsisV1")
+@Named("isis.viewer.ro.ContentNegotiationServiceOrgApacheIsisV1")
@Order(OrderPrecedence.MIDPOINT - 200)
@Qualifier("OrgApacheIsisV1")
@Log4j2
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.java
index 5550adf..332bc85 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceOrgApacheIsisV2.java
@@ -56,7 +56,7 @@ import org.apache.isis.viewer.restfulobjects.rendering.service.RepresentationSer
import lombok.val;
@Service
-@Named("isisRoRendering.ContentNegotiationServiceOrgApacheIsisV2")
+@Named("isis.viewer.ro.ContentNegotiationServiceOrgApacheIsisV2")
@Order(OrderPrecedence.MIDPOINT - 200)
@Qualifier("OrgApacheIsisV2")
public class ContentNegotiationServiceOrgApacheIsisV2 extends ContentNegotiationServiceAbstract {
diff --git a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
index 5d3a0e4..5aeddbb 100644
--- a/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
+++ b/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/conneg/ContentNegotiationServiceXRoDomainType.java
@@ -53,7 +53,7 @@ import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.ObjectAndAc
* </p>
*/
@Service
-@Named("isisRoRendering.ContentNegotiationServiceXRoDomainType")
+@Named("isis.viewer.ro.ContentNegotiationServiceXRoDomainType")
@Order(OrderPrecedence.MIDPOINT - 100)
@Qualifier("XRoDomainType")
public class ContentNegotiationServiceXRoDomainType extends ContentNegotiationServiceAbstract {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
index cebd312..0f73542 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupportDefault.java
@@ -48,7 +48,7 @@ import de.agilecoders.wicket.themes.markup.html.bootswatch.BootswatchThemeProvid
* @since 2.0
*/
@Service
-@Named("isisWicketUi.IsisWicketThemeSupportDefault")
+@Named("isis.viewer.wicket.IsisWicketThemeSupportDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
index eef7349..b00775f 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
@@ -101,7 +101,7 @@ import lombok.extern.log4j.Log4j2;
* implementations discovered by the IoC container.
*/
@Service
-@Named("isisWicketViewer.ComponentFactoryRegistrarDefault")
+@Named("isis.viewer.wicket.ComponentFactoryRegistrarDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
index 452593d..4ec0e3a 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistryDefault.java
@@ -57,7 +57,7 @@ import lombok.val;
* provided {@link ComponentFactoryRegistrar}.
*/
@Service
-@Named("isisWicketViewer.ComponentFactoryRegistryDefault")
+@Named("isis.viewer.wicket.ComponentFactoryRegistryDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
index b9856f5..f800da7 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
@@ -48,7 +48,7 @@ import org.apache.isis.viewer.wicket.ui.pages.voidreturn.VoidReturnPage;
* for each of the {@link PageType}s.
*/
@Service
-@Named("isisWicketViewer.PageClassListDefault")
+@Named("isis.viewer.wicket.PageClassListDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
index 11dc8fd..9c2b3ee 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageClassRegistryDefault.java
@@ -43,7 +43,7 @@ import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistrySpi;
* underlying {@link PageClassList}.
*/
@Service
-@Named("isisWicketViewer.PageClassRegistryDefault")
+@Named("isis.viewer.wicket.PageClassRegistryDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java
index a6b8d8a..52659e8 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/pages/PageNavigationServiceDefault.java
@@ -41,7 +41,7 @@ import org.apache.isis.viewer.wicket.ui.pages.PageNavigationService;
* Default implementation of {@link org.apache.isis.viewer.wicket.ui.pages.PageNavigationService}
*/
@Service
-@Named("isisWicketViewer.PageNavigationServiceDefault")
+@Named("isis.viewer.wicket.PageNavigationServiceDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java
index a5867ae..bdea100 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/BookmarkUiServiceWicket.java
@@ -29,7 +29,7 @@ import org.apache.isis.applib.services.bookmarkui.BookmarkUiService;
import org.apache.isis.viewer.wicket.viewer.integration.AuthenticatedWebSessionForIsis;
@Service
-@Named("isisWicketViewer.BookmarkUiServiceWicket")
+@Named("isis.viewer.wicket.BookmarkUiServiceWicket")
@Order(OrderPrecedence.EARLY)
@Qualifier("Wicket")
public class BookmarkUiServiceWicket implements BookmarkUiService {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
index 913cee2..ae7b417 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/DeepLinkServiceWicket.java
@@ -45,7 +45,7 @@ import org.apache.isis.viewer.wicket.ui.pages.PageClassRegistry;
* for Wicket Viewer
*/
@Service
-@Named("isisWicketViewer.DeepLinkServiceWicket")
+@Named("isis.viewer.wicket.DeepLinkServiceWicket")
@Order(OrderPrecedence.EARLY)
@Qualifier("Wicket")
public class DeepLinkServiceWicket implements DeepLinkService {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
index ce7e5a9..743273b 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/HintStoreUsingWicketSession.java
@@ -39,7 +39,7 @@ import lombok.val;
import lombok.extern.log4j.Log4j2;
@Service
-@Named("isisWicketViewer.HintStoreUsingWicketSession")
+@Named("isis.viewer.wicket.HintStoreUsingWicketSession")
@Order(OrderPrecedence.EARLY)
@Qualifier("Wicket")
@Log4j2
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java
index db3e652..e0c6cda 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/ImageResourceCacheClassPath.java
@@ -54,7 +54,7 @@ import images.Images;
* Searches for a fixed set of suffixes: <code>png, gif, jpeg, jpg, svg</code>.
*/
@Service
-@Named("isisWicketViewer.ImageResourceCacheClassPath")
+@Named("isis.viewer.wicket.ImageResourceCacheClassPath")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("ClassPath")
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java
index cb1fdf8..7b79a8e 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/LocaleProviderWicket.java
@@ -37,7 +37,7 @@ import org.apache.isis.applib.services.i18n.LocaleProvider;
* An implementation that provides the locale of the current session.
*/
@Service
-@Named("isisWicketViewer.LocaleProviderWicket")
+@Named("isis.viewer.wicket.LocaleProviderWicket")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("Wicket")
public class LocaleProviderWicket implements LocaleProvider {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
index 9283d13..ccb4af1 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/TranslationsResolverWicket.java
@@ -53,7 +53,7 @@ import lombok.extern.log4j.Log4j2;
* TODO ... or (ideally) let Spring handle translations
*/
@Service
-@Named("isisWicketViewer.TranslationsResolverWicket")
+@Named("isis.viewer.wicket.TranslationsResolverWicket")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("Wicket")
@RequiredArgsConstructor(onConstructor_ = {@Inject})
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/WicketViewerSettingsDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/WicketViewerSettingsDefault.java
index bc9f53c..9d38add 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/WicketViewerSettingsDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/WicketViewerSettingsDefault.java
@@ -34,7 +34,7 @@ import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
@Service
-@Named("isisWicketViewer.WicketViewerSettingsDefault")
+@Named("isis.viewer.wicket..WicketViewerSettingsDefault")
@Order(OrderPrecedence.MIDPOINT)
@Primary
@Qualifier("Default")
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoServiceWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoServiceWicket.java
index 35075ac..af24d8c 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoServiceWicket.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/services/mementos/ObjectMementoServiceWicket.java
@@ -57,7 +57,7 @@ import lombok.val;
*
*/
@Service
-@Named("isisWicketViewer.ObjectMementoServiceWicket")
+@Named("isis.viewer.wicket.ObjectMementoServiceWicket")
@Order(OrderPrecedence.MIDPOINT)
@Qualifier("Wicket")
@Singleton
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
index d0b2dde..f5180f1 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/webmodule/WebModuleWicket.java
@@ -46,7 +46,7 @@ import lombok.Getter;
* @since 2.0
*/
@Service
-@Named("isisWicketViewer.WebModuleWicket")
+@Named("isis.viewer.wicket.WebModuleWicket")
@Order(OrderPrecedence.MIDPOINT - 80)
@Qualifier("Wicket")
public final class WebModuleWicket extends WebModuleAbstract {