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:57 UTC
[causeway] 06/07: CAUSEWAY-3384 : reorg packages for fullcalendar.
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;