This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git
commit e21eb4475eab90b99be83548a5fb6bf9060fe9e3 Author: Dan Haywood <[email protected]> AuthorDate: Sat Aug 20 17:49:32 2022 +0100 ISIS-2965: further small doc improvements --- antora/playbooks/site-extensions.yml | 4 ++-- antora/playbooks/site.yml | 15 ++++++++------- extensions/{applib => core}/excel/adoc/antora.yml | 0 .../{applib => core}/excel/adoc/modules/excel/nav.adoc | 0 .../excel/adoc/modules/excel/pages/about.adoc | 0 .../excel/adoc/modules/excel/partials/module-nav.adoc | 0 extensions/{applib => core}/excel/applib/pom.xml | 0 .../isis/extensions/excel/applib/AggregationType.java | 0 .../extensions/excel/applib/ExcelMetaDataEnabled.java | 0 .../isis/extensions/excel/applib/ExcelService.java | 0 .../excel/applib/IsisModuleExtExcelApplib.java | 0 .../org/apache/isis/extensions/excel/applib/Mode.java | 0 .../apache/isis/extensions/excel/applib/RowHandler.java | 0 .../isis/extensions/excel/applib/WorksheetContent.java | 0 .../isis/extensions/excel/applib/WorksheetSpec.java | 0 .../extensions/excel/applib/annotation/HyperLink.java | 0 .../extensions/excel/applib/annotation/PivotColumn.java | 0 .../excel/applib/annotation/PivotDecoration.java | 0 .../extensions/excel/applib/annotation/PivotRow.java | 0 .../extensions/excel/applib/annotation/PivotValue.java | 0 .../excel/applib/service/ExcelServiceDefault.java | 0 .../extensions/excel/applib/service/_CellMarshaller.java | 0 .../extensions/excel/applib/service/_ExcelConverter.java | 0 .../excel/applib/service/_ExcelServiceHelper.java | 0 .../extensions/excel/applib/util/AnnotationList.java | 0 .../extensions/excel/applib/util/AnnotationTriplet.java | 0 .../excel/applib/util/ExcelFileBlobConverter.java | 0 .../isis/extensions/excel/applib/util/PivotUtils.java | 0 .../isis/extensions/excel/applib/util/SheetPivoter.java | 0 .../extensions/excel/applib/util/AnnotationListTest.java | 0 .../excel/applib/util/AnnotationTripletTest.java | 0 .../extensions/excel/applib/util/PivotUtilsTest.java | 0 .../extensions/excel/applib/util/SheetPivoterTest.java | 0 extensions/{applib => core}/excel/fixture/.gitignore | 0 .../excel/fixture/logging-dn-enhance.properties | 0 extensions/{applib => core}/excel/fixture/pom.xml | 0 .../excel/fixture/src/main/java/META-INF/persistence.xml | 0 .../excel/fixtures/IsisModuleExtExcelFixtures.java | 0 .../contributions/ExcelDemoToDoItem_export.java | 0 .../contributions/ExcelDemoToDoItem_export2.java | 0 .../bulkupdate/BulkUpdateLineItemForDemoToDoItem.java | 0 .../BulkUpdateLineItemForDemoToDoItem.layout.xml | 0 .../dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java | 0 .../BulkUpdateManagerForDemoToDoItem.layout.xml | 0 .../dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java | 0 .../dom/pivot/ExcelPivotByCategoryAndSubcategory.java | 0 .../pivot/ExcelPivotByCategoryAndSubcategoryMenu.java | 0 .../demotodoitem/DemoToDoItemRowHandler.java | 0 .../demotodoitem/DemoToDoItemRowHandler2.java | 0 .../excelupload/ExcelUploadRowHandler4ToDoItem.java | 0 .../excelupload/ExcelUploadServiceForDemoToDoItem.java | 0 .../DemoFixture_extending_ExcelFixture2.java | 0 .../DemoToDoItem_create_usingExcelFixture.java | 0 .../DemoToDoItem_recreate_usingExcelFixture.java | 0 .../demoapp/demomodule/fixturescripts/MoreToDoItems.xlsx | Bin .../demoapp/demomodule/fixturescripts/ToDoItems.xlsx | Bin .../excel/fixtures/demoapp/todomodule/dom/Category.java | 0 .../demoapp/todomodule/dom/DependenciesComparator.java | 0 .../demoapp/todomodule/dom/ExcelDemoToDoItem-done.png | Bin .../demoapp/todomodule/dom/ExcelDemoToDoItem-todo.png | Bin .../demoapp/todomodule/dom/ExcelDemoToDoItem.java | 0 .../demoapp/todomodule/dom/ExcelDemoToDoItem.layout.xml | 0 .../demoapp/todomodule/dom/ExcelDemoToDoItem.png | Bin .../demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java | 0 .../fixtures/demoapp/todomodule/dom/Subcategory.java | 0 .../fixturescripts/ExcelDemoToDoItem_recreate5_for.java | 0 .../ExcelDemoToDoItem_recreate5_forSven.java | 0 .../fixturescripts/ExcelDemoToDoItem_tearDown.java | 0 .../fixturescripts/ExcelDemoToDoItem_tearDown2.java | 0 .../{applib => core}/excel/integtests/log4j2-test.xml | 0 extensions/{applib => core}/excel/integtests/pom.xml | 0 .../excel/integtests/ExcelModuleIntegTestAbstract.java | 0 .../tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java | 0 ...celModuleDemoToDoItemBulkUpdateManager_IntegTest.java | 0 .../tests/ExcelModuleDemoUploadService_IntegTest.java | 0 .../integtests/tests/ToDoItemsWithMultipleSheets.xlsx | Bin .../excel/integtests/tests/toDoItems-expected.xlsx | Bin .../excel/integtests/tests/toDoItems-updated.xlsx | Bin .../excel/integtests/toDoItems-actual.xlsx | Bin .../{applib => core}/excel/integtests/translations.pot | 0 extensions/{applib => core}/excel/pom.xml | 0 extensions/{applib => core}/excel/testing/pom.xml | 0 .../isis/extensions/excel/testing/ExcelFixture.java | 0 .../isis/extensions/excel/testing/ExcelFixture2.java | 0 .../extensions/excel/testing/ExcelFixtureRowHandler.java | 0 .../excel/testing/ExcelFixtureWorkbookHandler.java | 0 .../extensions/excel/testing/FixtureAwareRowHandler.java | 0 .../excel/testing/IsisModuleExtExcelTesting.java | 0 extensions/pom.xml | 5 ++--- .../adoc/modules/fullcalendar/partials/module-nav.adoc | 2 +- .../vw/pdfjs/adoc/modules/pdfjs/partials/module-nav.adoc | 2 +- extensions/vw/sse/adoc/antora.yml | 2 +- .../vw/sse/adoc/modules/sse/partials/module-nav.adoc | 4 +--- .../wicket/adoc/modules/ROOT/partials/extensions.adoc | 1 + 94 files changed, 17 insertions(+), 18 deletions(-) diff --git a/antora/playbooks/site-extensions.yml b/antora/playbooks/site-extensions.yml index 26f9893199..9e8e48bfbb 100644 --- a/antora/playbooks/site-extensions.yml +++ b/antora/playbooks/site-extensions.yml @@ -38,10 +38,10 @@ content: branches: HEAD - url: . - start_path: extensions/applib/excel/adoc # extensions + start_path: extensions/core/commandlog/adoc # extensions branches: HEAD - url: . - start_path: extensions/core/commandlog/adoc # extensions + start_path: extensions/core/excel/adoc # extensions branches: HEAD - url: . start_path: extensions/core/executionlog/adoc # extensions diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml index 9e3d086730..12743c3ce5 100644 --- a/antora/playbooks/site.yml +++ b/antora/playbooks/site.yml @@ -108,20 +108,21 @@ content: start_path: extensions/adoc # extensions branches: HEAD + - url: . - start_path: extensions/applib/excel/adoc # extensions + start_path: extensions/core/commandlog/adoc # userguide branches: HEAD - url: . - start_path: extensions/core/commandlog/adoc # extensions + start_path: extensions/core/excel/adoc # userguide branches: HEAD - url: . - start_path: extensions/core/executionlog/adoc # extensions + start_path: extensions/core/executionlog/adoc # userguide branches: HEAD - url: . - start_path: extensions/core/executionoutbox/adoc # extensions + start_path: extensions/core/executionoutbox/adoc # userguide branches: HEAD - url: . - start_path: extensions/core/executionrepublisher/adoc # extensions + start_path: extensions/core/executionrepublisher/adoc # userguide branches: HEAD - url: . start_path: extensions/core/flyway/adoc # userguide @@ -149,6 +150,7 @@ content: - url: . start_path: extensions/vro/cors/adoc # vro branches: HEAD + - url: . start_path: extensions/vw/exceldownload/adoc # vw branches: HEAD @@ -161,9 +163,8 @@ content: - url: . start_path: extensions/vw/pdfjs/adoc # vw branches: HEAD - - url: . - start_path: extensions/vw/sse/adoc # extensions + start_path: extensions/vw/sse/adoc # vw branches: HEAD # incubator diff --git a/extensions/applib/excel/adoc/antora.yml b/extensions/core/excel/adoc/antora.yml similarity index 100% rename from extensions/applib/excel/adoc/antora.yml rename to extensions/core/excel/adoc/antora.yml diff --git a/extensions/applib/excel/adoc/modules/excel/nav.adoc b/extensions/core/excel/adoc/modules/excel/nav.adoc similarity index 100% rename from extensions/applib/excel/adoc/modules/excel/nav.adoc rename to extensions/core/excel/adoc/modules/excel/nav.adoc diff --git a/extensions/applib/excel/adoc/modules/excel/pages/about.adoc b/extensions/core/excel/adoc/modules/excel/pages/about.adoc similarity index 100% rename from extensions/applib/excel/adoc/modules/excel/pages/about.adoc rename to extensions/core/excel/adoc/modules/excel/pages/about.adoc diff --git a/extensions/applib/excel/adoc/modules/excel/partials/module-nav.adoc b/extensions/core/excel/adoc/modules/excel/partials/module-nav.adoc similarity index 100% rename from extensions/applib/excel/adoc/modules/excel/partials/module-nav.adoc rename to extensions/core/excel/adoc/modules/excel/partials/module-nav.adoc diff --git a/extensions/applib/excel/applib/pom.xml b/extensions/core/excel/applib/pom.xml similarity index 100% rename from extensions/applib/excel/applib/pom.xml rename to extensions/core/excel/applib/pom.xml diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/AggregationType.java b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/AggregationType.java similarity index 100% rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/AggregationType.java rename to extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/AggregationType.java diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/ExcelMetaDataEnabled.java b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/ExcelMetaDataEnabled.java similarity index 100% rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/ExcelMetaDataEnabled.java rename to extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/ExcelMetaDataEnabled.java diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/ExcelService.java b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/ExcelService.java similarity index 100% rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/ExcelService.java rename to extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/ExcelService.java diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/IsisModuleExtExcelApplib.java b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/IsisModuleExtExcelApplib.java similarity index 100% rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/IsisModuleExtExcelApplib.java rename to extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/IsisModuleExtExcelApplib.java diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/Mode.java b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/Mode.java similarity index 100% rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/Mode.java rename to extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/Mode.java diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/RowHandler.java b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/RowHandler.java similarity index 100% rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/RowHandler.java rename to extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/RowHandler.java diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/WorksheetContent.java b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/WorksheetContent.java similarity index 100% rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/WorksheetContent.java rename to extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/WorksheetContent.java diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/WorksheetSpec.java b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/WorksheetSpec.java similarity index 100% rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/WorksheetSpec.java rename to extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/WorksheetSpec.java diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/HyperLink.java b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/HyperLink.java similarity index 100% rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/HyperLink.java rename to extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/HyperLink.java diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotColumn.java b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotColumn.java similarity index 100% rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotColumn.java rename to extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotColumn.java diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotDecoration.java b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotDecoration.java similarity index 100% rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotDecoration.java rename to extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotDecoration.java diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotRow.java b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotRow.java similarity index 100% rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotRow.java rename to extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotRow.java diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotValue.java b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotValue.java similarity index 100% rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotValue.java rename to extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/annotation/PivotValue.java diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/ExcelServiceDefault.java b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/ExcelServiceDefault.java similarity index 100% rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/ExcelServiceDefault.java rename to extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/ExcelServiceDefault.java diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_CellMarshaller.java b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_CellMarshaller.java similarity index 100% rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_CellMarshaller.java rename to extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_CellMarshaller.java diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelConverter.java b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelConverter.java similarity index 100% rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelConverter.java rename to extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelConverter.java diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelServiceHelper.java b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelServiceHelper.java similarity index 100% rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelServiceHelper.java rename to extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/service/_ExcelServiceHelper.java diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/AnnotationList.java b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/AnnotationList.java similarity index 100% rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/AnnotationList.java rename to extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/AnnotationList.java diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/AnnotationTriplet.java b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/AnnotationTriplet.java similarity index 100% rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/AnnotationTriplet.java rename to extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/AnnotationTriplet.java diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/ExcelFileBlobConverter.java b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/ExcelFileBlobConverter.java similarity index 100% rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/ExcelFileBlobConverter.java rename to extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/ExcelFileBlobConverter.java diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/PivotUtils.java b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/PivotUtils.java similarity index 100% rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/PivotUtils.java rename to extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/PivotUtils.java diff --git a/extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/SheetPivoter.java b/extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/SheetPivoter.java similarity index 100% rename from extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/SheetPivoter.java rename to extensions/core/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/util/SheetPivoter.java diff --git a/extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/AnnotationListTest.java b/extensions/core/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/AnnotationListTest.java similarity index 100% rename from extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/AnnotationListTest.java rename to extensions/core/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/AnnotationListTest.java diff --git a/extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/AnnotationTripletTest.java b/extensions/core/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/AnnotationTripletTest.java similarity index 100% rename from extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/AnnotationTripletTest.java rename to extensions/core/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/AnnotationTripletTest.java diff --git a/extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/PivotUtilsTest.java b/extensions/core/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/PivotUtilsTest.java similarity index 100% rename from extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/PivotUtilsTest.java rename to extensions/core/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/PivotUtilsTest.java diff --git a/extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/SheetPivoterTest.java b/extensions/core/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/SheetPivoterTest.java similarity index 100% rename from extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/SheetPivoterTest.java rename to extensions/core/excel/applib/src/test/java/org/apache/isis/extensions/excel/applib/util/SheetPivoterTest.java diff --git a/extensions/applib/excel/fixture/.gitignore b/extensions/core/excel/fixture/.gitignore similarity index 100% rename from extensions/applib/excel/fixture/.gitignore rename to extensions/core/excel/fixture/.gitignore diff --git a/extensions/applib/excel/fixture/logging-dn-enhance.properties b/extensions/core/excel/fixture/logging-dn-enhance.properties similarity index 100% rename from extensions/applib/excel/fixture/logging-dn-enhance.properties rename to extensions/core/excel/fixture/logging-dn-enhance.properties diff --git a/extensions/applib/excel/fixture/pom.xml b/extensions/core/excel/fixture/pom.xml similarity index 100% rename from extensions/applib/excel/fixture/pom.xml rename to extensions/core/excel/fixture/pom.xml diff --git a/extensions/applib/excel/fixture/src/main/java/META-INF/persistence.xml b/extensions/core/excel/fixture/src/main/java/META-INF/persistence.xml similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/META-INF/persistence.xml rename to extensions/core/excel/fixture/src/main/java/META-INF/persistence.xml diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/IsisModuleExtExcelFixtures.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/IsisModuleExtExcelFixtures.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/IsisModuleExtExcelFixtures.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/IsisModuleExtExcelFixtures.java diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.layout.xml b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.layout.xml similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.layout.xml rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.layout.xml diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.layout.xml b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.layout.xml similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.layout.xml rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.layout.xml diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java 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/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/MoreToDoItems.xlsx b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/MoreToDoItems.xlsx similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/MoreToDoItems.xlsx rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/MoreToDoItems.xlsx diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/ToDoItems.xlsx b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/ToDoItems.xlsx similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/ToDoItems.xlsx rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/demomodule/fixturescripts/ToDoItems.xlsx diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Category.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Category.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Category.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Category.java diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/DependenciesComparator.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/DependenciesComparator.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/DependenciesComparator.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/DependenciesComparator.java diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-done.png b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-done.png similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-done.png rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-done.png diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-todo.png b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-todo.png similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-todo.png rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-todo.png diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.layout.xml b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.layout.xml similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.layout.xml rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.layout.xml diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.png b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.png similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.png rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.png diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Subcategory.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Subcategory.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Subcategory.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/dom/Subcategory.java diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java diff --git a/extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java b/extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java similarity index 100% rename from extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java rename to extensions/core/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java diff --git a/extensions/applib/excel/integtests/log4j2-test.xml b/extensions/core/excel/integtests/log4j2-test.xml similarity index 100% rename from extensions/applib/excel/integtests/log4j2-test.xml rename to extensions/core/excel/integtests/log4j2-test.xml diff --git a/extensions/applib/excel/integtests/pom.xml b/extensions/core/excel/integtests/pom.xml similarity index 100% rename from extensions/applib/excel/integtests/pom.xml rename to extensions/core/excel/integtests/pom.xml diff --git a/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java b/extensions/core/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java similarity index 100% rename from extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java rename to extensions/core/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/ExcelModuleIntegTestAbstract.java diff --git a/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java b/extensions/core/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java similarity index 100% rename from extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java rename to extensions/core/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java diff --git a/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java b/extensions/core/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java similarity index 100% rename from extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java rename to extensions/core/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java diff --git a/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java b/extensions/core/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java similarity index 100% rename from extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java rename to extensions/core/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java diff --git a/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ToDoItemsWithMultipleSheets.xlsx b/extensions/core/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ToDoItemsWithMultipleSheets.xlsx similarity index 100% rename from extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ToDoItemsWithMultipleSheets.xlsx rename to extensions/core/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/ToDoItemsWithMultipleSheets.xlsx diff --git a/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-expected.xlsx b/extensions/core/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-expected.xlsx similarity index 100% rename from extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-expected.xlsx rename to extensions/core/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-expected.xlsx diff --git a/extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-updated.xlsx b/extensions/core/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-updated.xlsx similarity index 100% rename from extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-updated.xlsx rename to extensions/core/excel/integtests/src/test/java/org/apache/isis/extensions/excel/integtests/tests/toDoItems-updated.xlsx diff --git a/extensions/applib/excel/integtests/toDoItems-actual.xlsx b/extensions/core/excel/integtests/toDoItems-actual.xlsx similarity index 100% rename from extensions/applib/excel/integtests/toDoItems-actual.xlsx rename to extensions/core/excel/integtests/toDoItems-actual.xlsx diff --git a/extensions/applib/excel/integtests/translations.pot b/extensions/core/excel/integtests/translations.pot similarity index 100% rename from extensions/applib/excel/integtests/translations.pot rename to extensions/core/excel/integtests/translations.pot diff --git a/extensions/applib/excel/pom.xml b/extensions/core/excel/pom.xml similarity index 100% rename from extensions/applib/excel/pom.xml rename to extensions/core/excel/pom.xml diff --git a/extensions/applib/excel/testing/pom.xml b/extensions/core/excel/testing/pom.xml similarity index 100% rename from extensions/applib/excel/testing/pom.xml rename to extensions/core/excel/testing/pom.xml diff --git a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture.java b/extensions/core/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture.java similarity index 100% rename from extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture.java rename to extensions/core/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture.java diff --git a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture2.java b/extensions/core/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture2.java similarity index 100% rename from extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture2.java rename to extensions/core/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixture2.java diff --git a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixtureRowHandler.java b/extensions/core/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixtureRowHandler.java similarity index 100% rename from extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixtureRowHandler.java rename to extensions/core/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixtureRowHandler.java diff --git a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixtureWorkbookHandler.java b/extensions/core/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixtureWorkbookHandler.java similarity index 100% rename from extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixtureWorkbookHandler.java rename to extensions/core/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/ExcelFixtureWorkbookHandler.java diff --git a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/FixtureAwareRowHandler.java b/extensions/core/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/FixtureAwareRowHandler.java similarity index 100% rename from extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/FixtureAwareRowHandler.java rename to extensions/core/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/FixtureAwareRowHandler.java diff --git a/extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/IsisModuleExtExcelTesting.java b/extensions/core/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/IsisModuleExtExcelTesting.java similarity index 100% rename from extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/IsisModuleExtExcelTesting.java rename to extensions/core/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/IsisModuleExtExcelTesting.java diff --git a/extensions/pom.xml b/extensions/pom.xml index db3535adfa..d4bf006406 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -431,7 +431,7 @@ <artifactId>isis-extensions-cors-impl</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> - + <dependency> <groupId>org.apache.isis.extensions</groupId> <artifactId>isis-extensions-spring-security-oauth2</artifactId> @@ -485,9 +485,9 @@ </dependencies> <modules> - <module>applib/excel</module> <module>core/commandlog</module> + <module>core/excel</module> <module>core/executionlog</module> <module>core/executionoutbox</module> <module>core/executionrepublisher</module> @@ -501,7 +501,6 @@ <module>security/spring-oauth2</module> <module>security/sessionlog</module> - <module>vro/cors</module> <module>vw/exceldownload</module> diff --git a/extensions/vw/fullcalendar/adoc/modules/fullcalendar/partials/module-nav.adoc b/extensions/vw/fullcalendar/adoc/modules/fullcalendar/partials/module-nav.adoc index 3c2dc4fb6e..f577e841cf 100644 --- a/extensions/vw/fullcalendar/adoc/modules/fullcalendar/partials/module-nav.adoc +++ b/extensions/vw/fullcalendar/adoc/modules/fullcalendar/partials/module-nav.adoc @@ -1,5 +1,5 @@ -** xref:vw:fullcalendar:about.adoc[fullcalendar] +** xref:vw:fullcalendar:about.adoc[Full Calendar] diff --git a/extensions/vw/pdfjs/adoc/modules/pdfjs/partials/module-nav.adoc b/extensions/vw/pdfjs/adoc/modules/pdfjs/partials/module-nav.adoc index 8d2e9a6bea..68e550cd53 100644 --- a/extensions/vw/pdfjs/adoc/modules/pdfjs/partials/module-nav.adoc +++ b/extensions/vw/pdfjs/adoc/modules/pdfjs/partials/module-nav.adoc @@ -1,5 +1,5 @@ -** xref:vw:pdfjs:about.adoc[pdf.js] +** xref:vw:pdfjs:about.adoc[PDF.js] diff --git a/extensions/vw/sse/adoc/antora.yml b/extensions/vw/sse/adoc/antora.yml index f59b33f37e..c1675fed61 100644 --- a/extensions/vw/sse/adoc/antora.yml +++ b/extensions/vw/sse/adoc/antora.yml @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. -name: extensions +name: vw version: latest diff --git a/extensions/vw/sse/adoc/modules/sse/partials/module-nav.adoc b/extensions/vw/sse/adoc/modules/sse/partials/module-nav.adoc index d296ffc554..ddb345e20e 100644 --- a/extensions/vw/sse/adoc/modules/sse/partials/module-nav.adoc +++ b/extensions/vw/sse/adoc/modules/sse/partials/module-nav.adoc @@ -1,5 +1,3 @@ - - -* xref:extensions:sse:about.adoc[SSE] +** xref:vw:sse:about.adoc[SSE] diff --git a/viewers/wicket/adoc/modules/ROOT/partials/extensions.adoc b/viewers/wicket/adoc/modules/ROOT/partials/extensions.adoc index af455004a4..f25c4191bc 100644 --- a/viewers/wicket/adoc/modules/ROOT/partials/extensions.adoc +++ b/viewers/wicket/adoc/modules/ROOT/partials/extensions.adoc @@ -2,3 +2,4 @@ include::vw:exceldownload:partial$module-nav.adoc[] include::vw:fullcalendar:partial$module-nav.adoc[] include::vw:gmap3:partial$module-nav.adoc[] include::vw:pdfjs:partial$module-nav.adoc[] +include::vw:sse:partial$module-nav.adoc[]
