You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2023/03/18 14:47:51 UTC
[causeway] branch master updated (d7dedb1b3d -> d338a5eae3)
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/causeway.git
from d7dedb1b3d CAUSEWAY-3255 : tweaks logo
new 081465108f Revert "CAUSEWAY-3372: [Wicket Viewer] Void action return should always result"
new 62623d2e23 CAUSEWAY-3388 : centres logo
new 8a4f227f91 CAUSEWAY-3385: fixes overflow for menu bar
new 7113cb2d26 CAUSEWAY-1840 : adds CausewayIntegrationGwtAbstract and updates docs
new 93da5efc17 CAUSEWAY-1840: regen docs
new 5cb9ea2596 CAUSEWAY-3384 : reorg packages for fullcalendar.
new d338a5eae3 CAUSEWAY-3372 : moves packages, adds module classes
The 7 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:
...CausewayIntegrationGwtAbstractWithFixtures.adoc | 12 ++
.../applib/CausewayIntegrationGwtAbstract.adoc | 18 +++
core/adoc/modules/_overview/pages/about.adoc | 11 +-
.../interactions-commands-and-executions.adoc | 1 +
.../wicket/common/ui/DemoAppWicketCommon.java | 2 +-
.../fullcalendar/applib/value/CalendarEvent.java | 4 +-
.../applib/value/CalendarEventSemantics.java | 1 +
...ewayModuleExtFullcalendarWicketIntegration.java | 15 +-
.../fc}/AbstractFullCalendar.java | 8 +-
.../fc}/ButtonText.java | 2 +-
.../fc}/CalendarConfig.java | 2 +-
.../fc}/CalendarResponse.java | 4 +-
.../{fullcalendar => integration/fc}/Event.java | 2 +-
.../fc}/EventProvider.java | 2 +-
.../fc}/EventSource.java | 4 +-
.../fc}/FullCalendar.java | 24 ++--
.../{fullcalendar => integration/fc}/Header.java | 2 +-
.../{fullcalendar => integration/fc}/ViewType.java | 2 +-
.../{fullcalendar => integration/fc}/_Json.java | 2 +-
.../fc}/callback/AbstractAjaxCallback.java | 4 +-
.../AbstractAjaxCallbackWithClientsideRevert.java | 2 +-
.../fc}/callback/AbstractCallback.java | 4 +-
.../fc}/callback/AbstractEventParam.java | 6 +-
.../fc}/callback/AbstractShiftedEventParam.java | 6 +-
.../fc}/callback/AjaxConcurrency.java | 2 +-
.../fc}/callback/BlockingDecorator.java | 2 +-
.../fc}/callback/CallbackWithHandler.java | 2 +-
.../fc}/callback/ClickedEvent.java | 6 +-
.../fc}/callback/DateRangeSelectedCallback.java | 4 +-
.../fc}/callback/DroppedEvent.java | 6 +-
.../fc}/callback/EventClickedCallback.java | 8 +-
.../fc}/callback/EventDroppedCallback.java | 8 +-
.../fc}/callback/EventResizedCallback.java | 8 +-
.../fc}/callback/GetEventsCallback.java | 4 +-
.../fc}/callback/ResizedEvent.java | 6 +-
.../fc}/callback/SelectedRange.java | 2 +-
.../fc}/callback/View.java | 4 +-
.../fc}/callback/ViewDisplayCallback.java | 6 +-
.../fc}/package-info.java | 2 +-
.../fc}/res/FullCalendarCssReference.java | 2 +-
.../fc}/res/FullCalendarEventSourceEvents.java | 6 +-
.../res/FullCalendarIntegrationJsReference.java | 4 +-
.../fc}/res/FullCalendarJsReference.java | 2 +-
.../fc}/res/fullcalendar-event-source-events.js | 0
.../fc}/res/fullcalendar-integration.js | 0
.../fc}/selector/EventSourceSelector.java | 6 +-
.../CausewayModuleExtFullcalendarWicketUi.java} | 18 +--
.../viewer/CalendaredCollectionAbstract.java | 12 +-
.../CalendaredCollectionFactoryAbstract.java | 2 +-
.../CausewayModuleExtFullCalendarWicketUi.java | 6 +-
.../wkt/{ => ui}/viewer/EventProviderAbstract.java | 6 +-
.../viewer/FullCalendarWithEventHandling.java | 10 +-
.../fullcalendar/wkt/{ => ui}/viewer/_Sample.java | 26 ++--
.../CalendarableCollectionAsFullCalendar.css | 0
.../CalendarableCollectionAsFullCalendar.html | 0
.../CalendarableCollectionAsFullCalendar.java | 6 +-
...alendarableCollectionAsFullCalendarFactory.java | 4 +-
.../calendarable/CalendarableEventProvider.java | 4 +-
.../CalendarEventableCollectionAsFullCalendar.css | 0
.../CalendarEventableCollectionAsFullCalendar.html | 0
.../CalendarEventableCollectionAsFullCalendar.java | 6 +-
...arEventableCollectionAsFullCalendarFactory.java | 4 +-
.../CalendarEventableEventProvider.java | 4 +-
...CausewayIntegrationGwtAbstractWithFixtures.java | 72 ++++++++++
.../adoc/modules/integtestsupport/pages/about.adoc | 9 +-
.../applib/CausewayIntegrationGwtAbstract.java | 151 +++++++++++++++++++++
.../applib/CausewayIntegrationTestAbstract.java | 108 +--------------
...tract.java => CausewayIntegrationTestBase.java} | 37 +----
.../commons/model/components/UiComponentType.java | 4 +-
.../models/{EmptyModel.java => VoidModel.java} | 33 +++--
viewers/wicket/ui/src/main/java/module-info.java | 4 +-
.../ActionResultResponseHandlingStrategy.java | 12 ++
.../actionresponse/ActionResultResponseType.java | 46 ++-----
.../VoidReturnPanel.html} | 0
.../VoidReturnPanel.java} | 6 +-
.../VoidReturnPanelFactory.java} | 10 +-
.../accmngt/AccountManagementPageAbstract.html | 2 +-
.../bootstrap/css/bootstrap-overrides-all-v2.css | 2 +-
.../VoidReturnPage.css} | 0
.../VoidReturnPage.html} | 0
.../VoidReturnPage.java} | 16 +--
.../ComponentFactoryRegistrarDefault.java | 8 +-
.../registries/pages/PageClassListDefault.java | 8 +-
83 files changed, 498 insertions(+), 368 deletions(-)
create mode 100644 antora/components/refguide-index/modules/testing/pages/index/fixtures/applib/CausewayIntegrationGwtAbstractWithFixtures.adoc
create mode 100644 antora/components/refguide-index/modules/testing/pages/index/integtestsupport/applib/CausewayIntegrationGwtAbstract.adoc
copy examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/DemoAppWicketCommon.java => extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/CausewayModuleExtFullcalendarWicketIntegration.java (71%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/AbstractFullCalendar.java (80%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/ButtonText.java (94%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/CalendarConfig.java (97%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/CalendarResponse.java (94%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/Event.java (95%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/EventProvider.java (96%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/EventSource.java (94%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/FullCalendar.java (86%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/Header.java (94%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/ViewType.java (94%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/_Json.java (97%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/callback/AbstractAjaxCallback.java (90%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/callback/AbstractAjaxCallbackWithClientsideRevert.java (96%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/callback/AbstractCallback.java (92%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/callback/AbstractEventParam.java (81%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/callback/AbstractShiftedEventParam.java (87%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/callback/AjaxConcurrency.java (92%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/callback/BlockingDecorator.java (96%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/callback/CallbackWithHandler.java (91%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/callback/ClickedEvent.java (80%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/callback/DateRangeSelectedCallback.java (92%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/callback/DroppedEvent.java (82%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/callback/EventClickedCallback.java (85%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/callback/EventDroppedCallback.java (88%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/callback/EventResizedCallback.java (88%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/callback/GetEventsCallback.java (91%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/callback/ResizedEvent.java (81%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/callback/SelectedRange.java (93%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/callback/View.java (87%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/callback/ViewDisplayCallback.java (92%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/package-info.java (92%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/res/FullCalendarCssReference.java (95%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/res/FullCalendarEventSourceEvents.java (88%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/res/FullCalendarIntegrationJsReference.java (93%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/res/FullCalendarJsReference.java (95%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/res/fullcalendar-event-source-events.js (100%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/res/fullcalendar-integration.js (100%)
rename extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{fullcalendar => integration/fc}/selector/EventSourceSelector.java (88%)
copy extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{viewer/CausewayModuleExtFullCalendarWicketUi.java => ui/CausewayModuleExtFullcalendarWicketUi.java} (62%)
rename extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{ => ui}/viewer/CalendaredCollectionAbstract.java (89%)
rename extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{ => ui}/viewer/CalendaredCollectionFactoryAbstract.java (97%)
rename extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{ => ui}/viewer/CausewayModuleExtFullCalendarWicketUi.java (80%)
rename extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{ => ui}/viewer/EventProviderAbstract.java (96%)
rename extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{ => ui}/viewer/FullCalendarWithEventHandling.java (88%)
rename extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{ => ui}/viewer/_Sample.java (85%)
rename extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{ => ui}/viewer/calendarable/CalendarableCollectionAsFullCalendar.css (100%)
rename extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{ => ui}/viewer/calendarable/CalendarableCollectionAsFullCalendar.html (100%)
rename extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{ => ui}/viewer/calendarable/CalendarableCollectionAsFullCalendar.java (88%)
rename extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{ => ui}/viewer/calendarable/CalendarableCollectionAsFullCalendarFactory.java (90%)
rename extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{ => ui}/viewer/calendarable/CalendarableEventProvider.java (92%)
rename extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{ => ui}/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.css (100%)
rename extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{ => ui}/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.html (100%)
rename extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{ => ui}/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.java (87%)
rename extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{ => ui}/viewer/calendareventable/CalendarEventableCollectionAsFullCalendarFactory.java (90%)
rename extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/{ => ui}/viewer/calendareventable/CalendarEventableEventProvider.java (92%)
create mode 100644 testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayIntegrationGwtAbstractWithFixtures.java
create mode 100644 testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationGwtAbstract.java
copy testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/{CausewayIntegrationTestAbstract.java => CausewayIntegrationTestBase.java} (77%)
rename viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/{EmptyModel.java => VoidModel.java} (62%)
rename viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/{emptyreturn/EmptyReturnPanel.html => voidreturn/VoidReturnPanel.html} (100%)
rename viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/{emptyreturn/EmptyReturnPanel.java => voidreturn/VoidReturnPanel.java} (87%)
rename viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/{emptyreturn/EmptyReturnPanelFactory.java => voidreturn/VoidReturnPanelFactory.java} (83%)
rename viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/{emptyreturn/EmptyReturnPage.css => voidreturn/VoidReturnPage.css} (100%)
rename viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/{emptyreturn/EmptyReturnPage.html => voidreturn/VoidReturnPage.html} (100%)
rename viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/{emptyreturn/EmptyReturnPage.java => voidreturn/VoidReturnPage.java} (81%)
[causeway] 06/07: CAUSEWAY-3384 : reorg packages for fullcalendar.
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/causeway.git
commit 5cb9ea2596790904fb39b37fc9fe6c22fa74398f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Mar 18 14:38:13 2023 +0000
CAUSEWAY-3384 : reorg packages for fullcalendar.
---
.../fc}/AbstractFullCalendar.java | 8 +++---
.../fc}/ButtonText.java | 2 +-
.../fc}/CalendarConfig.java | 2 +-
.../fc}/CalendarResponse.java | 4 +--
.../{fullcalendar => integration/fc}/Event.java | 2 +-
.../fc}/EventProvider.java | 2 +-
.../fc}/EventSource.java | 4 +--
.../fc}/FullCalendar.java | 24 ++++++++---------
.../{fullcalendar => integration/fc}/Header.java | 2 +-
.../{fullcalendar => integration/fc}/ViewType.java | 2 +-
.../{fullcalendar => integration/fc}/_Json.java | 2 +-
.../fc}/callback/AbstractAjaxCallback.java | 4 +--
.../AbstractAjaxCallbackWithClientsideRevert.java | 2 +-
.../fc}/callback/AbstractCallback.java | 4 +--
.../fc}/callback/AbstractEventParam.java | 6 ++---
.../fc}/callback/AbstractShiftedEventParam.java | 6 ++---
.../fc}/callback/AjaxConcurrency.java | 2 +-
.../fc}/callback/BlockingDecorator.java | 2 +-
.../fc}/callback/CallbackWithHandler.java | 2 +-
.../fc}/callback/ClickedEvent.java | 6 ++---
.../fc}/callback/DateRangeSelectedCallback.java | 4 +--
.../fc}/callback/DroppedEvent.java | 6 ++---
.../fc}/callback/EventClickedCallback.java | 8 +++---
.../fc}/callback/EventDroppedCallback.java | 8 +++---
.../fc}/callback/EventResizedCallback.java | 8 +++---
.../fc}/callback/GetEventsCallback.java | 4 +--
.../fc}/callback/ResizedEvent.java | 6 ++---
.../fc}/callback/SelectedRange.java | 2 +-
.../fc}/callback/View.java | 4 +--
.../fc}/callback/ViewDisplayCallback.java | 6 ++---
.../fc}/package-info.java | 2 +-
.../fc}/res/FullCalendarCssReference.java | 2 +-
.../fc}/res/FullCalendarEventSourceEvents.java | 6 ++---
.../res/FullCalendarIntegrationJsReference.java | 4 +--
.../fc}/res/FullCalendarJsReference.java | 2 +-
.../fc}/res/fullcalendar-event-source-events.js | 0
.../fc}/res/fullcalendar-integration.js | 0
.../fc}/selector/EventSourceSelector.java | 6 ++---
.../ui/CausewayModuleExtFullcalendarWicketUi.java} | 30 ++++++++++++----------
.../wkt/viewer/CalendaredCollectionAbstract.java | 10 ++++----
.../wkt/viewer/EventProviderAbstract.java | 4 +--
.../wkt/viewer/FullCalendarWithEventHandling.java | 8 +++---
.../fullcalendar/wkt/viewer/_Sample.java | 24 ++++++++---------
.../CalendarableCollectionAsFullCalendar.java | 2 +-
.../CalendarEventableCollectionAsFullCalendar.java | 2 +-
45 files changed, 124 insertions(+), 122 deletions(-)
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/AbstractFullCalendar.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/AbstractFullCalendar.java
similarity index 80%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/AbstractFullCalendar.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/AbstractFullCalendar.java
index a79baea4d2..f78fdd4dc4 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/AbstractFullCalendar.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/AbstractFullCalendar.java
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.IHeaderContributor;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.res.FullCalendarCssReference;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.res.FullCalendarIntegrationJsReference;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.res.FullCalendarJsReference;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.res.FullCalendarCssReference;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.res.FullCalendarIntegrationJsReference;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.res.FullCalendarJsReference;
abstract class AbstractFullCalendar extends MarkupContainer implements IHeaderContributor {
private static final long serialVersionUID = 1L;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/ButtonText.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/ButtonText.java
similarity index 94%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/ButtonText.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/ButtonText.java
index 94c0ca8140..929f4e3deb 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/ButtonText.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/ButtonText.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc;
import java.io.Serializable;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/CalendarConfig.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/CalendarConfig.java
similarity index 97%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/CalendarConfig.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/CalendarConfig.java
index 2131092021..7c1c914b6e 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/CalendarConfig.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/CalendarConfig.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/CalendarResponse.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/CalendarResponse.java
similarity index 94%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/CalendarResponse.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/CalendarResponse.java
index 86f7985a2f..9107767ea2 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/CalendarResponse.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/CalendarResponse.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc;
import java.util.Date;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.res.FullCalendarIntegrationJsReference;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.res.FullCalendarIntegrationJsReference;
public class CalendarResponse {
private final FullCalendar calendar;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/Event.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/Event.java
similarity index 95%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/Event.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/Event.java
index 6e8671fb12..4a3f5eb03e 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/Event.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/Event.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc;
import java.io.Serializable;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/EventProvider.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/EventProvider.java
similarity index 96%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/EventProvider.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/EventProvider.java
index 8ed046a2a2..84edf2098a 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/EventProvider.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/EventProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc;
import java.io.Serializable;
import java.time.ZonedDateTime;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/EventSource.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/EventSource.java
similarity index 94%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/EventSource.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/EventSource.java
index 77b110300d..e786702eee 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/EventSource.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/EventSource.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc;
import java.io.Serializable;
import java.util.HashMap;
@@ -25,7 +25,7 @@ import java.util.Map;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonRawValue;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.selector.EventSourceSelector;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.selector.EventSourceSelector;
import lombok.Getter;
import lombok.Setter;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/FullCalendar.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/FullCalendar.java
similarity index 86%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/FullCalendar.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/FullCalendar.java
index 6d75d3b2cf..a54b6d8b33 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/FullCalendar.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/FullCalendar.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
@@ -28,17 +28,17 @@ import org.apache.wicket.IRequestListener;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.util.lang.Objects;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.AjaxConcurrency;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.ClickedEvent;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.DateRangeSelectedCallback;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.DroppedEvent;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.EventClickedCallback;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.GetEventsCallback;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.ResizedEvent;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.SelectedRange;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.View;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.res.FullCalendarEventSourceEvents;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.res.FullCalendarIntegrationJsReference;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback.AjaxConcurrency;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback.ClickedEvent;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback.DateRangeSelectedCallback;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback.DroppedEvent;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback.EventClickedCallback;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback.GetEventsCallback;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback.ResizedEvent;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback.SelectedRange;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback.View;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.res.FullCalendarEventSourceEvents;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.res.FullCalendarIntegrationJsReference;
import lombok.val;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/Header.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/Header.java
similarity index 94%
copy from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/Header.java
copy to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/Header.java
index 6f49a7e91f..32f5432d83 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/Header.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/Header.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc;
import java.io.Serializable;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/ViewType.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/ViewType.java
similarity index 94%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/ViewType.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/ViewType.java
index 29c633f5f3..1389606e58 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/ViewType.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/ViewType.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc;
import lombok.RequiredArgsConstructor;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/_Json.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/_Json.java
similarity index 97%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/_Json.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/_Json.java
index 1466fbb3fb..f28397389b 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/_Json.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/_Json.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc;
import java.io.IOException;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractAjaxCallback.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/AbstractAjaxCallback.java
similarity index 90%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractAjaxCallback.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/AbstractAjaxCallback.java
index becada3b42..93cfbb2359 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractAjaxCallback.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/AbstractAjaxCallback.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.FullCalendar;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.FullCalendar;
import lombok.NonNull;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractAjaxCallbackWithClientsideRevert.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/AbstractAjaxCallbackWithClientsideRevert.java
similarity index 96%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractAjaxCallbackWithClientsideRevert.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/AbstractAjaxCallbackWithClientsideRevert.java
index 882cc5dbdc..6ed4ebe8b5 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractAjaxCallbackWithClientsideRevert.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/AbstractAjaxCallbackWithClientsideRevert.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback;
import java.util.UUID;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractCallback.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/AbstractCallback.java
similarity index 92%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractCallback.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/AbstractCallback.java
index 8825bb5338..f25f0a7828 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractCallback.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/AbstractCallback.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback;
import java.util.Map;
@@ -25,7 +25,7 @@ import org.apache.wicket.IRequestListener;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.FullCalendar;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.FullCalendar;
import lombok.Getter;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractEventParam.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/AbstractEventParam.java
similarity index 81%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractEventParam.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/AbstractEventParam.java
index 608dfce826..583cc7a866 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractEventParam.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/AbstractEventParam.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.Event;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventSource;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.Event;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.EventSource;
import lombok.AccessLevel;
import lombok.Getter;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractShiftedEventParam.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/AbstractShiftedEventParam.java
similarity index 87%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractShiftedEventParam.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/AbstractShiftedEventParam.java
index ad8f161665..e75fe6a314 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AbstractShiftedEventParam.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/AbstractShiftedEventParam.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback;
import org.joda.time.DateTime;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.Event;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventSource;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.Event;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.EventSource;
import lombok.Getter;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AjaxConcurrency.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/AjaxConcurrency.java
similarity index 92%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AjaxConcurrency.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/AjaxConcurrency.java
index 91c7c45bf1..4b476cba26 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/AjaxConcurrency.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/AjaxConcurrency.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback;
public enum AjaxConcurrency {
/** queue and execute all callbacks */
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/BlockingDecorator.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/BlockingDecorator.java
similarity index 96%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/BlockingDecorator.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/BlockingDecorator.java
index bd936bc81d..056bd848df 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/BlockingDecorator.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/BlockingDecorator.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.attributes.AjaxCallListener;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/CallbackWithHandler.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/CallbackWithHandler.java
similarity index 91%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/CallbackWithHandler.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/CallbackWithHandler.java
index adfcc184c7..fecc5f97a9 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/CallbackWithHandler.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/CallbackWithHandler.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback;
public interface CallbackWithHandler {
String getHandlerScript();
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/ClickedEvent.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/ClickedEvent.java
similarity index 80%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/ClickedEvent.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/ClickedEvent.java
index 0feaaa27d7..c5baf480a5 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/ClickedEvent.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/ClickedEvent.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.Event;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventSource;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.Event;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.EventSource;
import lombok.NonNull;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/DateRangeSelectedCallback.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/DateRangeSelectedCallback.java
similarity index 92%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/DateRangeSelectedCallback.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/DateRangeSelectedCallback.java
index 802db535be..8236093919 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/DateRangeSelectedCallback.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/DateRangeSelectedCallback.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.request.Request;
import org.joda.time.DateTime;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarResponse;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.CalendarResponse;
public abstract class DateRangeSelectedCallback
extends AbstractAjaxCallback
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/DroppedEvent.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/DroppedEvent.java
similarity index 82%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/DroppedEvent.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/DroppedEvent.java
index dee4f692e3..12ab6e9c50 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/DroppedEvent.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/DroppedEvent.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.Event;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventSource;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.Event;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.EventSource;
import lombok.Getter;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/EventClickedCallback.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/EventClickedCallback.java
similarity index 85%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/EventClickedCallback.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/EventClickedCallback.java
index a96947f222..5f4f1933bc 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/EventClickedCallback.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/EventClickedCallback.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.request.Request;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarResponse;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.Event;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventSource;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.CalendarResponse;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.Event;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.EventSource;
public abstract class EventClickedCallback
extends AbstractAjaxCallback
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/EventDroppedCallback.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/EventDroppedCallback.java
similarity index 88%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/EventDroppedCallback.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/EventDroppedCallback.java
index 89d66c63dd..3cf09d86c1 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/EventDroppedCallback.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/EventDroppedCallback.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.request.Request;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarResponse;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.Event;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventSource;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.CalendarResponse;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.Event;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.EventSource;
public abstract class EventDroppedCallback
extends AbstractAjaxCallbackWithClientsideRevert
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/EventResizedCallback.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/EventResizedCallback.java
similarity index 88%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/EventResizedCallback.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/EventResizedCallback.java
index 8827d8ef44..6aaa3db645 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/EventResizedCallback.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/EventResizedCallback.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.request.Request;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarResponse;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.Event;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventSource;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.CalendarResponse;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.Event;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.EventSource;
public abstract class EventResizedCallback
extends AbstractAjaxCallbackWithClientsideRevert
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/GetEventsCallback.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/GetEventsCallback.java
similarity index 91%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/GetEventsCallback.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/GetEventsCallback.java
index 9bb6964b4a..320a499689 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/GetEventsCallback.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/GetEventsCallback.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback;
import java.util.Map;
import org.apache.wicket.request.handler.TextRequestHandler;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventSource;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.EventSource;
import lombok.val;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/ResizedEvent.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/ResizedEvent.java
similarity index 81%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/ResizedEvent.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/ResizedEvent.java
index 929f9fa663..ce046846f3 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/ResizedEvent.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/ResizedEvent.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.Event;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventSource;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.Event;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.EventSource;
public class ResizedEvent extends AbstractShiftedEventParam {
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/SelectedRange.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/SelectedRange.java
similarity index 93%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/SelectedRange.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/SelectedRange.java
index 382920a8bd..a8562900a9 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/SelectedRange.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/SelectedRange.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback;
import org.joda.time.DateTime;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/View.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/View.java
similarity index 87%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/View.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/View.java
index 421af2a9d1..1018207923 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/View.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/View.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback;
import org.joda.time.DateMidnight;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.ViewType;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.ViewType;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/ViewDisplayCallback.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/ViewDisplayCallback.java
similarity index 92%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/ViewDisplayCallback.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/ViewDisplayCallback.java
index 5d79621b9e..ac8ff89ccc 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/callback/ViewDisplayCallback.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/callback/ViewDisplayCallback.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.request.Request;
@@ -25,8 +25,8 @@ import org.joda.time.DateTimeZone;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.ISODateTimeFormat;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarResponse;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.ViewType;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.CalendarResponse;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.ViewType;
/**
* A base callback that passes back calendar's starting date
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/package-info.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/package-info.java
similarity index 92%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/package-info.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/package-info.java
index 1a6cc36781..0d052f158a 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/package-info.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/package-info.java
@@ -19,4 +19,4 @@
/**
* A clone of https://github.com/42Lines/wicket-fullcalendar, with support for <i>Wicket</i> 9+.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar;
\ No newline at end of file
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarCssReference.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/res/FullCalendarCssReference.java
similarity index 95%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarCssReference.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/res/FullCalendarCssReference.java
index 9c4e91072b..7014c336ea 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarCssReference.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/res/FullCalendarCssReference.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.res;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.res;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarEventSourceEvents.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/res/FullCalendarEventSourceEvents.java
similarity index 88%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarEventSourceEvents.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/res/FullCalendarEventSourceEvents.java
index 31d8e7f84f..c82b338b68 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarEventSourceEvents.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/res/FullCalendarEventSourceEvents.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.res;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.res;
import java.util.Map;
import java.util.function.Function;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarConfig;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventSource;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.CalendarConfig;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.EventSource;
import org.apache.causeway.viewer.wicket.ui.util.LicensedTextTemplate;
import lombok.Getter;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarIntegrationJsReference.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/res/FullCalendarIntegrationJsReference.java
similarity index 93%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarIntegrationJsReference.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/res/FullCalendarIntegrationJsReference.java
index 3abcefcc16..ef92ff517e 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarIntegrationJsReference.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/res/FullCalendarIntegrationJsReference.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.res;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.res;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -24,7 +24,7 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.util.string.Strings;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarConfig;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.CalendarConfig;
import lombok.Getter;
import lombok.experimental.Accessors;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarJsReference.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/res/FullCalendarJsReference.java
similarity index 95%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarJsReference.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/res/FullCalendarJsReference.java
index ec95e910db..c577bb90ac 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/FullCalendarJsReference.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/res/FullCalendarJsReference.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.res;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.res;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/fullcalendar-event-source-events.js b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/res/fullcalendar-event-source-events.js
similarity index 100%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/fullcalendar-event-source-events.js
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/res/fullcalendar-event-source-events.js
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/fullcalendar-integration.js b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/res/fullcalendar-integration.js
similarity index 100%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/res/fullcalendar-integration.js
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/res/fullcalendar-integration.js
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/selector/EventSourceSelector.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/selector/EventSourceSelector.java
similarity index 88%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/selector/EventSourceSelector.java
rename to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/selector/EventSourceSelector.java
index c6ae66c482..f3e42ffdec 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/selector/EventSourceSelector.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/fc/selector/EventSourceSelector.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.selector;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.selector;
import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.WebComponent;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.FullCalendar;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.FullCalendar;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
public class EventSourceSelector extends WebComponent implements IHeaderContributor {
@@ -37,4 +37,4 @@ public class EventSourceSelector extends WebComponent implements IHeaderContribu
}
-}
\ No newline at end of file
+}
diff --git a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/Header.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/CausewayModuleExtFullcalendarWicketUi.java
similarity index 52%
rename from extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/Header.java
rename to extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/CausewayModuleExtFullcalendarWicketUi.java
index 6f49a7e91f..16454367d3 100644
--- a/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/fullcalendar/Header.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/CausewayModuleExtFullcalendarWicketUi.java
@@ -16,24 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar;
+package org.apache.causeway.extensions.fullcalendar.wkt.ui;
-import java.io.Serializable;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
+import org.apache.causeway.extensions.pdfjs.metamodel.CausewayModuleExtPdfjsMetaModel;
+import org.apache.causeway.extensions.pdfjs.wkt.integration.CausewayModuleExtPdfjsWicketIntegration;
+import org.apache.causeway.extensions.pdfjs.wkt.ui.components.PdfJsViewerPanelComponentFactory;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
/**
- * Represents the configuration of the UI header elements for <i>FullCalendar</i>.
+ * @since 2.0 {@index}
*/
-@Getter @Setter @Accessors(chain = true)
-public class Header implements Serializable {
-
- private static final long serialVersionUID = 1L;
+@Configuration
+@Import({
+ // Modules
+ CausewayModuleExtPdfjsMetaModel.class,
+ CausewayModuleExtPdfjsWicketIntegration.class,
- private String left;
- private String center;
- private String right;
+ // @Component's
+ PdfJsViewerPanelComponentFactory.class,
+})
+public class CausewayModuleExtFullcalendarWicketUi {
}
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CalendaredCollectionAbstract.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CalendaredCollectionAbstract.java
index 282dab5ff9..bf24c8725f 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CalendaredCollectionAbstract.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CalendaredCollectionAbstract.java
@@ -26,11 +26,11 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataRow;
import org.apache.causeway.core.metamodel.interactions.managed.nonscalar.DataTableModel;
import org.apache.causeway.core.metamodel.object.ManagedObject;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarConfig;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventProvider;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventSource;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.FullCalendar;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.selector.EventSourceSelector;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.CalendarConfig;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.EventProvider;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.EventSource;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.FullCalendar;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.selector.EventSourceSelector;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.causeway.viewer.wicket.ui.panels.PanelUtil;
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/EventProviderAbstract.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/EventProviderAbstract.java
index 8cdeeeb082..61325f25ec 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/EventProviderAbstract.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/EventProviderAbstract.java
@@ -34,8 +34,8 @@ import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.core.metamodel.object.ManagedObjects;
import org.apache.causeway.extensions.fullcalendar.applib.spi.CalendarableDereferencingService;
import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.Event;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventProvider;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.Event;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.EventProvider;
import org.apache.causeway.valuetypes.jodatime.applib.value.JodaTimeConverters;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/FullCalendarWithEventHandling.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/FullCalendarWithEventHandling.java
index 750043c0ad..470f904ce8 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/FullCalendarWithEventHandling.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/FullCalendarWithEventHandling.java
@@ -25,10 +25,10 @@ import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.object.ProtoObject;
import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
import org.apache.causeway.core.metamodel.specloader.SpecificationLoader;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarConfig;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarResponse;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.FullCalendar;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.ClickedEvent;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.CalendarConfig;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.CalendarResponse;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.FullCalendar;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback.ClickedEvent;
import org.apache.causeway.viewer.wicket.model.models.UiObjectWkt;
import org.apache.causeway.viewer.wicket.model.util.WktContext;
import org.apache.causeway.viewer.wicket.ui.pages.entity.EntityPage;
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/_Sample.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/_Sample.java
index f3ed60a20d..f50f5eaffb 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/_Sample.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/_Sample.java
@@ -23,18 +23,18 @@ import java.util.Random;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarConfig;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.CalendarResponse;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.Event;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventProvider;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventSource;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.FullCalendar;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.ClickedEvent;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.DroppedEvent;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.ResizedEvent;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.SelectedRange;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.callback.View;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.selector.EventSourceSelector;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.CalendarConfig;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.CalendarResponse;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.Event;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.EventProvider;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.EventSource;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.FullCalendar;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback.ClickedEvent;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback.DroppedEvent;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback.ResizedEvent;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback.SelectedRange;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.callback.View;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.selector.EventSourceSelector;
import org.apache.causeway.valuetypes.jodatime.applib.value.JodaTimeConverters;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableCollectionAsFullCalendar.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableCollectionAsFullCalendar.java
index 1d81b388bf..e41507ac97 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableCollectionAsFullCalendar.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableCollectionAsFullCalendar.java
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.core.metamodel.object.ManagedObject;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventProvider;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.EventProvider;
import org.apache.causeway.extensions.fullcalendar.wkt.viewer.CalendaredCollectionAbstract;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.java
index 5bd40c2c2f..e9c43010d2 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.java
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.core.metamodel.object.ManagedObject;
-import org.apache.causeway.extensions.fullcalendar.wkt.fullcalendar.EventProvider;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.EventProvider;
import org.apache.causeway.extensions.fullcalendar.wkt.viewer.CalendaredCollectionAbstract;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
[causeway] 07/07: CAUSEWAY-3372 : moves packages, adds module classes
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/causeway.git
commit d338a5eae356a54c53b97c0f5ab103067fec67b9
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Mar 18 14:47:20 2023 +0000
CAUSEWAY-3372 : moves packages, adds module classes
---
.../webapp/wicket/common/ui/DemoAppWicketCommon.java | 2 +-
.../fullcalendar/applib/value/CalendarEvent.java | 4 +++-
.../fullcalendar/applib/value/CalendarEventSemantics.java | 1 +
.../CausewayModuleExtFullcalendarWicketIntegration.java | 15 ++++++---------
.../wkt/ui/CausewayModuleExtFullcalendarWicketUi.java | 14 +++++++-------
.../wkt/{ => ui}/viewer/CalendaredCollectionAbstract.java | 2 +-
.../viewer/CalendaredCollectionFactoryAbstract.java | 2 +-
.../viewer/CausewayModuleExtFullCalendarWicketUi.java | 6 +++---
.../wkt/{ => ui}/viewer/EventProviderAbstract.java | 2 +-
.../{ => ui}/viewer/FullCalendarWithEventHandling.java | 2 +-
.../fullcalendar/wkt/{ => ui}/viewer/_Sample.java | 2 +-
.../calendarable/CalendarableCollectionAsFullCalendar.css | 0
.../CalendarableCollectionAsFullCalendar.html | 0
.../CalendarableCollectionAsFullCalendar.java | 4 ++--
.../CalendarableCollectionAsFullCalendarFactory.java | 4 ++--
.../viewer/calendarable/CalendarableEventProvider.java | 4 ++--
.../CalendarEventableCollectionAsFullCalendar.css | 0
.../CalendarEventableCollectionAsFullCalendar.html | 0
.../CalendarEventableCollectionAsFullCalendar.java | 4 ++--
.../CalendarEventableCollectionAsFullCalendarFactory.java | 4 ++--
.../calendareventable/CalendarEventableEventProvider.java | 4 ++--
21 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/DemoAppWicketCommon.java b/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/DemoAppWicketCommon.java
index e99ae209e4..7b4a68d87b 100644
--- a/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/DemoAppWicketCommon.java
+++ b/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/DemoAppWicketCommon.java
@@ -21,7 +21,7 @@ package demoapp.webapp.wicket.common.ui;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.causeway.extensions.fullcalendar.wkt.viewer.CausewayModuleExtFullCalendarWicketUi;
+import org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer.CausewayModuleExtFullCalendarWicketUi;
import demoapp.webapp.wicket.common.ui.custom.WhereInTheWorldPanelFactory;
diff --git a/extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/value/CalendarEvent.java b/extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/value/CalendarEvent.java
index 84aa6cced6..830eb4a58e 100644
--- a/extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/value/CalendarEvent.java
+++ b/extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/value/CalendarEvent.java
@@ -45,7 +45,7 @@ import lombok.With;
* @since 2.0 {@index}
* @apiNote implements Comparable<CalendarEvent> based on epochMillis
*/
-@Named(CausewayModuleExtFullCalendarApplib.NAMESPACE + ".value.CalendarEvent")
+@Named(CalendarEvent.LOGICAL_TYPE_NAME)
@org.apache.causeway.applib.annotation.Value
@XmlJavaTypeAdapter(CalendarEvent.JaxbAdapter.class)
@Getter @With
@@ -56,6 +56,8 @@ implements
Comparable<CalendarEvent>,
Serializable {
+ public static final String LOGICAL_TYPE_NAME = CausewayModuleExtFullCalendarApplib.NAMESPACE + ".value.CalendarEvent";
+
private static final long serialVersionUID = 1L;
private final long epochMillis;
diff --git a/extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/value/CalendarEventSemantics.java b/extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/value/CalendarEventSemantics.java
index b6d63fff28..15ca8e8632 100644
--- a/extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/value/CalendarEventSemantics.java
+++ b/extensions/vw/fullcalendar/applib/src/main/java/org/apache/causeway/extensions/fullcalendar/applib/value/CalendarEventSemantics.java
@@ -61,6 +61,7 @@ import lombok.experimental.Accessors;
@Component
@Import({
+ // mixins
CalendarEventSemantics.CalendarEvent_default.class
})
public class CalendarEventSemantics
diff --git a/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/DemoAppWicketCommon.java b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/CausewayModuleExtFullcalendarWicketIntegration.java
similarity index 71%
copy from examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/DemoAppWicketCommon.java
copy to extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/CausewayModuleExtFullcalendarWicketIntegration.java
index e99ae209e4..193f56e988 100644
--- a/examples/demo/wicket/common/src/main/java/demoapp/webapp/wicket/common/ui/DemoAppWicketCommon.java
+++ b/extensions/vw/fullcalendar/wicket/integration/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/integration/CausewayModuleExtFullcalendarWicketIntegration.java
@@ -16,23 +16,20 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.webapp.wicket.common.ui;
+package org.apache.causeway.extensions.fullcalendar.wkt.integration;
+import org.apache.causeway.extensions.fullcalendar.applib.CausewayModuleExtFullCalendarApplib;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.causeway.extensions.fullcalendar.wkt.viewer.CausewayModuleExtFullCalendarWicketUi;
-
-import demoapp.webapp.wicket.common.ui.custom.WhereInTheWorldPanelFactory;
-
/**
- * Featured Wicket specific extensions.
+ * @since 2.0 {@index}
*/
@Configuration
@Import({
- WhereInTheWorldPanelFactory.class,
- CausewayModuleExtFullCalendarWicketUi.class,
+ // Modules
+ CausewayModuleExtFullCalendarApplib.class,
})
-public class DemoAppWicketCommon {
+public class CausewayModuleExtFullcalendarWicketIntegration {
}
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/CausewayModuleExtFullcalendarWicketUi.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/CausewayModuleExtFullcalendarWicketUi.java
index 16454367d3..076dac3913 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/CausewayModuleExtFullcalendarWicketUi.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/CausewayModuleExtFullcalendarWicketUi.java
@@ -18,9 +18,9 @@
*/
package org.apache.causeway.extensions.fullcalendar.wkt.ui;
-import org.apache.causeway.extensions.pdfjs.metamodel.CausewayModuleExtPdfjsMetaModel;
-import org.apache.causeway.extensions.pdfjs.wkt.integration.CausewayModuleExtPdfjsWicketIntegration;
-import org.apache.causeway.extensions.pdfjs.wkt.ui.components.PdfJsViewerPanelComponentFactory;
+import org.apache.causeway.extensions.fullcalendar.wkt.integration.CausewayModuleExtFullcalendarWicketIntegration;
+import org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer.calendarable.CalendarableCollectionAsFullCalendarFactory;
+import org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer.calendareventable.CalendarEventableCollectionAsFullCalendarFactory;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
@@ -30,11 +30,11 @@ import org.springframework.context.annotation.Import;
@Configuration
@Import({
// Modules
- CausewayModuleExtPdfjsMetaModel.class,
- CausewayModuleExtPdfjsWicketIntegration.class,
+ CausewayModuleExtFullcalendarWicketIntegration.class,
- // @Component's
- PdfJsViewerPanelComponentFactory.class,
+ // Services
+ CalendarEventableCollectionAsFullCalendarFactory.class,
+ CalendarableCollectionAsFullCalendarFactory.class,
})
public class CausewayModuleExtFullcalendarWicketUi {
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CalendaredCollectionAbstract.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/CalendaredCollectionAbstract.java
similarity index 98%
rename from extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CalendaredCollectionAbstract.java
rename to extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/CalendaredCollectionAbstract.java
index bf24c8725f..024218089c 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CalendaredCollectionAbstract.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/CalendaredCollectionAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.viewer;
+package org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer;
import java.util.Set;
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CalendaredCollectionFactoryAbstract.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/CalendaredCollectionFactoryAbstract.java
similarity index 97%
rename from extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CalendaredCollectionFactoryAbstract.java
rename to extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/CalendaredCollectionFactoryAbstract.java
index 4e11d76d8b..b16069d2fb 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CalendaredCollectionFactoryAbstract.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/CalendaredCollectionFactoryAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.viewer;
+package org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CausewayModuleExtFullCalendarWicketUi.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/CausewayModuleExtFullCalendarWicketUi.java
similarity index 80%
rename from extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CausewayModuleExtFullCalendarWicketUi.java
rename to extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/CausewayModuleExtFullCalendarWicketUi.java
index fab5b01ed9..aac843c325 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/CausewayModuleExtFullCalendarWicketUi.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/CausewayModuleExtFullCalendarWicketUi.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.viewer;
+package org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.apache.causeway.extensions.fullcalendar.applib.CausewayModuleExtFullCalendarApplib;
-import org.apache.causeway.extensions.fullcalendar.wkt.viewer.calendarable.CalendarableCollectionAsFullCalendarFactory;
-import org.apache.causeway.extensions.fullcalendar.wkt.viewer.calendareventable.CalendarEventableCollectionAsFullCalendarFactory;
+import org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer.calendarable.CalendarableCollectionAsFullCalendarFactory;
+import org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer.calendareventable.CalendarEventableCollectionAsFullCalendarFactory;
/**
* @since 2.0 {@index}
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/EventProviderAbstract.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/EventProviderAbstract.java
similarity index 98%
rename from extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/EventProviderAbstract.java
rename to extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/EventProviderAbstract.java
index 61325f25ec..519cd8a41e 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/EventProviderAbstract.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/EventProviderAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.viewer;
+package org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer;
import java.time.ZoneId;
import java.time.ZonedDateTime;
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/FullCalendarWithEventHandling.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/FullCalendarWithEventHandling.java
similarity index 98%
rename from extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/FullCalendarWithEventHandling.java
rename to extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/FullCalendarWithEventHandling.java
index 470f904ce8..6cfa75b633 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/FullCalendarWithEventHandling.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/FullCalendarWithEventHandling.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.viewer;
+package org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer;
import org.apache.wicket.RestartResponseException;
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/_Sample.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/_Sample.java
similarity index 99%
rename from extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/_Sample.java
rename to extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/_Sample.java
index f50f5eaffb..140076db67 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/_Sample.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/_Sample.java
@@ -10,7 +10,7 @@
* the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.viewer;
+package org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer;
import java.time.Duration;
import java.time.ZonedDateTime;
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableCollectionAsFullCalendar.css b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendarable/CalendarableCollectionAsFullCalendar.css
similarity index 100%
rename from extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableCollectionAsFullCalendar.css
rename to extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendarable/CalendarableCollectionAsFullCalendar.css
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableCollectionAsFullCalendar.html b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendarable/CalendarableCollectionAsFullCalendar.html
similarity index 100%
rename from extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableCollectionAsFullCalendar.html
rename to extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendarable/CalendarableCollectionAsFullCalendar.html
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableCollectionAsFullCalendar.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendarable/CalendarableCollectionAsFullCalendar.java
similarity index 92%
rename from extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableCollectionAsFullCalendar.java
rename to extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendarable/CalendarableCollectionAsFullCalendar.java
index e41507ac97..d36ddb4c07 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableCollectionAsFullCalendar.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendarable/CalendarableCollectionAsFullCalendar.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.viewer.calendarable;
+package org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer.calendarable;
import java.util.LinkedHashSet;
import java.util.Set;
@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.EventProvider;
-import org.apache.causeway.extensions.fullcalendar.wkt.viewer.CalendaredCollectionAbstract;
+import org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer.CalendaredCollectionAbstract;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
public class CalendarableCollectionAsFullCalendar
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableCollectionAsFullCalendarFactory.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendarable/CalendarableCollectionAsFullCalendarFactory.java
similarity index 90%
rename from extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableCollectionAsFullCalendarFactory.java
rename to extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendarable/CalendarableCollectionAsFullCalendarFactory.java
index 8cb27fe598..38fe23db06 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableCollectionAsFullCalendarFactory.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendarable/CalendarableCollectionAsFullCalendarFactory.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.viewer.calendarable;
+package org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer.calendarable;
import org.apache.wicket.Component;
import org.springframework.stereotype.Service;
import org.apache.causeway.extensions.fullcalendar.applib.Calendarable;
-import org.apache.causeway.extensions.fullcalendar.wkt.viewer.CalendaredCollectionFactoryAbstract;
+import org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer.CalendaredCollectionFactoryAbstract;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableEventProvider.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendarable/CalendarableEventProvider.java
similarity index 92%
rename from extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableEventProvider.java
rename to extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendarable/CalendarableEventProvider.java
index c8de5bffa2..aeacd2878e 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendarable/CalendarableEventProvider.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendarable/CalendarableEventProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.viewer.calendarable;
+package org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer.calendarable;
import java.util.Set;
@@ -25,7 +25,7 @@ import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.extensions.fullcalendar.applib.CalendarEventable;
import org.apache.causeway.extensions.fullcalendar.applib.Calendarable;
import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
-import org.apache.causeway.extensions.fullcalendar.wkt.viewer.EventProviderAbstract;
+import org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer.EventProviderAbstract;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
public class CalendarableEventProvider extends EventProviderAbstract {
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.css b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.css
similarity index 100%
rename from extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.css
rename to extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.css
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.html b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.html
similarity index 100%
rename from extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.html
rename to extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.html
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.java
similarity index 91%
rename from extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.java
rename to extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.java
index e9c43010d2..06704db55f 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendareventable/CalendarEventableCollectionAsFullCalendar.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.viewer.calendareventable;
+package org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer.calendareventable;
import java.util.LinkedHashSet;
import java.util.Set;
@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.extensions.fullcalendar.wkt.integration.fc.EventProvider;
-import org.apache.causeway.extensions.fullcalendar.wkt.viewer.CalendaredCollectionAbstract;
+import org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer.CalendaredCollectionAbstract;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
public class CalendarEventableCollectionAsFullCalendar
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableCollectionAsFullCalendarFactory.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendareventable/CalendarEventableCollectionAsFullCalendarFactory.java
similarity index 90%
rename from extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableCollectionAsFullCalendarFactory.java
rename to extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendareventable/CalendarEventableCollectionAsFullCalendarFactory.java
index 5792637ea6..6f6cfed3b0 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableCollectionAsFullCalendarFactory.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendareventable/CalendarEventableCollectionAsFullCalendarFactory.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.viewer.calendareventable;
+package org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer.calendareventable;
import org.apache.wicket.Component;
import org.springframework.stereotype.Service;
import org.apache.causeway.extensions.fullcalendar.applib.CalendarEventable;
-import org.apache.causeway.extensions.fullcalendar.wkt.viewer.CalendaredCollectionFactoryAbstract;
+import org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer.CalendaredCollectionFactoryAbstract;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.causeway.viewer.wicket.ui.ComponentFactory;
diff --git a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableEventProvider.java b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendareventable/CalendarEventableEventProvider.java
similarity index 92%
rename from extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableEventProvider.java
rename to extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendareventable/CalendarEventableEventProvider.java
index aa245e00ba..935ec10425 100644
--- a/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/viewer/calendareventable/CalendarEventableEventProvider.java
+++ b/extensions/vw/fullcalendar/wicket/ui/src/main/java/org/apache/causeway/extensions/fullcalendar/wkt/ui/viewer/calendareventable/CalendarEventableEventProvider.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.extensions.fullcalendar.wkt.viewer.calendareventable;
+package org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer.calendareventable;
import java.util.Objects;
@@ -24,7 +24,7 @@ import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.core.metamodel.object.ManagedObject;
import org.apache.causeway.extensions.fullcalendar.applib.CalendarEventable;
import org.apache.causeway.extensions.fullcalendar.applib.value.CalendarEvent;
-import org.apache.causeway.extensions.fullcalendar.wkt.viewer.EventProviderAbstract;
+import org.apache.causeway.extensions.fullcalendar.wkt.ui.viewer.EventProviderAbstract;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModel;
public class CalendarEventableEventProvider extends EventProviderAbstract {
[causeway] 05/07: CAUSEWAY-1840: regen docs
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/causeway.git
commit 93da5efc17b90467a6911060bf93bd3918a016ae
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Mar 18 14:20:51 2023 +0000
CAUSEWAY-1840: regen docs
---
.../CausewayIntegrationGwtAbstractWithFixtures.adoc | 12 ++++++++++++
.../applib/CausewayIntegrationGwtAbstract.adoc | 18 ++++++++++++++++++
core/adoc/modules/_overview/pages/about.adoc | 11 ++++++++---
3 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/antora/components/refguide-index/modules/testing/pages/index/fixtures/applib/CausewayIntegrationGwtAbstractWithFixtures.adoc b/antora/components/refguide-index/modules/testing/pages/index/fixtures/applib/CausewayIntegrationGwtAbstractWithFixtures.adoc
new file mode 100644
index 0000000000..a0c8dc2a3c
--- /dev/null
+++ b/antora/components/refguide-index/modules/testing/pages/index/fixtures/applib/CausewayIntegrationGwtAbstractWithFixtures.adoc
@@ -0,0 +1,12 @@
+= CausewayIntegrationGwtAbstractWithFixtures
+:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+
+== API
+
+[source,java]
+.CausewayIntegrationGwtAbstractWithFixtures.java
+----
+class CausewayIntegrationGwtAbstractWithFixtures {
+}
+----
+
diff --git a/antora/components/refguide-index/modules/testing/pages/index/integtestsupport/applib/CausewayIntegrationGwtAbstract.adoc b/antora/components/refguide-index/modules/testing/pages/index/integtestsupport/applib/CausewayIntegrationGwtAbstract.adoc
new file mode 100644
index 0000000000..669e7ab807
--- /dev/null
+++ b/antora/components/refguide-index/modules/testing/pages/index/integtestsupport/applib/CausewayIntegrationGwtAbstract.adoc
@@ -0,0 +1,18 @@
+= CausewayIntegrationGwtAbstract
+:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
+
+Convenient base class to extend for integration tests.
+
+Unlike xref:refguide:testing:index/integtestsupport/applib/CausewayIntegrationTestAbstract.adoc[CausewayIntegrationTestAbstract] , this class is not _ExtendWith extended with_ xref:refguide:testing:index/integtestsupport/applib/CausewayInteractionHandler.adoc[CausewayInteractionHandler] , which means that there is _no_ _org.apache.causeway.applib.services.iactn.Interaction_ set up implicitly. Instead the _#given(Callable)_ , _#when(Callable)_ and _#then(Callable)_ (and their various over [...]
+
+Note that this means that references to entities must be re-retrieved within each given/when/then phase. _org.apache.causeway.applib.services.bookmark.Bookmark_ s and the _org.apache.causeway.applib.services.bookmark.BookmarkService_ can be a good way to do perform this re-retrieval.
+
+== API
+
+[source,java]
+.CausewayIntegrationGwtAbstract.java
+----
+class CausewayIntegrationGwtAbstract {
+}
+----
+
diff --git a/core/adoc/modules/_overview/pages/about.adoc b/core/adoc/modules/_overview/pages/about.adoc
index e057cf7b80..05dbb60092 100644
--- a/core/adoc/modules/_overview/pages/about.adoc
+++ b/core/adoc/modules/_overview/pages/about.adoc
@@ -460,7 +460,7 @@ org.apache.causeway.testing:causeway-testing-integtestsupport-applib:jar:<manage
.Document Index Entries
****
-xref:refguide:testing:index/fixtures/applib/CausewayIntegrationTestAbstractWithFixtures.adoc[CausewayIntegrationTestAbstractWithFixtures], xref:refguide:testing:index/fixtures/applib/CausewayModuleTestingFixturesApplib.adoc[CausewayModuleTestingFixturesApplib], xref:refguide:testing:index/fixtures/applib/events/FixturesInstalledEvent.adoc[FixturesInstalledEvent], xref:refguide:testing:index/fixtures/applib/events/FixturesInstallingEvent.adoc[FixturesInstallingEvent], xref:refguide:testin [...]
+xref:refguide:testing:index/fixtures/applib/CausewayIntegrationGwtAbstractWithFixtures.adoc[CausewayIntegrationGwtAbstractWithFixtures], xref:refguide:testing:index/fixtures/applib/CausewayIntegrationTestAbstractWithFixtures.adoc[CausewayIntegrationTestAbstractWithFixtures], xref:refguide:testing:index/fixtures/applib/CausewayModuleTestingFixturesApplib.adoc[CausewayModuleTestingFixturesApplib], xref:refguide:testing:index/fixtures/applib/events/FixturesInstalledEvent.adoc[FixturesInstal [...]
****
|Apache Causeway Tst - H2 Console (parent)
@@ -481,7 +481,12 @@ Artifact: causeway-testing-h2console-ui
Type: jar
Directory: /testing/h2console/ui
----
-|.Dependencies
+|.Components
+****
+o.a.i.testing.h2console.ui.webmodule.WebModuleH2Console +
+****
+
+.Dependencies
****
com.h2database:h2:jar:<managed> +
javax.servlet:javax.servlet-api:jar:<managed> +
@@ -562,7 +567,7 @@ org.springframework.boot:spring-boot-starter-test:jar:<managed> +
.Document Index Entries
****
-xref:refguide:testing:index/integtestsupport/applib/CausewayIntegrationTestAbstract.adoc[CausewayIntegrationTestAbstract], xref:refguide:testing:index/integtestsupport/applib/CausewayInteractionHandler.adoc[CausewayInteractionHandler], xref:refguide:testing:index/integtestsupport/applib/CausewayModuleTestingIntegTestSupportApplib.adoc[CausewayModuleTestingIntegTestSupportApplib], xref:refguide:testing:index/integtestsupport/applib/ExceptionRecognizerTranslate.adoc[ExceptionRecognizerTran [...]
+xref:refguide:testing:index/integtestsupport/applib/CausewayIntegrationGwtAbstract.adoc[CausewayIntegrationGwtAbstract], xref:refguide:testing:index/integtestsupport/applib/CausewayIntegrationTestAbstract.adoc[CausewayIntegrationTestAbstract], xref:refguide:testing:index/integtestsupport/applib/CausewayInteractionHandler.adoc[CausewayInteractionHandler], xref:refguide:testing:index/integtestsupport/applib/CausewayModuleTestingIntegTestSupportApplib.adoc[CausewayModuleTestingIntegTestSupp [...]
****
|Apache Causeway Tst - Spec/Cucumber (parent)
[causeway] 01/07: Revert "CAUSEWAY-3372: [Wicket Viewer] Void action return should always result"
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/causeway.git
commit 081465108f020cadfc41a4435f5fb823a07f4738
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Mar 18 13:11:19 2023 +0000
Revert "CAUSEWAY-3372: [Wicket Viewer] Void action return should always result"
This reverts commit fcc1cfe2b7e11aec8cc77e015a09301d654b6d70.
---
.../commons/model/components/UiComponentType.java | 4 +-
.../models/{EmptyModel.java => VoidModel.java} | 33 +++++++++++-----
viewers/wicket/ui/src/main/java/module-info.java | 4 +-
.../ActionResultResponseHandlingStrategy.java | 12 ++++++
.../actionresponse/ActionResultResponseType.java | 46 ++++++----------------
.../VoidReturnPanel.html} | 0
.../VoidReturnPanel.java} | 6 +--
.../VoidReturnPanelFactory.java} | 10 ++---
.../VoidReturnPage.css} | 0
.../VoidReturnPage.html} | 0
.../VoidReturnPage.java} | 16 ++++----
.../ComponentFactoryRegistrarDefault.java | 8 ++--
.../registries/pages/PageClassListDefault.java | 8 ++--
13 files changed, 74 insertions(+), 73 deletions(-)
diff --git a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/components/UiComponentType.java b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/components/UiComponentType.java
index e8362310f5..771bba375e 100644
--- a/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/components/UiComponentType.java
+++ b/viewers/commons/model/src/main/java/org/apache/causeway/viewer/commons/model/components/UiComponentType.java
@@ -134,9 +134,9 @@ public enum UiComponentType {
*/
EMPTY_COLLECTION,
/**
- * A <code>null</code> result from an action.
+ * A void result from an action.
*/
- EMPTY_RETURN,
+ VOID_RETURN,
/**
* A list of models, rendered as a list of links.
*/
diff --git a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/EmptyModel.java b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/VoidModel.java
similarity index 62%
rename from viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/EmptyModel.java
rename to viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/VoidModel.java
index 66b091b074..8fc2ef1b2f 100644
--- a/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/EmptyModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/causeway/viewer/wicket/model/models/VoidModel.java
@@ -21,17 +21,16 @@ package org.apache.causeway.viewer.wicket.model.models;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.core.metamodel.spec.feature.ObjectAction;
-import lombok.Getter;
-import lombok.Setter;
+
/**
- * Represents the result of invoking an action that returns <code>null</code>.
+ * Represents the result of invoking a <tt>void</tt> action.
*/
-public class EmptyModel extends ModelAbstract<Void> {
+public class VoidModel extends ModelAbstract<Void> {
private static final long serialVersionUID = 1L;
- public EmptyModel(final MetaModelContext commonContext) {
+ public VoidModel(final MetaModelContext commonContext) {
super(commonContext);
}
@@ -40,11 +39,25 @@ public class EmptyModel extends ModelAbstract<Void> {
return null;
}
+
+ // //////////////////////////////////////
+
+ private ActionModel actionModelHint;
/**
- * The {@link ActionModel model} of the {@link ObjectAction action}
- * that generated this {@link EmptyModel}.
+ * The {@link ActionModelImpl model} of the {@link ObjectAction action}
+ * that generated this {@link VoidModel}.
+ *
+ * @see #setActionHint(ActionModelImpl)
*/
- @Getter @Setter
- private ActionModel actionHint;
-
+ public ActionModel getActionModelHint() {
+ return actionModelHint;
+ }
+ /**
+ * Called by action.
+ *
+ * @see #getActionModelHint()
+ */
+ public void setActionHint(final ActionModel actionModelHint) {
+ this.actionModelHint = actionModelHint;
+ }
}
diff --git a/viewers/wicket/ui/src/main/java/module-info.java b/viewers/wicket/ui/src/main/java/module-info.java
index e36033aab3..599fffc521 100644
--- a/viewers/wicket/ui/src/main/java/module-info.java
+++ b/viewers/wicket/ui/src/main/java/module-info.java
@@ -35,7 +35,7 @@ module org.apache.causeway.viewer.wicket.ui {
exports org.apache.causeway.viewer.wicket.ui.pages.common.fontawesome;
exports org.apache.causeway.viewer.wicket.ui.components.propertyheader;
exports org.apache.causeway.viewer.wicket.ui.components.widgets.links;
- exports org.apache.causeway.viewer.wicket.ui.components.emptyreturn;
+ exports org.apache.causeway.viewer.wicket.ui.components.voidreturn;
exports org.apache.causeway.viewer.wicket.ui.app.logout;
exports org.apache.causeway.viewer.wicket.ui.components.property;
exports org.apache.causeway.viewer.wicket.ui.pages.common.bootstrap.css;
@@ -64,7 +64,7 @@ module org.apache.causeway.viewer.wicket.ui {
exports org.apache.causeway.viewer.wicket.ui.components.widgets.breadcrumbs;
exports org.apache.causeway.viewer.wicket.ui.components.bookmarkedpages;
exports org.apache.causeway.viewer.wicket.ui.pages.common.livequery.js;
- exports org.apache.causeway.viewer.wicket.ui.pages.emptyreturn;
+ exports org.apache.causeway.viewer.wicket.ui.pages.voidreturn;
exports org.apache.causeway.viewer.wicket.ui.pages.accmngt.password_reset;
exports org.apache.causeway.viewer.wicket.ui.components.scalars;
exports org.apache.causeway.viewer.wicket.ui.pages;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
index 66114717cb..63fd2027e3 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/ActionResultResponseHandlingStrategy.java
@@ -34,8 +34,20 @@ import org.apache.wicket.util.resource.IResourceStream;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
import org.apache.causeway.viewer.wicket.model.models.RedirectRequestHandlerWithOpenUrlStrategy;
+import org.apache.causeway.viewer.wicket.model.models.VoidModel;
+import org.apache.causeway.viewer.wicket.ui.pages.voidreturn.VoidReturnPage;
public enum ActionResultResponseHandlingStrategy {
+ REDIRECT_TO_VOID {
+ @Override
+ public void handleResults(
+ final MetaModelContext commonContext,
+ final ActionResultResponse resultResponse) {
+
+ final RequestCycle requestCycle = RequestCycle.get();
+ requestCycle.setResponsePage(new VoidReturnPage(new VoidModel(commonContext)));
+ }
+ },
REDIRECT_TO_PAGE {
@Override
public void handleResults(
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/ActionResultResponseType.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
index f71a495f53..744c0d06d0 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/actionresponse/ActionResultResponseType.java
@@ -22,8 +22,6 @@ import java.net.URL;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.cycle.PageRequestHandlerTracker;
-import org.apache.wicket.request.cycle.RequestCycle;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.value.Blob;
@@ -32,7 +30,6 @@ import org.apache.causeway.applib.value.LocalResourcePath;
import org.apache.causeway.applib.value.OpenUrlStrategy;
import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.assertions._Assert;
-import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.exceptions._Exceptions;
import org.apache.causeway.core.metamodel.context.MetaModelContext;
@@ -41,15 +38,15 @@ import org.apache.causeway.core.metamodel.object.ManagedObjects;
import org.apache.causeway.core.metamodel.object.PackedManagedObject;
import org.apache.causeway.core.security.authentication.logout.LogoutMenu.LoginRedirect;
import org.apache.causeway.viewer.wicket.model.models.ActionModel;
-import org.apache.causeway.viewer.wicket.model.models.EmptyModel;
import org.apache.causeway.viewer.wicket.model.models.EntityCollectionModelStandalone;
import org.apache.causeway.viewer.wicket.model.models.PageType;
import org.apache.causeway.viewer.wicket.model.models.ValueModel;
+import org.apache.causeway.viewer.wicket.model.models.VoidModel;
import org.apache.causeway.viewer.wicket.ui.pages.PageClassRegistry;
-import org.apache.causeway.viewer.wicket.ui.pages.emptyreturn.EmptyReturnPage;
import org.apache.causeway.viewer.wicket.ui.pages.entity.EntityPage;
import org.apache.causeway.viewer.wicket.ui.pages.standalonecollection.StandaloneCollectionPage;
import org.apache.causeway.viewer.wicket.ui.pages.value.ValuePage;
+import org.apache.causeway.viewer.wicket.ui.pages.voidreturn.VoidReturnPage;
import lombok.NonNull;
import lombok.SneakyThrows;
@@ -186,23 +183,6 @@ public enum ActionResultResponseType {
return ActionResultResponse.withHandler(handler);
}
},
- /** render the 'empty page' */
- EMPTY {
- @Override
- public ActionResultResponse interpretResult(
- final ActionModel actionModel,
- final AjaxRequestTarget target,
- final @Nullable ManagedObject resultAdapter, // arg is not used
- final Can<ManagedObject> args) {
- final var commonContext = actionModel.getMetaModelContext();
- final EmptyModel emptyModel = new EmptyModel(commonContext);
- emptyModel.setActionHint(actionModel);
- return ActionResultResponse.toPage(EmptyReturnPage.class, new EmptyReturnPage(emptyModel));
- }
- },
- /**
- * Issues a (current) page reload.
- */
VOID {
@Override
public ActionResultResponse interpretResult(
@@ -210,9 +190,10 @@ public enum ActionResultResponseType {
final AjaxRequestTarget target,
final @Nullable ManagedObject resultAdapter, // arg is not used
final Can<ManagedObject> args) {
- val currentPage = PageRequestHandlerTracker.getLastHandler(RequestCycle.get()).getPage();
- val pageClass = currentPage.getClass();
- return ActionResultResponse.toPage(PageRedirectRequest.forPage(pageClass, _Casts.uncheckedCast(currentPage)));
+ final var commonContext = actionModel.getMetaModelContext();
+ final VoidModel voidModel = new VoidModel(commonContext);
+ voidModel.setActionHint(actionModel);
+ return ActionResultResponse.toPage(VoidReturnPage.class, new VoidReturnPage(voidModel));
}
},
SIGN_IN {
@@ -248,8 +229,8 @@ public enum ActionResultResponseType {
final @Nullable ManagedObject resultAdapter,
final Can<ManagedObject> args) {
- val typeAndAdapter = determineFor(resultAdapter, targetIfAny, model.getAction().getElementType().isVoid());
- return typeAndAdapter.type // mapped to EMPTY if adapter is unspecified or null
+ val typeAndAdapter = determineFor(resultAdapter, targetIfAny);
+ return typeAndAdapter.type // mapped to VOID if adapter is unspecified or null
.interpretResult(model, targetIfAny, typeAndAdapter.resultAdapter, args);
}
@@ -286,15 +267,10 @@ public enum ActionResultResponseType {
private static TypeAndAdapter determineFor(
final ManagedObject resultAdapter,
- final AjaxRequestTarget targetIfAny,
- final boolean isActionWithVoidReturn) {
-
- if(isActionWithVoidReturn) {
- return TypeAndAdapter.of(ActionResultResponseType.VOID, resultAdapter);
- }
+ final AjaxRequestTarget targetIfAny) {
if(ManagedObjects.isNullOrUnspecifiedOrEmpty(resultAdapter)) {
- return TypeAndAdapter.of(ActionResultResponseType.EMPTY, resultAdapter);
+ return TypeAndAdapter.of(ActionResultResponseType.VOID, resultAdapter);
}
val resultSpec = resultAdapter.getSpecification();
@@ -343,7 +319,7 @@ public enum ActionResultResponseType {
case 1:
val firstElement = unpacked.getFirstElseFail();
// recursively unwrap
- return determineFor(firstElement, targetIfAny, false);
+ return determineFor(firstElement, targetIfAny);
default:
return TypeAndAdapter.of(ActionResultResponseType.COLLECTION, resultAdapter);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/emptyreturn/EmptyReturnPanel.html b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.html
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/emptyreturn/EmptyReturnPanel.html
rename to viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.html
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/emptyreturn/EmptyReturnPanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.java
similarity index 87%
rename from viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/emptyreturn/EmptyReturnPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.java
index c997c2280f..fa8ae30067 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/emptyreturn/EmptyReturnPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/voidreturn/VoidReturnPanel.java
@@ -16,18 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.emptyreturn;
+package org.apache.causeway.viewer.wicket.ui.components.voidreturn;
import org.apache.wicket.model.IModel;
import org.apache.causeway.viewer.wicket.ui.panels.PanelAbstract;
-public class EmptyReturnPanel
+public class VoidReturnPanel
extends PanelAbstract<Void, IModel<Void>> {
private static final long serialVersionUID = 1L;
- public EmptyReturnPanel(final String id) {
+ public VoidReturnPanel(final String id) {
super(id);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/emptyreturn/EmptyReturnPanelFactory.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java
similarity index 83%
rename from viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/emptyreturn/EmptyReturnPanelFactory.java
rename to viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java
index 0908ad1a36..a92b54637a 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/emptyreturn/EmptyReturnPanelFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/voidreturn/VoidReturnPanelFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.components.emptyreturn;
+package org.apache.causeway.viewer.wicket.ui.components.voidreturn;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
@@ -28,12 +28,12 @@ import org.apache.causeway.viewer.wicket.ui.ComponentFactoryAbstract;
/**
* {@link ComponentFactory} to represent an action that returns void.
*/
-public class EmptyReturnPanelFactory extends ComponentFactoryAbstract {
+public class VoidReturnPanelFactory extends ComponentFactoryAbstract {
private static final long serialVersionUID = 1L;
- public EmptyReturnPanelFactory() {
- super(UiComponentType.EMPTY_RETURN, EmptyReturnPanel.class);
+ public VoidReturnPanelFactory() {
+ super(UiComponentType.VOID_RETURN, VoidReturnPanel.class);
}
@Override
@@ -43,7 +43,7 @@ public class EmptyReturnPanelFactory extends ComponentFactoryAbstract {
@Override
public Component createComponent(final String id, final IModel<?> model) {
- return new EmptyReturnPanel(id);
+ return new VoidReturnPanel(id);
}
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/emptyreturn/EmptyReturnPage.css b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.css
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/emptyreturn/EmptyReturnPage.css
rename to viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.css
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/emptyreturn/EmptyReturnPage.html b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html
similarity index 100%
rename from viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/emptyreturn/EmptyReturnPage.html
rename to viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.html
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/emptyreturn/EmptyReturnPage.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
similarity index 81%
rename from viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/emptyreturn/EmptyReturnPage.java
rename to viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
index 297c05e993..a9fcdb16ce 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/emptyreturn/EmptyReturnPage.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/voidreturn/VoidReturnPage.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.causeway.viewer.wicket.ui.pages.emptyreturn;
+package org.apache.causeway.viewer.wicket.ui.pages.voidreturn;
import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
import org.apache.causeway.applib.services.user.UserMemento;
import org.apache.causeway.viewer.commons.model.components.UiComponentType;
import org.apache.causeway.viewer.wicket.model.models.ActionModel;
-import org.apache.causeway.viewer.wicket.model.models.EmptyModel;
+import org.apache.causeway.viewer.wicket.model.models.VoidModel;
import org.apache.causeway.viewer.wicket.model.util.PageParameterUtils;
import org.apache.causeway.viewer.wicket.ui.pages.PageAbstract;
import org.apache.causeway.viewer.wicket.ui.util.Wkt;
@@ -32,18 +32,18 @@ import org.apache.causeway.viewer.wicket.ui.util.Wkt;
* Web page representing an action invocation.
*/
@AuthorizeInstantiation(UserMemento.AUTHORIZED_USER_ROLE)
-public class EmptyReturnPage extends PageAbstract {
+public class VoidReturnPage extends PageAbstract {
private static final long serialVersionUID = 1L;
private static final String ID_ACTION_NAME = "actionName";
- public EmptyReturnPage(final EmptyModel model) {
+ public VoidReturnPage(final VoidModel model) {
this(model, actionNameFrom(model));
}
- private EmptyReturnPage(final EmptyModel model, final String actionName) {
- super(PageParameterUtils.newPageParameters(), actionName, UiComponentType.EMPTY_RETURN);
+ private VoidReturnPage(final VoidModel model, final String actionName) {
+ super(PageParameterUtils.newPageParameters(), actionName, UiComponentType.VOID_RETURN);
Wkt.labelAdd(themeDiv, ID_ACTION_NAME, actionName);
@@ -51,8 +51,8 @@ public class EmptyReturnPage extends PageAbstract {
addBookmarkedPages(themeDiv);
}
- private static String actionNameFrom(final EmptyModel model) {
- ActionModel actionModel = model.getActionHint();
+ private static String actionNameFrom(final VoidModel model) {
+ ActionModel actionModel = model.getActionModelHint();
if(actionModel != null) {
return actionModel.getFriendlyName();
}
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
index 4e076bf8b0..bda9f59ba2 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
@@ -52,7 +52,6 @@ import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.multip
import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.summary.CollectionContentsAsSummaryFactory;
import org.apache.causeway.viewer.wicket.ui.components.collectioncontents.unresolved.CollectionContentsHiddenPanelFactory;
import org.apache.causeway.viewer.wicket.ui.components.empty.EmptyCollectionPanelFactory;
-import org.apache.causeway.viewer.wicket.ui.components.emptyreturn.EmptyReturnPanelFactory;
import org.apache.causeway.viewer.wicket.ui.components.entity.collection.EntityCollectionPanelFactory;
import org.apache.causeway.viewer.wicket.ui.components.entity.header.EntityHeaderPanelFactory;
import org.apache.causeway.viewer.wicket.ui.components.entity.icontitle.EntityIconAndTitlePanelFactory;
@@ -80,6 +79,7 @@ import org.apache.causeway.viewer.wicket.ui.components.standalonecollection.Stan
import org.apache.causeway.viewer.wicket.ui.components.tree.TreePanelFactories;
import org.apache.causeway.viewer.wicket.ui.components.unknown.UnknownModelPanelFactory;
import org.apache.causeway.viewer.wicket.ui.components.value.StandaloneValuePanelFactory;
+import org.apache.causeway.viewer.wicket.ui.components.voidreturn.VoidReturnPanelFactory;
import org.apache.causeway.viewer.wicket.ui.components.welcome.WelcomePanelFactory;
import org.apache.causeway.viewer.wicket.ui.components.widgets.entitysimplelink.EntityLinkSimplePanelFactory;
@@ -151,7 +151,7 @@ public class ComponentFactoryRegistrarDefault implements ComponentFactoryRegistr
addComponentFactoriesForEmptyCollection(componentFactories);
addComponentFactoriesForScalar(componentFactories);
addComponentFactoriesForEntityLink(componentFactories);
- addComponentFactoriesForEmptyReturn(componentFactories);
+ addComponentFactoriesForVoidReturn(componentFactories);
addComponentFactoriesForValue(componentFactories);
addComponentFactoriesForParameters(componentFactories);
addComponentFactoriesForBreadcrumbs(componentFactories);
@@ -236,8 +236,8 @@ public class ComponentFactoryRegistrarDefault implements ComponentFactoryRegistr
componentFactories.add(new EntityLinkSimplePanelFactory());
}
- protected void addComponentFactoriesForEmptyReturn(final ComponentFactoryList componentFactories) {
- componentFactories.add(new EmptyReturnPanelFactory());
+ protected void addComponentFactoriesForVoidReturn(final ComponentFactoryList componentFactories) {
+ componentFactories.add(new VoidReturnPanelFactory());
}
protected void addComponentFactoriesForActionInfo(final ComponentFactoryList componentFactories) {
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassListDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
index 632e4fbfbf..9a4d052bcf 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/causeway/viewer/wicket/viewer/registries/pages/PageClassListDefault.java
@@ -33,12 +33,12 @@ import org.apache.causeway.viewer.wicket.ui.pages.about.AboutPage;
import org.apache.causeway.viewer.wicket.ui.pages.accmngt.password_reset.PasswordResetPage;
import org.apache.causeway.viewer.wicket.ui.pages.accmngt.register.RegisterPage;
import org.apache.causeway.viewer.wicket.ui.pages.accmngt.signup.RegistrationFormPage;
-import org.apache.causeway.viewer.wicket.ui.pages.emptyreturn.EmptyReturnPage;
import org.apache.causeway.viewer.wicket.ui.pages.entity.EntityPage;
import org.apache.causeway.viewer.wicket.ui.pages.home.HomePage;
import org.apache.causeway.viewer.wicket.ui.pages.login.WicketSignInPage;
import org.apache.causeway.viewer.wicket.ui.pages.standalonecollection.StandaloneCollectionPage;
import org.apache.causeway.viewer.wicket.ui.pages.value.ValuePage;
+import org.apache.causeway.viewer.wicket.ui.pages.voidreturn.VoidReturnPage;
/**
* Default implementation of {@link PageClassList}, specifying the default pages
@@ -64,7 +64,7 @@ public class PageClassListDefault implements PageClassList {
pageRegistry.registerPage(PageType.HOME_AFTER_PAGETIMEOUT, getHomePageClass());
pageRegistry.registerPage(PageType.STANDALONE_COLLECTION, getStandaloneCollectionPageClass());
pageRegistry.registerPage(PageType.VALUE, getValuePageClass());
- pageRegistry.registerPage(PageType.VOID_RETURN, getEmptyReturnPageClass());
+ pageRegistry.registerPage(PageType.VOID_RETURN, getVoidReturnPageClass());
}
@@ -92,8 +92,8 @@ public class PageClassListDefault implements PageClassList {
/**
* For subclassing if required.
*/
- protected Class<? extends Page> getEmptyReturnPageClass() {
- return EmptyReturnPage.class;
+ protected Class<? extends Page> getVoidReturnPageClass() {
+ return VoidReturnPage.class;
}
/**
[causeway] 04/07: CAUSEWAY-1840 : adds CausewayIntegrationGwtAbstract and updates docs
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/causeway.git
commit 7113cb2d262cf26e0e9b5566366c2396451272d0
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Mar 18 14:15:35 2023 +0000
CAUSEWAY-1840 : adds CausewayIntegrationGwtAbstract and updates docs
---
.../interactions-commands-and-executions.adoc | 1 +
...CausewayIntegrationGwtAbstractWithFixtures.java | 72 ++++++++++
.../adoc/modules/integtestsupport/pages/about.adoc | 9 +-
.../applib/CausewayIntegrationGwtAbstract.java | 151 +++++++++++++++++++++
.../applib/CausewayIntegrationTestAbstract.java | 108 +--------------
...tract.java => CausewayIntegrationTestBase.java} | 37 +----
6 files changed, 235 insertions(+), 143 deletions(-)
diff --git a/core/interaction/src/main/adoc/modules/interaction/pages/interactions-commands-and-executions.adoc b/core/interaction/src/main/adoc/modules/interaction/pages/interactions-commands-and-executions.adoc
index 24c5bf2bde..f4d031247c 100644
--- a/core/interaction/src/main/adoc/modules/interaction/pages/interactions-commands-and-executions.adoc
+++ b/core/interaction/src/main/adoc/modules/interaction/pages/interactions-commands-and-executions.adoc
@@ -16,6 +16,7 @@ One use case is for "headless" execution of background commands, eg as scheduled
Another important use case is within testing.
The xref:refguide:testing:index/integtestsupport/applib/CausewayInteractionHandler.adoc[] JUnit 5 extension takes responsibility for wrapping each test with an `Interaction` (taking account any xref:refguide:testing:index/integtestsupport/applib/annotation/InteractAs.adoc[] annotation if present).
The xref:refguide:testing:index/integtestsupport/applib/CausewayIntegrationTestAbstract.adoc[] is provided as a convenient superclass for integration tests, and is already annotated with the `CausewayInteractionHandler` extension.
+(Alternatively, xref:refguide:testing:index/integtestsupport/applib/CausewayIntegrationGwtAbstract.adoc[] is _not_ annotated with the handler; instead it provides `given(...)`, `when(...)` and `then(...)` methods that each execute the provided `Runnable`/`Callable` within the context of its own `Interaction`.
Integration tests can also simulate multiple interactions (HTTP requests) within a single test using xref:refguide:applib:index/services/iactnlayer/InteractionService.adoc#nextInteraction_[InteractionService#nextInteraction].
When called, any state changes made in the previous `Interaction` will be committed, and any references to entities should be either discarded or else be re-retrieved in the next `Interaction`.
diff --git a/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayIntegrationGwtAbstractWithFixtures.java b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayIntegrationGwtAbstractWithFixtures.java
new file mode 100644
index 0000000000..a320b7f270
--- /dev/null
+++ b/testing/fixtures/applib/src/main/java/org/apache/causeway/testing/fixtures/applib/CausewayIntegrationGwtAbstractWithFixtures.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.causeway.testing.fixtures.applib;
+
+import javax.inject.Inject;
+
+import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
+import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScripts;
+import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixturesService;
+import org.apache.causeway.testing.fixtures.applib.personas.BuilderScriptAbstract;
+import org.apache.causeway.testing.fixtures.applib.personas.PersonaWithBuilderScript;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationGwtAbstract;
+import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+
+/**
+ * @since 2.x {@index}
+ */
+public abstract class CausewayIntegrationGwtAbstractWithFixtures extends CausewayIntegrationGwtAbstract {
+
+ protected void run(final FixtureScript... fixtureScriptList) {
+ this.fixtureScripts.run(fixtureScriptList);
+ }
+
+ protected <T> T runBuilder(final BuilderScriptAbstract<T> fixtureScript) {
+ return this.fixtureScripts.runBuilder(fixtureScript);
+ }
+
+ protected void runPersonas(
+ @SuppressWarnings("unchecked") final PersonaWithBuilderScript<?, ? extends BuilderScriptAbstract<?>>... personaScripts) {
+ this.fixtureScripts.runPersonas(personaScripts);
+ }
+
+ protected <T> T runPersona(final PersonaWithBuilderScript<T, ? extends BuilderScriptAbstract<T>> personaScript) {
+ return this.fixtureScripts.runPersona(personaScript);
+ }
+
+ // -- DEPENDENCIES
+
+ @BeforeEach
+ protected void setupRefDataFixtures() {
+ fixtureScripts.run(moduleWithFixturesService.getRefDataSetupFixture());
+ }
+
+ @AfterEach
+ protected void tearDownFixtures() {
+ fixtureScripts.run(moduleWithFixturesService.getTeardownFixture());
+ }
+
+ @Inject protected ModuleWithFixturesService moduleWithFixturesService;
+
+ @Inject protected FixtureScripts fixtureScripts;
+
+
+}
diff --git a/testing/integtestsupport/adoc/modules/integtestsupport/pages/about.adoc b/testing/integtestsupport/adoc/modules/integtestsupport/pages/about.adoc
index da7acc30c9..fa6a19b38d 100644
--- a/testing/integtestsupport/adoc/modules/integtestsupport/pages/about.adoc
+++ b/testing/integtestsupport/adoc/modules/integtestsupport/pages/about.adoc
@@ -406,12 +406,11 @@ public class SimpleObject_IntegTest extends SimpleModuleIntegTestAbstract {
Some of the methods being called here are inherited from the superclass, so let's look at that next.
-== CausewayIntegrationTestAbstract
+== CausewayIntegrationTestAbstract / CausewayIntegrationGwtAbstract
-For convenience the framework provides the `CausewayIntegrationTestAbstract` as a base class for integration tests.
+For convenience the framework provides the xref:refguide:testing:index/integtestsupport/applib/CausewayIntegrationTestAbstract.adoc[] and xref:refguide:testing:index/integtestsupport/applib/CausewayIntegrationGwtAbstract.adoc[] classes, either of which can be used as a base class for integration tests.
-
-This is the class that provides the `wrap(...)` method (as see in the xref:about.adoc#typical-usage[previous section]).
+These classes that provides the `wrap(...)` method (as see in the xref:about.adoc#typical-usage[previous section]).
It also provides a number of other convenience methods:
* `wrap()` - as just mentioned.
@@ -457,8 +456,6 @@ This is discussed further xref:about.adoc#wrapper-factory[below].
for more control over transactions
-The class also defines (as a nested static class) the `InteractionSupport` as a domain service.
-If ``@Import``ed into the integration test's "app manifest", this ensures that any xref:refguide:applib:index/services/command/Command.adoc[Command]s that are raised as the result of interactions through the wrapper factory are setup correctly.
[#wrapper-factory]
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationGwtAbstract.java b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationGwtAbstract.java
new file mode 100644
index 0000000000..dd7bf54676
--- /dev/null
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationGwtAbstract.java
@@ -0,0 +1,151 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.causeway.testing.integtestsupport.applib;
+
+import java.util.concurrent.Callable;
+
+import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.commons.functional.ThrowingRunnable;
+import org.apache.causeway.commons.functional.Try;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+/**
+ * Convenient base class to extend for integration tests.
+ *
+ * <p>
+ * Unlike {@link CausewayIntegrationTestAbstract}, this class is not {@link ExtendWith extended with} {@link CausewayInteractionHandler},
+ * which means that there is <i>no</i> {@link org.apache.causeway.applib.services.iactn.Interaction} set up implicitly.
+ * Instead the {@link #given(Callable)}, {@link #when(Callable)} and {@link #then(Callable)} (and their various overrides) can be used
+ * with the provided {@link Callable} or {@link ThrowingRunnable} being called within its own {@link org.apache.causeway.applib.services.iactn.Interaction}.
+ * </p>
+ *
+ * <p>
+ * Note that this means that references to entities must be re-retrieved within each given/when/then phase.
+ * {@link org.apache.causeway.applib.services.bookmark.Bookmark}s and the {@link org.apache.causeway.applib.services.bookmark.BookmarkService} can be a good way to do perform this re-retrieval.
+ * </p>
+ *
+ * @since 2.0 {@index}
+ * @see CausewayIntegrationTestAbstract
+ */
+@ExtendWith({ExceptionRecognizerTranslate.class})
+public abstract class CausewayIntegrationGwtAbstract extends CausewayIntegrationTestBase {
+
+ protected void given(final ThrowingRunnable runnable) {
+ interactionService.runAnonymous(runnable);
+ }
+
+ protected <T> T given(final Callable<T> callable) {
+ return interactionService.callAnonymous(callable);
+ }
+
+ protected void given(final InteractionContext interactionContext, final ThrowingRunnable runnable) {
+ interactionService.run(interactionContext, runnable);
+ }
+
+ protected <T> T given(final InteractionContext interactionContext, final Callable<T> callable) {
+ return interactionService.call(interactionContext, callable);
+ }
+
+ protected Try<Void> givenAndCatch(final ThrowingRunnable runnable) {
+ return interactionService.runAnonymousAndCatch(runnable);
+ }
+
+ protected <T> Try<T> givenAndCatch(final Callable<T> callable) {
+ return interactionService.callAnonymousAndCatch(callable);
+ }
+
+ protected Try<Void> givenAndCatch(final InteractionContext interactionContext, final ThrowingRunnable runnable) {
+ return interactionService.runAndCatch(interactionContext, runnable);
+ }
+
+ protected <T> Try<T> givenAndCatch(final InteractionContext interactionContext, final Callable<T> callable) {
+ return interactionService.callAndCatch(interactionContext, callable);
+ }
+
+
+
+ protected void when(final ThrowingRunnable runnable) {
+ interactionService.runAnonymous(runnable);
+ }
+
+ protected <T> T when(final Callable<T> callable) {
+ return interactionService.callAnonymous(callable);
+ }
+
+ protected void when(final InteractionContext interactionContext, final ThrowingRunnable runnable) {
+ interactionService.run(interactionContext, runnable);
+ }
+
+ protected <T> T when(final InteractionContext interactionContext, final Callable<T> callable) {
+ return interactionService.call(interactionContext, callable);
+ }
+
+ protected Try<Void> whenAndCatch(final ThrowingRunnable runnable) {
+ return interactionService.runAnonymousAndCatch(runnable);
+ }
+
+ protected <T> Try<T> whenAndCatch(final Callable<T> callable) {
+ return interactionService.callAnonymousAndCatch(callable);
+ }
+
+ protected Try<Void> whenAndCatch(final InteractionContext interactionContext, final ThrowingRunnable runnable) {
+ return interactionService.runAndCatch(interactionContext, runnable);
+ }
+
+ protected <T> Try<T> whenAndCatch(final InteractionContext interactionContext, final Callable<T> callable) {
+ return interactionService.callAndCatch(interactionContext, callable);
+ }
+
+
+
+ protected void then(final ThrowingRunnable runnable) {
+ interactionService.runAnonymous(runnable);
+ }
+
+ protected <T> T then(final Callable<T> callable) {
+ return interactionService.callAnonymous(callable);
+ }
+
+ protected void then(final InteractionContext interactionContext, final ThrowingRunnable runnable) {
+ interactionService.run(interactionContext, runnable);
+ }
+
+ protected <T> T then(final InteractionContext interactionContext, final Callable<T> callable) {
+ return interactionService.call(interactionContext, callable);
+ }
+
+ protected Try<Void> thenAndCatch(final ThrowingRunnable runnable) {
+ return interactionService.runAnonymousAndCatch(runnable);
+ }
+
+ protected <T> Try<T> thenAndCatch(final Callable<T> callable) {
+ return interactionService.callAnonymousAndCatch(callable);
+ }
+
+ protected Try<Void> thenAndCatch(final InteractionContext interactionContext, final ThrowingRunnable runnable) {
+ return interactionService.runAndCatch(interactionContext, runnable);
+ }
+
+ protected <T> Try<T> thenAndCatch(final InteractionContext interactionContext, final Callable<T> callable) {
+ return interactionService.callAndCatch(interactionContext, callable);
+ }
+
+
+
+}
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationTestAbstract.java b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationTestAbstract.java
index 01e90f1d49..3ae8d51866 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationTestAbstract.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationTestAbstract.java
@@ -18,29 +18,7 @@
*/
package org.apache.causeway.testing.integtestsupport.applib;
-import javax.inject.Inject;
-import javax.inject.Provider;
-
import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.stereotype.Service;
-
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.applib.services.command.Command;
-import org.apache.causeway.applib.services.factory.FactoryService;
-import org.apache.causeway.applib.services.iactn.InteractionProvider;
-import org.apache.causeway.applib.services.inject.ServiceInjector;
-import org.apache.causeway.applib.services.metamodel.MetaModelService;
-import org.apache.causeway.applib.services.registry.ServiceRegistry;
-import org.apache.causeway.applib.services.repository.EntityState;
-import org.apache.causeway.applib.services.repository.RepositoryService;
-import org.apache.causeway.applib.services.user.UserService;
-import org.apache.causeway.applib.services.wrapper.WrapperFactory;
-import org.apache.causeway.applib.services.xactn.TransactionService;
-import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
-
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
/**
* Convenient base class to extend for integration tests.
@@ -48,90 +26,6 @@ import lombok.RequiredArgsConstructor;
* @since 2.0 {@index}
*/
@ExtendWith({ExceptionRecognizerTranslate.class, CausewayInteractionHandler.class})
-public abstract class CausewayIntegrationTestAbstract {
-
- /**
- * Hook to interact with
- * {@link org.apache.causeway.applib.services.iactn.Interaction}s and
- * therefore also {@link Command}s (currently unused).
- */
- @Service
- @javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
- @RequiredArgsConstructor(onConstructor_ = {@Inject})
- public static class InteractionSupport {
-
- @SuppressWarnings("unused")
- private final Provider<InteractionProvider> interactionProviderProvider;
-
- }
-
- /**
- * Convenience method, simply delegates to {@link WrapperFactory#wrap(Object)}
- */
- protected <T> T wrap(final T obj) {
- return wrapperFactory.wrap(obj);
- }
-
- /**
- * Convenience method, synonym of {@link #wrap(Object)}
- */
- protected <T> T w(final T obj) {
- return wrap(obj);
- }
-
- /**
- * Convenience method, simply delegates to {@link WrapperFactory#wrapMixin(Class, Object)}.
- */
- protected <T> T wrapMixin(final Class<T> mixinClass, final Object mixedIn) {
- return wrapperFactory.wrapMixin(mixinClass, mixedIn);
- }
-
- /**
- * Convenience method, synonym for {@link #wrapMixin(Class, Object)}.
- */
- protected <T> T wm(final Class<T> mixinClass, final Object mixedIn) {
- return wrapMixin(mixinClass, mixedIn);
- }
-
- /**
- * Convenience method, simply delegates to {@link FactoryService#mixin(Class, Object)}.
- */
- protected <T> T mixin(final Class<T> mixinClass, final Object mixedIn) {
- return factoryService.mixin(mixinClass, mixedIn);
- }
-
- /**
- * Convenience method, synonym for {@link #mixin(Class, Object)}.
- */
- protected <T> T m(final Class<T> mixinClass, final Object mixedIn) {
- return factoryService.mixin(mixinClass, mixedIn);
- }
-
- /**
- * For convenience of subclasses, remove some boilerplate
- */
- protected <T> T unwrap(final T obj) {
- return wrapperFactory.unwrap(obj);
- }
-
- /**
- * Get the current {@link EntityState} of given pojo.
- */
- protected EntityState entityState(final Object obj) {
- return objectManager.adapt(obj).getEntityState();
- }
-
- // -- DEPENDENCIES
-
- @Inject protected ServiceRegistry serviceRegistry;
- @Inject protected MetaModelService metaModelService;
- @Inject protected FactoryService factoryService;
- @Inject protected RepositoryService repositoryService;
- @Inject protected ServiceInjector serviceInjector;
- @Inject protected UserService userService;
- @Inject protected WrapperFactory wrapperFactory;
- @Inject protected TransactionService transactionService;
+public abstract class CausewayIntegrationTestAbstract extends CausewayIntegrationTestBase {
- // for internal framework debugging
- @Inject private ObjectManager objectManager;
}
diff --git a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationTestAbstract.java b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationTestBase.java
similarity index 77%
copy from testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationTestAbstract.java
copy to testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationTestBase.java
index 01e90f1d49..7e59bceedf 100644
--- a/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationTestAbstract.java
+++ b/testing/integtestsupport/applib/src/main/java/org/apache/causeway/testing/integtestsupport/applib/CausewayIntegrationTestBase.java
@@ -19,15 +19,9 @@
package org.apache.causeway.testing.integtestsupport.applib;
import javax.inject.Inject;
-import javax.inject.Provider;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.stereotype.Service;
-
-import org.apache.causeway.applib.annotation.PriorityPrecedence;
-import org.apache.causeway.applib.services.command.Command;
import org.apache.causeway.applib.services.factory.FactoryService;
-import org.apache.causeway.applib.services.iactn.InteractionProvider;
+import org.apache.causeway.applib.services.iactnlayer.InteractionService;
import org.apache.causeway.applib.services.inject.ServiceInjector;
import org.apache.causeway.applib.services.metamodel.MetaModelService;
import org.apache.causeway.applib.services.registry.ServiceRegistry;
@@ -38,32 +32,12 @@ import org.apache.causeway.applib.services.wrapper.WrapperFactory;
import org.apache.causeway.applib.services.xactn.TransactionService;
import org.apache.causeway.core.metamodel.objectmanager.ObjectManager;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
/**
- * Convenient base class to extend for integration tests.
- *
- * @since 2.0 {@index}
+ * Not public API, but factors out commonality of {@link CausewayIntegrationTestAbstract} and
+ * {@link CausewayIntegrationGwtAbstract}.
*/
-@ExtendWith({ExceptionRecognizerTranslate.class, CausewayInteractionHandler.class})
-public abstract class CausewayIntegrationTestAbstract {
-
- /**
- * Hook to interact with
- * {@link org.apache.causeway.applib.services.iactn.Interaction}s and
- * therefore also {@link Command}s (currently unused).
- */
- @Service
- @javax.annotation.Priority(PriorityPrecedence.MIDPOINT)
- @RequiredArgsConstructor(onConstructor_ = {@Inject})
- public static class InteractionSupport {
-
- @SuppressWarnings("unused")
- private final Provider<InteractionProvider> interactionProviderProvider;
+abstract class CausewayIntegrationTestBase {
- }
/**
* Convenience method, simply delegates to {@link WrapperFactory#wrap(Object)}
@@ -114,6 +88,7 @@ public abstract class CausewayIntegrationTestAbstract {
return wrapperFactory.unwrap(obj);
}
+
/**
* Get the current {@link EntityState} of given pojo.
*/
@@ -121,8 +96,10 @@ public abstract class CausewayIntegrationTestAbstract {
return objectManager.adapt(obj).getEntityState();
}
+
// -- DEPENDENCIES
+ @Inject protected InteractionService interactionService;
@Inject protected ServiceRegistry serviceRegistry;
@Inject protected MetaModelService metaModelService;
@Inject protected FactoryService factoryService;
[causeway] 02/07: CAUSEWAY-3388 : centres logo
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/causeway.git
commit 62623d2e23ca5b8965965ae68fd3543b01bb1e79
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Mar 18 13:32:20 2023 +0000
CAUSEWAY-3388 : centres logo
---
.../viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.html b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.html
index 7fb085d776..83559a39e2 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/accmngt/AccountManagementPageAbstract.html
@@ -43,7 +43,7 @@
</div>
<div class="row">
- <div class="headerContainer offset-4 col-sm-4 text-center">
+ <div class="headerContainer col-sm-12 text-center">
<a wicket:id="signInLink">
<h1 wicket:id="applicationName" class="applicationName">[application name]</h1>
<img wicket:id="brandLogo"/>
[causeway] 03/07: CAUSEWAY-3385: fixes overflow for menu bar
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/causeway.git
commit 8a4f227f91d4922301db3c6ac7fc3b56ca6fc492
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Mar 18 13:35:19 2023 +0000
CAUSEWAY-3385: fixes overflow for menu bar
---
.../wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css
index 9f0e2385cb..e1833041a3 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css
@@ -37,7 +37,7 @@ body {
margin-bottom: 0px;
}
-.navbar.primary ul.dropdown-menu,
+.navbar-nav.primary ul.dropdown-menu,
.navbar-nav.secondary ul.dropdown-menu,
.navbar-nav.tertiary ul.dropdown-menu {
max-height: 600px;