This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch ISIS-3100 in repository https://gitbox.apache.org/repos/asf/isis.git
commit 992b75a3ac38857980948c0d130ad3069f033da4 Author: Dan Haywood <[email protected]> AuthorDate: Mon Aug 1 06:28:15 2022 +0100 ISIS-3100: moves sse to extensions/vw/sse since it is wicket specific; keeps same pattern as other viewers. (If in the future any of these extensions support additional viewers, then we'll need to reorganise extensions to reflect this ... but for now, this is the pattern) --- antora/playbooks/site-extensions.yml | 4 ++-- antora/playbooks/site.yml | 4 ++-- extensions/pom.xml | 2 +- extensions/{ => vw}/sse/adoc/antora.yml | 0 extensions/{ => vw}/sse/adoc/modules/sse/nav.adoc | 0 extensions/{ => vw}/sse/adoc/modules/sse/pages/about.adoc | 0 extensions/{ => vw}/sse/adoc/modules/sse/partials/module-nav.adoc | 0 extensions/{ => vw}/sse/applib/pom.xml | 0 .../org/apache/isis/extensions/sse/applib/IsisModuleExtSseApplib.java | 0 .../isis/extensions/sse/applib/annotations/ServerSentEvents.java | 0 .../org/apache/isis/extensions/sse/applib/annotations/SseSource.java | 0 .../org/apache/isis/extensions/sse/applib/service/SseChannel.java | 0 .../org/apache/isis/extensions/sse/applib/service/SseService.java | 0 extensions/{ => vw}/sse/metamodel/pom.xml | 0 .../isis/extensions/sse/metamodel/IsisModuleExtSseMetaModel.java | 0 .../extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java | 0 .../apache/isis/extensions/sse/metamodel/facets/SseObserveFacet.java | 0 .../isis/extensions/sse/metamodel/facets/SseObserveFacetAbstract.java | 0 .../facets/SseObserveFacetForServerSentEventsAnnotation.java | 0 extensions/{ => vw}/sse/pom.xml | 0 extensions/{ => vw}/sse/wicket/pom.xml | 0 .../org/apache/isis/extensions/sse/wicket/IsisModuleExtSseWicket.java | 0 .../isis/extensions/sse/wicket/markup/ListeningMarkupComponent.java | 0 .../sse/wicket/markup/ListeningMarkupComponent_observing.java | 0 .../sse/wicket/markup/ListeningMarkupPanelFactoriesForWicket.java | 0 .../apache/isis/extensions/sse/wicket/markup/js/ObservingComponent.js | 0 .../apache/isis/extensions/sse/wicket/services/SseServiceDefault.java | 0 .../isis/extensions/sse/wicket/webmodule/ServerSentEventsServlet.java | 0 .../extensions/sse/wicket/webmodule/WebModuleServerSentEvents.java | 0 29 files changed, 5 insertions(+), 5 deletions(-) diff --git a/antora/playbooks/site-extensions.yml b/antora/playbooks/site-extensions.yml index 5188e7f880..26f9893199 100644 --- a/antora/playbooks/site-extensions.yml +++ b/antora/playbooks/site-extensions.yml @@ -91,9 +91,9 @@ content: start_path: extensions/vw/pdfjs/adoc # vw branches: HEAD - url: . - start_path: extensions/sse/adoc # extensions + start_path: extensions/vw/sse/adoc # extensions branches: HEAD - + # mavendeps - url: . diff --git a/antora/playbooks/site.yml b/antora/playbooks/site.yml index e919ca07ea..9e3d086730 100644 --- a/antora/playbooks/site.yml +++ b/antora/playbooks/site.yml @@ -161,9 +161,9 @@ content: - url: . start_path: extensions/vw/pdfjs/adoc # vw branches: HEAD - + - url: . - start_path: extensions/sse/adoc # extensions + start_path: extensions/vw/sse/adoc # extensions branches: HEAD # incubator diff --git a/extensions/pom.xml b/extensions/pom.xml index 5d01182ca1..c5e338ba8b 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -495,11 +495,11 @@ <module>security/spring-oauth2</module> <module>security/sessionlog</module> - <module>sse</module> <module>vro/cors</module> <module>vw/exceldownload</module> + <module>vw/sse</module> <module>vw/fullcalendar</module> <module>vw/pdfjs</module> diff --git a/extensions/sse/adoc/antora.yml b/extensions/vw/sse/adoc/antora.yml similarity index 100% rename from extensions/sse/adoc/antora.yml rename to extensions/vw/sse/adoc/antora.yml diff --git a/extensions/sse/adoc/modules/sse/nav.adoc b/extensions/vw/sse/adoc/modules/sse/nav.adoc similarity index 100% rename from extensions/sse/adoc/modules/sse/nav.adoc rename to extensions/vw/sse/adoc/modules/sse/nav.adoc diff --git a/extensions/sse/adoc/modules/sse/pages/about.adoc b/extensions/vw/sse/adoc/modules/sse/pages/about.adoc similarity index 100% rename from extensions/sse/adoc/modules/sse/pages/about.adoc rename to extensions/vw/sse/adoc/modules/sse/pages/about.adoc diff --git a/extensions/sse/adoc/modules/sse/partials/module-nav.adoc b/extensions/vw/sse/adoc/modules/sse/partials/module-nav.adoc similarity index 100% rename from extensions/sse/adoc/modules/sse/partials/module-nav.adoc rename to extensions/vw/sse/adoc/modules/sse/partials/module-nav.adoc diff --git a/extensions/sse/applib/pom.xml b/extensions/vw/sse/applib/pom.xml similarity index 100% rename from extensions/sse/applib/pom.xml rename to extensions/vw/sse/applib/pom.xml diff --git a/extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/IsisModuleExtSseApplib.java b/extensions/vw/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/IsisModuleExtSseApplib.java similarity index 100% rename from extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/IsisModuleExtSseApplib.java rename to extensions/vw/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/IsisModuleExtSseApplib.java diff --git a/extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/ServerSentEvents.java b/extensions/vw/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/ServerSentEvents.java similarity index 100% rename from extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/ServerSentEvents.java rename to extensions/vw/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/ServerSentEvents.java diff --git a/extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/SseSource.java b/extensions/vw/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/SseSource.java similarity index 100% rename from extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/SseSource.java rename to extensions/vw/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/SseSource.java diff --git a/extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseChannel.java b/extensions/vw/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseChannel.java similarity index 100% rename from extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseChannel.java rename to extensions/vw/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseChannel.java diff --git a/extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseService.java b/extensions/vw/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseService.java similarity index 100% rename from extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseService.java rename to extensions/vw/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseService.java diff --git a/extensions/sse/metamodel/pom.xml b/extensions/vw/sse/metamodel/pom.xml similarity index 100% rename from extensions/sse/metamodel/pom.xml rename to extensions/vw/sse/metamodel/pom.xml diff --git a/extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/IsisModuleExtSseMetaModel.java b/extensions/vw/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/IsisModuleExtSseMetaModel.java similarity index 100% rename from extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/IsisModuleExtSseMetaModel.java rename to extensions/vw/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/IsisModuleExtSseMetaModel.java diff --git a/extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java b/extensions/vw/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java similarity index 100% rename from extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java rename to extensions/vw/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java diff --git a/extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacet.java b/extensions/vw/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacet.java similarity index 100% rename from extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacet.java rename to extensions/vw/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacet.java diff --git a/extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetAbstract.java b/extensions/vw/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetAbstract.java similarity index 100% rename from extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetAbstract.java rename to extensions/vw/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetAbstract.java diff --git a/extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java b/extensions/vw/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java similarity index 100% rename from extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java rename to extensions/vw/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java diff --git a/extensions/sse/pom.xml b/extensions/vw/sse/pom.xml similarity index 100% rename from extensions/sse/pom.xml rename to extensions/vw/sse/pom.xml diff --git a/extensions/sse/wicket/pom.xml b/extensions/vw/sse/wicket/pom.xml similarity index 100% rename from extensions/sse/wicket/pom.xml rename to extensions/vw/sse/wicket/pom.xml diff --git a/extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/IsisModuleExtSseWicket.java b/extensions/vw/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/IsisModuleExtSseWicket.java similarity index 100% rename from extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/IsisModuleExtSseWicket.java rename to extensions/vw/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/IsisModuleExtSseWicket.java diff --git a/extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/ListeningMarkupComponent.java b/extensions/vw/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/ListeningMarkupComponent.java similarity index 100% rename from extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/ListeningMarkupComponent.java rename to extensions/vw/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/ListeningMarkupComponent.java diff --git a/extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/ListeningMarkupComponent_observing.java b/extensions/vw/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/ListeningMarkupComponent_observing.java similarity index 100% rename from extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/ListeningMarkupComponent_observing.java rename to extensions/vw/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/ListeningMarkupComponent_observing.java diff --git a/extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/ListeningMarkupPanelFactoriesForWicket.java b/extensions/vw/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/ListeningMarkupPanelFactoriesForWicket.java similarity index 100% rename from extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/ListeningMarkupPanelFactoriesForWicket.java rename to extensions/vw/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/ListeningMarkupPanelFactoriesForWicket.java diff --git a/extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/js/ObservingComponent.js b/extensions/vw/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/js/ObservingComponent.js similarity index 100% rename from extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/js/ObservingComponent.js rename to extensions/vw/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/js/ObservingComponent.js diff --git a/extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/services/SseServiceDefault.java b/extensions/vw/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/services/SseServiceDefault.java similarity index 100% rename from extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/services/SseServiceDefault.java rename to extensions/vw/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/services/SseServiceDefault.java diff --git a/extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/webmodule/ServerSentEventsServlet.java b/extensions/vw/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/webmodule/ServerSentEventsServlet.java similarity index 100% rename from extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/webmodule/ServerSentEventsServlet.java rename to extensions/vw/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/webmodule/ServerSentEventsServlet.java diff --git a/extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/webmodule/WebModuleServerSentEvents.java b/extensions/vw/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/webmodule/WebModuleServerSentEvents.java similarity index 100% rename from extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/webmodule/WebModuleServerSentEvents.java rename to extensions/vw/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/webmodule/WebModuleServerSentEvents.java
