This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch v4
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/v4 by this push:
new 39f2320db40 CAUSEWAY-2297: moving models to viewer commons (wkt)
39f2320db40 is described below
commit 39f2320db40d70cbd48de9435a1f66ba95fb072c
Author: Andi Huber <[email protected]>
AuthorDate: Tue Jul 29 07:59:11 2025 +0200
CAUSEWAY-2297: moving models to viewer commons (wkt)
---
viewers/commons/model/src/main/java/module-info.java | 12 +++++++-----
.../viewer/commons/model}/about/JarManifestAttributes.java | 6 +++---
.../viewer/commons/model}/about/JarManifestModel.java | 12 +++++-------
.../causeway/viewer/commons/model/error}/ExceptionModel.java | 2 +-
.../viewer/commons/model/error}/StackTraceDetail.java | 4 ++--
.../viewer/wicket/ui/components/about/AboutPanel.java | 1 +
.../wicket/ui/components/about/JarManifestListView.java | 1 +
.../viewer/wicket/ui/components/about/JarManifestPanel.java | 1 +
.../viewer/wicket/ui/errors/ExceptionStackTracePanel.java | 2 ++
.../causeway/viewer/wicket/ui/errors/StackTraceListView.java | 3 ++-
.../apache/causeway/viewer/wicket/ui/pages/PageAbstract.java | 2 +-
.../ui/pages/accmngt/AccountManagementPageAbstract.java | 2 +-
.../ui/pages/accmngt/password_reset/PasswordResetPage.java | 2 +-
.../wicket/ui/pages/accmngt/register/RegisterPage.java | 2 +-
.../wicket/ui/pages/accmngt/signup/RegistrationFormPage.java | 2 +-
.../causeway/viewer/wicket/ui/pages/error/ErrorPage.java | 4 ++--
.../viewer/wicket/ui/pages/login/WicketSignInPage.java | 2 +-
.../viewer/integration/WebRequestCycleForCauseway.java | 2 +-
18 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/viewers/commons/model/src/main/java/module-info.java
b/viewers/commons/model/src/main/java/module-info.java
index 9565c18ec76..74e17e28196 100644
--- a/viewers/commons/model/src/main/java/module-info.java
+++ b/viewers/commons/model/src/main/java/module-info.java
@@ -18,14 +18,16 @@
*/
module org.apache.causeway.viewer.commons.model {
exports org.apache.causeway.viewer.commons.model;
- exports org.apache.causeway.viewer.commons.model.layout;
- exports org.apache.causeway.viewer.commons.model.components;
- exports org.apache.causeway.viewer.commons.model.mixin;
- exports org.apache.causeway.viewer.commons.model.object;
+ exports org.apache.causeway.viewer.commons.model.about;
exports org.apache.causeway.viewer.commons.model.action;
- exports org.apache.causeway.viewer.commons.model.decorators;
exports org.apache.causeway.viewer.commons.model.attrib;
+ exports org.apache.causeway.viewer.commons.model.decorators;
+ exports org.apache.causeway.viewer.commons.model.error;
+ exports org.apache.causeway.viewer.commons.model.components;
exports org.apache.causeway.viewer.commons.model.hints;
+ exports org.apache.causeway.viewer.commons.model.layout;
+ exports org.apache.causeway.viewer.commons.model.mixin;
+ exports org.apache.causeway.viewer.commons.model.object;
requires static lombok;
requires transitive org.apache.causeway.applib;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestAttributes.java
b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/about/JarManifestAttributes.java
similarity index 93%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestAttributes.java
rename to
viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/about/JarManifestAttributes.java
index 0c0eca22324..ae1f1da3508 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestAttributes.java
+++
b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/about/JarManifestAttributes.java
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.about;
+package org.apache.causeway.viewer.commons.model.about;
import java.io.Serializable;
import java.net.URL;
import java.util.Map.Entry;
-record JarManifestAttributes(
+public record JarManifestAttributes(
Type type,
String line) implements Serializable {
- enum Type {
+ public enum Type {
JAR_NAME,
JAR_URL,
MANIFEST_ATTRIBUTE
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestModel.java
b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/about/JarManifestModel.java
similarity index 93%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestModel.java
rename to
viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/about/JarManifestModel.java
index 010a771dedd..9fa7b581651 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestModel.java
+++
b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/about/JarManifestModel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.about;
+package org.apache.causeway.viewer.commons.model.about;
import java.io.IOException;
import java.io.InputStream;
@@ -39,7 +39,7 @@
import org.apache.causeway.commons.internal.collections._Lists;
import org.apache.causeway.commons.internal.context._Context;
-record JarManifestModel(List<JarManifestAttributes> manifests) implements
Serializable {
+public record JarManifestModel(List<JarManifestAttributes> manifests)
implements Serializable {
/**
* @param metaInfManifestProvider provide using
<tt>getServletContext().getResourceAsStream("/META-INF/MANIFEST.MF")</tt>
@@ -140,12 +140,10 @@ private static JarName asJarName(final URL url) {
// split the path into parts, and reverse
List<String> parts = _Strings.splitThenStream(strippedPath, "/")
- .flatMap(s->_Strings.splitThenStream(s, "\\"))
- .filter(_Strings::isNotEmpty)
- .collect(Collectors.toList());
+ .flatMap(s->_Strings.splitThenStream(s, "\\"))
+ .filter(_Strings::isNotEmpty)
+ .collect(Collectors.toList());
- //XXX legacy of
- //List<String> parts =
_Lists.newArrayList(Splitter.on(CharMatcher.anyOf("/\\")).split(strippedPath));
Collections.reverse(parts);
// searching from the end, return the jar name if possible
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/ExceptionModel.java
b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/error/ExceptionModel.java
similarity index 99%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/ExceptionModel.java
rename to
viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/error/ExceptionModel.java
index 1e521f02189..f932d3d15b0 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/ExceptionModel.java
+++
b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/error/ExceptionModel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.errors;
+package org.apache.causeway.viewer.commons.model.error;
import java.io.Serializable;
import java.util.List;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/StackTraceDetail.java
b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/error/StackTraceDetail.java
similarity index 96%
rename from
viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/StackTraceDetail.java
rename to
viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/error/StackTraceDetail.java
index 3e95cb40082..cc53c91ab84 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/StackTraceDetail.java
+++
b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/error/StackTraceDetail.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.errors;
+package org.apache.causeway.viewer.commons.model.error;
import java.io.Serializable;
@@ -24,7 +24,7 @@ public record StackTraceDetail(
Type type,
String line) implements Serializable {
- enum Type {
+ public enum Type {
EXCEPTION_CLASS_NAME,
EXCEPTION_MESSAGE,
STACKTRACE_ELEMENT,
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/AboutPanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/AboutPanel.java
index b2720895236..08e3aaf1fe2 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/AboutPanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/AboutPanel.java
@@ -30,6 +30,7 @@
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.core.config.CausewayConfiguration;
+import org.apache.causeway.viewer.commons.model.about.JarManifestModel;
import org.apache.causeway.viewer.wicket.model.models.AboutModel;
import org.apache.causeway.viewer.wicket.ui.pages.home.HomePage;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestListView.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestListView.java
index 17ebab250db..f1448a6074f 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestListView.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestListView.java
@@ -24,6 +24,7 @@
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
+import org.apache.causeway.viewer.commons.model.about.JarManifestAttributes;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
final class JarManifestListView extends ListView<JarManifestAttributes> {
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestPanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestPanel.java
index 174e41f68cc..3a2336b9a30 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestPanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/about/JarManifestPanel.java
@@ -24,6 +24,7 @@
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.Model;
+import org.apache.causeway.viewer.commons.model.about.JarManifestModel;
import org.apache.causeway.viewer.wicket.ui.panels.PanelUtil;
class JarManifestPanel extends Panel {
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
index 1606cfb7b04..f754d61fbd3 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
@@ -33,6 +33,8 @@
import org.apache.causeway.applib.services.error.ErrorReportingService;
import org.apache.causeway.applib.services.error.Ticket;
import org.apache.causeway.commons.functional.Try;
+import org.apache.causeway.viewer.commons.model.error.ExceptionModel;
+import org.apache.causeway.viewer.commons.model.error.StackTraceDetail;
import org.apache.causeway.viewer.wicket.model.models.PageType;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
import
org.apache.causeway.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModel;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/StackTraceListView.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/StackTraceListView.java
index ea8e852e323..e29bbdf07fa 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/StackTraceListView.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/errors/StackTraceListView.java
@@ -24,6 +24,7 @@
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
+import org.apache.causeway.viewer.commons.model.error.StackTraceDetail;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
public final class StackTraceListView
@@ -33,7 +34,7 @@ public final class StackTraceListView
private final String idLine;
public StackTraceListView(final String id, final String idLine,
- final
List<org.apache.causeway.viewer.wicket.ui.errors.StackTraceDetail> list) {
+ final
List<org.apache.causeway.viewer.commons.model.error.StackTraceDetail> list) {
super(id, list);
this.idLine = idLine;
}
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageAbstract.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageAbstract.java
index c09fb984ac2..20c44d96325 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageAbstract.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/PageAbstract.java
@@ -53,6 +53,7 @@
import org.apache.causeway.commons.internal.debug._Debug;
import org.apache.causeway.commons.internal.debug.xray.XrayUi;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
+import org.apache.causeway.viewer.commons.model.error.ExceptionModel;
import org.apache.causeway.viewer.wicket.model.hints.CausewayEnvelopeEvent;
import
org.apache.causeway.viewer.wicket.model.hints.CausewayEventLetterAbstract;
import org.apache.causeway.viewer.wicket.model.hints.UiHintContainer;
@@ -70,7 +71,6 @@
import
org.apache.causeway.viewer.wicket.ui.components.actionpromptsb.ActionPromptSidebar;
import
org.apache.causeway.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModel;
import
org.apache.causeway.viewer.wicket.ui.components.widgets.breadcrumbs.BreadcrumbModelProvider;
-import org.apache.causeway.viewer.wicket.ui.errors.ExceptionModel;
import org.apache.causeway.viewer.wicket.ui.errors.JGrowlBehaviour;
import
org.apache.causeway.viewer.wicket.ui.pages.common.bootstrap.css.BootstrapOverridesCssResourceReference;
import
org.apache.causeway.viewer.wicket.ui.pages.common.fontawesome.FontAwesomeCssReferenceWkt;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
index 8773284e1de..a88b5089fdd 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.java
@@ -35,10 +35,10 @@
import org.apache.wicket.request.mapper.parameter.PageParameters;
import
org.apache.causeway.viewer.commons.applib.services.branding.BrandingUiService;
+import org.apache.causeway.viewer.commons.model.error.ExceptionModel;
import org.apache.causeway.viewer.wicket.model.models.PageType;
import
org.apache.causeway.viewer.wicket.ui.components.widgets.navbar.BrandLogo;
import
org.apache.causeway.viewer.wicket.ui.components.widgets.navbar.BrandName;
-import org.apache.causeway.viewer.wicket.ui.errors.ExceptionModel;
import org.apache.causeway.viewer.wicket.ui.errors.ExceptionStackTracePanel;
import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistry;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
index 857ebeedd6b..dc763903064 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/password_reset/PasswordResetPage.java
@@ -26,7 +26,7 @@
import org.apache.wicket.util.string.Strings;
import org.apache.causeway.applib.services.userreg.UserRegistrationService;
-import org.apache.causeway.viewer.wicket.ui.errors.ExceptionModel;
+import org.apache.causeway.viewer.commons.model.error.ExceptionModel;
import
org.apache.causeway.viewer.wicket.ui.pages.accmngt.AccountConfirmationMap;
import
org.apache.causeway.viewer.wicket.ui.pages.accmngt.AccountManagementPageAbstract;
import org.apache.causeway.viewer.wicket.ui.pages.login.WicketSignInPage;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/register/RegisterPage.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/register/RegisterPage.java
index e947554377c..aecfa9f85ab 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/register/RegisterPage.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/register/RegisterPage.java
@@ -27,8 +27,8 @@
import org.apache.wicket.util.string.Strings;
import org.apache.causeway.applib.services.userreg.UserDetails;
+import org.apache.causeway.viewer.commons.model.error.ExceptionModel;
import org.apache.causeway.viewer.wicket.model.models.PageType;
-import org.apache.causeway.viewer.wicket.ui.errors.ExceptionModel;
import org.apache.causeway.viewer.wicket.ui.pages.PageNavigationService;
import
org.apache.causeway.viewer.wicket.ui.pages.accmngt.AccountConfirmationMap;
import
org.apache.causeway.viewer.wicket.ui.pages.accmngt.AccountManagementPageAbstract;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java
index 8a9616173ed..8fd329a6a5b 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/signup/RegistrationFormPage.java
@@ -22,8 +22,8 @@
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.causeway.viewer.commons.model.error.ExceptionModel;
import org.apache.causeway.viewer.wicket.model.models.PageType;
-import org.apache.causeway.viewer.wicket.ui.errors.ExceptionModel;
import org.apache.causeway.viewer.wicket.ui.pages.PageNavigationService;
import
org.apache.causeway.viewer.wicket.ui.pages.accmngt.AccountManagementPageAbstract;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/error/ErrorPage.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/error/ErrorPage.java
index 7fb579132a6..841e1908a62 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/error/ErrorPage.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/error/ErrorPage.java
@@ -24,10 +24,10 @@
import org.apache.causeway.applib.services.user.UserMemento;
import org.apache.causeway.commons.internal.collections._Lists;
+import org.apache.causeway.viewer.commons.model.error.ExceptionModel;
+import org.apache.causeway.viewer.commons.model.error.StackTraceDetail;
import org.apache.causeway.viewer.wicket.model.util.PageParameterUtils;
-import org.apache.causeway.viewer.wicket.ui.errors.ExceptionModel;
import org.apache.causeway.viewer.wicket.ui.errors.ExceptionStackTracePanel;
-import org.apache.causeway.viewer.wicket.ui.errors.StackTraceDetail;
import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistry;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/WicketSignInPage.java
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/WicketSignInPage.java
index b4bbe38d2b8..663d369b09e 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/WicketSignInPage.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/login/WicketSignInPage.java
@@ -25,8 +25,8 @@
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.causeway.viewer.commons.model.error.ExceptionModel;
import org.apache.causeway.viewer.wicket.model.models.PageType;
-import org.apache.causeway.viewer.wicket.ui.errors.ExceptionModel;
import org.apache.causeway.viewer.wicket.ui.pages.PageNavigationService;
import
org.apache.causeway.viewer.wicket.ui.pages.accmngt.AccountManagementPageAbstract;
import
org.apache.causeway.viewer.wicket.ui.pages.accmngt.SuccessFeedbackCookieManager;
diff --git
a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/WebRequestCycleForCauseway.java
b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/WebRequestCycleForCauseway.java
index 0ca93100202..7bf6615ec50 100644
---
a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/WebRequestCycleForCauseway.java
+++
b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/integration/WebRequestCycleForCauseway.java
@@ -63,8 +63,8 @@
import org.apache.causeway.core.metamodel.context.HasMetaModelContext;
import org.apache.causeway.core.metamodel.spec.feature.ObjectMember;
import
org.apache.causeway.core.metamodel.specloader.validator.MetaModelInvalidException;
+import org.apache.causeway.viewer.commons.model.error.ExceptionModel;
import org.apache.causeway.viewer.wicket.model.models.PageType;
-import org.apache.causeway.viewer.wicket.ui.errors.ExceptionModel;
import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistry;
import org.apache.causeway.viewer.wicket.ui.pages.error.ErrorPage;
import org.apache.causeway.viewer.wicket.ui.pages.login.WicketSignInPage;
