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/04/13 21:49:05 UTC

[isis-app-helloworld] branch jdo-SNAPSHOT updated (72c150e -> 7cd93a3)

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

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


    from 72c150e  Merge branch 'jdo' into jdo-SNAPSHOT
     add b2f124a  simplifies menubars.layout.xml
     new 24f6050  Merge branch 'jdo' into jdo-SNAPSHOT
     new 835b934  updates to @PropertyLayout(fieldSet=)
     new 7cd93a3  updates parent pom to 2.0.0-M5.20210413-1443-108a3a48

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                                              |  2 +-
 .../modules/hello/dom/hwo/HelloWorldObject.java      |  6 +++---
 src/main/resources/menubars.layout.xml               | 20 +++++++++++++++-----
 3 files changed, 19 insertions(+), 9 deletions(-)

[isis-app-helloworld] 02/03: updates to @PropertyLayout(fieldSet=)

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 835b934a5374e806f84bb5fe094716c82d34b36b
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Apr 13 19:21:29 2021 +0100

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

diff --git a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
index 5ccce46..6f43512 100644
--- a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
+++ b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
@@ -11,7 +11,7 @@ import org.apache.isis.applib.annotation.Action;
 import org.apache.isis.applib.annotation.ActionLayout;
 import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.annotation.DomainObjectLayout;
-import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.PropertyLayout;
 import org.apache.isis.applib.annotation.Publishing;
 import org.apache.isis.applib.annotation.SemanticsOf;
 import org.apache.isis.applib.services.message.MessageService;
@@ -48,7 +48,7 @@ public class HelloWorldObject implements Comparable<HelloWorldObject> {
     }
 
     @Name
-    @MemberOrder(name = "identity", sequence = "1")
+    @PropertyLayout(fieldSetId = "identity", sequence = "1")
     private String name;
     public String getName() {
         return name;
@@ -58,7 +58,7 @@ public class HelloWorldObject implements Comparable<HelloWorldObject> {
     }
 
     @Notes
-    @MemberOrder(name = "details", sequence = "1")
+    @PropertyLayout(fieldSetId = "details", sequence = "1")
     private String notes;
     public String getNotes() {
         return notes;

[isis-app-helloworld] 03/03: updates parent pom to 2.0.0-M5.20210413-1443-108a3a48

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 7cd93a33d963799660fa84c9c5041dd62b937281
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Apr 13 22:48:22 2021 +0100

    updates parent pom to 2.0.0-M5.20210413-1443-108a3a48
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d1210a3..59ce20c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.apache.isis.app</groupId>
         <artifactId>isis-app-starter-parent</artifactId>
-        <version>2.0.0-M5.20210403-0430-d1a7ac64</version>
+        <version>2.0.0-M5.20210413-1443-108a3a48</version>
         <relativePath/>
     </parent>
 

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

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 24f6050b82a55675165fe16dfa14f50a548ef28d
Merge: 72c150e b2f124a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Apr 13 22:42:40 2021 +0100

    Merge branch 'jdo' into jdo-SNAPSHOT

 src/main/resources/menubars.layout.xml | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)