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/10 09:07:00 UTC
[isis] branch ISIS-3037 updated (3948d4a535 -> 7551f13d07)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch ISIS-3037
in repository https://gitbox.apache.org/repos/asf/isis.git
from 3948d4a535 ISIS-3037: fixes compile issues with XxxTestDomainPersona
add fc29a5f1ee ISIS-3041 blank added
add 0a3755f2e7 ISIS-2957 unused code removed
add 9c015cfca3 ISIS-3042 add PdfJs for KitchenSink
add 386c48717b Merge pull request #922 from apache/ISIS-3037
add 80db671f46 Merge branch 'master' of https://github.com/apache/isis
add bb68d174dc ISIS-3043 Upgrade Node / npm
add 649773c9c4 ISIS-3041 Duplicated sentence removed
add 4f52497720 ISIS-3041 space between see & xref
add 7a950e2d45 ISIS-3044 set LogEntry.type for Menubars
add a60e0f99b4 ISIS-3044 set default height for RoDialogs to 50%
add 26d62f046f ISIS-3039: incorporate clone of github.com/42Lines/wicket-fullcalendar
add c03f50c8bb ISIS-3039: joda to java.time conversions
add a2ecb7bd33 ISIS-3039: minor code quality
add e868d6f8c7 bring in changes from mholzer85
add eec3b635f0 ISIS-3039: restructure modules
add 5a2b484170 ISIS-3039: initial working sample
add 3a1aeb44ae ISIS-3039: some minor simplifications
add 0ff71aa3d6 Merge remote-tracking branch 'origin/master' into 3039-fullcalendar
add 6d06de0143 ISIS-3039: purge old config
add 1d29d9a17e ISIS-3039: object mapper fix
add fb75a58140 ISIS-3039: just comments
add 6635ef019c ISIS-3039: remove MIT licensed sources
add 2193e978e8 ISIS-3039: remove css resources
add 7c7cfa2e02 ISIS-3039: reinstate abandoned full-cal config settings
add 7c5336c28d ISIS-3039: reinstate abandoned EventSource.events as a js function
add 55033bf9a9 Merge pull request #923 from apache/3039-fullcalendar
add 9e979b4346 Bump datanucleus-api-jpa from 6.0.0-m4 to 6.0.0-m5
add 3a0fb64d95 Merge pull request #924 from apache/dependabot/maven/master/org.datanucleus-datanucleus-api-jpa-6.0.0-m5
add d564210f03 Bump datanucleus-jodatime from 6.0.0-m4 to 6.0.0-m5
add 04ad54400c Merge pull request #925 from apache/dependabot/maven/master/org.datanucleus-datanucleus-jodatime-6.0.0-m5
add 7a5bf245d1 Bump DN core 6.0.0-m4 -> 6.0.0-m5
add f071b97556 ISIS-3040: reorg. project structure
add f58311cac9 ISIS-3040: minor code review/cleanup
add a79851b93e ISIS-3040: split out former wicketstuff code into its own artifact (wicket/integration)
add 34bbde4bbd ISIS-3040: adds java-doc; also cleaning up code further
add 017e72aafd ISIS-3040: wording
add bc73061677 ISIS-3040: align package names with module names
add 01ec74693c ISIS-3040: fixes import in graphql demo app (after prev. commit)
add 6a8baea213 Bump maven-site-plugin from 3.11.0 to 3.12.0
add 63f6e0ba33 Merge pull request #926 from apache/dependabot/maven/master/org.apache.maven.plugins-maven-site-plugin-3.12.0
add ddf6f6a61c ISIS-3040: separation of concerns
add 1e56fe9d6c ISIS-3040: convert all resource references to singletons (optimization)
new 7551f13d07 ISIS-3037: rationalizes PersonaEnumPersistAll with v1
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:
.../components/userguide/modules/fun/pages/ui.adoc | 2 +-
.../fun/pages/ui/object-titles-and-icons.adoc | 3 +-
bom/pom.xml | 17 +-
core/pom.xml | 6 -
.../repainting/PdfJsViewerAdvisorFallback.java | 10 +-
examples/demo/wicket/common/pom.xml | 4 +-
.../wicket/common/ui/DemoAppWicketCommon.java | 2 +-
.../webapp/wicket/jdo/DemoAppWicketJdo.java | 2 +-
.../webapp/wicket/jpa/DemoAppWicketJpa.java | 4 +-
.../webapp/wicket/jpa/DemoAppWicketJpa.java | 2 +-
extensions/applib/excel/fixture/pom.xml | 17 --
extensions/pom.xml | 19 +-
extensions/vw/fullcalendar/applib/pom.xml | 2 +-
extensions/vw/fullcalendar/pom.xml | 4 +-
.../ui => fullcalendar/wicket/integration}/pom.xml | 41 ++-
.../wkt/fullcalendar/AbstractFullCalendar.java | 46 ++++
.../fullcalendar/wkt/fullcalendar/ButtonText.java} | 16 +-
.../wkt/fullcalendar/CalendarConfig.java | 99 +++++++
.../wkt/fullcalendar/CalendarResponse.java | 116 +++++++++
.../fullcalendar/wkt/fullcalendar/Event.java} | 41 +--
.../wkt/fullcalendar/EventProvider.java | 47 ++++
.../fullcalendar/wkt/fullcalendar/EventSource.java | 94 +++++++
.../wkt/fullcalendar/FullCalendar.java | 240 +++++++++++++++++
.../fullcalendar/wkt/fullcalendar/Header.java} | 20 +-
.../fullcalendar/wkt/fullcalendar/ViewType.java} | 19 +-
.../fullcalendar/wkt/fullcalendar/_Json.java | 92 +++++++
.../callback/AbstractAjaxCallback.java} | 39 +--
.../AbstractAjaxCallbackWithClientsideRevert.java | 68 +++++
.../fullcalendar/callback/AbstractCallback.java | 71 ++++++
.../fullcalendar/callback/AbstractEventParam.java} | 17 +-
.../callback/AbstractShiftedEventParam.java | 55 ++++
.../fullcalendar/callback/AjaxConcurrency.java} | 17 +-
.../fullcalendar/callback/BlockingDecorator.java | 66 +++++
.../callback/CallbackWithHandler.java} | 12 +-
.../wkt/fullcalendar/callback/ClickedEvent.java} | 13 +-
.../callback/DateRangeSelectedCallback.java | 60 +++++
.../wkt/fullcalendar/callback/DroppedEvent.java} | 20 +-
.../callback/EventClickedCallback.java | 58 +++++
.../callback/EventDroppedCallback.java | 70 +++++
.../callback/EventResizedCallback.java | 70 +++++
.../fullcalendar/callback/GetEventsCallback.java | 55 ++++
.../wkt/fullcalendar/callback/ResizedEvent.java} | 13 +-
.../wkt/fullcalendar/callback/SelectedRange.java} | 16 +-
.../wkt/fullcalendar/callback/View.java} | 19 +-
.../fullcalendar/callback/ViewDisplayCallback.java | 72 ++++++
.../wkt/fullcalendar/package-info.java} | 15 +-
.../res/FullCalendarCssReference.java} | 35 ++-
.../res/FullCalendarEventSourceEvents.java | 55 ++++
.../res/FullCalendarIntegrationJsReference.java | 69 +++++
.../fullcalendar/res/FullCalendarJsReference.java} | 34 ++-
.../res/fullcalendar-event-source-events.js} | 27 +-
.../fullcalendar/res/fullcalendar-integration.js | 153 +++++++++++
.../selector/EventSourceSelector.java} | 39 +--
extensions/vw/fullcalendar/{ => wicket}/pom.xml | 20 +-
extensions/vw/fullcalendar/{ => wicket}/ui/pom.xml | 33 +--
.../wkt/viewer}/CalendaredCollectionAbstract.java | 45 ++--
.../CalendaredCollectionFactoryAbstract.java | 2 +-
.../wkt/viewer}/EventProviderAbstract.java | 81 +++---
.../wkt/viewer}/FullCalendarWithEventHandling.java | 12 +-
.../wkt/viewer}/IsisModuleExtFullCalendarUi.java | 6 +-
.../fullcalendar/wkt/viewer/_Sample.java | 204 +++++++++++++++
.../CalendarableCollectionAsFullCalendar.css | 4 +
.../CalendarableCollectionAsFullCalendar.html | 2 +-
.../CalendarableCollectionAsFullCalendar.java | 7 +-
...alendarableCollectionAsFullCalendarFactory.java | 4 +-
.../calendarable/CalendarableEventProvider.java | 4 +-
.../CalendarEventableCollectionAsFullCalendar.css | 3 +
.../CalendarEventableCollectionAsFullCalendar.html | 2 +-
.../CalendarEventableCollectionAsFullCalendar.java | 7 +-
...arEventableCollectionAsFullCalendarFactory.java | 4 +-
.../CalendarEventableEventProvider.java | 4 +-
.../ui/wkt/callback/GetEventsCallbackTest.java | 12 +
extensions/vw/pdfjs/applib/pom.xml | 2 +-
.../pdfjs/applib/annotations/PdfJsViewer.java | 11 +-
.../viewer/wicket/pdfjs/applib/config/Scale.java | 22 +-
.../pdfjs/applib/spi/PdfJsViewerAdvisor.java | 284 +++------------------
extensions/vw/pdfjs/fixtures/pom.xml | 180 +------------
.../wicket/pdfjs/fixture/PdfjsFixturesModule.java | 4 +-
extensions/vw/pdfjs/metamodel/pom.xml | 2 +-
.../pdfjs/metamodel/facet/PdfJsViewerFacet.java | 2 +-
.../metamodel/facet/PdfJsViewerFacetAbstract.java | 12 +-
extensions/vw/pdfjs/pom.xml | 4 +-
.../java/org/wicketstuff/pdfjs/PdfJsReference.java | 51 ----
extensions/vw/pdfjs/wicket/integration/pom.xml | 63 +++++
.../wicket/pdfjs/wkt/integration}/PdfJsPanel.html | 0
.../wicket/pdfjs/wkt/integration}/PdfJsPanel.java | 50 ++--
.../integration/res/PdfJsIntegrationReference.java | 57 +++++
.../pdfjs/wkt/integration/res/PdfJsReference.java | 65 +++++
.../wicket/pdfjs/wkt/integration}/res/pdf.js | 0
.../pdfjs/wkt/integration}/res/pdf.worker.js | 0
.../wkt/integration/res/pdfjs-integration.js} | 0
.../vw/{fullcalendar => pdfjs/wicket}/pom.xml | 20 +-
extensions/vw/pdfjs/wicket/ui/pom.xml | 66 +++++
.../wicket/pdfjs/wkt}/ui/IsisModuleExtPdfjsUi.java | 4 +-
.../components/PdfJsViewerCallbacksReference.java} | 23 +-
.../ui/components/PdfJsViewerCssReference.java} | 33 ++-
.../wkt/ui/components/PdfJsViewerJsReference.java} | 25 +-
.../pdfjs/wkt}/ui/components/PdfJsViewerPanel.css | 0
.../pdfjs/wkt}/ui/components/PdfJsViewerPanel.html | 0
.../pdfjs/wkt}/ui/components/PdfJsViewerPanel.java | 57 ++---
.../pdfjs/wkt}/ui/components/PdfJsViewerPanel.js | 0
.../PdfJsViewerPanelCallbacks.template.js | 6 +-
.../PdfJsViewerPanelComponentFactory.java | 17 +-
.../ui/components/ScalarModelSubscriberLegacy.java | 2 +-
.../ui/components/ScalarPanelAbstractLegacy.java | 2 +-
incubator/clients/kroviz/build.gradle.kts | 1 +
.../isis/client/kroviz/core/event/LogEntry.kt | 8 +
.../apache/isis/client/kroviz/ui/core/RoDialog.kt | 2 +-
.../kroviz/utils/js/ChartjsPluginDatalabels.kt | 7 -
.../apache/isis/client/kroviz/utils/js/PdfJs.kt | 67 +++++
starters/pom.xml | 10 +-
supplemental-model/pom.xml | 2 +-
.../applib/setup/PersonaEnumPersistAll.java | 7 +-
.../fixtures/applib/personas/dom/Employee.java | 12 +
.../fixtures/applib/personas/dom/Person.java | 14 +
.../applib/personas/dom/PersonRepository.java | 18 ++
.../applib/personas/fixtures/Customer_persona.java | 1 +
.../applib/personas/fixtures/EmployeeBuilder.java | 25 ++
.../personas/fixtures/PersistAllFixtureScript.java | 18 +-
.../personas/fixtures/PersonBuilderScript.java | 25 ++
.../{Customer_persona.java => Person_persona.java} | 16 +-
.../personas/fixtures/ScenarioFixtureScript.java | 13 +-
.../applib/personas/fixtures/ScenarioTest.java | 14 +
.../viewer/wicket/model/models/ScalarModel.java | 18 +-
.../wicket/ui/util/LicensedTextTemplate.java | 60 +++++
.../org/apache/isis/viewer/wicket/ui/util/Wkt.java | 10 +
126 files changed, 3053 insertions(+), 1018 deletions(-)
rename extensions/vw/{pdfjs/ui => fullcalendar/wicket/integration}/pom.xml (60%)
create mode 100644 extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/AbstractFullCalendar.java
copy extensions/vw/{pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/ScalarModelSubscriberLegacy.java => fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/ButtonText.java} (64%)
create mode 100644 extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/CalendarConfig.java
create mode 100644 extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/CalendarResponse.java
copy extensions/vw/{pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/PdfJsViewerReference.java => fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/Event.java} (53%)
create mode 100644 extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/EventProvider.java
create mode 100644 extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/EventSource.java
create mode 100644 extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/FullCalendar.java
copy extensions/vw/{pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/ScalarModelSubscriberLegacy.java => fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/Header.java} (63%)
copy extensions/vw/{pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/ScalarModelSubscriberLegacy.java => fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/ViewType.java} (61%)
create mode 100644 extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/_Json.java
copy extensions/vw/{pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/PdfJsViewerReference.java => fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractAjaxCallback.java} (52%)
create mode 100644 extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractAjaxCallbackWithClientsideRevert.java
create mode 100644 extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractCallback.java
copy extensions/vw/{pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/facet/PdfJsViewerFacet.java => fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractEventParam.java} (63%)
create mode 100644 extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractShiftedEventParam.java
copy extensions/vw/{pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/ScalarModelSubscriberLegacy.java => fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/callback/AjaxConcurrency.java} (71%)
create mode 100644 extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/callback/BlockingDecorator.java
copy extensions/vw/{pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/ScalarModelSubscriberLegacy.java => fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/callback/CallbackWithHandler.java} (71%)
copy extensions/vw/{pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/ScalarModelSubscriberLegacy.java => fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/callback/ClickedEvent.java} (66%)
create mode 100644 extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/callback/DateRangeSelectedCallback.java
copy extensions/vw/{pdfjs/fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/PdfjsFixturesModule.java => fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/callback/DroppedEvent.java} (59%)
create mode 100644 extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/callback/EventClickedCallback.java
create mode 100644 extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/callback/EventDroppedCallback.java
create mode 100644 extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/callback/EventResizedCallback.java
create mode 100644 extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/callback/GetEventsCallback.java
copy extensions/vw/{pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/facet/PdfJsViewerFacet.java => fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/callback/ResizedEvent.java} (64%)
copy extensions/vw/{pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/ScalarModelSubscriberLegacy.java => fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/callback/SelectedRange.java} (71%)
copy extensions/vw/{pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/ScalarModelSubscriberLegacy.java => fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/callback/View.java} (65%)
create mode 100644 extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/callback/ViewDisplayCallback.java
copy extensions/vw/{pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/ScalarModelSubscriberLegacy.java => fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/package-info.java} (70%)
copy extensions/vw/{pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/PdfJsViewerReference.java => fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarCssReference.java} (54%)
create mode 100644 extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarEventSourceEvents.java
create mode 100644 extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarIntegrationJsReference.java
rename extensions/vw/{pdfjs/ui/src/main/java/org/wicketstuff/pdfjs/WicketStuffPdfJsReference.java => fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarJsReference.java} (54%)
copy extensions/vw/{pdfjs/metamodel/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/metamodel/facet/PdfJsViewerFacet.java => fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/res/fullcalendar-event-source-events.js} (59%)
create mode 100644 extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/res/fullcalendar-integration.js
copy extensions/vw/{pdfjs/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/PdfJsViewerPanel.css => fullcalendar/wicket/integration/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/fullcalendar/selector/EventSourceSelector.java} (56%)
copy extensions/vw/fullcalendar/{ => wicket}/pom.xml (72%)
rename extensions/vw/fullcalendar/{ => wicket}/ui/pom.xml (76%)
rename extensions/vw/fullcalendar/{ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component => wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer}/CalendaredCollectionAbstract.java (77%)
rename extensions/vw/fullcalendar/{ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component => wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer}/CalendaredCollectionFactoryAbstract.java (97%)
rename extensions/vw/fullcalendar/{ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component => wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer}/EventProviderAbstract.java (75%)
rename extensions/vw/fullcalendar/{ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component => wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer}/FullCalendarWithEventHandling.java (88%)
rename extensions/vw/fullcalendar/{ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component => wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer}/IsisModuleExtFullCalendarUi.java (80%)
create mode 100644 extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer/_Sample.java
rename extensions/vw/fullcalendar/{ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component => wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer}/calendarable/CalendarableCollectionAsFullCalendar.css (95%)
rename extensions/vw/fullcalendar/{ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component => wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer}/calendarable/CalendarableCollectionAsFullCalendar.html (94%)
rename extensions/vw/fullcalendar/{ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component => wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer}/calendarable/CalendarableCollectionAsFullCalendar.java (89%)
rename extensions/vw/fullcalendar/{ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component => wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer}/calendarable/CalendarableCollectionAsFullCalendarFactory.java (90%)
rename extensions/vw/fullcalendar/{ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component => wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer}/calendarable/CalendarableEventProvider.java (93%)
rename extensions/vw/fullcalendar/{ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component => wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer}/calendareventable/CalendarEventableCollectionAsFullCalendar.css (94%)
rename extensions/vw/fullcalendar/{ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component => wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer}/calendareventable/CalendarEventableCollectionAsFullCalendar.html (95%)
rename extensions/vw/fullcalendar/{ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component => wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer}/calendareventable/CalendarEventableCollectionAsFullCalendar.java (88%)
rename extensions/vw/fullcalendar/{ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component => wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer}/calendareventable/CalendarEventableCollectionAsFullCalendarFactory.java (90%)
rename extensions/vw/fullcalendar/{ui/src/main/java/org/apache/isis/extensions/fullcalendar/ui/component => wicket/ui/src/main/java/org/apache/isis/extensions/fullcalendar/wkt/viewer}/calendareventable/CalendarEventableEventProvider.java (92%)
create mode 100644 extensions/vw/fullcalendar/wicket/ui/src/test/java/org/apache/isis/extensions/fullcalendar/ui/wkt/callback/GetEventsCallbackTest.java
delete mode 100644 extensions/vw/pdfjs/ui/src/main/java/org/wicketstuff/pdfjs/PdfJsReference.java
create mode 100644 extensions/vw/pdfjs/wicket/integration/pom.xml
rename extensions/vw/pdfjs/{ui/src/main/java/org/wicketstuff/pdfjs => wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration}/PdfJsPanel.html (100%)
rename extensions/vw/pdfjs/{ui/src/main/java/org/wicketstuff/pdfjs => wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration}/PdfJsPanel.java (52%)
create mode 100644 extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration/res/PdfJsIntegrationReference.java
create mode 100644 extensions/vw/pdfjs/wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration/res/PdfJsReference.java
rename extensions/vw/pdfjs/{ui/src/main/java/org/wicketstuff/pdfjs => wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration}/res/pdf.js (100%)
rename extensions/vw/pdfjs/{ui/src/main/java/org/wicketstuff/pdfjs => wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration}/res/pdf.worker.js (100%)
rename extensions/vw/pdfjs/{ui/src/main/java/org/wicketstuff/pdfjs/res/wicketstuff-pdf.js => wicket/integration/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/integration/res/pdfjs-integration.js} (100%)
copy extensions/vw/{fullcalendar => pdfjs/wicket}/pom.xml (72%)
create mode 100644 extensions/vw/pdfjs/wicket/ui/pom.xml
rename extensions/vw/pdfjs/{ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs => wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt}/ui/IsisModuleExtPdfjsUi.java (88%)
copy extensions/vw/pdfjs/{fixtures/src/main/java/org/isisaddons/wicket/pdfjs/fixture/PdfjsFixturesModule.java => wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerCallbacksReference.java} (54%)
copy extensions/vw/pdfjs/{ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/PdfJsViewerReference.java => wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerCssReference.java} (55%)
rename extensions/vw/pdfjs/{ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/ui/components/PdfJsViewerReference.java => wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt/ui/components/PdfJsViewerJsReference.java} (63%)
rename extensions/vw/pdfjs/{ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs => wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt}/ui/components/PdfJsViewerPanel.css (100%)
rename extensions/vw/pdfjs/{ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs => wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt}/ui/components/PdfJsViewerPanel.html (100%)
rename extensions/vw/pdfjs/{ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs => wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt}/ui/components/PdfJsViewerPanel.java (86%)
rename extensions/vw/pdfjs/{ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs => wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt}/ui/components/PdfJsViewerPanel.js (100%)
rename extensions/vw/pdfjs/{ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs => wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt}/ui/components/PdfJsViewerPanelCallbacks.template.js (81%)
rename extensions/vw/pdfjs/{ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs => wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt}/ui/components/PdfJsViewerPanelComponentFactory.java (83%)
rename extensions/vw/pdfjs/{ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs => wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt}/ui/components/ScalarModelSubscriberLegacy.java (93%)
rename extensions/vw/pdfjs/{ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs => wicket/ui/src/main/java/org/apache/isis/extensions/viewer/wicket/pdfjs/wkt}/ui/components/ScalarPanelAbstractLegacy.java (99%)
delete mode 100644 incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/js/ChartjsPluginDatalabels.kt
create mode 100644 incubator/clients/kroviz/src/main/kotlin/org/apache/isis/client/kroviz/utils/js/PdfJs.kt
create mode 100644 testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/dom/Employee.java
create mode 100644 testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/dom/Person.java
create mode 100644 testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/dom/PersonRepository.java
create mode 100644 testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/EmployeeBuilder.java
create mode 100644 testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/PersonBuilderScript.java
copy testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/{Customer_persona.java => Person_persona.java} (52%)
create mode 100644 testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/ScenarioTest.java
create mode 100644 viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/LicensedTextTemplate.java
[isis] 01/01: ISIS-3037: rationalizes PersonaEnumPersistAll with v1
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-3037
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 7551f13d0752c15633843221b633b9b005b8f51a
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue May 10 10:06:34 2022 +0100
ISIS-3037: rationalizes PersonaEnumPersistAll with v1
---
.../applib/setup/PersonaEnumPersistAll.java | 7 +++---
.../fixtures/applib/personas/dom/Employee.java | 12 +++++++++++
.../fixtures/applib/personas/dom/Person.java | 14 ++++++++++++
.../applib/personas/dom/PersonRepository.java | 18 ++++++++++++++++
.../applib/personas/fixtures/Customer_persona.java | 1 +
.../applib/personas/fixtures/EmployeeBuilder.java | 25 ++++++++++++++++++++++
.../personas/fixtures/PersistAllFixtureScript.java | 18 ++++++----------
.../personas/fixtures/PersonBuilderScript.java | 25 ++++++++++++++++++++++
.../{Customer_persona.java => Person_persona.java} | 16 +++++++-------
.../personas/fixtures/ScenarioFixtureScript.java | 13 +++++------
.../applib/personas/fixtures/ScenarioTest.java | 14 ++++++++++++
11 files changed, 132 insertions(+), 31 deletions(-)
diff --git a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/setup/PersonaEnumPersistAll.java b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/setup/PersonaEnumPersistAll.java
index 9108ba1392..09920a86f3 100644
--- a/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/setup/PersonaEnumPersistAll.java
+++ b/testing/fixtures/applib/src/main/java/org/apache/isis/testing/fixtures/applib/setup/PersonaEnumPersistAll.java
@@ -32,10 +32,9 @@ import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
* @since 2.x {@index}
*/
@Programmatic
-public class PersonaEnumPersistAll<E extends Enum<E> & PersonaWithBuilderScript<T, ? extends BuilderScriptAbstract<T>>, T>
-
-extends FixtureScript
-implements FixtureScriptWithExecutionStrategy {
+public class PersonaEnumPersistAll<T, E extends Enum<E> & PersonaWithBuilderScript<T, B>, B extends BuilderScriptAbstract<T>>
+ extends FixtureScript
+ implements FixtureScriptWithExecutionStrategy {
private final Class<E> personaEnumClass;
diff --git a/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/dom/Employee.java b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/dom/Employee.java
new file mode 100644
index 0000000000..cc79297d1f
--- /dev/null
+++ b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/dom/Employee.java
@@ -0,0 +1,12 @@
+package org.apache.isis.testing.fixtures.applib.personas.dom;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class Employee {
+
+ private Person person;
+
+}
diff --git a/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/dom/Person.java b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/dom/Person.java
new file mode 100644
index 0000000000..b540b29b76
--- /dev/null
+++ b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/dom/Person.java
@@ -0,0 +1,14 @@
+package org.apache.isis.testing.fixtures.applib.personas.dom;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class Person {
+
+ private String firstName;
+ private String lastName;
+ private int age;
+
+}
diff --git a/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/dom/PersonRepository.java b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/dom/PersonRepository.java
new file mode 100644
index 0000000000..6f298a9bc8
--- /dev/null
+++ b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/dom/PersonRepository.java
@@ -0,0 +1,18 @@
+package org.apache.isis.testing.fixtures.applib.personas.dom;
+
+import java.util.Optional;
+
+public class PersonRepository {
+
+ public Person create(String firstName, String lastName, int age) {
+ return Person.builder()
+ .firstName(firstName)
+ .lastName(lastName)
+ .age(age)
+ .build();
+ }
+
+ public Optional<Person> findById(int id) {
+ return Optional.empty();
+ }
+}
diff --git a/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/Customer_persona.java b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/Customer_persona.java
index 7ed18efc57..22259efa88 100644
--- a/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/Customer_persona.java
+++ b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/Customer_persona.java
@@ -1,5 +1,6 @@
package org.apache.isis.testing.fixtures.applib.personas.fixtures;
+
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.testing.fixtures.applib.personas.Persona;
import org.apache.isis.testing.fixtures.applib.personas.dom.Customer;
diff --git a/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/EmployeeBuilder.java b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/EmployeeBuilder.java
new file mode 100644
index 0000000000..f30a2094fe
--- /dev/null
+++ b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/EmployeeBuilder.java
@@ -0,0 +1,25 @@
+package org.apache.isis.testing.fixtures.applib.personas.fixtures;
+
+import javax.resource.spi.work.ExecutionContext;
+
+import org.apache.isis.testing.fixtures.applib.personas.BuilderScriptAbstract;
+import org.apache.isis.testing.fixtures.applib.personas.dom.Employee;
+import org.apache.isis.testing.fixtures.applib.personas.dom.Person;
+
+import lombok.Getter;
+
+
+public class EmployeeBuilder extends BuilderScriptAbstract<Employee> {
+
+ private Person_persona persona;
+
+ @Getter
+ private Employee object;
+
+ @Override
+ protected void execute(ExecutionContext executionContext) {
+ Person person = objectFor(persona, executionContext);
+ object = Employee.builder().person(person).build();
+ }
+
+}
diff --git a/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/PersistAllFixtureScript.java b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/PersistAllFixtureScript.java
index c742cb6da2..90748e7ce4 100644
--- a/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/PersistAllFixtureScript.java
+++ b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/PersistAllFixtureScript.java
@@ -1,26 +1,22 @@
package org.apache.isis.testing.fixtures.applib.personas.fixtures;
-import java.util.List;
-
-import javax.inject.Inject;
+import javax.resource.spi.work.ExecutionContext;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.isis.testing.fixtures.applib.personas.BuilderScriptWithResult;
-import org.apache.isis.testing.fixtures.applib.personas.dom.Customer;
-import org.apache.isis.testing.fixtures.applib.personas.dom.CustomerRepository;
+import org.apache.isis.testing.fixtures.applib.personas.dom.Person;
import org.apache.isis.testing.fixtures.applib.setup.PersonaEnumPersistAll;
-import lombok.RequiredArgsConstructor;
-import lombok.val;
-
public class PersistAllFixtureScript extends FixtureScript {
@Override
protected void execute(ExecutionContext executionContext) {
- val persistAll = new PersonaEnumPersistAll<>(Customer_persona.class);
+ // create them all.
+ final PersonaEnumPersistAll<Person, Person_persona, PersonBuilderScript> persistAll = new PersonaEnumPersistAll<>(Person_persona.class);
+
+ executionContext.executeChildren(this, Person_persona.SteveSingle, Person_persona.MeghanMarriedMum);
- List<Customer> customers = executionContext.executeChildT(this, persistAll).getObjects();
+ Person person = executionContext.executeChildT(this, Person_persona.SteveSingle.builder()).getObject();
}
}
diff --git a/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/PersonBuilderScript.java b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/PersonBuilderScript.java
new file mode 100644
index 0000000000..15fb4de10c
--- /dev/null
+++ b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/PersonBuilderScript.java
@@ -0,0 +1,25 @@
+package org.apache.isis.testing.fixtures.applib.personas.fixtures;
+
+import javax.inject.Inject;
+import javax.resource.spi.work.ExecutionContext;
+
+import org.apache.isis.testing.fixtures.applib.personas.BuilderScriptWithResult;
+import org.apache.isis.testing.fixtures.applib.personas.dom.Person;
+import org.apache.isis.testing.fixtures.applib.personas.dom.PersonRepository;
+
+import lombok.RequiredArgsConstructor;
+
+
+@RequiredArgsConstructor
+public class PersonBuilderScript extends BuilderScriptWithResult<Person> {
+
+ private final Person_persona persona;
+
+ @Override
+ protected Person buildResult(ExecutionContext ec) {
+ return customerRepository.create(persona.getFirstName(), persona.getLastName(), persona.getAge());
+ }
+
+ @Inject PersonRepository customerRepository;
+
+}
diff --git a/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/Customer_persona.java b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/Person_persona.java
similarity index 52%
copy from testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/Customer_persona.java
copy to testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/Person_persona.java
index 7ed18efc57..ef4cd0f685 100644
--- a/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/Customer_persona.java
+++ b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/Person_persona.java
@@ -2,16 +2,16 @@ package org.apache.isis.testing.fixtures.applib.personas.fixtures;
import org.apache.isis.applib.services.registry.ServiceRegistry;
import org.apache.isis.testing.fixtures.applib.personas.Persona;
-import org.apache.isis.testing.fixtures.applib.personas.dom.Customer;
-import org.apache.isis.testing.fixtures.applib.personas.dom.CustomerRepository;
+import org.apache.isis.testing.fixtures.applib.personas.dom.Person;
+import org.apache.isis.testing.fixtures.applib.personas.dom.PersonRepository;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@Getter
@RequiredArgsConstructor
-public enum Customer_persona
- implements Persona<Customer, CustomerBuilderScript> {
+public enum Person_persona
+ implements Persona<Person, PersonBuilderScript> {
SteveSingle(1, "Steve", "Single", 21),
MeghanMarriedMum(2, "Meghan", "Married-Mum", 35);
@@ -22,12 +22,12 @@ public enum Customer_persona
private final int age;
@Override
- public CustomerBuilderScript builder() {
- return new CustomerBuilderScript(this);
+ public PersonBuilderScript builder() {
+ return new PersonBuilderScript(this);
}
@Override
- public Customer findUsing(ServiceRegistry serviceRegistry) {
- return serviceRegistry.lookupServiceElseFail(CustomerRepository.class).findById(id).orElseThrow();
+ public Person findUsing(ServiceRegistry serviceRegistry2) {
+ return serviceRegistry2.lookupServiceElseFail(PersonRepository.class).findById(id).orElseThrow(RuntimeException::new);
}
}
diff --git a/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/ScenarioFixtureScript.java b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/ScenarioFixtureScript.java
index 48d51f2001..bbffa3a3be 100644
--- a/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/ScenarioFixtureScript.java
+++ b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/ScenarioFixtureScript.java
@@ -1,13 +1,9 @@
package org.apache.isis.testing.fixtures.applib.personas.fixtures;
-import javax.inject.Inject;
+import javax.resource.spi.work.ExecutionContext;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.isis.testing.fixtures.applib.personas.BuilderScriptWithResult;
-import org.apache.isis.testing.fixtures.applib.personas.dom.Customer;
-import org.apache.isis.testing.fixtures.applib.personas.dom.CustomerRepository;
-
-import lombok.RequiredArgsConstructor;
+import org.apache.isis.testing.fixtures.applib.personas.dom.Person;
public class ScenarioFixtureScript extends FixtureScript {
@@ -16,9 +12,10 @@ public class ScenarioFixtureScript extends FixtureScript {
protected void execute(ExecutionContext executionContext) {
// build it ..
- Customer steve = Customer_persona.SteveSingle.build(this, executionContext);
+ Person steve = Person_persona.SteveSingle.build(this, executionContext);
// ... look it up
- Customer steve2 = Customer_persona.SteveSingle.findUsing(serviceRegistry);
+ Person steve2 = Person_persona.SteveSingle.findUsing(serviceRegistry);
+
}
}
diff --git a/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/ScenarioTest.java b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/ScenarioTest.java
new file mode 100644
index 0000000000..e19d13ba42
--- /dev/null
+++ b/testing/fixtures/applib/src/test/java/org/apache/isis/testing/fixtures/applib/personas/fixtures/ScenarioTest.java
@@ -0,0 +1,14 @@
+package org.apache.isis.testing.fixtures.applib.personas.fixtures;
+
+import org.apache.isis.testing.fixtures.applib.setup.PersonaEnumPersistAll;
+
+import lombok.val;
+
+
+public class ScenarioTest {
+
+
+ void setup() {
+ val persistAll = new PersonaEnumPersistAll<>(Person_persona.class);
+ }
+}