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/05/14 08:20:27 UTC
[isis-app-helloworld] branch jdo-SNAPSHOT updated: updates to
latest snapshot
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
The following commit(s) were added to refs/heads/jdo-SNAPSHOT by this push:
new b0390d2 updates to latest snapshot
b0390d2 is described below
commit b0390d2a537cb5582df9e7e07a59640cd4331a1a
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri May 14 09:20:14 2021 +0100
updates to latest snapshot
---
pom.xml | 3 +++
.../modules/hello/dom/hwo/HelloWorldObject.java | 8 +++++---
src/main/resources/menubars.layout.xml | 23 +++++++++++++++-------
3 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 59ce20c..ca2928f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,10 @@
<parent>
<groupId>org.apache.isis.app</groupId>
<artifactId>isis-app-starter-parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+<!--
<version>2.0.0-M5.20210413-1443-108a3a48</version>
+-->
<relativePath/>
</parent>
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 bcd6498..194f189 100644
--- a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
+++ b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
@@ -71,10 +71,12 @@ public class HelloWorldObject implements Comparable<HelloWorldObject> {
@Action(
semantics = SemanticsOf.IDEMPOTENT,
- executionPublishing = Publishing.ENABLED,
- associateWith = "name"
+ executionPublishing = Publishing.ENABLED
+ )
+ @ActionLayout(
+ associateWith = "name",
+ describedAs = "Updates the object's name"
)
- @ActionLayout(describedAs = "Updates the object's name")
public HelloWorldObject updateName(
@Name final String name) {
setName(name);
diff --git a/src/main/resources/menubars.layout.xml b/src/main/resources/menubars.layout.xml
index 8d714b9..5343643 100644
--- a/src/main/resources/menubars.layout.xml
+++ b/src/main/resources/menubars.layout.xml
@@ -17,6 +17,17 @@
<mb3:menu>
<mb3:named>Prototyping</mb3:named>
<mb3:section>
+ <mb3:named>Fixtures</mb3:named>
+ <mb3:serviceAction objectType="isis.ext.fixtures.FixtureScripts" id="runFixtureScript"/>
+ <mb3:serviceAction objectType="isis.ext.fixtures.FixtureScripts" id="recreateObjectsAndReturnFirst"/>
+ </mb3:section>
+ <mb3:section>
+ <mb3:named>Impersonate</mb3:named>
+ <mb3:serviceAction objectType="isis.sudo.ImpersonateMenu" id="impersonate"/>
+ <mb3:serviceAction objectType="isis.sudo.ImpersonateMenu" id="impersonateWithRoles"/>
+ <mb3:serviceAction objectType="isis.sudo.ImpersonateMenu" id="stopImpersonating"/>
+ </mb3:section>
+ <mb3:section>
<mb3:named>Layouts</mb3:named>
<mb3:serviceAction objectType="isis.applib.LayoutServiceMenu" id="downloadLayouts"/>
<mb3:serviceAction objectType="isis.applib.LayoutServiceMenu" id="downloadMenuBarsLayout"/>
@@ -33,9 +44,9 @@
</mb3:section>
<mb3:section>
<mb3:named>REST API</mb3:named>
- <mb3:serviceAction objectType="isis.applib.SwaggerServiceMenu" id="openSwaggerUi"/>
- <mb3:serviceAction objectType="isis.applib.SwaggerServiceMenu" id="openRestApi"/>
- <mb3:serviceAction objectType="isis.applib.SwaggerServiceMenu" id="downloadSwaggerSchemaDefinition"/>
+ <mb3:serviceAction objectType="isis.viewer.restfulobjects.SwaggerServiceMenu" id="openSwaggerUi"/>
+ <mb3:serviceAction objectType="isis.viewer.restfulobjects.SwaggerServiceMenu" id="openRestApi"/>
+ <mb3:serviceAction objectType="isis.viewer.restfulobjects.SwaggerServiceMenu" id="downloadSwaggerSchemaDefinition"/>
</mb3:section>
<mb3:section>
<mb3:named>i18n</mb3:named>
@@ -51,12 +62,10 @@
<mb3:named/>
<mb3:section>
<mb3:named>Configuration</mb3:named>
- <mb3:serviceAction objectType="isis.applib.ConfigurationMenu" id="configuration"/>
+ <mb3:serviceAction objectType="isis.conf.ConfigurationMenu" id="configuration"/>
</mb3:section>
<mb3:section>
- <mb3:serviceAction objectType="isis.security.LogoutMenu" id="logout">
- <cpt:named>Logout</cpt:named>
- </mb3:serviceAction>
+ <mb3:serviceAction objectType="isis.security.LogoutMenu" id="logout"/>
</mb3:section>
</mb3:menu>
</mb3:tertiary>