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/04/15 06:18:38 UTC
[isis] branch master updated (a018b258c1 -> 9b3d5f973e)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
from a018b258c1 Merge pull request #908 from apache/dependabot/maven/master/com.graphql-java-graphql-java-18.0
add e84237ff29 ISIS-3001: moves subdomains/excel to extensions/applib/excel
add 91af7520b3 ISIS-3001: further minor cleanup
add 9ef3b470f5 ISIS-3001: more tidy up
add 2d0f201427 ISIS-3001: fix depMgmt spelling
add 9d147f9928 ISIS-3001: more tidy up
add 3c05149659 ISIS-3001: fixes some compile issues
add 593866f13e ISIS-3001: fixes antora.yml for moved module
new 9b3d5f973e Merge pull request #909 from apache/ISIS-3001
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../modules/ROOT/partials/extensions.adoc | 1 +
.../userguide/modules/fun/pages/modules.adoc | 28 +--
antora/playbooks/site-extensions.yml | 3 +
antora/playbooks/site-mappings.yml | 74 --------
antora/playbooks/site-subdomains.yml | 83 ---------
antora/playbooks/site.yml | 10 +-
.../org/apache/isis/applib/annotation/Module.java | 4 +-
bom/pom.xml | 10 +-
.../command-log => applib/excel}/adoc/antora.yml | 0
.../applib/excel/adoc/modules/excel}/nav.adoc | 0
.../excel/adoc/modules/excel/pages/about.adoc | 0
.../adoc/modules/excel/partials/module-nav.adoc | 4 +
.../applib}/excel/applib/pom.xml | 12 +-
.../excel/applib/IsisModuleExtExcelApplib.java | 6 +-
.../excel/applib/dom/AggregationType.java | 2 +-
.../excel/applib/dom/ExcelMetaDataEnabled.java | 2 +-
.../extensions}/excel/applib/dom/ExcelService.java | 6 +-
.../extensions}/excel/applib/dom/HyperLink.java | 2 +-
.../extensions}/excel/applib/dom/PivotColumn.java | 2 +-
.../excel/applib/dom/PivotDecoration.java | 2 +-
.../extensions}/excel/applib/dom/PivotRow.java | 2 +-
.../extensions}/excel/applib/dom/PivotValue.java | 2 +-
.../extensions}/excel/applib/dom/RowHandler.java | 2 +-
.../excel/applib/dom/WorksheetContent.java | 2 +-
.../excel/applib/dom/WorksheetSpec.java | 4 +-
.../excel/applib/service/ExcelServiceDefault.java | 10 +-
.../excel/applib/service/_CellMarshaller.java | 4 +-
.../excel/applib/service/_ExcelConverter.java | 28 +--
.../excel/applib/service/_ExcelServiceHelper.java | 14 +-
.../excel/applib/util/AnnotationList.java | 2 +-
.../excel/applib/util/AnnotationTriplet.java | 2 +-
.../excel/applib/util/ExcelFileBlobConverter.java | 6 +-
.../isis/extensions}/excel/applib/util/Mode.java | 2 +-
.../extensions}/excel/applib/util/PivotUtils.java | 4 +-
.../excel/applib/util/SheetPivoter.java | 6 +-
.../excel/applib/util/AnnotationListTest.java | 6 +-
.../excel/applib/util/AnnotationTripletTest.java | 4 +-
.../excel/applib/util/PivotUtilsTest.java | 4 +-
.../excel/applib/util/SheetPivoterTest.java | 2 +-
.../applib}/excel/fixture/.gitignore | 0
.../excel/fixture/logging-dn-enhance.properties | 0
.../applib}/excel/fixture/pom.xml | 24 +--
.../fixture/src/main/java/META-INF/persistence.xml | 0
.../excel/fixtures/IsisModuleExtExcelFixtures.java | 10 +-
.../contributions/ExcelDemoToDoItem_export.java | 8 +-
.../contributions/ExcelDemoToDoItem_export2.java | 8 +-
.../BulkUpdateLineItemForDemoToDoItem.java | 10 +-
.../BulkUpdateLineItemForDemoToDoItem.layout.xml | 0
.../BulkUpdateManagerForDemoToDoItem.java | 20 +--
.../BulkUpdateManagerForDemoToDoItem.layout.xml | 0
.../bulkupdate/BulkUpdateMenuForDemoToDoItem.java | 8 +-
.../pivot/ExcelPivotByCategoryAndSubcategory.java | 14 +-
.../ExcelPivotByCategoryAndSubcategoryMenu.java | 6 +-
.../demotodoitem/DemoToDoItemRowHandler.java | 14 +-
.../demotodoitem/DemoToDoItemRowHandler2.java | 12 +-
.../ExcelUploadRowHandler4ToDoItem.java | 14 +-
.../ExcelUploadServiceForDemoToDoItem.java | 6 +-
.../DemoFixture_extending_ExcelFixture2.java | 10 +-
.../DemoToDoItem_create_usingExcelFixture.java | 8 +-
.../DemoToDoItem_recreate_usingExcelFixture.java | 4 +-
.../demomodule/fixturescripts/MoreToDoItems.xlsx | Bin
.../demomodule/fixturescripts/ToDoItems.xlsx | Bin
.../fixtures/demoapp/todomodule/dom/Category.java | 2 +-
.../todomodule/dom/DependenciesComparator.java | 2 +-
.../todomodule/dom/ExcelDemoToDoItem-done.png | Bin
.../todomodule/dom/ExcelDemoToDoItem-todo.png | Bin
.../demoapp/todomodule/dom/ExcelDemoToDoItem.java | 17 +-
.../todomodule/dom/ExcelDemoToDoItem.layout.xml | 0
.../demoapp/todomodule/dom/ExcelDemoToDoItem.png | Bin
.../todomodule/dom/ExcelDemoToDoItemMenu.java | 2 +-
.../demoapp/todomodule/dom/Subcategory.java | 2 +-
.../ExcelDemoToDoItem_recreate5_for.java | 10 +-
.../ExcelDemoToDoItem_recreate5_forSven.java | 2 +-
.../fixturescripts/ExcelDemoToDoItem_tearDown.java | 4 +-
.../ExcelDemoToDoItem_tearDown2.java | 2 +-
.../applib}/excel/integtests/log4j2-test.xml | 0
.../applib}/excel/integtests/pom.xml | 30 +++-
.../integtests/ExcelModuleIntegTestAbstract.java | 10 +-
.../ExcelModuleDemoMetaDataEnabled_IntegTest.java | 8 +-
...uleDemoToDoItemBulkUpdateManager_IntegTest.java | 18 +-
.../ExcelModuleDemoUploadService_IntegTest.java | 14 +-
.../tests/ToDoItemsWithMultipleSheets.xlsx | Bin
.../excel/integtests/tests/toDoItems-expected.xlsx | Bin
.../excel/integtests/tests/toDoItems-updated.xlsx | Bin
.../applib}/excel/integtests/toDoItems-actual.xlsx | Bin
.../applib}/excel/integtests/translations.pot | 16 +-
{subdomains => extensions/applib}/excel/pom.xml | 9 +-
.../applib}/excel/testing/pom.xml | 16 +-
.../extensions}/excel/testing/ExcelFixture.java | 8 +-
.../extensions}/excel/testing/ExcelFixture2.java | 10 +-
.../excel/testing/ExcelFixtureRowHandler.java | 2 +-
.../excel/testing/ExcelFixtureWorkbookHandler.java | 2 +-
.../excel/testing/FixtureAwareRowHandler.java | 4 +-
.../excel/testing/IsisModuleExtExcelTesting.java | 8 +-
.../core/outbox-publisher}/.gitkeep | 0
extensions/pom.xml | 24 +++
isis-tooling.yml | 7 +-
pom.xml | 10 +-
starters/pom.xml | 18 +-
subdomains/adoc/antora.yml | 23 ---
subdomains/adoc/modules/ROOT/nav.adoc | 4 -
subdomains/adoc/modules/ROOT/pages/about.adoc | 5 -
.../adoc/modules/ROOT/partials/component-nav.adoc | 14 --
.../adoc/modules/ROOT/partials/module-nav.adoc | 3 -
subdomains/excel/adoc/antora.yml | 19 --
subdomains/excel/adoc/modules/excel/nav.adoc | 4 -
.../adoc/modules/excel/partials/module-nav.adoc | 6 -
subdomains/pom.xml | 198 ---------------------
.../modules/tooling-cli/examples/isis-tooling.yml | 15 +-
.../apache/isis/tooling/cli/test/isis-tooling.yml | 20 +--
110 files changed, 338 insertions(+), 763 deletions(-)
delete mode 100644 antora/playbooks/site-mappings.yml
delete mode 100644 antora/playbooks/site-subdomains.yml
copy extensions/{core/command-log => applib/excel}/adoc/antora.yml (100%)
copy {antora/components/userguide/modules/btb => extensions/applib/excel/adoc/modules/excel}/nav.adoc (100%)
rename {subdomains => extensions/applib}/excel/adoc/modules/excel/pages/about.adoc (100%)
create mode 100644 extensions/applib/excel/adoc/modules/excel/partials/module-nav.adoc
rename {subdomains => extensions/applib}/excel/applib/pom.xml (91%)
rename subdomains/excel/applib/src/main/java/org/apache/isis/subdomains/excel/applib/IsisModuleSubdomainsExcelApplib.java => extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions/excel/applib/IsisModuleExtExcelApplib.java (87%)
rename {subdomains/excel/applib/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions}/excel/applib/dom/AggregationType.java (94%)
rename {subdomains/excel/applib/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions}/excel/applib/dom/ExcelMetaDataEnabled.java (94%)
rename {subdomains/excel/applib/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions}/excel/applib/dom/ExcelService.java (96%)
rename {subdomains/excel/applib/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions}/excel/applib/dom/HyperLink.java (95%)
rename {subdomains/excel/applib/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions}/excel/applib/dom/PivotColumn.java (95%)
rename {subdomains/excel/applib/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions}/excel/applib/dom/PivotDecoration.java (95%)
rename {subdomains/excel/applib/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions}/excel/applib/dom/PivotRow.java (95%)
rename {subdomains/excel/applib/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions}/excel/applib/dom/PivotValue.java (95%)
rename {subdomains/excel/applib/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions}/excel/applib/dom/RowHandler.java (95%)
rename {subdomains/excel/applib/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions}/excel/applib/dom/WorksheetContent.java (96%)
rename {subdomains/excel/applib/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions}/excel/applib/dom/WorksheetSpec.java (97%)
rename {subdomains/excel/applib/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions}/excel/applib/service/ExcelServiceDefault.java (95%)
rename {subdomains/excel/applib/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions}/excel/applib/service/_CellMarshaller.java (99%)
rename {subdomains/excel/applib/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions}/excel/applib/service/_ExcelConverter.java (96%)
rename {subdomains/excel/applib/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions}/excel/applib/service/_ExcelServiceHelper.java (95%)
rename {subdomains/excel/applib/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions}/excel/applib/util/AnnotationList.java (96%)
rename {subdomains/excel/applib/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions}/excel/applib/util/AnnotationTriplet.java (96%)
rename {subdomains/excel/applib/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions}/excel/applib/util/ExcelFileBlobConverter.java (93%)
rename {subdomains/excel/applib/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions}/excel/applib/util/Mode.java (95%)
rename {subdomains/excel/applib/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions}/excel/applib/util/PivotUtils.java (97%)
rename {subdomains/excel/applib/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/main/java/org/apache/isis/extensions}/excel/applib/util/SheetPivoter.java (99%)
rename {subdomains/excel/applib/src/test/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions}/excel/applib/util/AnnotationListTest.java (90%)
rename {subdomains/excel/applib/src/test/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions}/excel/applib/util/AnnotationTripletTest.java (95%)
rename {subdomains/excel/applib/src/test/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions}/excel/applib/util/PivotUtilsTest.java (98%)
rename {subdomains/excel/applib/src/test/java/org/apache/isis/subdomains => extensions/applib/excel/applib/src/test/java/org/apache/isis/extensions}/excel/applib/util/SheetPivoterTest.java (99%)
rename {subdomains => extensions/applib}/excel/fixture/.gitignore (100%)
rename {subdomains => extensions/applib}/excel/fixture/logging-dn-enhance.properties (100%)
rename {subdomains => extensions/applib}/excel/fixture/pom.xml (85%)
rename {subdomains => extensions/applib}/excel/fixture/src/main/java/META-INF/persistence.xml (100%)
rename subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains/excel/fixtures/IsisModuleSubdomainsExcelFixtures.java => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions/excel/fixtures/IsisModuleExtExcelFixtures.java (82%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export.java (87%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/demomodule/contributions/ExcelDemoToDoItem_export2.java (89%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.java (94%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateLineItemForDemoToDoItem.layout.xml (100%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.java (92%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateManagerForDemoToDoItem.layout.xml (100%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/demomodule/dom/bulkupdate/BulkUpdateMenuForDemoToDoItem.java (91%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategory.java (80%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/demomodule/dom/pivot/ExcelPivotByCategoryAndSubcategoryMenu.java (93%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler.java (88%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/demomodule/fixturehandlers/demotodoitem/DemoToDoItemRowHandler2.java (86%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadRowHandler4ToDoItem.java (87%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/demomodule/fixturehandlers/excelupload/ExcelUploadServiceForDemoToDoItem.java (93%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/demomodule/fixturescripts/DemoFixture_extending_ExcelFixture2.java (86%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_create_usingExcelFixture.java (91%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/demomodule/fixturescripts/DemoToDoItem_recreate_usingExcelFixture.java (93%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/demomodule/fixturescripts/MoreToDoItems.xlsx (100%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/demomodule/fixturescripts/ToDoItems.xlsx (100%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/todomodule/dom/Category.java (96%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/todomodule/dom/DependenciesComparator.java (95%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-done.png (100%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem-todo.png (100%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.java (95%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.layout.xml (100%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItem.png (100%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/todomodule/dom/ExcelDemoToDoItemMenu.java (99%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/todomodule/dom/Subcategory.java (96%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_for.java (93%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_recreate5_forSven.java (94%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown.java (90%)
rename {subdomains/excel/fixture/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/fixture/src/main/java/org/apache/isis/extensions}/excel/fixtures/demoapp/todomodule/fixturescripts/ExcelDemoToDoItem_tearDown2.java (96%)
rename {subdomains => extensions/applib}/excel/integtests/log4j2-test.xml (100%)
rename {subdomains => extensions/applib}/excel/integtests/pom.xml (77%)
rename {subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains => extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions}/excel/integtests/ExcelModuleIntegTestAbstract.java (89%)
rename {subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains => extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions}/excel/integtests/tests/ExcelModuleDemoMetaDataEnabled_IntegTest.java (92%)
rename {subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains => extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions}/excel/integtests/tests/ExcelModuleDemoToDoItemBulkUpdateManager_IntegTest.java (89%)
rename {subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains => extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions}/excel/integtests/tests/ExcelModuleDemoUploadService_IntegTest.java (83%)
rename {subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains => extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions}/excel/integtests/tests/ToDoItemsWithMultipleSheets.xlsx (100%)
rename {subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains => extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions}/excel/integtests/tests/toDoItems-expected.xlsx (100%)
rename {subdomains/excel/integtests/src/test/java/org/apache/isis/subdomains => extensions/applib/excel/integtests/src/test/java/org/apache/isis/extensions}/excel/integtests/tests/toDoItems-updated.xlsx (100%)
rename {subdomains => extensions/applib}/excel/integtests/toDoItems-actual.xlsx (100%)
rename {subdomains => extensions/applib}/excel/integtests/translations.pot (98%)
rename {subdomains => extensions/applib}/excel/pom.xml (85%)
rename {subdomains => extensions/applib}/excel/testing/pom.xml (81%)
rename {subdomains/excel/testing/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions}/excel/testing/ExcelFixture.java (96%)
rename {subdomains/excel/testing/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions}/excel/testing/ExcelFixture2.java (93%)
rename {subdomains/excel/testing/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions}/excel/testing/ExcelFixtureRowHandler.java (95%)
rename {subdomains/excel/testing/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions}/excel/testing/ExcelFixtureWorkbookHandler.java (95%)
rename {subdomains/excel/testing/src/main/java/org/apache/isis/subdomains => extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions}/excel/testing/FixtureAwareRowHandler.java (91%)
rename subdomains/excel/testing/src/main/java/org/apache/isis/subdomains/excel/testing/IsisModuleSubdomainsExcelTesting.java => extensions/applib/excel/testing/src/main/java/org/apache/isis/extensions/excel/testing/IsisModuleExtExcelTesting.java (82%)
copy {examples/demo/domain/src/main/java/demoapp/dom/domain/actions/ActionLayout/bookmarking => extensions/core/outbox-publisher}/.gitkeep (100%)
delete mode 100644 subdomains/adoc/antora.yml
delete mode 100644 subdomains/adoc/modules/ROOT/nav.adoc
delete mode 100644 subdomains/adoc/modules/ROOT/pages/about.adoc
delete mode 100644 subdomains/adoc/modules/ROOT/partials/component-nav.adoc
delete mode 100644 subdomains/adoc/modules/ROOT/partials/module-nav.adoc
delete mode 100644 subdomains/excel/adoc/antora.yml
delete mode 100644 subdomains/excel/adoc/modules/excel/nav.adoc
delete mode 100644 subdomains/excel/adoc/modules/excel/partials/module-nav.adoc
delete mode 100644 subdomains/pom.xml
[isis] 01/01: Merge pull request #909 from apache/ISIS-3001
Posted by da...@apache.org.
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 9b3d5f973eafc3173ec03621b55a72c01ed356d4
Merge: a018b258c1 593866f13e
Author: Dan Haywood <da...@apache.org>
AuthorDate: Fri Apr 15 07:18:32 2022 +0100
Merge pull request #909 from apache/ISIS-3001
Isis 3001
.../modules/ROOT/partials/extensions.adoc | 1 +
.../userguide/modules/fun/pages/modules.adoc | 28 +--
antora/playbooks/site-extensions.yml | 3 +
antora/playbooks/site-mappings.yml | 74 --------
antora/playbooks/site-subdomains.yml | 83 ---------
antora/playbooks/site.yml | 10 +-
.../org/apache/isis/applib/annotation/Module.java | 4 +-
bom/pom.xml | 10 +-
.../applib}/excel/adoc/antora.yml | 2 +-
.../applib/excel/adoc/modules/excel/nav.adoc | 3 +-
.../excel/adoc/modules/excel/pages/about.adoc | 0
.../adoc/modules/excel/partials/module-nav.adoc | 4 +
.../applib}/excel/applib/pom.xml | 12 +-
.../excel/applib/IsisModuleExtExcelApplib.java | 6 +-
.../excel/applib/dom/AggregationType.java | 2 +-
.../excel/applib/dom/ExcelMetaDataEnabled.java | 2 +-
.../extensions}/excel/applib/dom/ExcelService.java | 6 +-
.../extensions}/excel/applib/dom/HyperLink.java | 2 +-
.../extensions}/excel/applib/dom/PivotColumn.java | 2 +-
.../excel/applib/dom/PivotDecoration.java | 2 +-
.../extensions}/excel/applib/dom/PivotRow.java | 2 +-
.../extensions}/excel/applib/dom/PivotValue.java | 2 +-
.../extensions}/excel/applib/dom/RowHandler.java | 2 +-
.../excel/applib/dom/WorksheetContent.java | 2 +-
.../excel/applib/dom/WorksheetSpec.java | 4 +-
.../excel/applib/service/ExcelServiceDefault.java | 10 +-
.../excel/applib/service/_CellMarshaller.java | 4 +-
.../excel/applib/service/_ExcelConverter.java | 28 +--
.../excel/applib/service/_ExcelServiceHelper.java | 14 +-
.../excel/applib/util/AnnotationList.java | 2 +-
.../excel/applib/util/AnnotationTriplet.java | 2 +-
.../excel/applib/util/ExcelFileBlobConverter.java | 6 +-
.../isis/extensions}/excel/applib/util/Mode.java | 2 +-
.../extensions}/excel/applib/util/PivotUtils.java | 4 +-
.../excel/applib/util/SheetPivoter.java | 6 +-
.../excel/applib/util/AnnotationListTest.java | 6 +-
.../excel/applib/util/AnnotationTripletTest.java | 4 +-
.../excel/applib/util/PivotUtilsTest.java | 4 +-
.../excel/applib/util/SheetPivoterTest.java | 2 +-
.../applib}/excel/fixture/.gitignore | 0
.../excel/fixture/logging-dn-enhance.properties | 0
.../applib}/excel/fixture/pom.xml | 24 +--
.../fixture/src/main/java/META-INF/persistence.xml | 0
.../excel/fixtures/IsisModuleExtExcelFixtures.java | 10 +-
.../contributions/ExcelDemoToDoItem_export.java | 8 +-
.../contributions/ExcelDemoToDoItem_export2.java | 8 +-
.../BulkUpdateLineItemForDemoToDoItem.java | 10 +-
.../BulkUpdateLineItemForDemoToDoItem.layout.xml | 0
.../BulkUpdateManagerForDemoToDoItem.java | 20 +--
.../BulkUpdateManagerForDemoToDoItem.layout.xml | 0
.../bulkupdate/BulkUpdateMenuForDemoToDoItem.java | 8 +-
.../pivot/ExcelPivotByCategoryAndSubcategory.java | 14 +-
.../ExcelPivotByCategoryAndSubcategoryMenu.java | 6 +-
.../demotodoitem/DemoToDoItemRowHandler.java | 14 +-
.../demotodoitem/DemoToDoItemRowHandler2.java | 12 +-
.../ExcelUploadRowHandler4ToDoItem.java | 14 +-
.../ExcelUploadServiceForDemoToDoItem.java | 6 +-
.../DemoFixture_extending_ExcelFixture2.java | 10 +-
.../DemoToDoItem_create_usingExcelFixture.java | 8 +-
.../DemoToDoItem_recreate_usingExcelFixture.java | 4 +-
.../demomodule/fixturescripts/MoreToDoItems.xlsx | Bin
.../demomodule/fixturescripts/ToDoItems.xlsx | Bin
.../fixtures/demoapp/todomodule/dom/Category.java | 2 +-
.../todomodule/dom/DependenciesComparator.java | 2 +-
.../todomodule/dom/ExcelDemoToDoItem-done.png | Bin
.../todomodule/dom/ExcelDemoToDoItem-todo.png | Bin
.../demoapp/todomodule/dom/ExcelDemoToDoItem.java | 17 +-
.../todomodule/dom/ExcelDemoToDoItem.layout.xml | 0
.../demoapp/todomodule/dom/ExcelDemoToDoItem.png | Bin
.../todomodule/dom/ExcelDemoToDoItemMenu.java | 2 +-
.../demoapp/todomodule/dom/Subcategory.java | 2 +-
.../ExcelDemoToDoItem_recreate5_for.java | 10 +-
.../ExcelDemoToDoItem_recreate5_forSven.java | 2 +-
.../fixturescripts/ExcelDemoToDoItem_tearDown.java | 4 +-
.../ExcelDemoToDoItem_tearDown2.java | 2 +-
.../applib}/excel/integtests/log4j2-test.xml | 0
.../applib}/excel/integtests/pom.xml | 30 +++-
.../integtests/ExcelModuleIntegTestAbstract.java | 10 +-
.../ExcelModuleDemoMetaDataEnabled_IntegTest.java | 8 +-
...uleDemoToDoItemBulkUpdateManager_IntegTest.java | 18 +-
.../ExcelModuleDemoUploadService_IntegTest.java | 14 +-
.../tests/ToDoItemsWithMultipleSheets.xlsx | Bin
.../excel/integtests/tests/toDoItems-expected.xlsx | Bin
.../excel/integtests/tests/toDoItems-updated.xlsx | Bin
.../applib}/excel/integtests/toDoItems-actual.xlsx | Bin
.../applib}/excel/integtests/translations.pot | 16 +-
{subdomains => extensions/applib}/excel/pom.xml | 9 +-
.../applib}/excel/testing/pom.xml | 16 +-
.../extensions}/excel/testing/ExcelFixture.java | 8 +-
.../extensions}/excel/testing/ExcelFixture2.java | 10 +-
.../excel/testing/ExcelFixtureRowHandler.java | 2 +-
.../excel/testing/ExcelFixtureWorkbookHandler.java | 2 +-
.../excel/testing/FixtureAwareRowHandler.java | 4 +-
.../excel/testing/IsisModuleExtExcelTesting.java | 8 +-
extensions/core/outbox-publisher/.gitkeep | 0
extensions/pom.xml | 24 +++
isis-tooling.yml | 7 +-
pom.xml | 10 +-
starters/pom.xml | 18 +-
subdomains/adoc/antora.yml | 23 ---
subdomains/adoc/modules/ROOT/nav.adoc | 4 -
.../adoc/modules/ROOT/partials/component-nav.adoc | 14 --
.../adoc/modules/ROOT/partials/module-nav.adoc | 3 -
subdomains/excel/adoc/modules/excel/nav.adoc | 4 -
.../adoc/modules/excel/partials/module-nav.adoc | 6 -
subdomains/pom.xml | 198 ---------------------
.../modules/tooling-cli/examples/isis-tooling.yml | 15 +-
.../apache/isis/tooling/cli/test/isis-tooling.yml | 20 +--
108 files changed, 340 insertions(+), 742 deletions(-)