You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/10 18:35:26 UTC
[isis] 01/14: ISIS-2259: fixes up packages for sse module
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/isis.git
commit c1cd28d9883c1d098c9596c4b07e4c4ffa8106e2
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 10 15:24:48 2020 +0000
ISIS-2259: fixes up packages for sse module
---
.../main/java/demoapp/dom/actions/async/AsyncActionDemo.java | 8 ++++----
.../demo/src/main/java/demoapp/dom/actions/async/DemoTask.java | 4 ++--
examples/demo/src/main/java/demoapp/webapp/DemoApp.java | 2 +-
.../sse/applib/IsisModuleValSseApplib.java | 2 +-
.../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/applib/value/ListeningMarkup.java | 4 ++--
.../sse/metamodel/IsisModuleValSseMetaModel.java | 6 +++---
.../sse/metamodel/facets/SseAnnotationFacetFactory.java | 4 ++--
.../sse/metamodel/facets/SseObserveFacet.java | 4 ++--
.../sse/metamodel/facets/SseObserveFacetAbstract.java | 4 ++--
.../facets/SseObserveFacetForServerSentEventsAnnotation.java | 6 +++---
.../{extensions => valuetypes}/sse/ui/IsisModuleValSseUi.java | 10 +++++-----
.../sse/ui/markup/ListeningMarkupComponent.java | 2 +-
.../sse/ui/markup/ListeningMarkupComponent_observing.java | 2 +-
.../sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java | 4 ++--
.../sse/ui/markup/js/ObservingComponent.js | 0
.../sse/ui/services/SseServiceDefault.java | 8 ++++----
.../sse/ui/webmodule/ServerSentEventsServlet.java | 8 ++++----
.../sse/ui/webmodule/WebModuleServerSentEvents.java | 2 +-
22 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.java b/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.java
index d3196b0..a5bcf56 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/async/AsyncActionDemo.java
@@ -33,10 +33,10 @@ 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.util.JaxbAdapters;
-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 org.apache.isis.extensions.sse.applib.value.ListeningMarkup;
+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.valuetypes.sse.applib.value.ListeningMarkup;
import lombok.Getter;
import lombok.Setter;
diff --git a/examples/demo/src/main/java/demoapp/dom/actions/async/DemoTask.java b/examples/demo/src/main/java/demoapp/dom/actions/async/DemoTask.java
index 750049a..8a3e5d4 100644
--- a/examples/demo/src/main/java/demoapp/dom/actions/async/DemoTask.java
+++ b/examples/demo/src/main/java/demoapp/dom/actions/async/DemoTask.java
@@ -23,8 +23,8 @@ import java.util.concurrent.atomic.LongAdder;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
-import org.apache.isis.extensions.sse.applib.service.SseChannel;
-import org.apache.isis.extensions.sse.applib.annotations.SseSource;
+import org.apache.isis.valuetypes.sse.applib.service.SseChannel;
+import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
import lombok.RequiredArgsConstructor;
diff --git a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
index 61160a8..8130b27 100644
--- a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
+++ b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
@@ -39,7 +39,7 @@ import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleSecmanEncr
import org.apache.isis.extensions.secman.jdo.IsisModuleSecmanPersistenceJdo;
import org.apache.isis.extensions.secman.model.IsisModuleSecmanModel;
import org.apache.isis.extensions.secman.shiro.IsisModuleSecmanRealmShiro;
-import org.apache.isis.extensions.sse.applib.IsisModuleValSseApplib;
+import org.apache.isis.valuetypes.sse.applib.IsisModuleValSseApplib;
import org.apache.isis.incubator.model.metamodel.IsisModuleIncModelMetaModel;
import org.apache.isis.persistence.jdo.datanucleus5.IsisModuleJdoDataNucleus5;
import org.apache.isis.security.shiro.IsisModuleSecurityShiro;
diff --git a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/IsisModuleValSseApplib.java b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/IsisModuleValSseApplib.java
similarity index 97%
rename from valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/IsisModuleValSseApplib.java
rename to valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/IsisModuleValSseApplib.java
index dfd66cd..e4eb732 100644
--- a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/IsisModuleValSseApplib.java
+++ b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/IsisModuleValSseApplib.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.applib;
+package org.apache.isis.valuetypes.sse.applib;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
diff --git a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/ServerSentEvents.java b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/annotations/ServerSentEvents.java
similarity index 95%
rename from valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/ServerSentEvents.java
rename to valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/annotations/ServerSentEvents.java
index 3d87bd1..7011360 100644
--- a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/ServerSentEvents.java
+++ b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/annotations/ServerSentEvents.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.applib.annotations;
+package org.apache.isis.valuetypes.sse.applib.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/SseSource.java b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/annotations/SseSource.java
similarity index 93%
rename from valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/SseSource.java
rename to valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/annotations/SseSource.java
index 5c7756e..3d55e0d 100644
--- a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/annotations/SseSource.java
+++ b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/annotations/SseSource.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.applib.annotations;
+package org.apache.isis.valuetypes.sse.applib.annotations;
-import org.apache.isis.extensions.sse.applib.service.SseChannel;
+import org.apache.isis.valuetypes.sse.applib.service.SseChannel;
/**
* Server-sent events.
diff --git a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseChannel.java b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/service/SseChannel.java
similarity index 91%
rename from valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseChannel.java
rename to valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/service/SseChannel.java
index fbc3689..6b1200e 100644
--- a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseChannel.java
+++ b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/service/SseChannel.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.applib.service;
+package org.apache.isis.valuetypes.sse.applib.service;
import java.util.UUID;
import java.util.function.Predicate;
-import org.apache.isis.extensions.sse.applib.annotations.SseSource;
+import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
/**
* Server-sent events.
diff --git a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseService.java b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/service/SseService.java
similarity index 91%
rename from valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseService.java
rename to valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/service/SseService.java
index caad878..ce57eed 100644
--- a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/service/SseService.java
+++ b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/service/SseService.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.applib.service;
+package org.apache.isis.valuetypes.sse.applib.service;
import java.util.Optional;
-import org.apache.isis.extensions.sse.applib.annotations.SseSource;
+import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
/**
* Server-sent events.
diff --git a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/value/ListeningMarkup.java b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/value/ListeningMarkup.java
similarity index 84%
rename from valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/value/ListeningMarkup.java
rename to valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/value/ListeningMarkup.java
index 4d909e7..4798ca5 100644
--- a/valuetypes/sse/applib/src/main/java/org/apache/isis/extensions/sse/applib/value/ListeningMarkup.java
+++ b/valuetypes/sse/applib/src/main/java/org/apache/isis/valuetypes/sse/applib/value/ListeningMarkup.java
@@ -1,8 +1,8 @@
-package org.apache.isis.extensions.sse.applib.value;
+package org.apache.isis.valuetypes.sse.applib.value;
import org.apache.isis.applib.annotation.Value;
import org.apache.isis.applib.value.Markup;
-import org.apache.isis.extensions.sse.applib.annotations.ServerSentEvents;
+import org.apache.isis.valuetypes.sse.applib.annotations.ServerSentEvents;
/**
* Immutable value type holding pre-rendered HTML. Supports server sent events.
diff --git a/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/IsisModuleValSseMetaModel.java b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/IsisModuleValSseMetaModel.java
similarity index 86%
rename from valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/IsisModuleValSseMetaModel.java
rename to valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/IsisModuleValSseMetaModel.java
index 7c6a0f6..4fa079d 100644
--- a/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/IsisModuleValSseMetaModel.java
+++ b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/IsisModuleValSseMetaModel.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.metamodel;
+package org.apache.isis.valuetypes.sse.metamodel;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.sse.applib.IsisModuleValSseApplib;
-import org.apache.isis.extensions.sse.metamodel.facets.SseAnnotationFacetFactory;
+import org.apache.isis.valuetypes.sse.applib.IsisModuleValSseApplib;
+import org.apache.isis.valuetypes.sse.metamodel.facets.SseAnnotationFacetFactory;
@Configuration
@Import({
diff --git a/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseAnnotationFacetFactory.java
similarity index 94%
rename from valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java
rename to valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseAnnotationFacetFactory.java
index f7856d0..4f52e9b 100644
--- a/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseAnnotationFacetFactory.java
+++ b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseAnnotationFacetFactory.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.metamodel.facets;
+package org.apache.isis.valuetypes.sse.metamodel.facets;
import org.springframework.stereotype.Component;
-import org.apache.isis.extensions.sse.applib.annotations.ServerSentEvents;
+import org.apache.isis.valuetypes.sse.applib.annotations.ServerSentEvents;
import org.apache.isis.core.metamodel.facetapi.FacetUtil;
import org.apache.isis.core.metamodel.facetapi.FeatureType;
import org.apache.isis.core.metamodel.facetapi.MetaModelRefiner;
diff --git a/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacet.java b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacet.java
similarity index 92%
rename from valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacet.java
rename to valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacet.java
index b75c3b8..e9000bc 100644
--- a/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacet.java
+++ b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacet.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.metamodel.facets;
+package org.apache.isis.valuetypes.sse.metamodel.facets;
import org.apache.isis.applib.value.LocalResourcePath;
-import org.apache.isis.extensions.sse.applib.annotations.SseSource;
+import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
import org.apache.isis.core.metamodel.facets.SingleClassValueFacet;
/**
diff --git a/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetAbstract.java b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacetAbstract.java
similarity index 94%
rename from valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetAbstract.java
rename to valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacetAbstract.java
index a447df1..134490f 100644
--- a/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetAbstract.java
+++ b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacetAbstract.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.metamodel.facets;
+package org.apache.isis.valuetypes.sse.metamodel.facets;
import org.apache.isis.core.commons.internal.exceptions._Exceptions;
-import org.apache.isis.extensions.sse.applib.annotations.SseSource;
+import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.SingleClassValueFacetAbstract;
diff --git a/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java
similarity index 90%
rename from valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java
rename to valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java
index 9f61b9f..9a41197 100644
--- a/valuetypes/sse/metamodel/src/main/java/org/apache/isis/extensions/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java
+++ b/valuetypes/sse/metamodel/src/main/java/org/apache/isis/valuetypes/sse/metamodel/facets/SseObserveFacetForServerSentEventsAnnotation.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.metamodel.facets;
+package org.apache.isis.valuetypes.sse.metamodel.facets;
import java.util.Optional;
-import org.apache.isis.extensions.sse.applib.annotations.ServerSentEvents;
-import org.apache.isis.extensions.sse.applib.annotations.SseSource;
+import org.apache.isis.valuetypes.sse.applib.annotations.ServerSentEvents;
+import org.apache.isis.valuetypes.sse.applib.annotations.SseSource;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
/**
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/IsisModuleValSseUi.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/IsisModuleValSseUi.java
similarity index 82%
rename from valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/IsisModuleValSseUi.java
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/IsisModuleValSseUi.java
index c69d563..7a1529e 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/IsisModuleValSseUi.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/IsisModuleValSseUi.java
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.ui;
+package org.apache.isis.valuetypes.sse.ui;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.apache.isis.extensions.sse.metamodel.IsisModuleValSseMetaModel;
-import org.apache.isis.extensions.sse.ui.markup.ListeningMarkupPanelFactoriesForWicket;
-import org.apache.isis.extensions.sse.ui.services.SseServiceDefault;
-import org.apache.isis.extensions.sse.ui.webmodule.WebModuleServerSentEvents;
+import org.apache.isis.valuetypes.sse.metamodel.IsisModuleValSseMetaModel;
+import org.apache.isis.valuetypes.sse.ui.markup.ListeningMarkupPanelFactoriesForWicket;
+import org.apache.isis.valuetypes.sse.ui.services.SseServiceDefault;
+import org.apache.isis.valuetypes.sse.ui.webmodule.WebModuleServerSentEvents;
@Configuration
@Import({
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupComponent.java
similarity index 97%
rename from valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent.java
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupComponent.java
index b8c68b0..8b7d593 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupComponent.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.ui.markup;
+package org.apache.isis.valuetypes.sse.ui.markup;
import javax.inject.Inject;
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent_observing.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupComponent_observing.java
similarity index 98%
rename from valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent_observing.java
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupComponent_observing.java
index 36d42c4..ed1b210 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupComponent_observing.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupComponent_observing.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.ui.markup;
+package org.apache.isis.valuetypes.sse.ui.markup;
import java.io.IOException;
import java.util.UUID;
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java
similarity index 96%
rename from valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java
index 84c0d3b..8695c16 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/ListeningMarkupPanelFactoriesForWicket.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.isis.extensions.sse.ui.markup;
+package org.apache.isis.valuetypes.sse.ui.markup;
import org.springframework.stereotype.Component;
import org.apache.isis.applib.value.LocalResourcePath;
-import org.apache.isis.extensions.sse.metamodel.facets.SseObserveFacet;
+import org.apache.isis.valuetypes.sse.metamodel.facets.SseObserveFacet;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.markup.MarkupComponentFactory;
import org.apache.isis.viewer.wicket.ui.components.scalars.markup.MarkupPanelFactories;
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/js/ObservingComponent.js b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/js/ObservingComponent.js
similarity index 100%
rename from valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/markup/js/ObservingComponent.js
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/markup/js/ObservingComponent.js
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/services/SseServiceDefault.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/services/SseServiceDefault.java
similarity index 97%
rename from valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/services/SseServiceDefault.java
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/services/SseServiceDefault.java
index 73eacb1..c196f8e 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/services/SseServiceDefault.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/services/SseServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.ui.services;
+package org.apache.isis.valuetypes.sse.ui.services;
import java.util.List;
import java.util.Map;
@@ -42,9 +42,9 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.annotation.OrderPrecedence;
import org.apache.isis.applib.services.xactn.TransactionService;
import org.apache.isis.core.commons.internal.collections._Lists;
-import org.apache.isis.extensions.sse.applib.service.SseChannel;
-import org.apache.isis.extensions.sse.applib.service.SseService;
-import org.apache.isis.extensions.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.valuetypes.sse.applib.annotations.SseSource;
import org.apache.isis.runtime.persistence.transaction.IsisTransactionAspectSupport;
import org.apache.isis.runtime.session.IsisSessionFactory;
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/webmodule/ServerSentEventsServlet.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/webmodule/ServerSentEventsServlet.java
similarity index 95%
rename from valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/webmodule/ServerSentEventsServlet.java
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/webmodule/ServerSentEventsServlet.java
index a4484a0..090b018 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/webmodule/ServerSentEventsServlet.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/webmodule/ServerSentEventsServlet.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.ui.webmodule;
+package org.apache.isis.valuetypes.sse.ui.webmodule;
import java.io.IOException;
import java.util.Optional;
@@ -34,9 +34,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.apache.isis.applib.util.JaxbAdapters;
import org.apache.isis.core.commons.internal.base._Strings;
import org.apache.isis.core.commons.internal.context._Context;
-import org.apache.isis.extensions.sse.applib.service.SseChannel;
-import org.apache.isis.extensions.sse.applib.service.SseService;
-import org.apache.isis.extensions.sse.applib.value.ListeningMarkup;
+import org.apache.isis.valuetypes.sse.applib.service.SseChannel;
+import org.apache.isis.valuetypes.sse.applib.service.SseService;
+import org.apache.isis.valuetypes.sse.applib.value.ListeningMarkup;
import static org.apache.isis.core.commons.internal.base._With.requires;
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/webmodule/WebModuleServerSentEvents.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/webmodule/WebModuleServerSentEvents.java
similarity index 97%
rename from valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/webmodule/WebModuleServerSentEvents.java
rename to valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/webmodule/WebModuleServerSentEvents.java
index 9aa7225..4432340 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/extensions/sse/ui/webmodule/WebModuleServerSentEvents.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/webmodule/WebModuleServerSentEvents.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.extensions.sse.ui.webmodule;
+package org.apache.isis.valuetypes.sse.ui.webmodule;
import javax.inject.Inject;
import javax.inject.Named;