You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2023/09/26 20:42:56 UTC

[causeway] 01/02: CAUSEWAY-3587 : adds some additional default fa icons

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

danhaywood pushed a commit to branch CAUSEWAY-3610
in repository https://gitbox.apache.org/repos/asf/causeway.git

commit 05b4208ceed9899ccbc3123dcb87d6a8d63dc7fb
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Sep 26 18:02:20 2023 +0100

    CAUSEWAY-3587 : adds some additional default fa icons
---
 .../modules/applib/pages/index/services/repository/EntityState.adoc  | 5 +++--
 .../org/apache/causeway/applib/services/repository/EntityState.java  | 5 +++--
 .../java/org/apache/causeway/core/config/CausewayConfiguration.java  | 3 +++
 .../org/apache/causeway/core/config/DatanucleusConfiguration.java    | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/antora/components/refguide-index/modules/applib/pages/index/services/repository/EntityState.adoc b/antora/components/refguide-index/modules/applib/pages/index/services/repository/EntityState.adoc
index 0dd8e62cc4..f06d570e13 100644
--- a/antora/components/refguide-index/modules/applib/pages/index/services/repository/EntityState.adoc
+++ b/antora/components/refguide-index/modules/applib/pages/index/services/repository/EntityState.adoc
@@ -107,9 +107,10 @@ Object with this state is an entity that is attached to a persistence session, i
 
 Object with this state is an entity but that is detached from a persistence session, in other words changes to the entity will _not_ be flushed back to the database.JDO specifics:
 
-JDO distinguishes between DETACHED and HOLLOW, where we are using HOLLOW here, by virtue of _datanucleus.detachAllOnCommit=false_ .
+JDO distinguishes between DETACHED and HOLLOW, where we are using HOLLOW here, by virtue of _javax.jdo.option.DetachAllOnCommit=false_ .
 
-(Unfortunately, we have not found a way to recover _OIDs_ from _hollow_ entities, as used for serialization post commit. So a workaround is in place with DnStateManagerForHollow.)
+(Unfortunately, we have not found a way to recover _OIDs_ from _hollow_ entities, as used for serialization post commit.
+We have instead implemented a workaround using the `DnStateManagerForHollow` class).
 
 [#PERSISTABLE_REMOVED]
 === PERSISTABLE_REMOVED
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/repository/EntityState.java b/api/applib/src/main/java/org/apache/causeway/applib/services/repository/EntityState.java
index 848e051b0c..f74e3a5af2 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/repository/EntityState.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/repository/EntityState.java
@@ -61,9 +61,10 @@ public enum EntityState {
      * be tracked nor flushed back to the database.
      * <p>
      * JDO distinguishes between DETACHED and HOLLOW,
-     * by virtue of {@code datanucleus.detachAllOnCommit=false}.
+     * by virtue of {@code javax.jdo.option.detachAllOnCommit=false}.
      * <p>
-     * To recover <i>OIDs</i> from <i>hollow</i> entities, we introduced the DnStateManagerForHollow.
+     * (Unfortunately, we have not found a way to recover _OIDs_ from _hollow_ entities, as used for serialization post commit.
+     * We have instead implemented a workaround using the <code>DnStateManagerForHollow</code> class).
      *
      * @see "https://www.datanucleus.org/products/accessplatform_6_0/jdo/persistence.html#lifecycle"
      */
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
index 7596d031d2..db2da54210 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/CausewayConfiguration.java
@@ -916,6 +916,9 @@ public class CausewayConfiguration {
                             "lookup.*:fa-search",
                             "search.*:fa-search",
 
+                            "open.*:fa-solid fa-arrow-up-right-from-square",
+                            "close.*:fa-solid fa-regular fa-rectangle-xmark",
+
                             "recent.*:fa-solid fa-clock-rotate-left",
 
                             "lock.*:fa-solid fa-lock",
diff --git a/core/config/src/main/java/org/apache/causeway/core/config/DatanucleusConfiguration.java b/core/config/src/main/java/org/apache/causeway/core/config/DatanucleusConfiguration.java
index 80637fd821..6d955365c8 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/DatanucleusConfiguration.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/DatanucleusConfiguration.java
@@ -315,10 +315,10 @@ public class DatanucleusConfiguration {
 }
 
 /*
-As of 6.0.0-M5, these are all the config properties supported.
+As of 6.0.5, these are all the config properties supported (taken from <code>org.datanucleus.PropertyNames</code>).
 I'm pasting them here so that we might choose to surface some via application.properties, ie, define in this class.
 
-Note: As it's not easy (impossible?) to define camelCase in Spring Boot, but because DN does case-insensitive checks, we can just make em lowercase.
+Note: As it's not easy (impossible?) to define camelCase in Spring Boot, but because DN does case-insensitive checks, we can just make 'em lowercase.
 
 datanucleus.allowattachoftransient
 datanucleus.allowcallbacks