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:56 UTC
[isis] 02/03: ISIS-3057: moves classes around
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}