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 2020/07/10 09:02:05 UTC
[isis] branch master updated (8392f6f -> 437b63f)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 8392f6f ISIS-2400: section names to be optional not required
new b434677 ISIS-2222: moves some packages around, is all
new 1a99818 ISIS-2222: renames pom.xml names so group together more conveniently in the IDE
new 9b13354 ISIS-2222: fleshes out demo for application tenancy
new 437b63f ISIS-2222: fleshes out demo for application tenancy, tweaks.
The 4 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 => antora/pom.xml | 32 ++----
examples/demo/domain/pom.xml | 2 +-
.../samples/NameSamples.java} | 12 ++-
.../ActionLayout/ActionLayoutMenu.java | 12 +--
.../ActionLayoutPositionVm-description.adoc | 0
.../position/ActionLayoutPositionVm.java | 4 +-
.../position/ActionLayoutPositionVm.layout.xml | 0
.../ActionLayoutPositionVm_annotatedBelow.java | 2 +-
.../ActionLayoutPositionVm_annotatedPanel.java | 2 +-
...ionLayoutPositionVm_annotatedPanelDropDown.java | 2 +-
.../ActionLayoutPositionVm_annotatedRight.java | 2 +-
.../ActionLayoutPositionVm_layoutBelow.java | 2 +-
.../ActionLayoutPositionVm_layoutPanel.java | 2 +-
...ActionLayoutPositionVm_layoutPanelDropDown.java | 2 +-
.../ActionLayoutPositionVm_layoutRight.java | 2 +-
.../ActionLayoutPromptStyleVm-description.adoc | 0
.../promptStyle/ActionLayoutPromptStyleVm.java | 2 +-
.../ActionLayoutPromptStyleVm.layout.xml | 0
.../ActionLayoutPromptStyleVm_annotatedInline.java | 2 +-
...ayoutPromptStyleVm_annotatedInlineAsIfEdit.java | 2 +-
.../ActionLayoutPromptStyleVm_annotatedModal.java | 2 +-
...ActionLayoutPromptStyleVm_annotatedSidebar.java | 2 +-
.../ActionLayoutPromptStyleVm_layoutDialog.java | 2 +-
.../ActionLayoutPromptStyleVm_layoutInline.java | 2 +-
...onLayoutPromptStyleVm_layoutInlineAsIfEdit.java | 2 +-
.../PropertyLayout/PropertyLayoutMenu.java | 12 +--
.../PropertyLayoutCssClassMetaAnnotation.java | 2 +-
.../PropertyLayoutCssClassVm-description.adoc | 0
.../cssClass/PropertyLayoutCssClassVm.java | 4 +-
.../cssClass/PropertyLayoutCssClassVm.layout.xml | 0
.../PropertyLayoutCssClassVm_annotatedMixin.java | 5 +-
.../named/PropertyLayoutNamedMetaAnnotation.java | 3 +-
.../named/PropertyLayoutNamedVm-description.adoc | 0
.../named/PropertyLayoutNamedVm.java | 3 +-
.../named/PropertyLayoutNamedVm.layout.xml | 0
.../secman/IsisExtSecManMenu.java} | 19 ++--
.../extensions/secman/entities/TenantedJdo.java | 48 +++++++++
.../secman/entities/TenantedJdoEntities.java | 22 ++++
.../entities/seed/TenantedJdoSeedService.java | 41 ++++++++
.../ApplicationTenancyEvaluatorForDemo.java | 64 ++++++++++++
.../extensions/secman/vm/SecManVm-description.adoc | 34 ++++++
.../demoapp/dom/extensions/secman/vm/SecManVm.java | 116 +++++++++++++++++++++
.../secman/vm/SecManVm.layout.xml} | 33 +++---
.../src/main/java/demoapp/dom/menubars.layout.xml | 11 +-
.../strings/samples/JavaLangStringSamples.java | 2 +
.../{ => seed}/ChildJdoSeedService.java | 27 ++---
.../usingjaxb/StatefulVmUsingJaxb-description.adoc | 2 +-
.../src/main/resources/static/css/application.css | 3 +-
examples/demo/pom.xml | 2 +-
examples/demo/vaadin/pom.xml | 2 +-
examples/demo/wicket/pom.xml | 2 +-
pom.xml | 1 +
52 files changed, 433 insertions(+), 119 deletions(-)
copy pom.xml => antora/pom.xml (59%)
copy examples/demo/domain/src/main/java/demoapp/dom/{types/javalang/strings/samples/JavaLangStringSamples.java => _infra/samples/NameSamples.java} (75%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/ActionLayout/ActionLayoutMenu.java (74%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/ActionLayout/position/ActionLayoutPositionVm-description.adoc (100%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/ActionLayout/position/ActionLayoutPositionVm.java (93%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/ActionLayout/position/ActionLayoutPositionVm.layout.xml (100%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/ActionLayout/position/ActionLayoutPositionVm_annotatedBelow.java (96%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/ActionLayout/position/ActionLayoutPositionVm_annotatedPanel.java (96%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/ActionLayout/position/ActionLayoutPositionVm_annotatedPanelDropDown.java (96%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/ActionLayout/position/ActionLayoutPositionVm_annotatedRight.java (96%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/ActionLayout/position/ActionLayoutPositionVm_layoutBelow.java (96%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/ActionLayout/position/ActionLayoutPositionVm_layoutPanel.java (96%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/ActionLayout/position/ActionLayoutPositionVm_layoutPanelDropDown.java (96%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/ActionLayout/position/ActionLayoutPositionVm_layoutRight.java (96%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/ActionLayout/promptStyle/ActionLayoutPromptStyleVm-description.adoc (100%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.java (98%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.layout.xml (100%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedInline.java (96%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedInlineAsIfEdit.java (96%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedModal.java (96%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedSidebar.java (96%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_layoutDialog.java (96%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_layoutInline.java (96%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_layoutInlineAsIfEdit.java (96%)
copy examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/PropertyLayout/PropertyLayoutMenu.java (74%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/PropertyLayout/cssClass/PropertyLayoutCssClassMetaAnnotation.java (90%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/PropertyLayout/cssClass/PropertyLayoutCssClassVm-description.adoc (100%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/PropertyLayout/cssClass/PropertyLayoutCssClassVm.java (95%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/PropertyLayout/cssClass/PropertyLayoutCssClassVm.layout.xml (100%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/PropertyLayout/cssClass/PropertyLayoutCssClassVm_annotatedMixin.java (88%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/PropertyLayout/named/PropertyLayoutNamedMetaAnnotation.java (85%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/PropertyLayout/named/PropertyLayoutNamedVm-description.adoc (100%)
rename examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/PropertyLayout/named/PropertyLayoutNamedVm.java (97%)
copy examples/demo/domain/src/main/java/demoapp/dom/{ => annotations}/PropertyLayout/named/PropertyLayoutNamedVm.layout.xml (100%)
rename examples/demo/domain/src/main/java/demoapp/dom/{PropertyLayout/PropertyLayoutMenu.java => extensions/secman/IsisExtSecManMenu.java} (68%)
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/entities/TenantedJdo.java
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/entities/TenantedJdoEntities.java
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/entities/seed/TenantedJdoSeedService.java
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/spiimpl/ApplicationTenancyEvaluatorForDemo.java
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/vm/SecManVm-description.adoc
create mode 100644 examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/vm/SecManVm.java
rename examples/demo/domain/src/main/java/demoapp/dom/{PropertyLayout/named/PropertyLayoutNamedVm.layout.xml => extensions/secman/vm/SecManVm.layout.xml} (56%)
rename examples/demo/domain/src/main/java/demoapp/dom/viewmodels/jaxbrefentity/{ => seed}/ChildJdoSeedService.java (64%)
[isis] 03/04: ISIS-2222: fleshes out demo for application tenancy
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9b1335405021fa380527e874187a1660544ff698
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jul 10 09:56:46 2020 +0100
ISIS-2222: fleshes out demo for application tenancy
---
pom.xml => antora/pom.xml | 32 ++----
.../samples/NameSamples.java} | 12 ++-
.../annotations/ActionLayout/ActionLayoutMenu.java | 2 +-
.../PropertyLayout/PropertyLayoutMenu.java | 2 +-
.../secman/IsisExtSecManMenu.java} | 19 ++--
.../extensions/secman/entities/TenantedJdo.java | 48 +++++++++
.../secman/entities/TenantedJdoEntities.java | 22 ++++
.../entities/seed/TenantedJdoSeedService.java | 41 ++++++++
.../ApplicationTenancyEvaluatorForDemo.java | 64 ++++++++++++
.../extensions/secman/vm/SecManVm-description.adoc | 34 ++++++
.../demoapp/dom/extensions/secman/vm/SecManVm.java | 116 +++++++++++++++++++++
.../dom/extensions/secman/vm/SecManVm.layout.xml | 46 ++++++++
.../src/main/java/demoapp/dom/menubars.layout.xml | 11 +-
.../strings/samples/JavaLangStringSamples.java | 2 +
.../{ => seed}/ChildJdoSeedService.java | 27 ++---
.../usingjaxb/StatefulVmUsingJaxb-description.adoc | 2 +-
pom.xml | 1 +
17 files changed, 425 insertions(+), 56 deletions(-)
diff --git a/pom.xml b/antora/pom.xml
similarity index 59%
copy from pom.xml
copy to antora/pom.xml
index ba1cbff..e110709 100644
--- a/pom.xml
+++ b/antora/pom.xml
@@ -11,34 +11,22 @@
language governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.isis</groupId>
- <artifactId>isis-all</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <parent>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../core-parent/pom.xml</relativePath>
+ </parent>
+ <artifactId>antora</artifactId>
<packaging>pom</packaging>
- <name>Apache Isis (Aggregator)</name>
- <description>
- Convenience aggregator POM that references all modules.
- The parent POM of the core framework is core-parent/pom.xml
- </description>
+ <name>Apache Isis Antora</name>
- <scm>
- <connection>scm:git:https://github.com/apache/isis.git</connection>
- <developerConnection>scm:git:https://github.com/apache/isis.git</developerConnection>
- <url>https://github.com/apache/isis.git</url>
- <tag>HEAD</tag>
- </scm>
-
- <modules>
- <module>core-parent</module>
+</project>
- <module>examples/demo</module>
- <module>examples/smoketests</module>
- </modules>
-</project>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/samples/JavaLangStringSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/NameSamples.java
similarity index 75%
copy from examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/samples/JavaLangStringSamples.java
copy to examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/NameSamples.java
index 432001a..0d69bc5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/samples/JavaLangStringSamples.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/NameSamples.java
@@ -16,20 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.javalang.strings.samples;
+package demoapp.dom._infra.samples;
import java.util.stream.Stream;
+import javax.inject.Named;
+
import org.springframework.stereotype.Service;
import demoapp.dom.types.Samples;
@Service
-public class JavaLangStringSamples implements Samples<String> {
+public class NameSamples implements Samples<String> {
@Override
public Stream<String> stream() {
- return Stream.of("Hello", "world");
+ return Stream.of(
+ "Joey", "Chandler", "Monica", "Ross", "Phoebe", "Rachel",
+ "Tom", "Jerry", "Margo", "Barbara",
+ "Mary", "Mungo", "Midge"
+ );
}
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/ActionLayoutMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/ActionLayoutMenu.java
index 6cad895..13ffa81 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/ActionLayoutMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/ActionLayoutMenu.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import lombok.extern.log4j.Log4j2;
@DomainService(nature=NatureOfService.VIEW, objectType = "demo.ActionLayoutMenu")
-@DomainObjectLayout(named="ActionLayout")
+@DomainObjectLayout(named="@ActionLayout")
@Log4j2
public class ActionLayoutMenu {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/PropertyLayoutMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/PropertyLayoutMenu.java
index 633665b..a380f99 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/PropertyLayoutMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/PropertyLayoutMenu.java
@@ -27,7 +27,7 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import lombok.extern.log4j.Log4j2;
@DomainService(nature=NatureOfService.VIEW, objectType = "demo.PropertyLayoutMenu")
-@DomainObjectLayout(named="PropertyLayout")
+@DomainObjectLayout(named="@PropertyLayout")
@Log4j2
public class PropertyLayoutMenu {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/PropertyLayoutMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/IsisExtSecManMenu.java
similarity index 65%
copy from examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/PropertyLayoutMenu.java
copy to examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/IsisExtSecManMenu.java
index 633665b..bf8840a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/PropertyLayoutMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/IsisExtSecManMenu.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.annotations.PropertyLayout;
+package demoapp.dom.extensions.secman;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.DomainObjectLayout;
@@ -26,19 +26,16 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import lombok.extern.log4j.Log4j2;
-@DomainService(nature=NatureOfService.VIEW, objectType = "demo.PropertyLayoutMenu")
-@DomainObjectLayout(named="PropertyLayout")
-@Log4j2
-public class PropertyLayoutMenu {
+import demoapp.dom.extensions.secman.vm.SecManVm;
- @Action(semantics = SemanticsOf.SAFE)
- public demoapp.dom.annotations.PropertyLayout.named.PropertyLayoutNamedVm named(){
- return new demoapp.dom.annotations.PropertyLayout.named.PropertyLayoutNamedVm();
- }
+@DomainService(nature=NatureOfService.VIEW, objectType = "demo.IsisExtSecManMenu")
+@DomainObjectLayout(named="SecMan")
+@Log4j2
+public class IsisExtSecManMenu {
@Action(semantics = SemanticsOf.SAFE)
- public demoapp.dom.annotations.PropertyLayout.cssClass.PropertyLayoutCssClassVm cssClass(){
- return new demoapp.dom.annotations.PropertyLayout.cssClass.PropertyLayoutCssClassVm();
+ public SecManVm secMan(){
+ return new SecManVm();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/entities/TenantedJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/entities/TenantedJdo.java
new file mode 100644
index 0000000..bd3c279
--- /dev/null
+++ b/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/entities/TenantedJdo.java
@@ -0,0 +1,48 @@
+package demoapp.dom.extensions.secman.entities;
+
+import javax.jdo.annotations.DatastoreIdentity;
+import javax.jdo.annotations.IdGeneratorStrategy;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.Bounding;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.SemanticsOf;
+import org.apache.isis.applib.annotation.Title;
+import org.apache.isis.applib.jaxbadapters.PersistentEntityAdapter;
+
+import lombok.Getter;
+import lombok.Setter;
+
+//tag::class[]
+@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo" )
+@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
+public class TenantedJdo {
+
+ public TenantedJdo(String name) {
+ this.name = name;
+ }
+
+ @Title
+ @Property(editing = Editing.ENABLED)
+ @MemberOrder(name = "General", sequence = "1")
+ @Getter @Setter
+ private String name;
+
+ @Action(associateWith = "name", associateWithSequence = "1", semantics = SemanticsOf.SAFE)
+ public TenantedJdo updateName(final String name) {
+ this.name = name;
+ return this;
+ }
+ public String default0UpdateName() {
+ return this.name;
+ }
+
+}
+//end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/entities/TenantedJdoEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/entities/TenantedJdoEntities.java
new file mode 100644
index 0000000..bb3f13f
--- /dev/null
+++ b/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/entities/TenantedJdoEntities.java
@@ -0,0 +1,22 @@
+package demoapp.dom.extensions.secman.entities;
+
+import java.util.List;
+import java.util.Optional;
+
+import javax.inject.Inject;
+
+import org.springframework.stereotype.Service;
+
+import org.apache.isis.applib.services.repository.RepositoryService;
+
+@Service
+public class TenantedJdoEntities {
+
+ public List<TenantedJdo> all() {
+ return repositoryService.allInstances(TenantedJdo.class);
+ }
+
+ @Inject
+ RepositoryService repositoryService;
+
+}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/entities/seed/TenantedJdoSeedService.java b/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/entities/seed/TenantedJdoSeedService.java
new file mode 100644
index 0000000..586f85f
--- /dev/null
+++ b/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/entities/seed/TenantedJdoSeedService.java
@@ -0,0 +1,41 @@
+package demoapp.dom.extensions.secman.entities.seed;
+
+import javax.inject.Inject;
+
+import org.springframework.stereotype.Service;
+
+import org.apache.isis.applib.services.repository.RepositoryService;
+import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
+
+import demoapp.dom._infra.seed.SeedServiceAbstract;
+import demoapp.dom._infra.samples.NameSamples;
+import demoapp.dom.extensions.secman.entities.TenantedJdo;
+
+@Service
+public class TenantedJdoSeedService extends SeedServiceAbstract {
+
+ public TenantedJdoSeedService() {
+ super(TenantedJdoEntityFixture::new);
+ }
+
+ static class TenantedJdoEntityFixture extends FixtureScript {
+
+ @Override
+ protected void execute(ExecutionContext executionContext) {
+ secManNameSamples.stream()
+ .map(TenantedJdo::new)
+ .forEach(domainObject -> {
+ repositoryService.persist(domainObject);
+ executionContext.addResult(this, domainObject);
+ });
+ }
+
+ @Inject
+ RepositoryService repositoryService;
+
+ @Inject
+ NameSamples secManNameSamples;
+ }
+
+
+}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/spiimpl/ApplicationTenancyEvaluatorForDemo.java b/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/spiimpl/ApplicationTenancyEvaluatorForDemo.java
new file mode 100644
index 0000000..024c758
--- /dev/null
+++ b/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/spiimpl/ApplicationTenancyEvaluatorForDemo.java
@@ -0,0 +1,64 @@
+package demoapp.dom.extensions.secman.spiimpl;
+
+import java.util.regex.Pattern;
+
+import org.springframework.stereotype.Service;
+
+import org.apache.isis.extensions.secman.api.tenancy.ApplicationTenancyEvaluator;
+import org.apache.isis.extensions.secman.api.user.ApplicationUser;
+
+import lombok.Getter;
+import lombok.val;
+
+import demoapp.dom.extensions.secman.entities.TenantedJdo;
+
+//tag::class[]
+@Service
+public class ApplicationTenancyEvaluatorForDemo
+ implements ApplicationTenancyEvaluator { // <.>
+
+ @Override
+ public boolean handles(Class<?> cls) { // <.>
+ return TenantedJdo.class.isAssignableFrom(cls);
+ }
+
+ @Override
+ public String hides(Object domainObject, ApplicationUser applicationUser) { // <.>
+ if(hidePattern == null) {
+ return null;
+ }
+ val tenantedJdo = (TenantedJdo) domainObject;
+ val name = tenantedJdo.getName();
+
+ return hidePattern.matcher(name).matches() ? "hidden" : null;
+ }
+
+ @Override
+ public String disables(Object domainObject, ApplicationUser applicationUser) { // <.>
+ if(disablePattern == null) {
+ return null;
+ }
+ val tenantedJdo = (TenantedJdo) domainObject;
+ val name = tenantedJdo.getName();
+
+ return disablePattern.matcher(name).matches() ? "disabled" : null;
+ }
+
+ @Getter
+ private String hideRegex;
+ public void setHideRegex(String hideRegex) {
+ this.hideRegex = hideRegex;
+ this.hidePattern = hideRegex != null ? Pattern.compile(hideRegex) : null;
+ }
+ private Pattern hidePattern;
+
+ @Getter
+ private String disableRegex;
+ public void setDisableRegex(String disableRegex) {
+ this.disableRegex = disableRegex;
+ this.disablePattern = disableRegex != null ? Pattern.compile(disableRegex) : null;
+ }
+ private Pattern disablePattern;
+
+}
+//end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/vm/SecManVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/vm/SecManVm-description.adoc
new file mode 100644
index 0000000..8b81151
--- /dev/null
+++ b/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/vm/SecManVm-description.adoc
@@ -0,0 +1,34 @@
+Application Tenancy is the idea that certain information "belongs" to one party and should be either not visible or at least not modifiable by some other party.
+
+The SecMan extension provides a very flexible way of implementing this, through the `ApplicationTenancyEvaluator` SPI.
+This allows a domain service to decide whether to hide or to disable each object for the current user.
+
+For example:
+
+[source,java]
+----
+include::../spiimpl/ApplicationTenancyEvaluatorForDemo.java[tags=class]
+----
+<.> implements the SPI.
+There can be multiple implementations; all will be checked.
+
+<.> whether this implementation handles the type of the domain object being considered.
+This demo application deals only with the `TenantedJdo` entity type.
+
+<.> whether the current user can view the domain object.
+<.> whether the current user can interact (invoke actions, modify the properties of) the domain object.
+
+This view model object you are viewing at right now provides a couple of properties to control the domain service, for example:
+
+[source,java]
+----
+include::SecManVm.java[tags=hideRegex]
+----
+
+[IMPORTANT]
+====
+This SPI is a presentation-layer concern only.
+It does not prevent the domain objects from being retrieved from the data store.
+
+In particular, there is nothing to prevent "malicious" code from retrieving and interacting with objects from another tenancy.
+====
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/vm/SecManVm.java b/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/vm/SecManVm.java
new file mode 100644
index 0000000..f45e21f
--- /dev/null
+++ b/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/vm/SecManVm.java
@@ -0,0 +1,116 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package demoapp.dom.extensions.secman.vm;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.Collection;
+import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.Optionality;
+import org.apache.isis.applib.annotation.Parameter;
+import org.apache.isis.applib.annotation.PromptStyle;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.SemanticsOf;
+import org.apache.isis.viewer.wicket.model.common.CommonContextUtils;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.val;
+
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
+import demoapp.dom.extensions.secman.entities.TenantedJdo;
+import demoapp.dom.extensions.secman.entities.TenantedJdoEntities;
+import demoapp.dom.extensions.secman.spiimpl.ApplicationTenancyEvaluatorForDemo;
+import demoapp.dom.viewmodels.jaxbrefentity.ChildJdo;
+
+//tag::class[]
+@XmlRootElement(name = "root")
+@XmlType()
+@XmlAccessorType(XmlAccessType.FIELD)
+@DomainObject(
+ nature=Nature.VIEW_MODEL
+ , objectType = "demo.SecManVm"
+)
+public class SecManVm implements HasAsciiDocDescription {
+
+ public String title() {
+ return "Tenancy demo";
+ }
+
+ public List<TenantedJdo> getTenantedEntities() {
+ return tenantedJdoEntities.all();
+ }
+
+ //tag::hideRegex[]
+ public String getHideRegex() {
+ return applicationTenancyEvaluatorForDemo.getHideRegex();
+ }
+ @Action(associateWith = "hideRegex")
+ @ActionLayout(promptStyle = PromptStyle.INLINE_AS_IF_EDIT)
+ public SecManVm updateHideRegex(
+ @Parameter(optionality = Optionality.OPTIONAL)
+ String regex) {
+ applicationTenancyEvaluatorForDemo.setHideRegex(regex);
+ return this;
+ }
+ public String default0UpdateHideRegex() {
+ return getHideRegex();
+ }
+ //end::hideRegex[]
+
+ //tag::disableRegex[]
+ public String getDisableRegex() {
+ return applicationTenancyEvaluatorForDemo.getDisableRegex();
+ }
+ @Action(associateWith = "disableRegex")
+ @ActionLayout(promptStyle = PromptStyle.INLINE_AS_IF_EDIT)
+ public SecManVm updateDisableRegex(
+ @Parameter(optionality = Optionality.OPTIONAL)
+ String regex) {
+ applicationTenancyEvaluatorForDemo.setDisableRegex(regex);
+ return this;
+ }
+ public String default0UpdateDisableRegex() {
+ return getDisableRegex();
+ }
+ //end::disableRegex[]
+
+
+ @Inject
+ TenantedJdoEntities tenantedJdoEntities;
+
+ @Inject
+ ApplicationTenancyEvaluatorForDemo applicationTenancyEvaluatorForDemo;
+
+}
+//end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/vm/SecManVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/vm/SecManVm.layout.xml
new file mode 100644
index 0000000..da088ac
--- /dev/null
+++ b/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/vm/SecManVm.layout.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<bs3:grid
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+>
+ <bs3:row>
+ <bs3:col span="10" unreferencedActions="true">
+ <cpt:domainObject />
+ <cpt:action id="rebuildMetamodel"/>
+ </bs3:col>
+ <bs3:col span="2">
+ <cpt:fieldSet name="" id="sources" />
+ </bs3:col>
+ </bs3:row>
+ <bs3:row>
+ <bs3:col span="6">
+ <bs3:row>
+ <bs3:col span="12">
+ <cpt:collection id="tenantedEntities"/>
+ </bs3:col>
+ </bs3:row>
+ <bs3:row>
+ <bs3:col span="12">
+ <cpt:fieldSet name="General" id="general">
+ <cpt:property id="hideRegex"/>
+ <cpt:property id="disableRegex"/>
+ </cpt:fieldSet>
+ </bs3:col>
+ </bs3:row>
+ <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
+ </bs3:col>
+ <bs3:col span="6">
+ <cpt:fieldSet name="Description" id="description" >
+ <cpt:action id="clearHints" position="PANEL" />
+ <cpt:action id="downloadLayoutXml" position="PANEL_DROPDOWN"/>
+ <cpt:action id="downloadMetamodelXml" position="PANEL_DROPDOWN"/>
+ <cpt:action id="inspectMetamodel" position="PANEL_DROPDOWN"/>
+ <cpt:action id="openRestApi" position="PANEL_DROPDOWN" />
+ <cpt:property id="description"/>
+ </cpt:fieldSet>
+ </bs3:col>
+ </bs3:row>
+ <bs3:row>
+ <bs3:col span="12" unreferencedCollections="true"/>
+ </bs3:row>
+</bs3:grid>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml
index 7817e6a..cb3671e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml
@@ -102,18 +102,21 @@
</mb3:menu>
<mb3:menu>
- <mb3:named>ActionLayout</mb3:named>
+ <mb3:named>Annotations</mb3:named>
<mb3:section>
<mb3:serviceAction objectType="demo.ActionLayoutMenu" id="position"/>
<mb3:serviceAction objectType="demo.ActionLayoutMenu" id="promptStyle"/>
</mb3:section>
+ <mb3:section>
+ <mb3:serviceAction objectType="demo.PropertyLayoutMenu" id="named"/>
+ <mb3:serviceAction objectType="demo.PropertyLayoutMenu" id="cssClass"/>
+ </mb3:section>
</mb3:menu>
<mb3:menu>
- <mb3:named>PropertyLayout</mb3:named>
+ <mb3:named>Extensions</mb3:named>
<mb3:section>
- <mb3:serviceAction objectType="demo.PropertyLayoutMenu" id="named"/>
- <mb3:serviceAction objectType="demo.PropertyLayoutMenu" id="cssClass"/>
+ <mb3:serviceAction objectType="demo.IsisExtSecManMenu" id="secMan"/>
</mb3:section>
</mb3:menu>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/samples/JavaLangStringSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/samples/JavaLangStringSamples.java
index 432001a..296a8b8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/samples/JavaLangStringSamples.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/javalang/strings/samples/JavaLangStringSamples.java
@@ -20,11 +20,13 @@ package demoapp.dom.types.javalang.strings.samples;
import java.util.stream.Stream;
+import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Service;
import demoapp.dom.types.Samples;
@Service
+@Primary
public class JavaLangStringSamples implements Samples<String> {
@Override
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/jaxbrefentity/ChildJdoSeedService.java b/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/jaxbrefentity/seed/ChildJdoSeedService.java
similarity index 64%
rename from examples/demo/domain/src/main/java/demoapp/dom/viewmodels/jaxbrefentity/ChildJdoSeedService.java
rename to examples/demo/domain/src/main/java/demoapp/dom/viewmodels/jaxbrefentity/seed/ChildJdoSeedService.java
index 1a6330e..7b3d976 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/jaxbrefentity/ChildJdoSeedService.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/jaxbrefentity/seed/ChildJdoSeedService.java
@@ -1,5 +1,6 @@
-package demoapp.dom.viewmodels.jaxbrefentity;
+package demoapp.dom.viewmodels.jaxbrefentity.seed;
+import java.util.function.Supplier;
import java.util.stream.Stream;
import javax.inject.Inject;
@@ -12,27 +13,24 @@ import org.apache.isis.core.runtime.events.app.AppLifecycleEvent;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.isis.testing.fixtures.applib.fixturescripts.FixtureScripts;
-@Service
-public class ChildJdoSeedService {
+import demoapp.dom._infra.samples.NameSamples;
+import demoapp.dom._infra.seed.SeedServiceAbstract;
+import demoapp.dom.viewmodels.jaxbrefentity.ChildJdo;
- @EventListener(AppLifecycleEvent.class)
- public void onAppLifecycleEvent(AppLifecycleEvent event) {
+@Service
+public class ChildJdoSeedService extends SeedServiceAbstract {
- if (event.getEventType() == AppLifecycleEvent.EventType.appPostMetamodel) {
- fixtureScripts.run(new ChildJdoEntityFixture());
- }
+ public ChildJdoSeedService() {
+ super(ChildJdoEntityFixture::new);
}
- @Inject
- FixtureScripts fixtureScripts;
-
static class ChildJdoEntityFixture extends FixtureScript {
@Override
protected void execute(ExecutionContext executionContext) {
- Stream.of("Fred", "Mary", "Joe")
+ nameSamples.stream()
.map(ChildJdo::new)
- .forEach(domainObject -> {
+ .forEach(domainObject -> {
repositoryService.persist(domainObject);
executionContext.addResult(this, domainObject);
});
@@ -41,5 +39,8 @@ public class ChildJdoSeedService {
@Inject
RepositoryService repositoryService;
+ @Inject
+ NameSamples nameSamples;
+
}
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/usingjaxb/StatefulVmUsingJaxb-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/usingjaxb/StatefulVmUsingJaxb-description.adoc
index 070de2d..5d9a59f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/usingjaxb/StatefulVmUsingJaxb-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/usingjaxb/StatefulVmUsingJaxb-description.adoc
@@ -7,7 +7,7 @@ The framework provides a number of ways to serialize this state, but the most fl
[source,java]
----
-include::StatefulViewModelUsingJaxb.java[tags=class]
+include::StatefulVmUsingJaxb.java[tags=class]
----
<.> mandatory, specifies this is a JAXB element
diff --git a/pom.xml b/pom.xml
index ba1cbff..0337f38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,7 @@
</scm>
<modules>
+ <module>antora</module>
<module>core-parent</module>
<module>examples/demo</module>
[isis] 04/04: ISIS-2222: fleshes out demo for application tenancy,
tweaks.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 437b63f847b18f2509520b0c4e95de98ed31fbf9
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jul 10 10:00:39 2020 +0100
ISIS-2222: fleshes out demo for application tenancy, tweaks.
---
.../extensions/secman/spiimpl/ApplicationTenancyEvaluatorForDemo.java | 4 ++--
examples/demo/domain/src/main/resources/static/css/application.css | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/spiimpl/ApplicationTenancyEvaluatorForDemo.java b/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/spiimpl/ApplicationTenancyEvaluatorForDemo.java
index 024c758..7477345 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/spiimpl/ApplicationTenancyEvaluatorForDemo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/extensions/secman/spiimpl/ApplicationTenancyEvaluatorForDemo.java
@@ -30,7 +30,7 @@ public class ApplicationTenancyEvaluatorForDemo
val tenantedJdo = (TenantedJdo) domainObject;
val name = tenantedJdo.getName();
- return hidePattern.matcher(name).matches() ? "hidden" : null;
+ return hidePattern.matcher(name).matches() ? "any non-null value will hide" : null;
}
@Override
@@ -41,7 +41,7 @@ public class ApplicationTenancyEvaluatorForDemo
val tenantedJdo = (TenantedJdo) domainObject;
val name = tenantedJdo.getName();
- return disablePattern.matcher(name).matches() ? "disabled" : null;
+ return disablePattern.matcher(name).matches() ? String.format("disabled, because name matches '%s'", disablePattern) : null;
}
@Getter
diff --git a/examples/demo/domain/src/main/resources/static/css/application.css b/examples/demo/domain/src/main/resources/static/css/application.css
index 3af478c..b781ee1 100644
--- a/examples/demo/domain/src/main/resources/static/css/application.css
+++ b/examples/demo/domain/src/main/resources/static/css/application.css
@@ -116,7 +116,8 @@
}
.literalblock + .colist, .listingblock + .colist {
- margin-top: 1.0em
+ margin-top: 1.0em;
+ margin-bottom: 1.0em;
}
.colist td:not([class]):first-child {
[isis] 01/04: ISIS-2222: moves some packages around, is all
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b43467791de098c999a000c6a433ddbe91089cde
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jul 10 06:36:35 2020 +0100
ISIS-2222: moves some packages around, is all
---
.../dom/{ => annotations}/ActionLayout/ActionLayoutMenu.java | 10 +++++-----
.../position/ActionLayoutPositionVm-description.adoc | 0
.../ActionLayout/position/ActionLayoutPositionVm.java | 4 +---
.../ActionLayout/position/ActionLayoutPositionVm.layout.xml | 0
.../position/ActionLayoutPositionVm_annotatedBelow.java | 2 +-
.../position/ActionLayoutPositionVm_annotatedPanel.java | 2 +-
.../ActionLayoutPositionVm_annotatedPanelDropDown.java | 2 +-
.../position/ActionLayoutPositionVm_annotatedRight.java | 2 +-
.../position/ActionLayoutPositionVm_layoutBelow.java | 2 +-
.../position/ActionLayoutPositionVm_layoutPanel.java | 2 +-
.../position/ActionLayoutPositionVm_layoutPanelDropDown.java | 2 +-
.../position/ActionLayoutPositionVm_layoutRight.java | 2 +-
.../promptStyle/ActionLayoutPromptStyleVm-description.adoc | 0
.../ActionLayout/promptStyle/ActionLayoutPromptStyleVm.java | 2 +-
.../promptStyle/ActionLayoutPromptStyleVm.layout.xml | 0
.../promptStyle/ActionLayoutPromptStyleVm_annotatedInline.java | 2 +-
.../ActionLayoutPromptStyleVm_annotatedInlineAsIfEdit.java | 2 +-
.../promptStyle/ActionLayoutPromptStyleVm_annotatedModal.java | 2 +-
.../ActionLayoutPromptStyleVm_annotatedSidebar.java | 2 +-
.../promptStyle/ActionLayoutPromptStyleVm_layoutDialog.java | 2 +-
.../promptStyle/ActionLayoutPromptStyleVm_layoutInline.java | 2 +-
.../ActionLayoutPromptStyleVm_layoutInlineAsIfEdit.java | 2 +-
.../{ => annotations}/PropertyLayout/PropertyLayoutMenu.java | 10 +++++-----
.../cssClass/PropertyLayoutCssClassMetaAnnotation.java | 2 +-
.../cssClass/PropertyLayoutCssClassVm-description.adoc | 0
.../PropertyLayout/cssClass/PropertyLayoutCssClassVm.java | 4 +---
.../cssClass/PropertyLayoutCssClassVm.layout.xml | 0
.../cssClass/PropertyLayoutCssClassVm_annotatedMixin.java | 5 +----
.../named/PropertyLayoutNamedMetaAnnotation.java | 3 +--
.../named/PropertyLayoutNamedVm-description.adoc | 0
.../PropertyLayout/named/PropertyLayoutNamedVm.java | 3 +--
.../PropertyLayout/named/PropertyLayoutNamedVm.layout.xml | 0
examples/demo/pom.xml | 2 +-
33 files changed, 33 insertions(+), 42 deletions(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/ActionLayoutMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/ActionLayoutMenu.java
similarity index 76%
rename from examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/ActionLayoutMenu.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/ActionLayoutMenu.java
index cdcfd63..6cad895 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/ActionLayoutMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/ActionLayoutMenu.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.ActionLayout;
+package demoapp.dom.annotations.ActionLayout;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.DomainObjectLayout;
@@ -32,13 +32,13 @@ import lombok.extern.log4j.Log4j2;
public class ActionLayoutMenu {
@Action(semantics = SemanticsOf.SAFE)
- public demoapp.dom.ActionLayout.position.ActionLayoutPositionVm position(){
- return new demoapp.dom.ActionLayout.position.ActionLayoutPositionVm();
+ public demoapp.dom.annotations.ActionLayout.position.ActionLayoutPositionVm position(){
+ return new demoapp.dom.annotations.ActionLayout.position.ActionLayoutPositionVm();
}
@Action(semantics = SemanticsOf.SAFE)
- public demoapp.dom.ActionLayout.promptStyle.ActionLayoutPromptStyleVm promptStyle(){
- return new demoapp.dom.ActionLayout.promptStyle.ActionLayoutPromptStyleVm();
+ public demoapp.dom.annotations.ActionLayout.promptStyle.ActionLayoutPromptStyleVm promptStyle(){
+ return new demoapp.dom.annotations.ActionLayout.promptStyle.ActionLayoutPromptStyleVm();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm.java
similarity index 93%
rename from examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm.java
index 18f7f8e..89fd1a4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.ActionLayout.position;
+package demoapp.dom.annotations.ActionLayout.position;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -25,12 +25,10 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_annotatedBelow.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_annotatedBelow.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_annotatedBelow.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_annotatedBelow.java
index 4bcfe26..6cfa957 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_annotatedBelow.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_annotatedBelow.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.ActionLayout.position;
+package demoapp.dom.annotations.ActionLayout.position;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_annotatedPanel.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_annotatedPanel.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_annotatedPanel.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_annotatedPanel.java
index 0ce7e77..ef67588 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_annotatedPanel.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_annotatedPanel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.ActionLayout.position;
+package demoapp.dom.annotations.ActionLayout.position;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_annotatedPanelDropDown.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_annotatedPanelDropDown.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_annotatedPanelDropDown.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_annotatedPanelDropDown.java
index 256f986..cf97ba5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_annotatedPanelDropDown.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_annotatedPanelDropDown.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.ActionLayout.position;
+package demoapp.dom.annotations.ActionLayout.position;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_annotatedRight.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_annotatedRight.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_annotatedRight.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_annotatedRight.java
index ba2854c..2b2d317 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_annotatedRight.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_annotatedRight.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.ActionLayout.position;
+package demoapp.dom.annotations.ActionLayout.position;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_layoutBelow.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_layoutBelow.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_layoutBelow.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_layoutBelow.java
index f020383..296945d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_layoutBelow.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_layoutBelow.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.ActionLayout.position;
+package demoapp.dom.annotations.ActionLayout.position;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_layoutPanel.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_layoutPanel.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_layoutPanel.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_layoutPanel.java
index b2c0ae0..adb128b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_layoutPanel.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_layoutPanel.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.ActionLayout.position;
+package demoapp.dom.annotations.ActionLayout.position;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_layoutPanelDropDown.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_layoutPanelDropDown.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_layoutPanelDropDown.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_layoutPanelDropDown.java
index 120fe41..a40ff00 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_layoutPanelDropDown.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_layoutPanelDropDown.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.ActionLayout.position;
+package demoapp.dom.annotations.ActionLayout.position;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_layoutRight.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_layoutRight.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_layoutRight.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_layoutRight.java
index 71c2d2b..dac5ae2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm_layoutRight.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/position/ActionLayoutPositionVm_layoutRight.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.ActionLayout.position;
+package demoapp.dom.annotations.ActionLayout.position;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.java
similarity index 98%
rename from examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.java
index f52323f..2addaf7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.ActionLayout.promptStyle;
+package demoapp.dom.annotations.ActionLayout.promptStyle;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedInline.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedInline.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedInline.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedInline.java
index ac2c3f1..2357fd3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedInline.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedInline.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.ActionLayout.promptStyle;
+package demoapp.dom.annotations.ActionLayout.promptStyle;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedInlineAsIfEdit.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedInlineAsIfEdit.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedInlineAsIfEdit.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedInlineAsIfEdit.java
index b696cbe..20eaf89 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedInlineAsIfEdit.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedInlineAsIfEdit.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.ActionLayout.promptStyle;
+package demoapp.dom.annotations.ActionLayout.promptStyle;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedModal.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedModal.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedModal.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedModal.java
index 76f2b3d..f98326f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedModal.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedModal.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.ActionLayout.promptStyle;
+package demoapp.dom.annotations.ActionLayout.promptStyle;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedSidebar.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedSidebar.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedSidebar.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedSidebar.java
index 9c60d9e..3fa30f1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedSidebar.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_annotatedSidebar.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.ActionLayout.promptStyle;
+package demoapp.dom.annotations.ActionLayout.promptStyle;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_layoutDialog.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_layoutDialog.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_layoutDialog.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_layoutDialog.java
index c6eb259..494715a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_layoutDialog.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_layoutDialog.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.ActionLayout.promptStyle;
+package demoapp.dom.annotations.ActionLayout.promptStyle;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_layoutInline.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_layoutInline.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_layoutInline.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_layoutInline.java
index c440aea..4c50cfe 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_layoutInline.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_layoutInline.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.ActionLayout.promptStyle;
+package demoapp.dom.annotations.ActionLayout.promptStyle;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_layoutInlineAsIfEdit.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_layoutInlineAsIfEdit.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_layoutInlineAsIfEdit.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_layoutInlineAsIfEdit.java
index 69a4def..3781ac5 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_layoutInlineAsIfEdit.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/ActionLayout/promptStyle/ActionLayoutPromptStyleVm_layoutInlineAsIfEdit.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.ActionLayout.promptStyle;
+package demoapp.dom.annotations.ActionLayout.promptStyle;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/PropertyLayoutMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/PropertyLayoutMenu.java
similarity index 77%
rename from examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/PropertyLayoutMenu.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/PropertyLayoutMenu.java
index 87e52b1..633665b 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/PropertyLayoutMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/PropertyLayoutMenu.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.PropertyLayout;
+package demoapp.dom.annotations.PropertyLayout;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.DomainObjectLayout;
@@ -32,13 +32,13 @@ import lombok.extern.log4j.Log4j2;
public class PropertyLayoutMenu {
@Action(semantics = SemanticsOf.SAFE)
- public demoapp.dom.PropertyLayout.named.PropertyLayoutNamedVm named(){
- return new demoapp.dom.PropertyLayout.named.PropertyLayoutNamedVm();
+ public demoapp.dom.annotations.PropertyLayout.named.PropertyLayoutNamedVm named(){
+ return new demoapp.dom.annotations.PropertyLayout.named.PropertyLayoutNamedVm();
}
@Action(semantics = SemanticsOf.SAFE)
- public demoapp.dom.PropertyLayout.cssClass.PropertyLayoutCssClassVm cssClass(){
- return new demoapp.dom.PropertyLayout.cssClass.PropertyLayoutCssClassVm();
+ public demoapp.dom.annotations.PropertyLayout.cssClass.PropertyLayoutCssClassVm cssClass(){
+ return new demoapp.dom.annotations.PropertyLayout.cssClass.PropertyLayoutCssClassVm();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/cssClass/PropertyLayoutCssClassMetaAnnotation.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/cssClass/PropertyLayoutCssClassMetaAnnotation.java
similarity index 90%
rename from examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/cssClass/PropertyLayoutCssClassMetaAnnotation.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/cssClass/PropertyLayoutCssClassMetaAnnotation.java
index e9f996c..36fb6da 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/cssClass/PropertyLayoutCssClassMetaAnnotation.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/cssClass/PropertyLayoutCssClassMetaAnnotation.java
@@ -1,4 +1,4 @@
-package demoapp.dom.PropertyLayout.cssClass;
+package demoapp.dom.annotations.PropertyLayout.cssClass;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/cssClass/PropertyLayoutCssClassVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/cssClass/PropertyLayoutCssClassVm-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/cssClass/PropertyLayoutCssClassVm-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/cssClass/PropertyLayoutCssClassVm-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/cssClass/PropertyLayoutCssClassVm.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/cssClass/PropertyLayoutCssClassVm.java
similarity index 95%
rename from examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/cssClass/PropertyLayoutCssClassVm.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/cssClass/PropertyLayoutCssClassVm.java
index 9f6ebd9..0254f64 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/cssClass/PropertyLayoutCssClassVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/cssClass/PropertyLayoutCssClassVm.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.PropertyLayout.cssClass;
+package demoapp.dom.annotations.PropertyLayout.cssClass;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -31,13 +31,11 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.PropertyLayout.named.PropertyLayoutNamedMetaAnnotation;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/cssClass/PropertyLayoutCssClassVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/cssClass/PropertyLayoutCssClassVm.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/cssClass/PropertyLayoutCssClassVm.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/cssClass/PropertyLayoutCssClassVm.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/cssClass/PropertyLayoutCssClassVm_annotatedMixin.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/cssClass/PropertyLayoutCssClassVm_annotatedMixin.java
similarity index 88%
rename from examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/cssClass/PropertyLayoutCssClassVm_annotatedMixin.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/cssClass/PropertyLayoutCssClassVm_annotatedMixin.java
index 0b9850f..82071a6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/cssClass/PropertyLayoutCssClassVm_annotatedMixin.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/cssClass/PropertyLayoutCssClassVm_annotatedMixin.java
@@ -16,12 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.PropertyLayout.cssClass;
+package demoapp.dom.annotations.PropertyLayout.cssClass;
import org.apache.isis.applib.annotation.MemberOrder;
-import org.apache.isis.applib.annotation.Property;
-import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Where;
import lombok.RequiredArgsConstructor;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/named/PropertyLayoutNamedMetaAnnotation.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/named/PropertyLayoutNamedMetaAnnotation.java
similarity index 85%
rename from examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/named/PropertyLayoutNamedMetaAnnotation.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/named/PropertyLayoutNamedMetaAnnotation.java
index 8e86673..82758e7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/named/PropertyLayoutNamedMetaAnnotation.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/named/PropertyLayoutNamedMetaAnnotation.java
@@ -1,4 +1,4 @@
-package demoapp.dom.PropertyLayout.named;
+package demoapp.dom.annotations.PropertyLayout.named;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
@@ -6,7 +6,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/named/PropertyLayoutNamedVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/named/PropertyLayoutNamedVm-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/named/PropertyLayoutNamedVm-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/named/PropertyLayoutNamedVm-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/named/PropertyLayoutNamedVm.java b/examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/named/PropertyLayoutNamedVm.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/named/PropertyLayoutNamedVm.java
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/named/PropertyLayoutNamedVm.java
index c057af4..348f433 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/named/PropertyLayoutNamedVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/named/PropertyLayoutNamedVm.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.PropertyLayout.named;
+package demoapp.dom.annotations.PropertyLayout.named;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -31,7 +31,6 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
-import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import lombok.Getter;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/named/PropertyLayoutNamedVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/named/PropertyLayoutNamedVm.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/named/PropertyLayoutNamedVm.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/annotations/PropertyLayout/named/PropertyLayoutNamedVm.layout.xml
diff --git a/examples/demo/pom.xml b/examples/demo/pom.xml
index 5f2b268..68ac4ea 100644
--- a/examples/demo/pom.xml
+++ b/examples/demo/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.apache.isis.examples.apps</groupId>
<artifactId>demo-parent</artifactId>
- <name>Apache Isis Demo - Parent</name>
+ <name>Demo - Parent</name>
<packaging>pom</packaging>
[isis] 02/04: ISIS-2222: renames pom.xml names so group together
more conveniently in the IDE
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1a9981816109005fe62916349cb70834e5e09115
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jul 10 06:36:49 2020 +0100
ISIS-2222: renames pom.xml names so group together more conveniently in the IDE
---
examples/demo/domain/pom.xml | 2 +-
examples/demo/vaadin/pom.xml | 2 +-
examples/demo/wicket/pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/examples/demo/domain/pom.xml b/examples/demo/domain/pom.xml
index 97135b1..db5bdaa 100644
--- a/examples/demo/domain/pom.xml
+++ b/examples/demo/domain/pom.xml
@@ -23,7 +23,7 @@
<artifactId>demo-domain</artifactId>
- <name>Apache Isis Demo - Domain</name>
+ <name>Demo - Domain</name>
<packaging>jar</packaging>
diff --git a/examples/demo/vaadin/pom.xml b/examples/demo/vaadin/pom.xml
index bb1f898..17908b7 100644
--- a/examples/demo/vaadin/pom.xml
+++ b/examples/demo/vaadin/pom.xml
@@ -23,7 +23,7 @@
<artifactId>demo-vaadin</artifactId>
- <name>Apache Isis Demo - Vaadin</name>
+ <name>Demo - Vaadin</name>
<packaging>${packaging.type}</packaging>
diff --git a/examples/demo/wicket/pom.xml b/examples/demo/wicket/pom.xml
index b9b41de..2e813ba 100644
--- a/examples/demo/wicket/pom.xml
+++ b/examples/demo/wicket/pom.xml
@@ -23,7 +23,7 @@
<artifactId>demo-wicket</artifactId>
- <name>Apache Isis Demo - Wicket</name>
+ <name>Demo - Wicket</name>
<packaging>${packaging.type}</packaging>