You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2022/05/19 05:24:54 UTC
[isis] branch ISIS-3046 created (now dc19022db7)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch ISIS-3046
in repository https://gitbox.apache.org/repos/asf/isis.git
at dc19022db7 ISIS-3046: updates docs on mavendeps
This branch includes the following new commits:
new 59ce2e6a7c ISIS-2965: updates docs for SudoService
new 51c1963e83 ISIS-3057: moves classes around
new dc19022db7 ISIS-3046: updates docs on mavendeps
The 3 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.
[isis] 01/03: ISIS-2965: updates docs for SudoService
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-3046
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 59ce2e6a7cf0c22eb4a7ce8c9abbf06c57d54f55
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed May 18 07:10:30 2022 +0100
ISIS-2965: updates docs for SudoService
---
.../index/services/sudo/hooks/SudoService_020-examples-and-usage.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/sudo/hooks/SudoService_020-examples-and-usage.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/sudo/hooks/SudoService_020-examples-and-usage.adoc
index 61e3edfe87..ca801e0af5 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/sudo/hooks/SudoService_020-examples-and-usage.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/sudo/hooks/SudoService_020-examples-and-usage.adoc
@@ -35,7 +35,7 @@ For example:
----
protected void execute(final ExecutionContext ec) {
...
- sudoService.sudo(InteractionContext.switchUser(
+ sudoService.call(InteractionContext.switchUser(
UserMemento.ofNameAndRoles("seed-user", SudoService.ACCESS_ALL_ROLE),
() -> { /* ... */ }
);
[isis] 03/03: ISIS-3046: updates docs on mavendeps
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-3046
in repository https://gitbox.apache.org/repos/asf/isis.git
commit dc19022db7848a042623bead3dbe6d3ffa57ef5f
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu May 19 06:23:33 2022 +0100
ISIS-3046: updates docs on mavendeps
---
.../components/docs/modules/ROOT/pages/about.adoc | 2 +-
.../ROOT/partials/module-nav/quick-start.adoc | 2 +-
core/adoc/modules/_overview/pages/about.adoc | 66 +++++-----
mavendeps/adoc/modules/mavendeps/pages/about.adoc | 137 ++-------------------
.../modules/parent-pom/attachments/parent-pom.pptx | Bin 51680 -> 49485 bytes
5 files changed, 43 insertions(+), 164 deletions(-)
diff --git a/antora/components/docs/modules/ROOT/pages/about.adoc b/antora/components/docs/modules/ROOT/pages/about.adoc
index cbabb41cc6..6df229612e 100644
--- a/antora/components/docs/modules/ROOT/pages/about.adoc
+++ b/antora/components/docs/modules/ROOT/pages/about.adoc
@@ -33,7 +33,7 @@ link:https://simpleapp.jpa.isis.incode.work[jpa])
_POMs_
* xref:docs:parent-pom:about.adoc[Parent POM]
-* xref:docs:mavendeps:about.adoc[Aggregator POMs]
+* xref:docs:mavendeps:about.adoc[Webapp Aggregator POM]
|
[discrete]
diff --git a/antora/components/docs/modules/ROOT/partials/module-nav/quick-start.adoc b/antora/components/docs/modules/ROOT/partials/module-nav/quick-start.adoc
index e89a19f025..8b799ba66f 100644
--- a/antora/components/docs/modules/ROOT/partials/module-nav/quick-start.adoc
+++ b/antora/components/docs/modules/ROOT/partials/module-nav/quick-start.adoc
@@ -7,6 +7,6 @@
** xref:docs:starters:simpleapp.adoc[SimpleApp]
** xref:docs:parent-pom:about.adoc[Parent POM]
-** xref:docs:mavendeps:about.adoc[Aggregator POMs]
+** xref:docs:mavendeps:about.adoc[Webapp Aggregator POM]
diff --git a/core/adoc/modules/_overview/pages/about.adoc b/core/adoc/modules/_overview/pages/about.adoc
index dbace8a672..91b0b72e79 100644
--- a/core/adoc/modules/_overview/pages/about.adoc
+++ b/core/adoc/modules/_overview/pages/about.adoc
@@ -33,7 +33,7 @@ package "App\n[Software System]" {
.Projects/Modules (App)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Starter Parent
[source,yaml]
@@ -98,7 +98,7 @@ package "Mavendeps\n[Software System]" {
.Projects/Modules (Mavendeps)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Maven Deps
[source,yaml]
@@ -326,7 +326,7 @@ package "Testing\n[Software System]" {
.Projects/Modules (Testing)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Testing
[source,yaml]
@@ -751,7 +751,7 @@ package "Examples\n[Software System]" {
.Projects/Modules (Examples)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Demo - Parent
[source,yaml]
@@ -1085,7 +1085,7 @@ org.apache.isis.valuetypes:isis-valuetypes-markdown-ui-wkt:jar:<managed> +
org.apache.isis.valuetypes:isis-valuetypes-sse-ui-wkt:jar:<managed> +
org.projectlombok:lombok:jar:<managed> +
****
-
+Sudo
|Demo - Web
[source,yaml]
----
@@ -1231,7 +1231,7 @@ package "Root\n[Software System]" {
.Projects/Modules (Root)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis (Aggregator)
[source,yaml]
@@ -1311,7 +1311,7 @@ package "Commons\n[Software System]" {
.Projects/Modules (Commons)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Commons
[source,yaml]
@@ -1468,7 +1468,7 @@ package "Core\n[Software System]" {
.Projects/Modules (Core)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Core
[source,yaml]
@@ -2040,7 +2040,7 @@ package "JDO\n[Software System]" {
.Projects/Modules (JDO)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Persistence - JDO
[source,yaml]
@@ -2272,7 +2272,7 @@ package "JPA\n[Software System]" {
.Projects/Modules (JPA)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Persistence - JPA
[source,yaml]
@@ -2413,7 +2413,7 @@ package "Bypass\n[Software System]" {
.Projects/Modules (Bypass)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Security - Bypass
[source,yaml]
@@ -2470,7 +2470,7 @@ package "Keycloak\n[Software System]" {
.Projects/Modules (Keycloak)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Security - Keycloak
[source,yaml]
@@ -2536,7 +2536,7 @@ package "Shiro\n[Software System]" {
.Projects/Modules (Shiro)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Security - Shiro
[source,yaml]
@@ -2601,7 +2601,7 @@ package "Spring\n[Software System]" {
.Projects/Modules (Spring)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Security - Spring
[source,yaml]
@@ -2668,7 +2668,7 @@ package "Common\n[Software System]" {
.Projects/Modules (Common)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Viewer - Common Model
[source,yaml]
@@ -2771,7 +2771,7 @@ package "Restful Objects\n[Software System]" {
.Projects/Modules (Restful Objects)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Viewer - RO
[source,yaml]
@@ -2998,7 +2998,7 @@ package "Wicket\n[Software System]" {
.Projects/Modules (Wicket)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Viewer - Wicket
[source,yaml]
@@ -3196,7 +3196,7 @@ package "Valuetypes\n[Software System]" {
.Projects/Modules (Valuetypes)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Value types
[source,yaml]
@@ -3406,7 +3406,7 @@ package "Asciidoc\n[Software System]" {
.Projects/Modules (Asciidoc)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Val - Asciidoctor (parent)
[source,yaml]
@@ -3652,7 +3652,7 @@ package "Markdown\n[Software System]" {
.Projects/Modules (Markdown)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Val - Markdown (parent)
[source,yaml]
@@ -3859,7 +3859,7 @@ package "SSE\n[Software System]" {
.Projects/Modules (SSE)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Val - Server Sent Events (parent)
[source,yaml]
@@ -4136,7 +4136,7 @@ package "Extensions\n[Software System]" {
.Projects/Modules (Extensions)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Extensions
[source,yaml]
@@ -4677,7 +4677,7 @@ package "Applib: Excel\n[Software System]" {
.Projects/Modules (Applib: Excel)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Ext - Excel (parent)
[source,yaml]
@@ -4862,7 +4862,7 @@ package "Core: Command Log\n[Software System]" {
.Projects/Modules (Core: Command Log)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Ext - Command Log
[source,yaml]
@@ -5002,7 +5002,7 @@ package "Core: Command Replay\n[Software System]" {
.Projects/Modules (Core: Command Replay)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Ext - Command Replay
[source,yaml]
@@ -5121,7 +5121,7 @@ package "Core: Quartz\n[Software System]" {
.Projects/Modules (Core: Quartz)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Ext - Quartz
[source,yaml]
@@ -5245,7 +5245,7 @@ package "Tooling\n[Software System]" {
.Projects/Modules (Tooling)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis - Tooling
[source,yaml]
@@ -5547,7 +5547,7 @@ package "Regression Tests\n[Software System]" {
.Projects/Modules (Regression Tests)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis - Regression Tests
[source,yaml]
@@ -5862,7 +5862,7 @@ package "Incubator\n[Software System]" {
.Projects/Modules (Incubator)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Incubator
[source,yaml]
@@ -5910,7 +5910,7 @@ package "Kroviz Client\n[Software System]" {
.Projects/Modules (Kroviz Client)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Incubator - Client kroViz
[source,yaml]
@@ -5974,7 +5974,7 @@ package "GraphQL Viewer\n[Software System]" {
.Projects/Modules (GraphQL Viewer)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Inc - Viewer GraphQL
[source,yaml]
@@ -6102,7 +6102,7 @@ package "Vaadin Viewer\n[Software System]" {
.Projects/Modules (Vaadin Viewer)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Inc - Viewer Vaadin
[source,yaml]
@@ -6239,7 +6239,7 @@ package "JavaFX Viewer\n[Software System]" {
.Projects/Modules (JavaFX Viewer)
[cols="3a,5a", options="header"]
|===
-|Coordinates |Description
+|Coordinates |Description
|Apache Isis Inc - Viewer JavaFX
[source,yaml]
diff --git a/mavendeps/adoc/modules/mavendeps/pages/about.adoc b/mavendeps/adoc/modules/mavendeps/pages/about.adoc
index af9670873e..cb45f103f0 100644
--- a/mavendeps/adoc/modules/mavendeps/pages/about.adoc
+++ b/mavendeps/adoc/modules/mavendeps/pages/about.adoc
@@ -1,17 +1,9 @@
-= Aggregator POMs
+= Webapp Aggregator POM
: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 [...]
-The framework provides a number of "aggregator" POMs that act as a convenient way to aggregate together various common dependencies.
-
-For example, when writing unit tests for your domain app, it can simply depend on the `isis-mavendeps-unittests` artifact (rather than have to reference all of JUnit, AssertJ, Spring Boot, Hamcrest, Mockito and so on).
-
-Currently five aggregator POMs are provided.
-
-== Webapp
-
The `isis-mavendeps-webapp` aggregates the main runtime dependencies of a production webapp.
-Note however that it does _not_ include the runtime dependencies for either JDO or JPA; these have their own "mavendeps" POM, discussed xref:#jdo-and-jpa[below].
+Note that it does _not_ include the runtime dependencies for either JDO or JPA; these must be included separately.
To use, add the following :
@@ -33,133 +25,20 @@ For convenience, it includes all of the current components available:
* Apache Isis Core - the xref:refguide:ROOT:about.adoc[Applib] and underlying implementation (xref:core:runtime-services:about.adoc[Runtime Services])
-* Two of the security implementations (xref:security:bypass:about.adoc[Bypass] and xref:security:keycloak:about.adoc[Keycloak])
+* The xref:security:bypass:about.adoc[Bypass] security implementation.
+
-The xref:security:shiro:about.adoc[Shiro] and xref:security:spring:about.adoc[Spring] implementations are omitted, as each of these have additional third-party dependencies.
+Other security implementations (xref:security:shiro:about.adoc[Shiro], xref:security:spring:about.adoc[Spring] and and xref:security:keycloak:about.adoc[Keycloak]) are omitted, as each of these have additional third-party dependencies.
-* All the viewer implementations (xref:vw:ROOT:about.adoc[Wicket], xref:vro:ROOT:about.adoc[Restful Objects])
+* The viewer implementations (xref:vw:ROOT:about.adoc[Wicket], xref:vro:ROOT:about.adoc[Restful Objects])
-// doesn't seem to include these...
-//* All the persistence implementations (xref:pjdo:ROOT:about.adoc[JDO/DataNucleus], xref:pjpa:ROOT:about.adoc[JPA/EclipseLink])
+If you don't need any of these, then use a Maven `<exclusion>`.
-If you don't need any of these (for example, you'll probably only want one security implementation), then you can exclude the others.
+In addition, you will probably need to specify a persistence implementation (xref:pjpa:ROOT:about.adoc[JPA/Eclipselink] or xref:pjdo:ROOT:about.adoc[JDO/DataNucleus]) as well as a security implementation.
Also, remember that adding the class onto the classpath does _not_ make that functionality available (Apache Isis does not currently leverage Spring Boot's link:https://docs.spring.io/spring-boot/docs/current/reference/html/using-spring-boot.html#using-boot-auto-configuration[auto configuration] capabilities).
-So, you must also add in the appropriate `IsisModuleXxx` to your application's top-level link:https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/context/annotation/Configuration.html[@Configuration] (aka "app manifest").
+You must therefore also add in the appropriate `IsisModuleXxx` to your application's top-level link:https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/context/annotation/Configuration.html[@Configuration] (aka "app manifest").
For example, see the xref:docs:starters:simpleapp.adoc#appmanifest[AppManifest for the SimpleApp] starter app.
-== Testing
-
-Three aggregator POMs are provided to support xref:testing:unittestsupport:about.adoc[unit testing], xref:testing:integtestsupport:about.adoc[integ testing] or running xref:testing:specsupport:about.adoc[BDD (Cucumber) specs].
-
-To use them when unit testing, add:
-
-[source,xml]
-.pom.xml
-----
-<dependencies>
- <dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-unittests</artifactId>
- <type>pom</type>
- <scope>test</scope>
- </dependency>
-</dependencies>
-----
-
-For integration testing, add:
-
-[source,xml]
-.pom.xml
-----
-<dependencies>
- <dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
- <artifactId>isis-mavendeps-integtests</artifactId>
- <type>pom</type>
- <scope>test</scope>
- </dependency>
-</dependencies>
-----
-
-
-The table below summarises the dependencies that each of these aggregator POMs brings in.
-
-.Dependencies of the Aggregator POM for Tests
-[cols="3a,^1a,^1a", options="header"]
-|===
-
-| Dependency
-| mavendeps-
-unittests
-| mavendeps-
-integtests
-
-
-|Apache Isis +
-xref:testing:unittestsupport:about.adoc[unit test support] +
-| Y |
-
-|Apache Isis +
-xref:testing:integtestsupport:about.adoc[integ test support] +
-| | Y
-
-
-| Apache Isis +
-xref:refguide:ROOT:about.adoc[Applib]
-| Y | Y
-
-| Apache Isis +
-xref:security:bypass:about.adoc[Bypass] security
-| | Y
-
-| Apache Isis +
-xref:testing:fakedata:about.adoc[Fake Data]
-| Y | Y
-
-|Apache Isis +
-xref:testing:fixtures:about.adoc[Fixture Scripts]
-| | Y
-
-| link:https://junit.org/junit5/docs/current/user-guide/[JUnit 5 "jupiter"]
-| Y | Y
-
-| link:https://junit.org/junit5/docs/current/user-guide/#migrating-from-junit4[JUnit 5 "vintage"]
-| Y |
-
-| link:https://docs.spring.io/spring-boot/docs/current/reference/html/spring-boot-features.html#boot-features-testing[Spring Boot Test]
-| Y | Y
-
-| link:http://hamcrest.org/JavaHamcrest/[Hamcrest] (core + library)
-| Y | Y
-
-| link:https://joel-costigliola.github.io/assertj/[AssertJ]
-| Y | Y
-
-| link:https://site.mockito.org/[Mockito]
-| Y | Y
-
-| link:http://jmock.org/[JMock]
-| Y |
-
-| link:https://github.com/approvals/ApprovalTests.Java[Approval tests]
-| Y | Y
-
-| link:http://picocontainer.com/[PicoContainer] +
-(for JMock2 extensions)
-| Y |
-
-| link:https://github.com/google/guava/wiki[Google's Guava]
-| Y |
-
-| link:http://hsqldb.org[HSQLDB]
-| | Y
-
-| link:https://www.h2database.com[H2 Database]
-| | Y
-
-|===
-
diff --git a/starters/adoc/modules/parent-pom/attachments/parent-pom.pptx b/starters/adoc/modules/parent-pom/attachments/parent-pom.pptx
index 75c6453c5e..eff9f26892 100644
Binary files a/starters/adoc/modules/parent-pom/attachments/parent-pom.pptx and b/starters/adoc/modules/parent-pom/attachments/parent-pom.pptx differ
[isis] 02/03: ISIS-3057: moves classes around
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-3046
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 51c1963e83151f859c271495f7292cf6f2f27a46
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Wed May 18 07:13:00 2022 +0100
ISIS-3057: moves classes around
---
.../excel/applib/{dom => }/AggregationType.java | 2 +-
.../applib/{dom => }/ExcelMetaDataEnabled.java | 2 +-
.../excel/applib/{dom => }/ExcelService.java | 3 +--
.../extensions/excel/applib/{util => }/Mode.java | 2 +-
.../excel/applib/{dom => }/RowHandler.java | 2 +-
.../excel/applib/{dom => }/WorksheetContent.java | 2 +-
.../excel/applib/{dom => }/WorksheetSpec.java | 3 +--
.../applib/{dom => annotation}/HyperLink.java | 2 +-
.../applib/{dom => annotation}/PivotColumn.java | 2 +-
.../{dom => annotation}/PivotDecoration.java | 2 +-
.../excel/applib/{dom => annotation}/PivotRow.java | 2 +-
.../applib/{dom => annotation}/PivotValue.java | 4 +++-
.../excel/applib/service/ExcelServiceDefault.java | 8 ++++----
.../excel/applib/service/_ExcelConverter.java | 22 +++++++++++-----------
.../excel/applib/service/_ExcelServiceHelper.java | 10 +++++-----
.../excel/applib/util/ExcelFileBlobConverter.java | 2 +-
.../extensions/excel/applib/util/PivotUtils.java | 2 +-
.../extensions/excel/applib/util/SheetPivoter.java | 2 +-
.../contributions/ExcelDemoToDoItem_export.java | 2 +-
.../contributions/ExcelDemoToDoItem_export2.java | 2 +-
.../BulkUpdateManagerForDemoToDoItem.java | 6 +++---
.../bulkupdate/BulkUpdateMenuForDemoToDoItem.java | 2 +-
.../pivot/ExcelPivotByCategoryAndSubcategory.java | 8 ++++----
.../demotodoitem/DemoToDoItemRowHandler2.java | 2 +-
.../DemoFixture_extending_ExcelFixture2.java | 4 ++--
...uleDemoToDoItemBulkUpdateManager_IntegTest.java | 3 +--
.../extensions/excel/testing/ExcelFixture.java | 2 +-
.../extensions/excel/testing/ExcelFixture2.java | 4 ++--
.../excel/testing/FixtureAwareRowHandler.java | 2 +-
29 files changed, 55 insertions(+), 56 deletions(-)
diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/AggregationType.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/AggregationType.java
similarity index 94%
rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/AggregationType.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/AggregationType.java
index 482e3dc33a..b5f332478f 100644
--- a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/AggregationType.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/AggregationType.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.excel.applib.dom;
+package org.apache.isis.extensions.excel.applib;
/**
* @since 2.0 {@index}
diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/ExcelMetaDataEnabled.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/ExcelMetaDataEnabled.java
similarity index 94%
rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/ExcelMetaDataEnabled.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/ExcelMetaDataEnabled.java
index 3aedd6ea7b..9ee83868fc 100644
--- a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/ExcelMetaDataEnabled.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/ExcelMetaDataEnabled.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.excel.applib.dom;
+package org.apache.isis.extensions.excel.applib;
/**
diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/ExcelService.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/ExcelService.java
similarity index 97%
rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/ExcelService.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/ExcelService.java
index 0540b28e1e..d071db2221 100644
--- a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/ExcelService.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/ExcelService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.excel.applib.dom;
+package org.apache.isis.extensions.excel.applib;
import java.io.InputStream;
import java.util.List;
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.isis.applib.exceptions.RecoverableException;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.extensions.excel.applib.service.ExcelServiceDefault;
-import org.apache.isis.extensions.excel.applib.util.Mode;
/**
* @since 2.0 {@index}
diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/Mode.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/Mode.java
similarity index 95%
rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/Mode.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/Mode.java
index 2f394569d1..f5f5957556 100644
--- a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/Mode.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/Mode.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.excel.applib.util;
+package org.apache.isis.extensions.excel.applib;
/**
* @since 2.0 {@index}
diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/RowHandler.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/RowHandler.java
similarity index 95%
rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/RowHandler.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/RowHandler.java
index 6beb81a249..0441325523 100644
--- a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/RowHandler.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/RowHandler.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.excel.applib.dom;
+package org.apache.isis.extensions.excel.applib;
import org.apache.isis.applib.annotation.Programmatic;
diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/WorksheetContent.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/WorksheetContent.java
similarity index 96%
rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/WorksheetContent.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/WorksheetContent.java
index 6493a95224..b902cd31ed 100644
--- a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/WorksheetContent.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/WorksheetContent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.excel.applib.dom;
+package org.apache.isis.extensions.excel.applib;
import java.util.List;
diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/WorksheetSpec.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/WorksheetSpec.java
similarity index 97%
rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/WorksheetSpec.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/WorksheetSpec.java
index 9d5f477886..1f4497d6a9 100644
--- a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/WorksheetSpec.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/WorksheetSpec.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.excel.applib.dom;
+package org.apache.isis.extensions.excel.applib;
import java.util.List;
@@ -24,7 +24,6 @@ import javax.inject.Inject;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.services.inject.ServiceInjector;
-import org.apache.isis.extensions.excel.applib.util.Mode;
import lombok.Setter;
diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/HyperLink.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/HyperLink.java
similarity index 94%
rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/HyperLink.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/HyperLink.java
index f527867f08..3694c40219 100644
--- a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/HyperLink.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/HyperLink.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.excel.applib.dom;
+package org.apache.isis.extensions.excel.applib.annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotColumn.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotColumn.java
similarity index 94%
rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotColumn.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotColumn.java
index fa983871c0..ec459bc48b 100644
--- a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotColumn.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotColumn.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.excel.applib.dom;
+package org.apache.isis.extensions.excel.applib.annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotDecoration.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotDecoration.java
similarity index 94%
rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotDecoration.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotDecoration.java
index fb773067f7..ca61cb0fb4 100644
--- a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotDecoration.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotDecoration.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.excel.applib.dom;
+package org.apache.isis.extensions.excel.applib.annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotRow.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotRow.java
similarity index 94%
rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotRow.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotRow.java
index ef2a68bcc2..7d74a9c707 100644
--- a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotRow.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotRow.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.excel.applib.dom;
+package org.apache.isis.extensions.excel.applib.annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotValue.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotValue.java
similarity index 89%
rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotValue.java
rename to extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotValue.java
index b18f747d3b..dbf2187a4b 100644
--- a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/dom/PivotValue.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotValue.java
@@ -16,11 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.excel.applib.dom;
+package org.apache.isis.extensions.excel.applib.annotation;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import org.apache.isis.extensions.excel.applib.AggregationType;
+
/**
* @since 2.0 {@index}
*/
diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/ExcelServiceDefault.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/ExcelServiceDefault.java
index 24ee30c138..dd50f5f61c 100644
--- a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/ExcelServiceDefault.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/ExcelServiceDefault.java
@@ -37,10 +37,10 @@ import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.inject.ServiceInjector;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.extensions.excel.applib.dom.ExcelService;
-import org.apache.isis.extensions.excel.applib.dom.WorksheetContent;
-import org.apache.isis.extensions.excel.applib.dom.WorksheetSpec;
-import org.apache.isis.extensions.excel.applib.util.Mode;
+import org.apache.isis.extensions.excel.applib.ExcelService;
+import org.apache.isis.extensions.excel.applib.WorksheetContent;
+import org.apache.isis.extensions.excel.applib.WorksheetSpec;
+import org.apache.isis.extensions.excel.applib.Mode;
@Service
diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelConverter.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelConverter.java
index 8680254429..a4f29111aa 100644
--- a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelConverter.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelConverter.java
@@ -63,17 +63,17 @@ import org.apache.isis.core.metamodel.spec.feature.MixedIn;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.extensions.excel.applib.dom.AggregationType;
-import org.apache.isis.extensions.excel.applib.dom.ExcelMetaDataEnabled;
-import org.apache.isis.extensions.excel.applib.dom.HyperLink;
-import org.apache.isis.extensions.excel.applib.dom.PivotColumn;
-import org.apache.isis.extensions.excel.applib.dom.PivotDecoration;
-import org.apache.isis.extensions.excel.applib.dom.PivotRow;
-import org.apache.isis.extensions.excel.applib.dom.PivotValue;
-import org.apache.isis.extensions.excel.applib.dom.RowHandler;
-import org.apache.isis.extensions.excel.applib.dom.WorksheetContent;
-import org.apache.isis.extensions.excel.applib.dom.WorksheetSpec;
-import org.apache.isis.extensions.excel.applib.util.Mode;
+import org.apache.isis.extensions.excel.applib.AggregationType;
+import org.apache.isis.extensions.excel.applib.ExcelMetaDataEnabled;
+import org.apache.isis.extensions.excel.applib.annotation.HyperLink;
+import org.apache.isis.extensions.excel.applib.annotation.PivotColumn;
+import org.apache.isis.extensions.excel.applib.annotation.PivotDecoration;
+import org.apache.isis.extensions.excel.applib.annotation.PivotRow;
+import org.apache.isis.extensions.excel.applib.annotation.PivotValue;
+import org.apache.isis.extensions.excel.applib.RowHandler;
+import org.apache.isis.extensions.excel.applib.WorksheetContent;
+import org.apache.isis.extensions.excel.applib.WorksheetSpec;
+import org.apache.isis.extensions.excel.applib.Mode;
import org.apache.isis.extensions.excel.applib.util.PivotUtils;
import org.apache.isis.extensions.excel.applib.util.SheetPivoter;
diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelServiceHelper.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelServiceHelper.java
index a9d396f138..7998c41edf 100644
--- a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelServiceHelper.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelServiceHelper.java
@@ -33,11 +33,11 @@ import org.apache.isis.applib.value.Blob;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.core.metamodel.objectmanager.ObjectManager;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
-import org.apache.isis.extensions.excel.applib.dom.PivotColumn;
-import org.apache.isis.extensions.excel.applib.dom.PivotRow;
-import org.apache.isis.extensions.excel.applib.dom.PivotValue;
-import org.apache.isis.extensions.excel.applib.dom.WorksheetContent;
-import org.apache.isis.extensions.excel.applib.dom.WorksheetSpec;
+import org.apache.isis.extensions.excel.applib.annotation.PivotColumn;
+import org.apache.isis.extensions.excel.applib.annotation.PivotRow;
+import org.apache.isis.extensions.excel.applib.annotation.PivotValue;
+import org.apache.isis.extensions.excel.applib.WorksheetContent;
+import org.apache.isis.extensions.excel.applib.WorksheetSpec;
import org.apache.isis.extensions.excel.applib.util.ExcelFileBlobConverter;
import lombok.SneakyThrows;
diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/ExcelFileBlobConverter.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/ExcelFileBlobConverter.java
index 0c5b3277e1..3caa4bd315 100644
--- a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/ExcelFileBlobConverter.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/ExcelFileBlobConverter.java
@@ -28,7 +28,7 @@ import org.apache.poi.util.IOUtils;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.commons.internal.base._Bytes;
-import org.apache.isis.extensions.excel.applib.dom.ExcelService;
+import org.apache.isis.extensions.excel.applib.ExcelService;
import org.apache.isis.extensions.excel.applib.service.ExcelServiceDefault;
import lombok.val;
diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/PivotUtils.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/PivotUtils.java
index 27bea8fd86..8288f768db 100644
--- a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/PivotUtils.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/PivotUtils.java
@@ -24,7 +24,7 @@ import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.Row;
-import org.apache.isis.extensions.excel.applib.dom.AggregationType;
+import org.apache.isis.extensions.excel.applib.AggregationType;
/**
* @since 2.0 {@index}
diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/SheetPivoter.java b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/SheetPivoter.java
index affb095c65..ca9253a2ab 100644
--- a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/SheetPivoter.java
+++ b/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/SheetPivoter.java
@@ -34,7 +34,7 @@ import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.util.CellReference;
-import org.apache.isis.extensions.excel.applib.dom.AggregationType;
+import org.apache.isis.extensions.excel.applib.AggregationType;
import org.apache.isis.extensions.excel.applib.service.ExcelServiceDefault;
import lombok.val;
diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java
index e59f3d20b4..11d123882e 100644
--- a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java
@@ -22,7 +22,7 @@ import javax.inject.Inject;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.excel.applib.dom.ExcelService;
+import org.apache.isis.extensions.excel.applib.ExcelService;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java
index 27ffe381b8..4968c90672 100644
--- a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java
@@ -22,7 +22,7 @@ import javax.inject.Inject;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.excel.applib.dom.ExcelService;
+import org.apache.isis.extensions.excel.applib.ExcelService;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItemMenu;
diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
index ecf89c65cc..704fd9cd1a 100644
--- a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java
@@ -46,9 +46,9 @@ import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.user.UserService;
import org.apache.isis.applib.value.Blob;
-import org.apache.isis.extensions.excel.applib.dom.ExcelService;
-import org.apache.isis.extensions.excel.applib.dom.WorksheetContent;
-import org.apache.isis.extensions.excel.applib.dom.WorksheetSpec;
+import org.apache.isis.extensions.excel.applib.ExcelService;
+import org.apache.isis.extensions.excel.applib.WorksheetContent;
+import org.apache.isis.extensions.excel.applib.WorksheetSpec;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.ExcelDemoToDoItem;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
index b78bceaea3..31da563809 100644
--- a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java
@@ -33,7 +33,7 @@ import org.apache.isis.applib.services.bookmark.BookmarkService;
import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.user.UserService;
-import org.apache.isis.extensions.excel.applib.dom.ExcelService;
+import org.apache.isis.extensions.excel.applib.ExcelService;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
index a86af91353..019fc6daee 100644
--- a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java
@@ -22,10 +22,10 @@ import java.math.BigDecimal;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.extensions.excel.applib.dom.AggregationType;
-import org.apache.isis.extensions.excel.applib.dom.PivotColumn;
-import org.apache.isis.extensions.excel.applib.dom.PivotRow;
-import org.apache.isis.extensions.excel.applib.dom.PivotValue;
+import org.apache.isis.extensions.excel.applib.AggregationType;
+import org.apache.isis.extensions.excel.applib.annotation.PivotColumn;
+import org.apache.isis.extensions.excel.applib.annotation.PivotRow;
+import org.apache.isis.extensions.excel.applib.annotation.PivotValue;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
index 9b9b294544..e61c1bda3a 100644
--- a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java
@@ -22,7 +22,7 @@ import java.math.BigDecimal;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.extensions.excel.applib.dom.ExcelMetaDataEnabled;
+import org.apache.isis.extensions.excel.applib.ExcelMetaDataEnabled;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Category;
import org.apache.isis.extensions.excel.fixtures.demoapp.todomodule.dom.Subcategory;
import org.apache.isis.extensions.excel.testing.ExcelFixture2;
diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
index 2530f7949f..1430fd1e29 100644
--- a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
+++ b/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java
@@ -20,8 +20,8 @@ package org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturescri
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.commons.internal.resources._Resources;
-import org.apache.isis.extensions.excel.applib.dom.WorksheetSpec;
-import org.apache.isis.extensions.excel.applib.util.Mode;
+import org.apache.isis.extensions.excel.applib.WorksheetSpec;
+import org.apache.isis.extensions.excel.applib.Mode;
import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.fixturehandlers.demotodoitem.DemoToDoItemRowHandler2;
import org.apache.isis.extensions.excel.testing.ExcelFixture2;
diff --git a/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java b/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
index 43d36343ec..1e61d2b532 100644
--- a/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
+++ b/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java
@@ -28,14 +28,13 @@ import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.commons.internal.base._Bytes;
import org.apache.isis.commons.internal.resources._Resources;
-import org.apache.isis.extensions.excel.applib.dom.ExcelService;
+import org.apache.isis.extensions.excel.applib.ExcelService;
import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateLineItemForDemoToDoItem;
import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateManagerForDemoToDoItem;
import org.apache.isis.extensions.excel.fixtures.demoapp.demomodule.dom.bulkupdate.BulkUpdateMenuForDemoToDoItem;
diff --git a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture.java b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture.java
index 970642bc0e..edf59c7492 100644
--- a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture.java
+++ b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture.java
@@ -41,7 +41,7 @@ import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
import org.apache.isis.extensions.excel.applib.IsisModuleExtExcelApplib;
-import org.apache.isis.extensions.excel.applib.dom.ExcelService;
+import org.apache.isis.extensions.excel.applib.ExcelService;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureResultList;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
diff --git a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture2.java b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture2.java
index e75b9c2347..a63e5f3575 100644
--- a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture2.java
+++ b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture2.java
@@ -30,8 +30,8 @@ import org.apache.isis.applib.services.factory.FactoryService;
import org.apache.isis.applib.value.Blob;
import org.apache.isis.commons.internal.base._Bytes;
import org.apache.isis.extensions.excel.applib.IsisModuleExtExcelApplib;
-import org.apache.isis.extensions.excel.applib.dom.ExcelService;
-import org.apache.isis.extensions.excel.applib.dom.WorksheetSpec;
+import org.apache.isis.extensions.excel.applib.ExcelService;
+import org.apache.isis.extensions.excel.applib.WorksheetSpec;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import lombok.Getter;
diff --git a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/FixtureAwareRowHandler.java b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/FixtureAwareRowHandler.java
index 370d5fc5ab..69e3ca9075 100644
--- a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/FixtureAwareRowHandler.java
+++ b/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/FixtureAwareRowHandler.java
@@ -20,7 +20,7 @@ package org.apache.isis.extensions.excel.testing;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.isis.extensions.excel.applib.dom.RowHandler;
+import org.apache.isis.extensions.excel.applib.RowHandler;
/**
* @since 2.0 {@index}