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:58 UTC
[causeway] 07/07: CAUSEWAY-3372 : moves packages, adds module classes
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 {