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 2019/09/29 14:28:12 UTC
[isis] 02/02: ISIS-2086: declares
'isis.persistor.datanucleus.impl.javax.jdo.option.connectionUrl' into the
new type-safe config
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2086
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 14a28ee89394ce502d99c26765e258845ae3ade0
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Sep 29 15:27:53 2019 +0100
ISIS-2086: declares 'isis.persistor.datanucleus.impl.javax.jdo.option.connectionUrl' into the new type-safe config
---
.../java/org/apache/isis/config/IsisConfiguration.java | 14 +++++++++++++-
.../isis/runtime/services/hsqldb/HsqlDbManagerMenu.java | 8 ++++++--
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
index 621ba17..b644591 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
@@ -80,7 +80,19 @@ public class IsisConfiguration {
private final Impl impl = new Impl();
@Data
public static class Impl {
-
+ private final Javax javax = new Javax();
+ @Data
+ public static class Javax {
+ private final Jdo jdo = new Jdo();
+ @Data
+ public static class Jdo {
+ private final Option option = new Option();
+ @Data
+ public static class Option {
+ private String connectionUrl = null;
+ }
+ }
+ }
}
private boolean installFixtures = false;
}
diff --git a/core/runtime-extensions/src/main/java/org/apache/isis/runtime/services/hsqldb/HsqlDbManagerMenu.java b/core/runtime-extensions/src/main/java/org/apache/isis/runtime/services/hsqldb/HsqlDbManagerMenu.java
index f2c1709..aaaf898 100644
--- a/core/runtime-extensions/src/main/java/org/apache/isis/runtime/services/hsqldb/HsqlDbManagerMenu.java
+++ b/core/runtime-extensions/src/main/java/org/apache/isis/runtime/services/hsqldb/HsqlDbManagerMenu.java
@@ -19,7 +19,9 @@
package org.apache.isis.runtime.services.hsqldb;
import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+import org.apache.isis.config.IsisConfiguration;
import org.hsqldb.util.DatabaseManagerSwing;
import org.apache.isis.applib.IsisApplibModule;
@@ -48,10 +50,12 @@ public class HsqlDbManagerMenu {
private String url;
+ @Inject
+ IsisConfiguration configuration;
+
@PostConstruct
public void init() {
- this.url = IsisContext.getConfigurationLegacy()
- .getString("isis.persistor.datanucleus.impl.javax.jdo.option.ConnectionURL");
+ this.url = configuration.getPersistor().getDatanucleus().getImpl().getJavax().getJdo().getOption().getConnectionUrl();
}