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 2021/03/20 14:59:25 UTC
[isis-app-simpleapp] branch jpa updated: workaround for ISIS-2583
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jpa
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
The following commit(s) were added to refs/heads/jpa by this push:
new c5135fa workaround for ISIS-2583
c5135fa is described below
commit c5135fa9c978fe3f592d57a264470a4f982aaf5c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Mar 20 14:59:05 2021 +0000
workaround for ISIS-2583
---
webapp/src/main/resources/application.yml | 5 +++++
webapp/src/main/resources/config/application-SQLSERVER.properties | 2 --
webapp/src/main/resources/config/application.properties | 1 -
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/webapp/src/main/resources/application.yml b/webapp/src/main/resources/application.yml
index deb1d70..1add5af 100644
--- a/webapp/src/main/resources/application.yml
+++ b/webapp/src/main/resources/application.yml
@@ -102,3 +102,8 @@ app:
message: "'{character}' is invalid."
prohibited-characters: "&%$!"
+# workaround for https://issues.apache.org/jira/browse/ISIS-2583: not used, but needed to prevent NPE
+datanucleus:
+ cache:
+ level2:
+ type: soft
diff --git a/webapp/src/main/resources/config/application-SQLSERVER.properties b/webapp/src/main/resources/config/application-SQLSERVER.properties
index 026330e..07d8fe3 100644
--- a/webapp/src/main/resources/config/application-SQLSERVER.properties
+++ b/webapp/src/main/resources/config/application-SQLSERVER.properties
@@ -28,6 +28,4 @@ spring.datasource.password=simpleapp
#isis.persistence.schema.create-schema-sql-template= (use flyway instead)
isis.persistence.schema.auto-create-schemas=
-# DataNucleus, and must use camelCase rather than kebab-case
-datanucleus.schema.autoCreateAll=false
diff --git a/webapp/src/main/resources/config/application.properties b/webapp/src/main/resources/config/application.properties
index 36b43d9..aed22f6 100644
--- a/webapp/src/main/resources/config/application.properties
+++ b/webapp/src/main/resources/config/application.properties
@@ -17,7 +17,6 @@ spring.datasource.driver-class-name=org.h2.Driver
isis.persistence.schema.create-schema-sql-template=CREATE SCHEMA IF NOT EXISTS %S
isis.persistence.schema.auto-create-schemas=SIMPLE
-datanucleus.schema.autoCreateTables=true
# uncomment to run during bootstrap
#isis.testing.fixtures.initial-script = domainapp.webapp.application.fixture.scenarios.DomainAppDemo