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/01/17 13:00:26 UTC

[isis-app-simpleapp] 04/04: fixes use of jdo

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

danhaywood pushed a commit to branch v2.0.0-jpa-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git

commit e2ed5ef382b587874d97b96603f32a2d05db8d7c
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Jan 17 13:00:01 2021 +0000

    fixes use of jdo
---
 .../domainapp/modules/simple/SimpleModule.java     |  9 +++---
 webapp/src/main/resources/application.yml          | 36 ++++++++--------------
 2 files changed, 17 insertions(+), 28 deletions(-)

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 a5fd57f..da09455 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.context.annotation.Import;
 import org.springframework.validation.annotation.Validated;
 
 import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
-import org.apache.isis.testing.fixtures.applib.teardown.TeardownFixtureAbstract;
 import org.apache.isis.testing.fixtures.applib.modules.ModuleWithFixtures;
 
 import lombok.Data;
@@ -24,20 +23,20 @@ public class SimpleModule implements ModuleWithFixtures {
 
     @Override
     public FixtureScript getTeardownFixture() {
-        return new TeardownFixtureAbstract() {
+        return new FixtureScript() {
             @Override
             protected void execute(ExecutionContext executionContext) {
-                deleteFrom(SimpleObject.class);
+                repositoryService.removeAll(SimpleObject.class);
             }
         };
     }
 
     public static class PropertyDomainEvent<S,T>
             extends org.apache.isis.applib.events.domain.PropertyDomainEvent<S,T> {}
-    
+
     public static class CollectionDomainEvent<S,T>
             extends org.apache.isis.applib.events.domain.CollectionDomainEvent<S,T> {}
-    
+
     public static class ActionDomainEvent<S>
             extends org.apache.isis.applib.events.domain.ActionDomainEvent<S> {}
 
diff --git a/webapp/src/main/resources/application.yml b/webapp/src/main/resources/application.yml
index 7659e7c..1cae5e5 100644
--- a/webapp/src/main/resources/application.yml
+++ b/webapp/src/main/resources/application.yml
@@ -9,8 +9,8 @@ isis:
     annotation:
       action:
         explicit: true
-        command: ignore_safe
-        publishing: all
+        command-publishing: ignore_safe
+        execution-publishing: all
       action-layout:
         css-class:
           patterns:
@@ -21,8 +21,8 @@ isis:
         auditing: all
         publishing: all
       property:
-        command: all
-        publishing: all
+        command-publishing: all
+        execution-publishing: all
 
   core:
     meta-model:
@@ -66,25 +66,7 @@ isis:
         show-chooser: true
         show-drop-down-on-footer: true
 
-
-  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
+  #persistence:
 
 resteasy:
   jaxrs:
@@ -99,6 +81,14 @@ spring:
   banner:
     location: banner.txt
 
+  quartz:
+    job-store-type: memory
+
+management:
+  endpoint:
+    health:
+      enabled: true
+
 app:
   simple-module:
     types: