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:01 UTC
[isis] branch master updated (250d52d -> b9364cd)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 250d52d ISIS-2511: rationalize core namespaces
new 10dcfa1 ISIS-2511: move Timestample and co-interfaces from
new b9364cd ISIS-2511: rationalize viewer namespaces
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc | 6 ++++
.../applib/services/wrapper/WrapperFactory.adoc | 2 +-
.../having/HasUpdatedAt.adoc} | 4 +--
.../having/HasUpdatedBy.adoc} | 4 +--
.../xmlsnapshot/XmlSnapshotServiceDefault.adoc | 33 ----------------------
.../modules/generated/pages/system-overview.adoc | 6 ++--
.../isis/applib/mixins/timestamp/package-info.java | 25 ----------------
.../apache/isis/commons/having/HasUpdatedAt.java | 4 +--
.../apache/isis/commons/having/HasUpdatedBy.java | 4 +--
.../isis/commons/having/HasUpdatedByAndAt.java | 8 +++---
.../changetracking/events/TimestampService.java | 12 ++++----
.../testdomain/jdo/entities/JdoProductComment.java | 4 +--
.../testdomain/jpa/entities/JpaProductComment.java | 4 +--
.../fakedata/applib/services/FakeDataService.java | 2 +-
.../webmodule/WebModuleJaxrsResteasy4.java | 2 +-
.../rendering/domainobjects/JsonValueEncoder.java | 2 +-
.../RepresentationServiceContentNegotiator.java | 2 +-
.../acceptheader/AcceptHeaderServiceForRest.java | 2 +-
...entNegotiationServiceForRestfulObjectsV1_0.java | 2 +-
.../ContentNegotiationServiceOrgApacheIsisV1.java | 2 +-
.../ContentNegotiationServiceOrgApacheIsisV2.java | 2 +-
.../ContentNegotiationServiceXRoDomainType.java | 2 +-
.../themepicker/IsisWicketThemeSupportDefault.java | 2 +-
.../ComponentFactoryRegistrarDefault.java | 2 +-
.../ComponentFactoryRegistryDefault.java | 2 +-
.../registries/pages/PageClassListDefault.java | 2 +-
.../registries/pages/PageClassRegistryDefault.java | 2 +-
.../pages/PageNavigationServiceDefault.java | 2 +-
.../viewer/services/BookmarkUiServiceWicket.java | 2 +-
.../viewer/services/DeepLinkServiceWicket.java | 2 +-
.../services/HintStoreUsingWicketSession.java | 2 +-
.../services/ImageResourceCacheClassPath.java | 2 +-
.../viewer/services/LocaleProviderWicket.java | 2 +-
.../services/TranslationsResolverWicket.java | 2 +-
.../services/WicketViewerSettingsDefault.java | 2 +-
.../mementos/ObjectMementoServiceWicket.java | 2 +-
.../wicket/viewer/webmodule/WebModuleWicket.java | 2 +-
37 files changed, 56 insertions(+), 108 deletions(-)
rename antora/components/system/modules/generated/pages/index/{applib/mixins/timestamp/HoldsUpdatedAt.adoc => commons/having/HasUpdatedAt.adoc} (93%)
rename antora/components/system/modules/generated/pages/index/{applib/mixins/timestamp/HoldsUpdatedBy.adoc => commons/having/HasUpdatedBy.adoc} (93%)
delete mode 100644 antora/components/system/modules/generated/pages/index/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.adoc
delete mode 100644 api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/package-info.java
rename api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/HoldsUpdatedAt.java => commons/src/main/java/org/apache/isis/commons/having/HasUpdatedAt.java (91%)
rename api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/HoldsUpdatedBy.java => commons/src/main/java/org/apache/isis/commons/having/HasUpdatedBy.java (91%)
rename api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/Timestampable.java => commons/src/main/java/org/apache/isis/commons/having/HasUpdatedByAndAt.java (87%)
[isis] 01/02: ISIS-2511: move Timestample and co-interfaces from
Posted by ah...@apache.org.
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 10dcfa13e1a436df49cdacb79621eb07b596bd1f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Jan 31 09:44:44 2021 +0100
ISIS-2511: move Timestample and co-interfaces from
org.apache.isis.applib.mixins.timestamp
to
org.apache.isis.commons.having
also rename to more canonical names
---
.../modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc | 6 ++++
.../applib/services/wrapper/WrapperFactory.adoc | 2 +-
.../having/HasUpdatedAt.adoc} | 4 +--
.../having/HasUpdatedBy.adoc} | 4 +--
.../xmlsnapshot/XmlSnapshotServiceDefault.adoc | 33 ----------------------
.../modules/generated/pages/system-overview.adoc | 6 ++--
.../isis/applib/mixins/timestamp/package-info.java | 25 ----------------
.../apache/isis/commons/having/HasUpdatedAt.java | 4 +--
.../apache/isis/commons/having/HasUpdatedBy.java | 4 +--
.../isis/commons/having/HasUpdatedByAndAt.java | 8 +++---
.../changetracking/events/TimestampService.java | 12 ++++----
.../testdomain/jdo/entities/JdoProductComment.java | 4 +--
.../testdomain/jpa/entities/JpaProductComment.java | 4 +--
13 files changed, 32 insertions(+), 84 deletions(-)
diff --git a/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc
index f52aa96..b13d969 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M5/mignotes.adoc
@@ -238,6 +238,12 @@ CommandServiceInternal -> CommandPublisher
| FatalException (removed)
| removed, adds no new semantics compared to the already existing UnrecoverableException
+| HoldsUpdatedBy, HoldsUpdatedAt, Timestampable
+| moved to 'commons' and renamed:
+ HasUpdatedBy,
+ HasUpdatedAt,
+ HasUpdatedByAndAt
+
| IsisInteractionFactory
| InteractionFactory
diff --git a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/WrapperFactory.adoc b/antora/components/system/modules/generated/pages/index/applib/services/wrapper/WrapperFactory.adoc
index bf7e1da..8399284 100644
--- a/antora/components/system/modules/generated/pages/index/applib/services/wrapper/WrapperFactory.adoc
+++ b/antora/components/system/modules/generated/pages/index/applib/services/wrapper/WrapperFactory.adoc
@@ -1,7 +1,7 @@
= WrapperFactory : _interface_
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-Provides the ability to "wrap" of a domain object such that it can be interacted with while enforcing the hide/disable/validate rules implied by the Apache Isis programming model.
+Provides the ability to 'wrap' a domain object such that it can be interacted with while enforcing the hide/disable/validate rules implied by the Apache Isis programming model.
The wrapper can alternatively also be used to execute the action asynchronously, through an _java.util.concurrent.ExecutorService_ . Any business rules will be invoked synchronously beforehand, however. hand
diff --git a/antora/components/system/modules/generated/pages/index/applib/mixins/timestamp/HoldsUpdatedAt.adoc b/antora/components/system/modules/generated/pages/index/commons/having/HasUpdatedAt.adoc
similarity index 93%
rename from antora/components/system/modules/generated/pages/index/applib/mixins/timestamp/HoldsUpdatedAt.adoc
rename to antora/components/system/modules/generated/pages/index/commons/having/HasUpdatedAt.adoc
index 83aafbb..997c098 100644
--- a/antora/components/system/modules/generated/pages/index/applib/mixins/timestamp/HoldsUpdatedAt.adoc
+++ b/antora/components/system/modules/generated/pages/index/commons/having/HasUpdatedAt.adoc
@@ -1,10 +1,10 @@
-= HoldsUpdatedAt : _interface_
+= HasUpdatedAt : _interface_
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
.Java Sources
[source,java]
----
-interface HoldsUpdatedAt {
+interface HasUpdatedAt {
void setUpdatedAt(java.sql.Timestamp updatedAt)
}
diff --git a/antora/components/system/modules/generated/pages/index/applib/mixins/timestamp/HoldsUpdatedBy.adoc b/antora/components/system/modules/generated/pages/index/commons/having/HasUpdatedBy.adoc
similarity index 93%
rename from antora/components/system/modules/generated/pages/index/applib/mixins/timestamp/HoldsUpdatedBy.adoc
rename to antora/components/system/modules/generated/pages/index/commons/having/HasUpdatedBy.adoc
index c5ab62e..5c72853 100644
--- a/antora/components/system/modules/generated/pages/index/applib/mixins/timestamp/HoldsUpdatedBy.adoc
+++ b/antora/components/system/modules/generated/pages/index/commons/having/HasUpdatedBy.adoc
@@ -1,10 +1,10 @@
-= HoldsUpdatedBy : _interface_
+= HasUpdatedBy : _interface_
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
.Java Sources
[source,java]
----
-interface HoldsUpdatedBy {
+interface HasUpdatedBy {
void setUpdatedBy(String updatedBy)
}
diff --git a/antora/components/system/modules/generated/pages/index/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.adoc b/antora/components/system/modules/generated/pages/index/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.adoc
deleted file mode 100644
index ab72329..0000000
--- a/antora/components/system/modules/generated/pages/index/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.adoc
+++ /dev/null
@@ -1,33 +0,0 @@
-= XmlSnapshotServiceDefault : _class_
-:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
-
-This service allows an XML document to be generated capturing the data of a root entity and specified related entities. This XML can be used for various purposes, such as mail merge/reporting, or adhoc auditing.
-
-This implementation has no UI and there are no other implementations of the service API, and so it annotated with _org.apache.isis.applib.annotation.DomainService_ . Because this class is implemented in core, this means that it is automatically registered and available for use; no further configuration is required.
-
-.Java Sources
-[source,java]
-----
-class XmlSnapshotServiceDefault {
-
- XmlSnapshotServiceDefault(final XmlService xmlService, final SpecificationLoader specificationLoader)
-
- XmlSnapshotService.Snapshot snapshotFor(final Object domainObject) // <.>
-
- Snapshot.Builder builderFor(final Object domainObject) // <.>
-
- T getChildElementValue(final Element el, final String tagname, final Class<T> expectedCls)
-}
-----
-
-<.> `[teal]#*snapshotFor*#(Object domainObject)` : `xref:system:generated:index/applib/annotation/Snapshot.adoc[Snapshot]`
-+
---
-Creates a simple snapshot of the domain object.
---
-<.> `[teal]#*builderFor*#(Object domainObject)` : `Builder`
-+
---
-Creates a builder that allows a custom snapshot - traversing additional associated properties or collections (using _Snapshot.Builder#includePath(String)_ and _Snapshot.Builder#includePathAndAnnotation(String, String)_ ) - to be created.
---
-
diff --git a/antora/components/system/modules/generated/pages/system-overview.adoc b/antora/components/system/modules/generated/pages/system-overview.adoc
index d540db5..d8b3844 100644
--- a/antora/components/system/modules/generated/pages/system-overview.adoc
+++ b/antora/components/system/modules/generated/pages/system-overview.adoc
@@ -160,7 +160,7 @@ _Dependencies_
_Document Index Entries_
-xref:system:generated:index/commons/functional/Result.adoc[Result], xref:system:generated:index/commons/having/HasUniqueId.adoc[HasUniqueId], xref:system:generated:index/commons/having/HasUsername.adoc[HasUsername], xref:system:generated:index/commons/resource/ResourceCoordinates.adoc[ResourceCoordinates]
+xref:system:generated:index/commons/functional/Result.adoc[Result], xref:system:generated:index/commons/having/HasUniqueId.adoc[HasUniqueId], xref:system:generated:index/commons/having/HasUpdatedAt.adoc[HasUpdatedAt], xref:system:generated:index/commons/having/HasUpdatedBy.adoc[HasUpdatedBy], xref:system:generated:index/commons/having/HasUsername.adoc[HasUsername], xref:system:generated:index/commons/resource/ResourceCoordinates.adoc[ResourceCoordinates]
|===
== Core
@@ -335,7 +335,7 @@ _Dependencies_
_Document Index Entries_
-xref:system:generated:index/applib/AbstractViewModel.adoc[AbstractViewModel], xref:system:generated:index/applib/Identifier.adoc[Identifier], xref:system:generated:index/applib/RecreatableDomainObject.adoc[RecreatableDomainObject], xref:system:generated:index/applib/ViewModel.adoc[ViewModel], xref:system:generated:index/applib/adapters/AbstractValueSemanticsProvider.adoc[AbstractValueSemanticsProvider], xref:system:generated:index/applib/adapters/DefaultsProvider.adoc[DefaultsProvider], [...]
+xref:system:generated:index/applib/AbstractViewModel.adoc[AbstractViewModel], xref:system:generated:index/applib/Identifier.adoc[Identifier], xref:system:generated:index/applib/RecreatableDomainObject.adoc[RecreatableDomainObject], xref:system:generated:index/applib/ViewModel.adoc[ViewModel], xref:system:generated:index/applib/adapters/AbstractValueSemanticsProvider.adoc[AbstractValueSemanticsProvider], xref:system:generated:index/applib/adapters/DefaultsProvider.adoc[DefaultsProvider], [...]
|Apache Isis Core - Code Gen (ByteBuddy)
[source,yaml]
@@ -566,7 +566,7 @@ _Dependencies_
_Document Index Entries_
-xref:system:generated:index/core/runtimeservices/recognizer/dae/impl/ExceptionRecognizerForOtherDataAccessProblem.adoc[ExceptionRecognizerForOtherDataAccessProblem], xref:system:generated:index/core/runtimeservices/transaction/TransactionServiceSpring.adoc[TransactionServiceSpring], xref:system:generated:index/core/runtimeservices/xml/XmlServiceDefault.adoc[XmlServiceDefault], xref:system:generated:index/core/runtimeservices/xmlsnapshot/XmlSnapshotServiceDefault.adoc[XmlSnapshotServiceDefault]
+xref:system:generated:index/core/runtimeservices/recognizer/dae/impl/ExceptionRecognizerForOtherDataAccessProblem.adoc[ExceptionRecognizerForOtherDataAccessProblem], xref:system:generated:index/core/runtimeservices/transaction/TransactionServiceSpring.adoc[TransactionServiceSpring], xref:system:generated:index/core/runtimeservices/xml/XmlServiceDefault.adoc[XmlServiceDefault]
|Apache Isis Core - Security
[source,yaml]
diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/package-info.java b/api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/package-info.java
deleted file mode 100644
index 09942ea..0000000
--- a/api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/package-info.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Defines a number of interfaces for mixins to contribute to.
- *
- * @see <a href="">Reference guide</a>
- */
-package org.apache.isis.applib.mixins.timestamp;
\ No newline at end of file
diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/HoldsUpdatedAt.java b/commons/src/main/java/org/apache/isis/commons/having/HasUpdatedAt.java
similarity index 91%
rename from api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/HoldsUpdatedAt.java
rename to commons/src/main/java/org/apache/isis/commons/having/HasUpdatedAt.java
index a47b65a..98054e1 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/HoldsUpdatedAt.java
+++ b/commons/src/main/java/org/apache/isis/commons/having/HasUpdatedAt.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.mixins.timestamp;
+package org.apache.isis.commons.having;
/**
* @since 2.0 {@index}
*/
-public interface HoldsUpdatedAt {
+public interface HasUpdatedAt {
void setUpdatedAt(java.sql.Timestamp updatedAt);
diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/HoldsUpdatedBy.java b/commons/src/main/java/org/apache/isis/commons/having/HasUpdatedBy.java
similarity index 91%
rename from api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/HoldsUpdatedBy.java
rename to commons/src/main/java/org/apache/isis/commons/having/HasUpdatedBy.java
index 6348c51..fe95f0b 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/HoldsUpdatedBy.java
+++ b/commons/src/main/java/org/apache/isis/commons/having/HasUpdatedBy.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.mixins.timestamp;
+package org.apache.isis.commons.having;
/**
* @since 2.0 {@index}
*/
-public interface HoldsUpdatedBy {
+public interface HasUpdatedBy {
void setUpdatedBy(String updatedBy);
diff --git a/api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/Timestampable.java b/commons/src/main/java/org/apache/isis/commons/having/HasUpdatedByAndAt.java
similarity index 87%
rename from api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/Timestampable.java
rename to commons/src/main/java/org/apache/isis/commons/having/HasUpdatedByAndAt.java
index ed509bb..8ad59ef 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/mixins/timestamp/Timestampable.java
+++ b/commons/src/main/java/org/apache/isis/commons/having/HasUpdatedByAndAt.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.applib.mixins.timestamp;
+package org.apache.isis.commons.having;
-public interface Timestampable
+public interface HasUpdatedByAndAt
extends
- HoldsUpdatedBy,
- HoldsUpdatedAt {
+ HasUpdatedBy,
+ HasUpdatedAt {
}
diff --git a/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/events/TimestampService.java b/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/events/TimestampService.java
index 19cae74..4039b19 100644
--- a/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/events/TimestampService.java
+++ b/core/transaction/src/main/java/org/apache/isis/core/transaction/changetracking/events/TimestampService.java
@@ -28,10 +28,10 @@ import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
-import org.apache.isis.applib.mixins.timestamp.HoldsUpdatedAt;
-import org.apache.isis.applib.mixins.timestamp.HoldsUpdatedBy;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.user.UserService;
+import org.apache.isis.commons.having.HasUpdatedAt;
+import org.apache.isis.commons.having.HasUpdatedBy;
import lombok.val;
@@ -50,12 +50,12 @@ public class TimestampService {
val persistableObject = event.getPersistableObject();
- if(persistableObject instanceof HoldsUpdatedBy) {
- ((HoldsUpdatedBy)persistableObject).setUpdatedBy(userService.currentUserNameElseNobody());
+ if(persistableObject instanceof HasUpdatedBy) {
+ ((HasUpdatedBy)persistableObject).setUpdatedBy(userService.currentUserNameElseNobody());
}
- if(persistableObject instanceof HoldsUpdatedAt) {
- ((HoldsUpdatedAt)persistableObject).setUpdatedAt(clockService.getClock().javaSqlTimestamp());
+ if(persistableObject instanceof HasUpdatedAt) {
+ ((HasUpdatedAt)persistableObject).setUpdatedAt(clockService.getClock().javaSqlTimestamp());
}
}
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoProductComment.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoProductComment.java
index 23cb33d..0406a41 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoProductComment.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jdo/entities/JdoProductComment.java
@@ -27,7 +27,7 @@ import javax.jdo.annotations.PersistenceCapable;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.applib.mixins.timestamp.Timestampable;
+import org.apache.isis.commons.having.HasUpdatedByAndAt;
import lombok.Getter;
import lombok.Setter;
@@ -36,7 +36,7 @@ import lombok.Setter;
@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="id")
@DomainObject(
objectType = "testdomain.jdo.ProductComment")
-public class JdoProductComment implements Timestampable {
+public class JdoProductComment implements HasUpdatedByAndAt {
@Property @Column(allowsNull = "false")
@Getter @Setter private JdoProduct product;
diff --git a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProductComment.java b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProductComment.java
index 67bad27..b98ad00 100644
--- a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProductComment.java
+++ b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/jpa/entities/JpaProductComment.java
@@ -30,7 +30,7 @@ import javax.persistence.ManyToOne;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.applib.mixins.timestamp.Timestampable;
+import org.apache.isis.commons.having.HasUpdatedByAndAt;
import lombok.Getter;
import lombok.Setter;
@@ -38,7 +38,7 @@ import lombok.Setter;
@Entity
@DomainObject(
objectType = "testdomain.jpa.ProductComment")
-public class JpaProductComment implements Timestampable {
+public class JpaProductComment implements HasUpdatedByAndAt {
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
[isis] 02/02: ISIS-2511: rationalize viewer namespaces
Posted by ah...@apache.org.
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 {