[isis] 02/02: ISIS-2158: fixes broken SSE demo

[ah...@apache.org]

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

commit fa02b2ce540d8ac48b38b2b3882d00cd493199d3
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Jan 13 13:26:40 2020 +0100

    ISIS-2158: fixes broken SSE demo
---
 examples/demo/src/main/java/demoapp/webapp/DemoApp.java       |  8 ++++----
 .../isis/valuetypes/sse/ui/services/SseServiceDefault.java    | 11 +++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
index 190680e..8e0aba2 100644
--- a/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
+++ b/examples/demo/src/main/java/demoapp/webapp/DemoApp.java
@@ -31,7 +31,7 @@ import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.PropertySources;
 
 import org.apache.isis.core.config.presets.IsisPresets;
-import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
+import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
 import org.apache.isis.extensions.secman.api.SecurityModuleConfig;
 import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationService;
 import org.apache.isis.extensions.secman.api.permission.PermissionsEvaluationServiceAllowBeatsVeto;
@@ -39,15 +39,15 @@ import org.apache.isis.extensions.secman.encryption.jbcrypt.IsisModuleExtSecmanE
 import org.apache.isis.extensions.secman.jdo.IsisModuleExtSecmanPersistenceJdo;
 import org.apache.isis.extensions.secman.model.IsisModuleExtSecmanModel;
 import org.apache.isis.extensions.secman.shiro.IsisModuleExtSecmanRealmShiro;
-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;
+import org.apache.isis.testing.fixtures.applib.IsisModuleTestingFixturesApplib;
 import org.apache.isis.valuetypes.asciidoc.ui.IsisModuleValAsciidocUi;
+import org.apache.isis.valuetypes.sse.ui.IsisModuleValSseUi;
 import org.apache.isis.viewer.restfulobjects.jaxrsresteasy4.IsisModuleViewerRestfulObjectsJaxrsResteasy4;
 import org.apache.isis.viewer.restfulobjects.viewer.IsisModuleViewerRestfulObjectsViewer;
 import org.apache.isis.viewer.wicket.viewer.IsisModuleViewerWicketViewer;
-import org.apache.isis.core.webspringboot.IsisModuleCoreWebSpringBoot;
 
 import demoapp.dom.DemoModule;
 import demoapp.utils.LibraryPreloadingService;
@@ -87,7 +87,7 @@ public class DemoApp extends SpringBootServletInitializer {
         IsisModuleSecurityShiro.class,
         IsisModuleJdoDataNucleus5.class,
         IsisModuleViewerWicketViewer.class,
-        IsisModuleValSseApplib.class, // server sent events
+        IsisModuleValSseUi.class, // server sent events
         IsisModuleValAsciidocUi.class, // ascii-doc rendering support
         
         // REST
diff --git a/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/services/SseServiceDefault.java b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/services/SseServiceDefault.java
index eede37a..28797aa 100644
--- a/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/services/SseServiceDefault.java
+++ b/valuetypes/sse/ui/src/main/java/org/apache/isis/valuetypes/sse/ui/services/SseServiceDefault.java
@@ -40,13 +40,12 @@ import org.springframework.core.annotation.Order;
 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.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.core.runtime.persistence.transaction.IsisTransactionAspectSupport;
 import org.apache.isis.core.runtime.session.IsisSessionFactory;
+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 lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -70,8 +69,8 @@ import lombok.extern.log4j.Log4j2;
 @Log4j2
 public class SseServiceDefault implements SseService {
 
-    @Inject TransactionService transactionService;
-    @Inject IsisSessionFactory isisSessionFactory;
+    //@Inject private TransactionService transactionService;
+    @Inject private IsisSessionFactory isisSessionFactory;
 
     private final EventStreamPool eventStreamPool = new EventStreamPool();