This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new aad1c16378 ISIS-3100: align SSE package names and 'module entrypoints'
aad1c16378 is described below
commit aad1c16378ac2239e8161494bf0fd7aa252dc03b
Author: andi-huber <[email protected]>
AuthorDate: Sat Jul 30 10:50:21 2022 +0200
ISIS-3100: align SSE package names and 'module entrypoints'
---
.../modules/ROOT/pages/2022/2.0.0-M8/mignotes.adoc | 13 +++++++++++++
.../demoapp/dom/types/isisext/sse/AsyncActionDemo.java | 6 +++---
.../main/java/demoapp/dom/types/isisext/sse/DemoTask.java | 4 ++--
.../src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java | 4 ++--
.../java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java | 4 ++--
.../java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java | 4 ++--
.../java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java | 4 ++--
.../sse/applib/IsisModuleExtSseApplib.java} | 4 ++--
.../sse/applib/annotations/ServerSentEvents.java | 2 +-
.../sse/applib/annotations/SseSource.java | 4 ++--
.../sse/applib/service/SseChannel.java | 4 ++--
.../sse/applib/service/SseService.java | 4 ++--
.../sse/metamodel/IsisModuleExtSseMetaModel.java} | 10 +++++-----
.../sse/metamodel/facets/SseAnnotationFacetFactory.java | 4 ++--
.../sse/metamodel/facets/SseObserveFacet.java | 4 ++--
.../sse/metamodel/facets/SseObserveFacetAbstract.java | 4 ++--
.../SseObserveFacetForServerSentEventsAnnotation.java | 6 +++---
.../sse/wicket/IsisModuleExtSseWicket.java} | 14 +++++++-------
.../sse/wicket}/markup/ListeningMarkupComponent.java | 2 +-
.../wicket}/markup/ListeningMarkupComponent_observing.java | 2 +-
.../markup/ListeningMarkupPanelFactoriesForWicket.java | 4 ++--
.../sse/wicket}/markup/js/ObservingComponent.js | 0
.../sse/wicket}/services/SseServiceDefault.java | 8 ++++----
.../sse/wicket}/webmodule/ServerSentEventsServlet.java | 6 +++---
.../sse/wicket}/webmodule/WebModuleServerSentEvents.java | 2 +-
.../model/valuetypes/Configuration_usingValueTypes.java | 4 ++--
26 files changed, 70 insertions(+), 57 deletions(-)
diff --git
a/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-M8/mignotes.adoc
b/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-M8/mignotes.adoc
index 2be4f8e423..e4ec2d7f1c 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-M8/mignotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-M8/mignotes.adoc
@@ -234,4 +234,17 @@ import
org.apache.isis.viewer.restfulobjects.client.RestfulClientConfig;
<groupId>org.apache.isis.viewer.commons</groupId>
<artifactId>isis-viewer-commons-prism</artifactId>
+<!-- moved
+ <groupId>org.apache.isis.valuetypes</groupId>
+ <artifactId>isis-valuetypes-sse*</artifactId>
+-->
+
+<!-- instead use ... -->
+<groupId>org.apache.isis.extensions</groupId>
+<artifactId>isis-extensions-sse*</artifactId>
+
+IsisModuleValSseApplib renamed to IsisModuleExtSseApplib
+IsisModuleValSseMetaModel renamed to IsisModuleExtSseMetaModel
+IsisModuleValSseUiWkt renamed to IsisModuleExtSseWicket
+
----
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/AsyncActionDemo.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/AsyncActionDemo.java
index 701dc146a7..97049f8375 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/AsyncActionDemo.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/AsyncActionDemo.java
@@ -34,9 +34,9 @@ import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.value.Markup;
-import org.apache.isis.valuetypes.sse.applib.annotations.ServerSentEvents;
-import org.apache.isis.valuetypes.sse.applib.service.SseService;
-import
org.apache.isis.valuetypes.sse.applib.service.SseService.ExecutionBehavior;
+import org.apache.isis.extensions.sse.applib.annotations.ServerSentEvents;
+import org.apache.isis.extensions.sse.applib.service.SseService;
+import
org.apache.isis.extensions.sse.applib.service.SseService.ExecutionBehavior;
import lombok.Getter;
import lombok.Setter;
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/DemoTask.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/DemoTask.java
index 29596920c4..060d9a2703 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/DemoTask.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/sse/DemoTask.java
@@ -27,8 +27,8 @@ import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.commons.internal.concurrent._ThreadSleep;
-import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
-import org.apache.isis.valuetypes.sse.applib.service.SseChannel;
+import org.apache.isis.extensions.sse.applib.annotations.SseSource;
+import org.apache.isis.extensions.sse.applib.service.SseChannel;
import lombok.RequiredArgsConstructor;
diff --git
a/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java
b/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java
index 19c724d48f..be613969a6 100644
---
a/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java
+++
b/examples/demo/vaadin/src/main/java/demoapp/webapp/vaadin/DemoAppVaadin.java
@@ -23,10 +23,10 @@ import
org.springframework.boot.autoconfigure.SpringBootApplication;
import
org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.context.annotation.Import;
+import org.apache.isis.extensions.sse.wicket.IsisModuleExtSseWicket;
import
org.apache.isis.incubator.viewer.vaadin.viewer.IsisModuleIncViewerVaadinViewer;
import org.apache.isis.valuetypes.asciidoc.ui.vaa.IsisModuleValAsciidocUiVaa;
import org.apache.isis.valuetypes.asciidoc.ui.wkt.IsisModuleValAsciidocUiWkt;
-import org.apache.isis.valuetypes.sse.ui.wkt.IsisModuleValSseUiWkt;
import org.apache.isis.viewer.wicket.viewer.IsisModuleViewerWicketViewer;
import demoapp.dom.DemoModuleCommon;
@@ -46,7 +46,7 @@ import demoapp.web.DemoAppManifestJdo;
// WICKET INTEGRATION ... to allow side by side comparison
IsisModuleViewerWicketViewer.class, // wicket viewer
- IsisModuleValSseUiWkt.class, // server sent events
+ IsisModuleExtSseWicket.class, // server sent events
IsisModuleValAsciidocUiWkt.class, // ascii-doc rendering support (for
Wicket)
})
diff --git
a/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java
b/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java
index d91c1e190c..bfba83d2e7 100644
---
a/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java
+++
b/examples/demo/wicket/jdo/src/main/java/demoapp/webapp/wicket/jdo/DemoAppWicketJdo.java
@@ -28,13 +28,13 @@ import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.config.util.SpringProfileUtil;
import
org.apache.isis.extensions.commandlog.applib.IsisModuleExtCommandLogApplib;
import org.apache.isis.extensions.pdfjs.wkt.ui.IsisModuleExtPdfjsWicketUi;
+import org.apache.isis.extensions.sse.wicket.IsisModuleExtSseWicket;
import
org.apache.isis.valuetypes.asciidoc.metamodel.IsisModuleValAsciidocMetaModel;
import
org.apache.isis.valuetypes.asciidoc.persistence.jdo.dn.IsisModuleValAsciidocPersistenceJdoDn;
import org.apache.isis.valuetypes.asciidoc.ui.wkt.IsisModuleValAsciidocUiWkt;
import
org.apache.isis.valuetypes.markdown.metamodel.IsisModuleValMarkdownMetaModel;
import
org.apache.isis.valuetypes.markdown.persistence.jdo.dn.IsisModuleValMarkdownPersistenceJdoDn;
import org.apache.isis.valuetypes.markdown.ui.wkt.IsisModuleValMarkdownUiWkt;
-import org.apache.isis.valuetypes.sse.ui.wkt.IsisModuleValSseUiWkt;
import org.apache.isis.viewer.wicket.viewer.IsisModuleViewerWicketViewer;
import demoapp.web.DemoAppManifestJdo;
@@ -54,7 +54,7 @@ import demoapp.webapp.wicket.common.ui.DemoAppWicketCommon;
// UI (Wicket Viewer)
IsisModuleViewerWicketViewer.class,
- IsisModuleValSseUiWkt.class,
+ IsisModuleExtSseWicket.class,
IsisModuleValAsciidocUiWkt.class,
IsisModuleValMarkdownUiWkt.class,
IsisModuleExtPdfjsWicketUi.class,
diff --git
a/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
b/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
index e159cd2724..34c0664441 100644
---
a/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
+++
b/examples/demo/wicket/jpa-and-graphql/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
@@ -28,13 +28,13 @@ import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.config.util.SpringProfileUtil;
import
org.apache.isis.extensions.commandlog.applib.IsisModuleExtCommandLogApplib;
import org.apache.isis.extensions.pdfjs.wkt.ui.IsisModuleExtPdfjsWicketUi;
+import org.apache.isis.extensions.sse.wicket.IsisModuleExtSseWicket;
import
org.apache.isis.valuetypes.asciidoc.metamodel.IsisModuleValAsciidocMetaModel;
import
org.apache.isis.valuetypes.asciidoc.persistence.jpa.IsisModuleValAsciidocPersistenceJpa;
import org.apache.isis.valuetypes.asciidoc.ui.wkt.IsisModuleValAsciidocUiWkt;
import
org.apache.isis.valuetypes.markdown.metamodel.IsisModuleValMarkdownMetaModel;
import
org.apache.isis.valuetypes.markdown.persistence.jpa.IsisModuleValMarkdownPersistenceJpa;
import org.apache.isis.valuetypes.markdown.ui.wkt.IsisModuleValMarkdownUiWkt;
-import org.apache.isis.valuetypes.sse.ui.wkt.IsisModuleValSseUiWkt;
import org.apache.isis.viewer.graphql.viewer.IsisModuleIncViewerGraphqlViewer;
import org.apache.isis.viewer.wicket.viewer.IsisModuleViewerWicketViewer;
@@ -56,7 +56,7 @@ import demoapp.webapp.wicket.common.ui.DemoAppWicketCommon;
// UI (Wicket Viewer)
IsisModuleViewerWicketViewer.class,
- IsisModuleValSseUiWkt.class,
+ IsisModuleExtSseWicket.class,
IsisModuleValAsciidocUiWkt.class,
IsisModuleValMarkdownUiWkt.class,
IsisModuleExtPdfjsWicketUi.class,
diff --git
a/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
b/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
index fc83b7eec3..ead1d98db7 100644
---
a/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
+++
b/examples/demo/wicket/jpa/src/main/java/demoapp/webapp/wicket/jpa/DemoAppWicketJpa.java
@@ -28,13 +28,13 @@ import org.apache.isis.core.config.presets.IsisPresets;
import org.apache.isis.core.config.util.SpringProfileUtil;
import
org.apache.isis.extensions.commandlog.applib.IsisModuleExtCommandLogApplib;
import org.apache.isis.extensions.pdfjs.wkt.ui.IsisModuleExtPdfjsWicketUi;
+import org.apache.isis.extensions.sse.wicket.IsisModuleExtSseWicket;
import
org.apache.isis.valuetypes.asciidoc.metamodel.IsisModuleValAsciidocMetaModel;
import
org.apache.isis.valuetypes.asciidoc.persistence.jpa.IsisModuleValAsciidocPersistenceJpa;
import org.apache.isis.valuetypes.asciidoc.ui.wkt.IsisModuleValAsciidocUiWkt;
import
org.apache.isis.valuetypes.markdown.metamodel.IsisModuleValMarkdownMetaModel;
import
org.apache.isis.valuetypes.markdown.persistence.jpa.IsisModuleValMarkdownPersistenceJpa;
import org.apache.isis.valuetypes.markdown.ui.wkt.IsisModuleValMarkdownUiWkt;
-import org.apache.isis.valuetypes.sse.ui.wkt.IsisModuleValSseUiWkt;
import org.apache.isis.viewer.wicket.viewer.IsisModuleViewerWicketViewer;
import demoapp.web.DemoAppManifestJpa;
@@ -55,7 +55,7 @@ import demoapp.webapp.wicket.common.ui.DemoAppWicketCommon;
// UI (Wicket Viewer)
IsisModuleViewerWicketViewer.class,
- IsisModuleValSseUiWkt.class,
+ IsisModuleExtSseWicket.class,
IsisModuleValAsciidocUiWkt.class,
IsisModuleValMarkdownUiWkt.class,
IsisModuleExtPdfjsWicketUi.class,
diff --git
a/extensions/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/IsisModuleValSseApplib.java
b/extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/IsisModuleExtSseApplib.java
similarity index 91%
rename from
extensions/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/IsisModuleValSseApplib.java
rename to
extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/IsisModuleExtSseApplib.java
index a78d6d2ceb..d9bf7b0ac1 100644
---
a/extensions/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/IsisModuleValSseApplib.java
+++
b/extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/IsisModuleExtSseApplib.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.valuetypes.sse.applib;
+package org.apache.isis.extensions.sse.applib;
import org.springframework.context.annotation.Configuration;
@@ -25,6 +25,6 @@ import org.springframework.context.annotation.Configuration;
* @since 2.0 {@index}
*/
@Configuration
-public class IsisModuleValSseApplib {
+public class IsisModuleExtSseApplib {
}
diff --git
a/extensions/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/annotations/ServerSentEvents.java
b/extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/ServerSentEvents.java
similarity index 95%
rename from
extensions/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/annotations/ServerSentEvents.java
rename to
extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/ServerSentEvents.java
index c278c4d377..9290512767 100644
---
a/extensions/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/annotations/ServerSentEvents.java
+++
b/extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/ServerSentEvents.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.valuetypes.sse.applib.annotations;
+package org.apache.isis.extensions.sse.applib.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git
a/extensions/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/annotations/SseSource.java
b/extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/SseSource.java
similarity index 93%
rename from
extensions/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/annotations/SseSource.java
rename to
extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/SseSource.java
index 007bd1b9e9..6061fd52ac 100644
---
a/extensions/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/annotations/SseSource.java
+++
b/extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/SseSource.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.valuetypes.sse.applib.annotations;
+package org.apache.isis.extensions.sse.applib.annotations;
-import org.apache.isis.valuetypes.sse.applib.service.SseChannel;
+import org.apache.isis.extensions.sse.applib.service.SseChannel;
/**
* Server-sent events.
diff --git
a/extensions/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/service/SseChannel.java
b/extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseChannel.java
similarity index 91%
rename from
extensions/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/service/SseChannel.java
rename to
extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseChannel.java
index 01817b1976..1b39e4716a 100644
---
a/extensions/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/service/SseChannel.java
+++
b/extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseChannel.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.valuetypes.sse.applib.service;
+package org.apache.isis.extensions.sse.applib.service;
import java.util.UUID;
import java.util.function.Predicate;
-import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
+import org.apache.isis.extensions.sse.applib.annotations.SseSource;
/**
* Server-sent events.
diff --git
a/extensions/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/service/SseService.java
b/extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseService.java
similarity index 91%
rename from
extensions/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/service/SseService.java
rename to
extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseService.java
index 12a8c503dc..4bed1e1af4 100644
---
a/extensions/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/service/SseService.java
+++
b/extensions/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseService.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.valuetypes.sse.applib.service;
+package org.apache.isis.extensions.sse.applib.service;
import java.util.Optional;
-import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
+import org.apache.isis.extensions.sse.applib.annotations.SseSource;
/**
* Server-sent events.
diff --git
a/extensions/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/IsisModuleValSseMetaModel.java
b/extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/IsisModuleExtSseMetaModel.java
similarity index 81%
rename from
extensions/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/IsisModuleValSseMetaModel.java
rename to
extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/IsisModuleExtSseMetaModel.java
index 4fa079d300..ff8d986485 100644
---
a/extensions/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/IsisModuleValSseMetaModel.java
+++
b/extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/IsisModuleExtSseMetaModel.java
@@ -16,22 +16,22 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.valuetypes.sse.metamodel;
+package org.apache.isis.extensions.sse.metamodel;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.valuetypes.sse.applib.IsisModuleValSseApplib;
-import
org.apache.isis.valuetypes.sse.metamodel.facets.SseAnnotationFacetFactory;
+import org.apache.isis.extensions.sse.applib.IsisModuleExtSseApplib;
+import
org.apache.isis.extensions.sse.metamodel.facets.SseAnnotationFacetFactory;
@Configuration
@Import({
// module dependencies
- IsisModuleValSseApplib.class,
+ IsisModuleExtSseApplib.class,
// @Component's
SseAnnotationFacetFactory.Register.class,
})
-public class IsisModuleValSseMetaModel {
+public class IsisModuleExtSseMetaModel {
}
diff --git
a/extensions/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseAnnotationFacetFactory.java
b/extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java
similarity index 95%
rename from
extensions/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseAnnotationFacetFactory.java
rename to
extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java
index 2c2713cc6f..d89e81691b 100644
---
a/extensions/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseAnnotationFacetFactory.java
+++
b/extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.valuetypes.sse.metamodel.facets;
+package org.apache.isis.extensions.sse.metamodel.facets;
import javax.inject.Inject;
@@ -28,7 +28,7 @@ import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
import org.apache.isis.core.metamodel.facets.FacetFactoryAbstract;
import org.apache.isis.core.metamodel.progmodel.ProgrammingModel;
-import org.apache.isis.valuetypes.sse.applib.annotations.ServerSentEvents;
+import org.apache.isis.extensions.sse.applib.annotations.ServerSentEvents;
import lombok.val;
diff --git
a/extensions/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacet.java
b/extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacet.java
similarity index 92%
rename from
extensions/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacet.java
rename to
extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacet.java
index bfc05b37a2..5e16e8662e 100644
---
a/extensions/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacet.java
+++
b/extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacet.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.valuetypes.sse.metamodel.facets;
+package org.apache.isis.extensions.sse.metamodel.facets;
import org.apache.isis.applib.value.LocalResourcePath;
-import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
import org.apache.isis.core.metamodel.facets.SingleClassValueFacet;
+import org.apache.isis.extensions.sse.applib.annotations.SseSource;
/**
* Corresponds to <tt>@???(observe=...)</tt> annotation in the Isis
programming model.
diff --git
a/extensions/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacetAbstract.java
b/extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetAbstract.java
similarity index 94%
rename from
extensions/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacetAbstract.java
rename to
extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetAbstract.java
index 0ccb7d5be9..1185199a61 100644
---
a/extensions/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacetAbstract.java
+++
b/extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetAbstract.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.valuetypes.sse.metamodel.facets;
+package org.apache.isis.extensions.sse.metamodel.facets;
-import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.SingleClassValueFacetAbstract;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.extensions.sse.applib.annotations.SseSource;
public abstract class SseObserveFacetAbstract extends
SingleClassValueFacetAbstract implements SseObserveFacet {
diff --git
a/extensions/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java
b/extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java
similarity index 90%
rename from
extensions/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java
rename to
extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java
index afb2773c4c..b418955535 100644
---
a/extensions/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java
+++
b/extensions/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.valuetypes.sse.metamodel.facets;
+package org.apache.isis.extensions.sse.metamodel.facets;
import java.util.Optional;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
-import org.apache.isis.valuetypes.sse.applib.annotations.ServerSentEvents;
-import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
+import org.apache.isis.extensions.sse.applib.annotations.ServerSentEvents;
+import org.apache.isis.extensions.sse.applib.annotations.SseSource;
/**
*
diff --git
a/extensions/sse/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/IsisModuleValSseUiWkt.java
b/extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/IsisModuleExtSseWicket.java
similarity index 77%
rename from
extensions/sse/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/IsisModuleValSseUiWkt.java
rename to
extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/IsisModuleExtSseWicket.java
index 377de74f6a..d84df7e6f2 100644
---
a/extensions/sse/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/IsisModuleValSseUiWkt.java
+++
b/extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/IsisModuleExtSseWicket.java
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.valuetypes.sse.ui.wkt;
+package org.apache.isis.extensions.sse.wicket;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.valuetypes.sse.metamodel.IsisModuleValSseMetaModel;
-import
org.apache.isis.valuetypes.sse.ui.wkt.markup.ListeningMarkupPanelFactoriesForWicket;
-import org.apache.isis.valuetypes.sse.ui.wkt.services.SseServiceDefault;
-import
org.apache.isis.valuetypes.sse.ui.wkt.webmodule.WebModuleServerSentEvents;
+import org.apache.isis.extensions.sse.metamodel.IsisModuleExtSseMetaModel;
+import
org.apache.isis.extensions.sse.wicket.markup.ListeningMarkupPanelFactoriesForWicket;
+import org.apache.isis.extensions.sse.wicket.services.SseServiceDefault;
+import
org.apache.isis.extensions.sse.wicket.webmodule.WebModuleServerSentEvents;
/**
* @since 2.0 {@index}
@@ -32,7 +32,7 @@ import
org.apache.isis.valuetypes.sse.ui.wkt.webmodule.WebModuleServerSentEvents
@Configuration
@Import({
// module dependencies
- IsisModuleValSseMetaModel.class,
+ IsisModuleExtSseMetaModel.class,
// @Component's
ListeningMarkupPanelFactoriesForWicket.Parented.class,
@@ -42,6 +42,6 @@ import
org.apache.isis.valuetypes.sse.ui.wkt.webmodule.WebModuleServerSentEvents
SseServiceDefault.class,
WebModuleServerSentEvents.class
})
-public class IsisModuleValSseUiWkt {
+public class IsisModuleExtSseWicket {
}
diff --git
a/extensions/sse/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/markup/ListeningMarkupComponent.java
b/extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/ListeningMarkupComponent.java
similarity index 97%
rename from
extensions/sse/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/markup/ListeningMarkupComponent.java
rename to
extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/ListeningMarkupComponent.java
index 15a99d7430..acad3ccd5b 100644
---
a/extensions/sse/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/markup/ListeningMarkupComponent.java
+++
b/extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/ListeningMarkupComponent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.valuetypes.sse.ui.wkt.markup;
+package org.apache.isis.extensions.sse.wicket.markup;
import javax.inject.Inject;
diff --git
a/extensions/sse/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/markup/ListeningMarkupComponent_observing.java
b/extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/ListeningMarkupComponent_observing.java
similarity index 98%
rename from
extensions/sse/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/markup/ListeningMarkupComponent_observing.java
rename to
extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/ListeningMarkupComponent_observing.java
index 1ee26eabaa..6b1f6979f0 100644
---
a/extensions/sse/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/markup/ListeningMarkupComponent_observing.java
+++
b/extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/ListeningMarkupComponent_observing.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.valuetypes.sse.ui.wkt.markup;
+package org.apache.isis.extensions.sse.wicket.markup;
import java.io.IOException;
import java.util.UUID;
diff --git
a/extensions/sse/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/markup/ListeningMarkupPanelFactoriesForWicket.java
b/extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/ListeningMarkupPanelFactoriesForWicket.java
similarity index 96%
rename from
extensions/sse/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/markup/ListeningMarkupPanelFactoriesForWicket.java
rename to
extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/ListeningMarkupPanelFactoriesForWicket.java
index 9b7b6922a7..10dae24b4d 100644
---
a/extensions/sse/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/markup/ListeningMarkupPanelFactoriesForWicket.java
+++
b/extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/markup/ListeningMarkupPanelFactoriesForWicket.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.valuetypes.sse.ui.wkt.markup;
+package org.apache.isis.extensions.sse.wicket.markup;
import org.springframework.stereotype.Component;
import org.apache.isis.applib.value.LocalResourcePath;
import org.apache.isis.applib.value.Markup;
-import org.apache.isis.valuetypes.sse.metamodel.facets.SseObserveFacet;
+import org.apache.isis.extensions.sse.metamodel.facets.SseObserveFacet;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.model.models.ValueModel;
import
org.apache.isis.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
diff --git
a/extensions/sse/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/markup/js/ObservingComponent.js
b/extensions/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/valuetypes/sse/ui/wkt/markup/js/ObservingComponent.js
rename to
extensions/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/valuetypes/sse/ui/wkt/services/SseServiceDefault.java
b/extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/services/SseServiceDefault.java
similarity index 96%
rename from
extensions/sse/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/services/SseServiceDefault.java
rename to
extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/services/SseServiceDefault.java
index 7874c69c09..f4a2db5b98 100644
---
a/extensions/sse/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/services/SseServiceDefault.java
+++
b/extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/services/SseServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.valuetypes.sse.ui.wkt.services;
+package org.apache.isis.extensions.sse.wicket.services;
import java.util.List;
import java.util.Map;
@@ -42,9 +42,9 @@ import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.services.iactnlayer.InteractionService;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.commons.internal.collections._Lists;
-import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
-import org.apache.isis.valuetypes.sse.applib.service.SseChannel;
-import org.apache.isis.valuetypes.sse.applib.service.SseService;
+import org.apache.isis.extensions.sse.applib.annotations.SseSource;
+import org.apache.isis.extensions.sse.applib.service.SseChannel;
+import org.apache.isis.extensions.sse.applib.service.SseService;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/extensions/sse/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/webmodule/ServerSentEventsServlet.java
b/extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/webmodule/ServerSentEventsServlet.java
similarity index 96%
rename from
extensions/sse/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/webmodule/ServerSentEventsServlet.java
rename to
extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/webmodule/ServerSentEventsServlet.java
index 5fd8aa3dea..e6437451f9 100644
---
a/extensions/sse/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/webmodule/ServerSentEventsServlet.java
+++
b/extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/webmodule/ServerSentEventsServlet.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.valuetypes.sse.ui.wkt.webmodule;
+package org.apache.isis.extensions.sse.wicket.webmodule;
import java.io.IOException;
import java.util.Objects;
@@ -34,8 +34,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.apache.isis.applib.value.Markup;
import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.valuetypes.sse.applib.service.SseChannel;
-import org.apache.isis.valuetypes.sse.applib.service.SseService;
+import org.apache.isis.extensions.sse.applib.service.SseChannel;
+import org.apache.isis.extensions.sse.applib.service.SseService;
import lombok.val;
import lombok.extern.log4j.Log4j2;
diff --git
a/extensions/sse/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/webmodule/WebModuleServerSentEvents.java
b/extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/webmodule/WebModuleServerSentEvents.java
similarity index 97%
rename from
extensions/sse/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/webmodule/WebModuleServerSentEvents.java
rename to
extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/webmodule/WebModuleServerSentEvents.java
index afdba439c9..82b51275d3 100644
---
a/extensions/sse/wicket/src/main/java/org/apache/isis/valuetypes/sse/ui/wkt/webmodule/WebModuleServerSentEvents.java
+++
b/extensions/sse/wicket/src/main/java/org/apache/isis/extensions/sse/wicket/webmodule/WebModuleServerSentEvents.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.valuetypes.sse.ui.wkt.webmodule;
+package org.apache.isis.extensions.sse.wicket.webmodule;
import javax.inject.Inject;
import javax.inject.Named;
diff --git
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/valuetypes/Configuration_usingValueTypes.java
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/valuetypes/Configuration_usingValueTypes.java
index 0ca1f66f35..280f5645f0 100644
---
a/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/valuetypes/Configuration_usingValueTypes.java
+++
b/regressiontests/stable/src/main/java/org/apache/isis/testdomain/model/valuetypes/Configuration_usingValueTypes.java
@@ -23,15 +23,15 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import
org.apache.isis.extensions.fullcalendar.applib.IsisModuleExtFullCalendarApplib;
+import org.apache.isis.extensions.sse.metamodel.IsisModuleExtSseMetaModel;
import
org.apache.isis.valuetypes.asciidoc.metamodel.IsisModuleValAsciidocMetaModel;
import
org.apache.isis.valuetypes.markdown.metamodel.IsisModuleValMarkdownMetaModel;
-import org.apache.isis.valuetypes.sse.metamodel.IsisModuleValSseMetaModel;
@Configuration
@Import({
IsisModuleValAsciidocMetaModel.class,
IsisModuleValMarkdownMetaModel.class,
- IsisModuleValSseMetaModel.class,
+ IsisModuleExtSseMetaModel.class,
IsisModuleExtFullCalendarApplib.class,
})
@ComponentScan(
