You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/02/04 18:31:10 UTC
[isis-app-simpleapp] branch jdo updated: fixes datasource
configuration
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
The following commit(s) were added to refs/heads/jdo by this push:
new f04665b fixes datasource configuration
f04665b is described below
commit f04665bf5cd8606d10bd61c8244e1383205cae1b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Feb 4 19:30:58 2021 +0100
fixes datasource configuration
---
module-simple/pom.xml | 1 +
.../domainapp/modules/simple/SimpleModule.java | 1 -
.../SimpleModuleTestConfiguration_usingJdo.java | 2 +-
...mainAppFixtureScriptsSpecificationProvider.java | 2 --
.../services/health/HealthCheckServiceImpl.java | 7 +++--
webapp/src/main/resources/application.yml | 35 +++++++++++-----------
.../main/resources/config/application.properties | 12 ++++----
...ties => todo~application-POSTGRESQL.properties} | 0
...rties => todo~application-SQLSERVER.properties} | 0
...impleApplicationTestConfiguration_usingJdo.java | 2 +-
10 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/module-simple/pom.xml b/module-simple/pom.xml
index c81a00f..4aa656b 100644
--- a/module-simple/pom.xml
+++ b/module-simple/pom.xml
@@ -67,6 +67,7 @@
</dependency>
<!-- TESTS -->
+
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-unittests</artifactId>
diff --git a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
index 02e1d55..c5d7aee 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
@@ -7,7 +7,6 @@ import org.springframework.validation.annotation.Validated;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
-import org.apache.isis.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
import lombok.Data;
diff --git a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleTestConfiguration_usingJdo.java b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleTestConfiguration_usingJdo.java
index 56a2faa..0df5209 100644
--- a/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleTestConfiguration_usingJdo.java
+++ b/module-simple/src/test/java/domainapp/modules/simple/integtests/SimpleModuleTestConfiguration_usingJdo.java
@@ -47,7 +47,7 @@ import domainapp.modules.simple.SimpleModule;
})
@PropertySources({
@PropertySource(IsisPresets.H2InMemory_withUniqueSchema),
- @PropertySource(IsisPresets.DataNucleusAutoCreate),
+ @PropertySource(IsisPresets.DatanucleusAutocreateNoValidate),
@PropertySource(IsisPresets.UseLog4j2Test),
})
public class SimpleModuleTestConfiguration_usingJdo {
diff --git a/webapp/src/main/java/domainapp/webapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java b/webapp/src/main/java/domainapp/webapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
index daa7a9a..44a100c 100644
--- a/webapp/src/main/java/domainapp/webapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
+++ b/webapp/src/main/java/domainapp/webapp/application/fixture/DomainAppFixtureScriptsSpecificationProvider.java
@@ -2,8 +2,6 @@ package domainapp.webapp.application.fixture;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.annotation.DomainService;
-import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
import org.apache.isis.testing.fixtures.applib.fixturespec.FixtureScriptsSpecification;
import org.apache.isis.testing.fixtures.applib.fixturespec.FixtureScriptsSpecificationProvider;
diff --git a/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java b/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
index f6b6a8c..c03b01e 100644
--- a/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
+++ b/webapp/src/main/java/domainapp/webapp/application/services/health/HealthCheckServiceImpl.java
@@ -3,14 +3,15 @@ package domainapp.webapp.application.services.health;
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.isis.applib.services.health.Health;
-import org.apache.isis.applib.services.health.HealthCheckService;
import org.springframework.stereotype.Service;
-import domainapp.modules.simple.dom.so.SimpleObjects;
+import org.apache.isis.applib.services.health.Health;
+import org.apache.isis.applib.services.health.HealthCheckService;
import lombok.extern.log4j.Log4j2;
+import domainapp.modules.simple.dom.so.SimpleObjects;
+
@Service
@Named("domainapp.HealthCheckServiceImpl")
@Log4j2
diff --git a/webapp/src/main/resources/application.yml b/webapp/src/main/resources/application.yml
index 7659e7c..0a07e91 100644
--- a/webapp/src/main/resources/application.yml
+++ b/webapp/src/main/resources/application.yml
@@ -68,23 +68,24 @@ isis:
persistence:
- jdo-datanucleus:
- impl:
- # note that properties under 'isis.persistence.jdo-datanucleus.impl' are passed through directly
- # to DataNucleus, and use variously camelCase or PascalCase rather than kebab-case
- datanucleus:
- schema:
- validateTables: true
- validateConstraints: true
-
- persistenceByReachabilityAtCommit: false
- identifier:
- case: MixedCase
-
- cache:
- level2:
- type: none
- mode: ENABLE_SELECTIVE
+ schema:
+ auto-create-schemas: simple
+ create-schema-sql-template: "CREATE SCHEMA IF NOT EXISTS %S"
+
+# note that properties under 'datanucleus' must use camelCase rather than kebab-case
+datanucleus:
+ schema:
+ validateTables: true
+ validateConstraints: true
+
+ persistenceByReachabilityAtCommit: false
+ identifier:
+ case: MixedCase
+
+ cache:
+ level2:
+ type: none
+ mode: ENABLE_SELECTIVE
resteasy:
jaxrs:
diff --git a/webapp/src/main/resources/config/application.properties b/webapp/src/main/resources/config/application.properties
index 654146b..94f0df5 100644
--- a/webapp/src/main/resources/config/application.properties
+++ b/webapp/src/main/resources/config/application.properties
@@ -8,15 +8,13 @@
#
-# note that properties under 'isis.persistence.jdo-datanucleus.impl' are passed through directly
-# to DataNucleus, and use variously camelCase or PascalCase rather than kebab-case
+# note that properties under 'datanucleus' must use variously camelCase or PascalCase rather than kebab-case
-isis.persistence.jdo-datanucleus.impl.javax.jdo.option.ConnectionURL = jdbc:h2:mem:test
-isis.persistence.jdo-datanucleus.impl.javax.jdo.option.ConnectionDriverName = org.h2.Driver
-isis.persistence.jdo-datanucleus.impl.javax.jdo.option.ConnectionUserName = sa
-isis.persistence.jdo-datanucleus.impl.javax.jdo.option.ConnectionPassword =
+datanucleus.schema.autoCreateAll=true
+
+spring.datasource.platform=h2
+spring.datasource.url=jdbc:h2:mem:simple
-isis.persistence.jdo-datanucleus.impl.datanucleus.schema.autoCreateAll=true
spring.flyway.enabled=false
# uncomment to run during bootstrap
diff --git a/webapp/src/main/resources/config/application-POSTGRESQL.properties b/webapp/src/main/resources/config/todo~application-POSTGRESQL.properties
similarity index 100%
rename from webapp/src/main/resources/config/application-POSTGRESQL.properties
rename to webapp/src/main/resources/config/todo~application-POSTGRESQL.properties
diff --git a/webapp/src/main/resources/config/application-SQLSERVER.properties b/webapp/src/main/resources/config/todo~application-SQLSERVER.properties
similarity index 100%
rename from webapp/src/main/resources/config/application-SQLSERVER.properties
rename to webapp/src/main/resources/config/todo~application-SQLSERVER.properties
diff --git a/webapp/src/test/java/domainapp/webapp/integtests/SimpleApplicationTestConfiguration_usingJdo.java b/webapp/src/test/java/domainapp/webapp/integtests/SimpleApplicationTestConfiguration_usingJdo.java
index f509a33..8628bc8 100644
--- a/webapp/src/test/java/domainapp/webapp/integtests/SimpleApplicationTestConfiguration_usingJdo.java
+++ b/webapp/src/test/java/domainapp/webapp/integtests/SimpleApplicationTestConfiguration_usingJdo.java
@@ -47,7 +47,7 @@ import domainapp.modules.simple.SimpleModule;
})
@PropertySources({
@PropertySource(IsisPresets.H2InMemory_withUniqueSchema),
- @PropertySource(IsisPresets.DataNucleusAutoCreate),
+ @PropertySource(IsisPresets.DatanucleusAutocreateNoValidate),
@PropertySource(IsisPresets.UseLog4j2Test),
})
public class SimpleApplicationTestConfiguration_usingJdo {