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 17:47:40 UTC

[isis-app-helloworld] branch jpa updated: ISIS-2512: fixes datasource conf

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch jpa
in repository https://gitbox.apache.org/repos/asf/isis-app-helloworld.git


The following commit(s) were added to refs/heads/jpa by this push:
     new 4295697  ISIS-2512: fixes datasource conf
4295697 is described below

commit 4295697a80c5cabcb2268cb7b49c36ecd8011dec
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Feb 4 18:47:32 2021 +0100

    ISIS-2512: fixes datasource conf
---
 src/main/resources/application.yml               | 19 +------------------
 src/main/resources/config/application.properties | 12 ++----------
 2 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4686c08..c1a8fde 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -44,24 +44,7 @@ isis:
       max-title-length-in-parented-tables: 0
 
   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
-    jpa:
+    schema:
       auto-create-schemas: hello
       create-schema-sql-template: "CREATE SCHEMA IF NOT EXISTS %S"
 
diff --git a/src/main/resources/config/application.properties b/src/main/resources/config/application.properties
index c0b1891..2b01a88 100644
--- a/src/main/resources/config/application.properties
+++ b/src/main/resources/config/application.properties
@@ -7,13 +7,5 @@
 # See also /application.yml
 #
 
-
-# note that properties under 'isis.persistence.jdo-datanucleus.impl' are passed through directly
-# to DataNucleus, and must use camelCase 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 =
-
-isis.persistence.jdo-datanucleus.impl.datanucleus.schema.autoCreateAll=true
\ No newline at end of file
+spring.datasource.platform=h2
+spring.datasource.url=jdbc:h2:mem:helloworld
\ No newline at end of file