[isis-app-helloworld] 03/04: Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT

[da...@apache.org]

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

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

commit 1f503ca72babd537a39499d6e6a7f98ac012c13a
Merge: b978cdc 835b934
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Apr 13 22:45:24 2021 +0100

    Merge branch 'jdo-SNAPSHOT' into jpa-SNAPSHOT

 src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --cc src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
index 6395911,6f43512..a46dd22
--- a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
+++ b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
@@@ -52,8 -48,7 +52,8 @@@ public class HelloWorldObject implement
      }
  
      @Name
 +    @javax.persistence.Column(length = Name.MAX_LEN, nullable = false)
-     @MemberOrder(name = "identity", sequence = "1")
+     @PropertyLayout(fieldSetId = "identity", sequence = "1")
      private String name;
      public String getName() {
          return name;
@@@ -63,8 -58,7 +63,8 @@@
      }
  
      @Notes
 +    @javax.persistence.Column(length = Notes.MAX_LEN, nullable = true)
-     @MemberOrder(name = "details", sequence = "1")
+     @PropertyLayout(fieldSetId = "details", sequence = "1")
      private String notes;
      public String getNotes() {
          return notes;