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

[isis] branch master updated: ISIS-2515: cleaning up a bit

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

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 2ca96b3  ISIS-2515: cleaning up a bit
2ca96b3 is described below

commit 2ca96b3cc00b06439ad4e6c7f3dba8ea7e4f3a3c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Feb 1 14:00:46 2021 +0100

    ISIS-2515: cleaning up a bit
---
 .../jdo/datanucleus/test/ConfigurationTest2.java      | 19 +++++--------------
 persistence/jdo/spring/README.adoc                    |  8 ++++----
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/persistence/jdo/datanucleus/src/test/java/org/apache/isis/persistence/jdo/datanucleus/test/ConfigurationTest2.java b/persistence/jdo/datanucleus/src/test/java/org/apache/isis/persistence/jdo/datanucleus/test/ConfigurationTest2.java
index 5429381..033c1c3 100644
--- a/persistence/jdo/datanucleus/src/test/java/org/apache/isis/persistence/jdo/datanucleus/test/ConfigurationTest2.java
+++ b/persistence/jdo/datanucleus/src/test/java/org/apache/isis/persistence/jdo/datanucleus/test/ConfigurationTest2.java
@@ -26,20 +26,11 @@ import org.springframework.boot.test.context.SpringBootTest;
                 ConfigurationExample2.class
         },
         properties = {
-//                "isis.persistence.jdo-datanucleus.impl.datanucleus.cache.level2.mode=ENABLE_SELECTIVE",
-//                "isis.persistence.jdo-datanucleus.impl.datanucleus.cache.level2.type=none",
-//                "isis.persistence.jdo-datanucleus.impl.datanucleus.identifier.case=MixedCase",
-//                "isis.persistence.jdo-datanucleus.impl.datanucleus.persistenceByReachabilityAtCommit=false",
-//                "isis.persistence.jdo-datanucleus.impl.datanucleus.schema.autoCreateAll=true",
-//                "isis.persistence.jdo-datanucleus.impl.datanucleus.schema.validateAll=false",
-//                "isis.persistence.jdo-datanucleus.impl.datanucleus.schema.validateConstraints=true",
-//                "isis.persistence.jdo-datanucleus.impl.datanucleus.schema.validateTables=true",
-//                
-//                "isis.persistence.jdo-datanucleus.impl.javax.jdo.PersistenceManagerFactoryClass=org.datanucleus.api.jdo.JDOPersistenceManagerFactory",
-                "spring.datasource.url=jdbc:h2:mem:test",
-                "spring.datasource.driver-class-name=org.h2.Driver",
-                "spring.datasource.username=sa",
-                "spring.datasource.password=",
+//                XXX not used with this example 
+//                "spring.datasource.url=jdbc:h2:mem:test",
+//                "spring.datasource.driver-class-name=org.h2.Driver",
+//                "spring.datasource.username=sa",
+//                "spring.datasource.password=",
        }
 )
 class ConfigurationTest2 {
diff --git a/persistence/jdo/spring/README.adoc b/persistence/jdo/spring/README.adoc
index 7c9a7cb..5ea9e8b 100644
--- a/persistence/jdo/spring/README.adoc
+++ b/persistence/jdo/spring/README.adoc
@@ -27,7 +27,7 @@ style as the _Hibernate_ support. The corresponding integration classes reside i
 _Spring_ provides a `LocalPersistenceManagerFactoryBean` class that allows you to define a
 local JDO `PersistenceManagerFactory` within a _Spring_ application context:
 
-.Option 1 - Beans Configuration (XML)
+.Option 1a - Beans Configuration (XML)
 [%collapsible]
 ====
 [source,xml]
@@ -42,7 +42,7 @@ local JDO `PersistenceManagerFactory` within a _Spring_ application context:
 ----
 ====
 
-.Option 2 - Java Beans
+.Option 1b - Java Beans (programmatic)
 [%collapsible]
 ====
 [source,java]
@@ -100,7 +100,7 @@ JDBC `DataSource`, passed into the connectionFactory property. For example, for
 JDO implementation https://www.datanucleus.org/[DataNucleus],
 this is the XML configuration of the PersistenceManagerFactory implementation:
 
-.Option 1 - Beans Configuration (XML)
+.Option 2a - Beans Configuration (XML)
 [%collapsible]
 ====
 [source,xml]
@@ -123,7 +123,7 @@ this is the XML configuration of the PersistenceManagerFactory implementation:
 ----
 ====
 
-.Option 2 - Java Beans
+.Option 2b - Java Beans (programmatic)
 [%collapsible]
 ====
 [source,java]