This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/spring6 by this push:
new 66eda88297 java-fx launch fixes
66eda88297 is described below
commit 66eda88297d7578297ae8b8520ea1a26430bc153
Author: Andi Huber <[email protected]>
AuthorDate: Mon Dec 12 10:09:02 2022 +0100
java-fx launch fixes
---
examples/demo/javafx/pom.xml | 1 -
examples/demo/javafx/src/main/java/demoapp/javafx/DemoAppJavaFx.java | 3 +++
incubator/viewers/javafx/viewer/pom.xml | 4 ++++
.../viewer/javafx/viewer/CausewayModuleIncViewerJavaFxViewer.java | 2 ++
4 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/examples/demo/javafx/pom.xml b/examples/demo/javafx/pom.xml
index 4337f69095..669d1897cd 100644
--- a/examples/demo/javafx/pom.xml
+++ b/examples/demo/javafx/pom.xml
@@ -28,7 +28,6 @@
<packaging>jar</packaging>
<properties>
- <maven.compiler.release>11</maven.compiler.release>
<maven.deploy.skip>true</maven.deploy.skip>
<sonar.skip>true</sonar.skip>
</properties>
diff --git
a/examples/demo/javafx/src/main/java/demoapp/javafx/DemoAppJavaFx.java
b/examples/demo/javafx/src/main/java/demoapp/javafx/DemoAppJavaFx.java
index 11a20e1092..058a42c143 100644
--- a/examples/demo/javafx/src/main/java/demoapp/javafx/DemoAppJavaFx.java
+++ b/examples/demo/javafx/src/main/java/demoapp/javafx/DemoAppJavaFx.java
@@ -25,6 +25,7 @@ import org.springframework.context.annotation.Import;
import org.apache.causeway.commons.internal.debug._Probe;
import org.apache.causeway.core.config.presets.CausewayPresets;
import
org.apache.causeway.core.runtimeservices.session.InteractionServiceDefault;
+import
org.apache.causeway.extensions.secman.jpa.CausewayModuleExtSecmanPersistenceJpa;
import
org.apache.causeway.incubator.viewer.javafx.model.events.JavaFxViewerConfig;
import org.apache.causeway.incubator.viewer.javafx.model.util._fx;
import
org.apache.causeway.incubator.viewer.javafx.viewer.CausewayModuleIncViewerJavaFxViewer;
@@ -42,6 +43,8 @@ import demoapp.dom.DemoModuleJpa;
// INCUBATING
CausewayModuleSecurityBypass.class,
+ // Security Manager Extension (secman)
+ CausewayModuleExtSecmanPersistenceJpa.class,
CausewayModuleIncViewerJavaFxViewer.class,
})
diff --git a/incubator/viewers/javafx/viewer/pom.xml
b/incubator/viewers/javafx/viewer/pom.xml
index b19a4cbb69..d87ca79a58 100644
--- a/incubator/viewers/javafx/viewer/pom.xml
+++ b/incubator/viewers/javafx/viewer/pom.xml
@@ -36,6 +36,10 @@
<artifactId>causeway-viewer-javafx-ui</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.causeway.viewer</groupId>
+
<artifactId>causeway-viewer-commons-services</artifactId>
+ </dependency>
</dependencies>
diff --git
a/incubator/viewers/javafx/viewer/src/main/java/org/apache/causeway/incubator/viewer/javafx/viewer/CausewayModuleIncViewerJavaFxViewer.java
b/incubator/viewers/javafx/viewer/src/main/java/org/apache/causeway/incubator/viewer/javafx/viewer/CausewayModuleIncViewerJavaFxViewer.java
index 720b5bd38e..75243f9c27 100644
---
a/incubator/viewers/javafx/viewer/src/main/java/org/apache/causeway/incubator/viewer/javafx/viewer/CausewayModuleIncViewerJavaFxViewer.java
+++
b/incubator/viewers/javafx/viewer/src/main/java/org/apache/causeway/incubator/viewer/javafx/viewer/CausewayModuleIncViewerJavaFxViewer.java
@@ -22,6 +22,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import
org.apache.causeway.incubator.viewer.javafx.ui.CausewayModuleIncViewerJavaFxUi;
+import
org.apache.causeway.viewer.commons.services.CausewayModuleViewerCommonsServices;
/**
*
@@ -32,6 +33,7 @@ import
org.apache.causeway.incubator.viewer.javafx.ui.CausewayModuleIncViewerJav
// Modules
CausewayModuleIncViewerJavaFxUi.class,
+ CausewayModuleViewerCommonsServices.class,
// @Service's
