This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch CAUSEWAY-2485 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 8336c7a5530d5171904280e725b4a80ca01d3b52 Author: danhaywood <[email protected]> AuthorDate: Wed Apr 5 07:50:12 2023 +0200 CAUSEWAY-2485: moves progmodel packages ; completes @DomainObjectLayout#named --- .../src/main/java/demoapp/dom/DemoModuleJpa.java | 2 +- .../Action/domainEvent/ActionDomainEventPage.java | 2 +- .../DomainObjectXxxDomainEventPage.java | 2 +- .../cssClassFa/DomainObjectLayoutCssClassFa.java | 2 +- ...omainObjectLayoutCssClassFaJpa-description.adoc | 2 +- ...ainObjectLayoutDescribedAsPage-description.adoc | 2 +- .../DomainObjectLayoutDescribedAsPage.java | 2 +- .../DomainObjectLayoutDescribedAsPage.layout.xml | 4 ++-- ...mainObjectLayoutDescribedAsJpa-description.adoc | 2 +- .../named/DomainObjectLayoutNamed.java | 2 +- .../DomainObjectLayoutNamedPage-description.adoc | 26 ++++++++++++++++++---- .../named/DomainObjectLayoutNamedPage.java | 9 +++----- .../named/DomainObjectLayoutNamedPage.layout.xml | 25 ++++++++++++++------- .../DomainObjectLayoutNamedJpa-description.adoc | 2 +- .../paged/DomainObjectLayoutPaged.java | 2 +- .../DomainObjectLayoutPagedJpa-description.adoc | 6 ++--- .../assoc/AssociatedActionDemo-description.adoc | 0 .../actions/assoc}/assoc/AssociatedActionDemo.java | 2 +- .../assoc}/assoc/AssociatedActionDemo.layout.xml | 0 .../actions/assoc}/assoc/AssociatedActionMenu.java | 2 +- .../actions/assoc}/assoc/DemoItem.java | 2 +- .../actions/depargs}/depargs/DemoItem.java | 2 +- .../DependentArgsActionDemo-description.adoc | 0 .../depargs}/depargs/DependentArgsActionDemo.java | 2 +- .../depargs/DependentArgsActionDemo.layout.xml | 0 .../DependentArgsActionDemo_bulkAction.java | 2 +- .../DependentArgsActionDemo_useAutoComplete.java | 2 +- .../DependentArgsActionDemo_useAutoComplete2.java | 2 +- .../DependentArgsActionDemo_useChoices.java | 2 +- .../DependentArgsActionDemo_useChoices2.java | 2 +- .../DependentArgsActionDemo_useDefault.java | 2 +- .../DependentArgsActionDemo_useDisable.java | 2 +- .../depargs/DependentArgsActionDemo_useHide.java | 2 +- .../DependentArgsActionDemo_useIndependent.java | 2 +- .../depargs}/depargs/DependentArgsActionMenu.java | 2 +- .../actions/depargs}/depargs/Parity.java | 2 +- .../objects/embedded}/embedded/ComplexNumber.java | 2 +- .../embedded}/embedded/EmbeddedTypeMenu.java | 2 +- .../embedded/EmbeddedTypeVm-description.adoc | 0 .../objects/embedded}/embedded/EmbeddedTypeVm.java | 4 ++-- .../embedded}/embedded/EmbeddedTypeVm.layout.xml | 0 .../embedded}/embedded/jdo/ComplexNumberJdo.java | 4 ++-- .../jdo/ComplexNumberJdoValueSemantics.java | 2 +- .../jdo/NumberConstantJdo-description.adoc | 0 .../embedded}/embedded/jdo/NumberConstantJdo.java | 6 ++--- .../embedded/jdo/NumberConstantJdo.layout.xml | 0 .../embedded}/embedded/jdo/NumberConstantJdo.svg | 0 .../embedded/jdo/NumberConstantJdoRepository.java | 4 ++-- .../jdo/NumberConstantJdo_updateNumber.java | 2 +- .../embedded}/embedded/jpa/ComplexNumberJpa.java | 4 ++-- .../jpa/ComplexNumberJpaValueSemantics.java | 2 +- .../jpa/NumberConstantJpa-description.adoc | 0 .../embedded}/embedded/jpa/NumberConstantJpa.java | 6 ++--- .../embedded/jpa/NumberConstantJpa.layout.xml | 0 .../embedded}/embedded/jpa/NumberConstantJpa.svg | 0 .../embedded/jpa/NumberConstantJpaRepository.java | 4 ++-- .../jpa/NumberConstantJpa_updateNumber.java | 2 +- .../embedded/persistence/NumberConstantEntity.java | 4 ++-- .../persistence/NumberConstantSeeding.java | 4 ++-- .../embedded/samples/ComplexNumberSamples.java | 4 ++-- .../objects/mixins}/mixins/CountHolder.java | 2 +- .../mixins}/mixins/CountHolder_explanation.java | 2 +- .../mixins/CountHolder_fibonacciSequence.java | 2 +- .../mixins}/mixins/CountHolder_updateCount.java | 2 +- .../mixins/FibonacciNumberVm-description.adoc | 0 .../objects/mixins}/mixins/FibonacciNumberVm.java | 2 +- .../mixins}/mixins/FibonacciNumberVm.layout.xml | 0 .../objects/mixins}/mixins/MixinMenu.java | 2 +- .../mixins}/mixins/MixinVm-description.adoc | 0 .../objects/mixins}/mixins/MixinVm.java | 2 +- .../objects/mixins}/mixins/MixinVm.layout.xml | 0 .../domainEvent/PropertyDomainEventPage.java | 2 +- .../layout/describedAs/DescribedAsMenu.java | 2 +- .../featured/layout/describedAs/DescribedAsVm.java | 2 +- .../CausewayLocalResourcePaths.java | 2 +- .../customvaluetypes/ComplexNumberJdo_Test.java | 2 +- 76 files changed, 114 insertions(+), 90 deletions(-) diff --git a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java index d84de66069..c54dec9e53 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java @@ -40,7 +40,7 @@ import demoapp.dom.domain.objects.DomainObjectLayout.named.jpa.DomainObjectLayou import demoapp.dom.domain.objects.DomainObjectLayout.paged.jpa.DomainObjectLayoutPagedJpa; import demoapp.dom.domain.objects.DomainObjectLayout.tabledec.jpa.DomainObjectLayoutTableDecoratorJpa; import demoapp.dom.domain.objects.DomainObjectLayout.xxxUiEvent.jpa.DomainObjectLayoutXxxUiEventJpa; -import demoapp.dom.domain.objects.other.embedded.jpa.NumberConstantJpa; +import demoapp.dom.domain.progmodel.objects.embedded.embedded.jpa.NumberConstantJpa; import demoapp.dom.domain.properties.Property.commandPublishing.jpa.PropertyCommandPublishingJpa; import demoapp.dom.domain.properties.Property.executionPublishing.jpa.PropertyExecutionPublishingJpa; import demoapp.dom.domain.properties.Property.projecting.jpa.PropertyProjectingChildJpa; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage.java index d665f060ce..a618b1debf 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/Action/domainEvent/ActionDomainEventPage.java @@ -31,7 +31,7 @@ import org.apache.causeway.applib.annotation.Nature; import org.apache.causeway.applib.annotation.ObjectSupport; import org.apache.causeway.applib.annotation.Property; -@XmlRootElement(name = "demo.ActionDomainEventPage") +@XmlRootElement(name = "root") @XmlType @XmlAccessorType(XmlAccessType.FIELD) @Named("demo.ActionDomainEventPage") diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage.java index 221d0ac2d4..fbf891b18d 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObject/xxxDomainEvent/DomainObjectXxxDomainEventPage.java @@ -35,7 +35,7 @@ import org.apache.causeway.applib.events.domain.ActionDomainEvent; import org.apache.causeway.applib.events.domain.CollectionDomainEvent; import org.apache.causeway.applib.events.domain.PropertyDomainEvent; -@XmlRootElement(name = "demo.DomainObjectxxxDomainEventPage") +@XmlRootElement(name = "root") @XmlType @XmlAccessorType(XmlAccessType.FIELD) @Named("demo.DomainObjectxxxDomainEventPage") diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFa.java index ad2d7ce886..41c99b8a88 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFa.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/DomainObjectLayoutCssClassFa.java @@ -25,7 +25,7 @@ import org.apache.causeway.applib.annotation.DomainObjectLayout; //tag::class[] @DomainObjectLayout( - cssClassFa = "fa-user" // <.> + cssClassFa = "user" // <.> ) public abstract class DomainObjectLayoutCssClassFa //end::class[] diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/jpa/DomainObjectLayoutCssClassFaJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/jpa/DomainObjectLayoutCssClassFaJpa-description.adoc index fd96d19984..b6fd25dcbb 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/jpa/DomainObjectLayoutCssClassFaJpa-description.adoc +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/cssClassFa/jpa/DomainObjectLayoutCssClassFaJpa-description.adoc @@ -1,6 +1,6 @@ :Notice: 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 ag [...] -This object is annotated with a CSS font-awesome class of "fa-user": +This domain class is annotated with `cssClassFa` to provide a CSS font-awesome class of "user": [source,java,indent=0] ---- diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage-description.adoc index 8ace11409b..87af16c6c0 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage-description.adoc +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage-description.adoc @@ -5,7 +5,7 @@ The purpose of the link:https://causeway.apache.org/refguide/2.0.0-SNAPSHOT/appl === How this demo works The collection on the left hand side shows a set of objects that have been annotated with `describedAs`. -Hover over the icons of the objects in the collection, and this text will be shown in a tooltip. +Hover over the icons of the objects in the collection, and this text will be shown in (the bottom half of) each tooltip. Navigate into any of the objects and the same text is shown when hovering over the object's title. diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage.java index ee7afba624..0799beec69 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage.java @@ -40,7 +40,7 @@ import org.apache.causeway.applib.annotation.ObjectSupport; public class DomainObjectLayoutDescribedAsPage implements HasAsciiDocDescription { @ObjectSupport public String title() { - return "DomainObjectLayout#describedAs"; + return "@DomainObjectLayout#describedAs"; } } diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage.layout.xml index cbd26b27ed..e0ed33a418 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage.layout.xml +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/DomainObjectLayoutDescribedAsPage.layout.xml @@ -28,8 +28,8 @@ <bs3:col span="6"> <bs3:row> <bs3:col span="12"> - <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/> - </bs3:col> + <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/> + </bs3:col> </bs3:row> <bs3:row> <bs3:col span="12"> diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/jpa/DomainObjectLayoutDescribedAsJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/jpa/DomainObjectLayoutDescribedAsJpa-description.adoc index 71ef0a4a23..d593f6e8e0 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/jpa/DomainObjectLayoutDescribedAsJpa-description.adoc +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/describedAs/jpa/DomainObjectLayoutDescribedAsJpa-description.adoc @@ -1,6 +1,6 @@ :Notice: 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 ag [...] -This object uses `describedAs` to provide a description. +This domain class uses `describedAs` to provide a description. [source,java,indent=0] ---- diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamed.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamed.java index eb798008dd..315efbb6f9 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamed.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamed.java @@ -25,7 +25,7 @@ import org.apache.causeway.applib.annotation.DomainObjectLayout; //tag::class[] @DomainObjectLayout( - cssClassFa = "fa-user" // <.> + named = "Customer" // <.> ) public abstract class DomainObjectLayoutNamed //end::class[] diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage-description.adoc index 10a4b6efda..c72fe88cc6 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage-description.adoc +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage-description.adoc @@ -1,7 +1,25 @@ :Notice: 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 ag [...] -The `named` attribute ... +The purpose of the link:https://causeway.apache.org/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainObjectLayout.html#named[@DomainObjectLayout#named] is to provide a different effective name for the domain class wherever it appears in the user interface, for example tooltips. + +One reason to use this annotation is if the default name (derived from the physical class name) would expose implementation details that you might prefer to keep hidden. + +Note that this does _not_ affect the bookmark, for example as used in the URL; for that, specify the logical type name using `@javax.inject.Named`. + + +=== How this demo works + +The collection on the left hand side shows a set of objects that have been annotated with `named`. +Hover over the icons of the objects in the collection, and the name will be shown in the (top half of) each tooltip. + +Navigate into any of the objects and the name is shown when hovering over the object's title. + +In terms of code: + +[source,java,indent=0] +---- +include::DomainObjectLayoutNamed.java[tags=class] +---- +<.> provides the description. +The viewer renders this in a tooltip. -link:https://causeway.apache.org/refguide/2.0.0-SNAPSHOT/applib/index/annotation/DomainObjectLayout.html#named[@DomainObjectLayout#named] -WARNING: TODO[CAUSEWAY-3309] -Custom text for the domain object's type wherever labeled diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage.java index eb2b2413a4..00cfc219d4 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage.java @@ -35,15 +35,12 @@ import org.apache.causeway.applib.annotation.ObjectSupport; @XmlRootElement(name = "root") @XmlType @XmlAccessorType(XmlAccessType.FIELD) -@Named("demo.DomainObjectLayoutNamedVm") -@DomainObject( - nature=Nature.VIEW_MODEL) -@DomainObjectLayout( - named = "object name") +@Named("demo.DomainObjectLayoutNamedPage") +@DomainObject(nature=Nature.VIEW_MODEL) public class DomainObjectLayoutNamedPage implements HasAsciiDocDescription { @ObjectSupport public String title() { - return "DomainObjectLayout#named"; + return "@DomainObjectLayout#named"; } } diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage.layout.xml index 49008db41e..58e7f470fe 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage.layout.xml +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/DomainObjectLayoutNamedPage.layout.xml @@ -10,10 +10,10 @@ OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> <bs3:grid - xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"; - xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"; - xmlns:cpt="https://causeway.apache.org/applib/layout/component"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> + xsi:schemaLocation="https://causeway.apache.org/applib/layout/component https://causeway.apache.org/applib/layout/component/component.xsd https://causeway.apache.org/applib/layout/grid/bootstrap3 https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"; + xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3"; + xmlns:cpt="https://causeway.apache.org/applib/layout/component"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";> <bs3:row> <bs3:col span="10" unreferencedActions="true"> @@ -26,7 +26,16 @@ <bs3:row> <bs3:col span="6"> - <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/> + <bs3:row> + <bs3:col span="12"> + <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/> + </bs3:col> + </bs3:row> + <bs3:row> + <bs3:col span="12"> + <cpt:collection id="objects"/> + </bs3:col> + </bs3:row> </bs3:col> <bs3:col span="6"> <cpt:fieldSet name="Description" id="description" > @@ -36,9 +45,9 @@ <cpt:action id="inspectMetamodel" position="PANEL_DROPDOWN"/> <cpt:action id="downloadMetamodelXml" position="PANEL_DROPDOWN"/> <cpt:action id="downloadJdoMetamodel" position="PANEL_DROPDOWN"/> - <cpt:action id="recentCommands" position="PANEL_DROPDOWN"/> - <cpt:action id="recentExecutions" position="PANEL_DROPDOWN"/> - <cpt:action id="recentAuditTrailEntries" position="PANEL_DROPDOWN"/> + <cpt:action id="recentCommands" position="PANEL_DROPDOWN"/> + <cpt:action id="recentExecutions" position="PANEL_DROPDOWN"/> + <cpt:action id="recentAuditTrailEntries" position="PANEL_DROPDOWN"/> <cpt:action id="impersonateWithRoles" position="PANEL_DROPDOWN"/> <cpt:action id="openRestApi" position="PANEL_DROPDOWN" /> <cpt:property id="description"/> diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/jpa/DomainObjectLayoutNamedJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/jpa/DomainObjectLayoutNamedJpa-description.adoc index 773c651f46..089e5cf4fa 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/jpa/DomainObjectLayoutNamedJpa-description.adoc +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/named/jpa/DomainObjectLayoutNamedJpa-description.adoc @@ -1,6 +1,6 @@ :Notice: 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 ag [...] -This object is annotated with a CSS font-awesome class of "fa-user": +This domain class uses `named` to provide a different effective name. [source,java,indent=0] ---- diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPaged.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPaged.java index 12cc63f60a..e3f88b1f2d 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPaged.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/DomainObjectLayoutPaged.java @@ -25,7 +25,7 @@ import org.apache.causeway.applib.annotation.DomainObjectLayout; //tag::class[] @DomainObjectLayout( - cssClassFa = "fa-user" // <.> + paged = 5 // <.> ) public abstract class DomainObjectLayoutPaged //end::class[] diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/jpa/DomainObjectLayoutPagedJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/jpa/DomainObjectLayoutPagedJpa-description.adoc index fd96d19984..c03b4ad632 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/jpa/DomainObjectLayoutPagedJpa-description.adoc +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/DomainObjectLayout/paged/jpa/DomainObjectLayoutPagedJpa-description.adoc @@ -1,10 +1,10 @@ :Notice: 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 ag [...] -This object is annotated with a CSS font-awesome class of "fa-user": +This domain class is annotated with `paged` attribute of 5: [source,java,indent=0] ---- -include::../DomainObjectLayoutCssClassFa.java[tags=class] +include::../DomainObjectLayoutPaged.java[tags=class] ---- -<.> specifies "bus" CSS font-awesome style +<.> specifies that by default only objects are shown in any collection of this domain class. diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/AssociatedActionDemo-description.adoc similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo-description.adoc rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/AssociatedActionDemo-description.adoc diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/AssociatedActionDemo.java similarity index 98% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/AssociatedActionDemo.java index 0f0a67fe54..71325cce22 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/AssociatedActionDemo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.actions.progmodel.assoc; +package demoapp.dom.domain.progmodel.actions.assoc.assoc; import java.util.LinkedHashSet; import java.util.Set; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/AssociatedActionDemo.layout.xml similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionDemo.layout.xml rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/AssociatedActionDemo.layout.xml diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/AssociatedActionMenu.java similarity index 97% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionMenu.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/AssociatedActionMenu.java index f1ae018bc9..45d64ffa4e 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/AssociatedActionMenu.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/AssociatedActionMenu.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.actions.progmodel.assoc; +package demoapp.dom.domain.progmodel.actions.assoc.assoc; import javax.inject.Inject; import javax.inject.Named; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/DemoItem.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/DemoItem.java similarity index 96% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/DemoItem.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/DemoItem.java index 9f87b0174c..4278a53207 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/assoc/DemoItem.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/assoc/assoc/DemoItem.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.actions.progmodel.assoc; +package demoapp.dom.domain.progmodel.actions.assoc.assoc; import javax.inject.Named; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DemoItem.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DemoItem.java similarity index 97% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DemoItem.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DemoItem.java index 7a6ed67c72..58c63993b4 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DemoItem.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DemoItem.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.actions.progmodel.depargs; +package demoapp.dom.domain.progmodel.actions.depargs.depargs; import javax.inject.Named; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo-description.adoc similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo-description.adoc rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo-description.adoc diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo.java similarity index 98% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo.java index 3042946053..c3610c4e6b 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.actions.progmodel.depargs; +package demoapp.dom.domain.progmodel.actions.depargs.depargs; import java.util.LinkedHashSet; import java.util.Set; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo.layout.xml similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo.layout.xml rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo.layout.xml diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_bulkAction.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_bulkAction.java similarity index 98% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_bulkAction.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_bulkAction.java index 5b26619d3d..dc2d238a9b 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_bulkAction.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_bulkAction.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.actions.progmodel.depargs; +package demoapp.dom.domain.progmodel.actions.depargs.depargs; import java.util.Collection; import java.util.Set; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useAutoComplete.java similarity index 98% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useAutoComplete.java index 34c76236ed..39252af9e9 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useAutoComplete.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.actions.progmodel.depargs; +package demoapp.dom.domain.progmodel.actions.depargs.depargs; import java.util.Collection; import java.util.stream.Collectors; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete2.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useAutoComplete2.java similarity index 98% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete2.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useAutoComplete2.java index 97f9681954..3ac5a17e40 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useAutoComplete2.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useAutoComplete2.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.actions.progmodel.depargs; +package demoapp.dom.domain.progmodel.actions.depargs.depargs; import java.util.Collections; import java.util.List; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useChoices.java similarity index 98% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useChoices.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useChoices.java index 7a8e62549c..f88093dc8f 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useChoices.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useChoices.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.actions.progmodel.depargs; +package demoapp.dom.domain.progmodel.actions.depargs.depargs; import java.util.Collection; import java.util.stream.Collectors; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useChoices2.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useChoices2.java similarity index 98% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useChoices2.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useChoices2.java index fe451bbe11..f5691ce2da 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useChoices2.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useChoices2.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.actions.progmodel.depargs; +package demoapp.dom.domain.progmodel.actions.depargs.depargs; import java.util.Collections; import java.util.List; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useDefault.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useDefault.java similarity index 97% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useDefault.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useDefault.java index 68c781e8d7..203cac968c 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useDefault.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useDefault.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.actions.progmodel.depargs; +package demoapp.dom.domain.progmodel.actions.depargs.depargs; import javax.inject.Inject; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useDisable.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useDisable.java similarity index 97% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useDisable.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useDisable.java index 63a6ac6abf..9495268906 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useDisable.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useDisable.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.actions.progmodel.depargs; +package demoapp.dom.domain.progmodel.actions.depargs.depargs; import javax.inject.Inject; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useHide.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useHide.java similarity index 97% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useHide.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useHide.java index d0cad0b38e..3c939a121c 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useHide.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useHide.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.actions.progmodel.depargs; +package demoapp.dom.domain.progmodel.actions.depargs.depargs; import javax.inject.Inject; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useIndependent.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useIndependent.java similarity index 97% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useIndependent.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useIndependent.java index 64c22b6317..b547e23f09 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionDemo_useIndependent.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionDemo_useIndependent.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.actions.progmodel.depargs; +package demoapp.dom.domain.progmodel.actions.depargs.depargs; import java.util.Collection; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionMenu.java similarity index 97% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionMenu.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionMenu.java index 4a8b96da25..488731d801 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/DependentArgsActionMenu.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/DependentArgsActionMenu.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.actions.progmodel.depargs; +package demoapp.dom.domain.progmodel.actions.depargs.depargs; import javax.inject.Inject; import javax.inject.Named; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/Parity.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/Parity.java similarity index 94% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/Parity.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/Parity.java index 505e59f229..da031acf76 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/actions/progmodel/depargs/Parity.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/actions/depargs/depargs/Parity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.actions.progmodel.depargs; +package demoapp.dom.domain.progmodel.actions.depargs.depargs; import org.apache.causeway.applib.annotation.ObjectSupport; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/ComplexNumber.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/ComplexNumber.java similarity index 95% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/ComplexNumber.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/ComplexNumber.java index a9f95ccd50..b90163a1d6 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/ComplexNumber.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/ComplexNumber.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.objects.other.embedded; +package demoapp.dom.domain.progmodel.objects.embedded.embedded; import lombok.Value; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/EmbeddedTypeMenu.java similarity index 96% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeMenu.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/EmbeddedTypeMenu.java index d1225dc391..c17cc975ce 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeMenu.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/EmbeddedTypeMenu.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.objects.other.embedded; +package demoapp.dom.domain.progmodel.objects.embedded.embedded; import lombok.RequiredArgsConstructor; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/EmbeddedTypeVm-description.adoc similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm-description.adoc rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/EmbeddedTypeVm-description.adoc diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/EmbeddedTypeVm.java similarity index 91% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/EmbeddedTypeVm.java index 40bbb8da3d..9424779fea 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/EmbeddedTypeVm.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.objects.other.embedded; +package demoapp.dom.domain.progmodel.objects.embedded.embedded; import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription; import demoapp.dom._infra.values.ValueHolderRepository; -import demoapp.dom.domain.objects.other.embedded.persistence.NumberConstantEntity; +import demoapp.dom.domain.progmodel.objects.embedded.embedded.persistence.NumberConstantEntity; import java.util.List; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/EmbeddedTypeVm.layout.xml similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/EmbeddedTypeVm.layout.xml rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/EmbeddedTypeVm.layout.xml diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/ComplexNumberJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/ComplexNumberJdo.java similarity index 95% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/ComplexNumberJdo.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/ComplexNumberJdo.java index d30d02c02c..0952d5f8e1 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/ComplexNumberJdo.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/ComplexNumberJdo.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.objects.other.embedded.jdo; +package demoapp.dom.domain.progmodel.objects.embedded.embedded.jdo; -import demoapp.dom.domain.objects.other.embedded.ComplexNumber; +import demoapp.dom.domain.progmodel.objects.embedded.embedded.ComplexNumber; import lombok.AccessLevel; import lombok.val; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/ComplexNumberJdoValueSemantics.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/ComplexNumberJdoValueSemantics.java similarity index 98% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/ComplexNumberJdoValueSemantics.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/ComplexNumberJdoValueSemantics.java index 2b6d5b5796..451383bc15 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/ComplexNumberJdoValueSemantics.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/ComplexNumberJdoValueSemantics.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.objects.other.embedded.jdo; +package demoapp.dom.domain.progmodel.objects.embedded.embedded.jdo; import org.apache.causeway.applib.util.schema.CommonDtoUtils; import org.apache.causeway.applib.value.semantics.*; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/NumberConstantJdo-description.adoc similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo-description.adoc rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/NumberConstantJdo-description.adoc diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/NumberConstantJdo.java similarity index 90% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/NumberConstantJdo.java index b38b554930..0939b31daf 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/NumberConstantJdo.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.objects.other.embedded.jdo; +package demoapp.dom.domain.progmodel.objects.embedded.embedded.jdo; -import demoapp.dom.domain.objects.other.embedded.ComplexNumber; -import demoapp.dom.domain.objects.other.embedded.persistence.NumberConstantEntity; +import demoapp.dom.domain.progmodel.objects.embedded.embedded.ComplexNumber; +import demoapp.dom.domain.progmodel.objects.embedded.embedded.persistence.NumberConstantEntity; import lombok.Getter; import lombok.Setter; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/NumberConstantJdo.layout.xml similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.layout.xml rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/NumberConstantJdo.layout.xml diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.svg b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/NumberConstantJdo.svg similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo.svg rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/NumberConstantJdo.svg diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdoRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/NumberConstantJdoRepository.java similarity index 91% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdoRepository.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/NumberConstantJdoRepository.java index 1e6ee51c41..21735617ee 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdoRepository.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/NumberConstantJdoRepository.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.objects.other.embedded.jdo; +package demoapp.dom.domain.progmodel.objects.embedded.embedded.jdo; import demoapp.dom._infra.values.ValueHolderRepository; -import demoapp.dom.domain.objects.other.embedded.ComplexNumber; +import demoapp.dom.domain.progmodel.objects.embedded.embedded.ComplexNumber; import lombok.val; import org.springframework.context.annotation.Profile; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo_updateNumber.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/NumberConstantJdo_updateNumber.java similarity index 96% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo_updateNumber.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/NumberConstantJdo_updateNumber.java index c6e8e2d1fa..566cb00574 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jdo/NumberConstantJdo_updateNumber.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jdo/NumberConstantJdo_updateNumber.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.objects.other.embedded.jdo; +package demoapp.dom.domain.progmodel.objects.embedded.embedded.jdo; import lombok.RequiredArgsConstructor; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/ComplexNumberJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/ComplexNumberJpa.java similarity index 95% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/ComplexNumberJpa.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/ComplexNumberJpa.java index 2cdf44dc7b..5ea5f81db4 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/ComplexNumberJpa.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/ComplexNumberJpa.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.objects.other.embedded.jpa; +package demoapp.dom.domain.progmodel.objects.embedded.embedded.jpa; -import demoapp.dom.domain.objects.other.embedded.ComplexNumber; +import demoapp.dom.domain.progmodel.objects.embedded.embedded.ComplexNumber; import lombok.AccessLevel; import lombok.val; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/ComplexNumberJpaValueSemantics.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/ComplexNumberJpaValueSemantics.java similarity index 98% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/ComplexNumberJpaValueSemantics.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/ComplexNumberJpaValueSemantics.java index ac35350934..f3c6af255c 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/ComplexNumberJpaValueSemantics.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/ComplexNumberJpaValueSemantics.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.objects.other.embedded.jpa; +package demoapp.dom.domain.progmodel.objects.embedded.embedded.jpa; import org.apache.causeway.applib.util.schema.CommonDtoUtils; import org.apache.causeway.applib.value.semantics.*; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/NumberConstantJpa-description.adoc similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa-description.adoc rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/NumberConstantJpa-description.adoc diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/NumberConstantJpa.java similarity index 89% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/NumberConstantJpa.java index 56ed95ab5c..096c045a7a 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/NumberConstantJpa.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.objects.other.embedded.jpa; +package demoapp.dom.domain.progmodel.objects.embedded.embedded.jpa; -import demoapp.dom.domain.objects.other.embedded.ComplexNumber; -import demoapp.dom.domain.objects.other.embedded.persistence.NumberConstantEntity; +import demoapp.dom.domain.progmodel.objects.embedded.embedded.ComplexNumber; +import demoapp.dom.domain.progmodel.objects.embedded.embedded.persistence.NumberConstantEntity; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/NumberConstantJpa.layout.xml similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.layout.xml rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/NumberConstantJpa.layout.xml diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.svg b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/NumberConstantJpa.svg similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa.svg rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/NumberConstantJpa.svg diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpaRepository.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/NumberConstantJpaRepository.java similarity index 91% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpaRepository.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/NumberConstantJpaRepository.java index 0ac6eb976d..2f9b187166 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpaRepository.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/NumberConstantJpaRepository.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.objects.other.embedded.jpa; +package demoapp.dom.domain.progmodel.objects.embedded.embedded.jpa; import demoapp.dom._infra.values.ValueHolderRepository; -import demoapp.dom.domain.objects.other.embedded.ComplexNumber; +import demoapp.dom.domain.progmodel.objects.embedded.embedded.ComplexNumber; import lombok.val; import org.springframework.context.annotation.Profile; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa_updateNumber.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/NumberConstantJpa_updateNumber.java similarity index 96% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa_updateNumber.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/NumberConstantJpa_updateNumber.java index c849c89a13..a57e85dff1 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/jpa/NumberConstantJpa_updateNumber.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/jpa/NumberConstantJpa_updateNumber.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.objects.other.embedded.jpa; +package demoapp.dom.domain.progmodel.objects.embedded.embedded.jpa; import lombok.RequiredArgsConstructor; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/persistence/NumberConstantEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/persistence/NumberConstantEntity.java similarity index 90% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/persistence/NumberConstantEntity.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/persistence/NumberConstantEntity.java index 96cb885617..96e2991c68 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/persistence/NumberConstantEntity.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/persistence/NumberConstantEntity.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.objects.other.embedded.persistence; +package demoapp.dom.domain.progmodel.objects.embedded.embedded.persistence; import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription; import demoapp.dom._infra.values.ValueHolder; -import demoapp.dom.domain.objects.other.embedded.ComplexNumber; +import demoapp.dom.domain.progmodel.objects.embedded.embedded.ComplexNumber; import javax.inject.Named; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/persistence/NumberConstantSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/persistence/NumberConstantSeeding.java similarity index 89% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/persistence/NumberConstantSeeding.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/persistence/NumberConstantSeeding.java index 25e319bce5..07935f4fa7 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/persistence/NumberConstantSeeding.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/persistence/NumberConstantSeeding.java @@ -18,11 +18,11 @@ * */ -package demoapp.dom.domain.objects.other.embedded.persistence; +package demoapp.dom.domain.progmodel.objects.embedded.embedded.persistence; import demoapp.dom._infra.seed.SeedServiceAbstract; import demoapp.dom._infra.values.ValueHolderRepository; -import demoapp.dom.domain.objects.other.embedded.ComplexNumber; +import demoapp.dom.domain.progmodel.objects.embedded.embedded.ComplexNumber; import javax.inject.Inject; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/samples/ComplexNumberSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/samples/ComplexNumberSamples.java similarity index 89% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/samples/ComplexNumberSamples.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/samples/ComplexNumberSamples.java index c241595bc9..a07ef924a0 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/embedded/samples/ComplexNumberSamples.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/embedded/embedded/samples/ComplexNumberSamples.java @@ -18,9 +18,9 @@ * */ -package demoapp.dom.domain.objects.other.embedded.samples; +package demoapp.dom.domain.progmodel.objects.embedded.embedded.samples; -import demoapp.dom.domain.objects.other.embedded.ComplexNumber; +import demoapp.dom.domain.progmodel.objects.embedded.embedded.ComplexNumber; import demoapp.dom.types.Samples; import java.util.stream.Stream; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/CountHolder.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder.java similarity index 94% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/CountHolder.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder.java index 19eac8b43d..6e4fdb10ff 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/CountHolder.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.objects.other.mixins; +package demoapp.dom.domain.progmodel.objects.mixins.mixins; import javax.inject.Named; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/CountHolder_explanation.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder_explanation.java similarity index 95% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/CountHolder_explanation.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder_explanation.java index 06560335bb..d2fd8f3630 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/CountHolder_explanation.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder_explanation.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.objects.other.mixins; +package demoapp.dom.domain.progmodel.objects.mixins.mixins; import lombok.RequiredArgsConstructor; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/CountHolder_fibonacciSequence.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder_fibonacciSequence.java similarity index 97% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/CountHolder_fibonacciSequence.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder_fibonacciSequence.java index 08e8ad6359..d8d7fb1454 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/CountHolder_fibonacciSequence.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder_fibonacciSequence.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.objects.other.mixins; +package demoapp.dom.domain.progmodel.objects.mixins.mixins; import lombok.RequiredArgsConstructor; import lombok.val; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/CountHolder_updateCount.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder_updateCount.java similarity index 96% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/CountHolder_updateCount.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder_updateCount.java index 38c5029e41..40af4176d7 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/CountHolder_updateCount.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/CountHolder_updateCount.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.objects.other.mixins; +package demoapp.dom.domain.progmodel.objects.mixins.mixins; import lombok.RequiredArgsConstructor; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/FibonacciNumberVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/FibonacciNumberVm-description.adoc similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/FibonacciNumberVm-description.adoc rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/FibonacciNumberVm-description.adoc diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/FibonacciNumberVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/FibonacciNumberVm.java similarity index 96% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/FibonacciNumberVm.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/FibonacciNumberVm.java index d53c4234fc..808207b307 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/FibonacciNumberVm.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/FibonacciNumberVm.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.objects.other.mixins; +package demoapp.dom.domain.progmodel.objects.mixins.mixins; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/FibonacciNumberVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/FibonacciNumberVm.layout.xml similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/FibonacciNumberVm.layout.xml rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/FibonacciNumberVm.layout.xml diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinMenu.java similarity index 95% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinMenu.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinMenu.java index 3bf8a2abb9..f00d906b1c 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinMenu.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinMenu.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.objects.other.mixins; +package demoapp.dom.domain.progmodel.objects.mixins.mixins; import lombok.val; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinVm-description.adoc similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinVm-description.adoc rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinVm-description.adoc diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinVm.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinVm.java similarity index 96% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinVm.java rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinVm.java index 5656f69129..0be3d17773 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinVm.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinVm.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package demoapp.dom.domain.objects.other.mixins; +package demoapp.dom.domain.progmodel.objects.mixins.mixins; import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription; import lombok.Getter; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinVm.layout.xml similarity index 100% rename from examples/demo/domain/src/main/java/demoapp/dom/domain/objects/other/mixins/MixinVm.layout.xml rename to examples/demo/domain/src/main/java/demoapp/dom/domain/progmodel/objects/mixins/mixins/MixinVm.layout.xml diff --git a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage.java b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage.java index 61d71ebf36..c6edff7870 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/domain/properties/Property/domainEvent/PropertyDomainEventPage.java @@ -29,7 +29,7 @@ import javax.xml.bind.annotation.*; import org.apache.causeway.applib.annotation.*; import org.apache.causeway.applib.events.domain.PropertyDomainEvent; -@XmlRootElement(name = "demo.PropertyDomainEventPage") +@XmlRootElement(name = "root") @XmlType @XmlAccessorType(XmlAccessType.FIELD) @Named("demo.PropertyDomainEventPage") diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsMenu.java index 72608ebbe9..3a5cb0a2f6 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsMenu.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsMenu.java @@ -29,7 +29,7 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence; import org.apache.causeway.applib.annotation.SemanticsOf; import org.apache.causeway.applib.services.factory.FactoryService; -import demoapp.dom.domain.actions.progmodel.assoc.DemoItem; +import demoapp.dom.domain.progmodel.actions.assoc.assoc.DemoItem; import lombok.RequiredArgsConstructor; import lombok.val; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsVm.java b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsVm.java index 279a702288..9a5ce84c8f 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsVm.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/describedAs/DescribedAsVm.java @@ -50,7 +50,7 @@ import org.apache.causeway.applib.services.message.MessageService; import org.apache.causeway.applib.value.Markup; import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription; -import demoapp.dom.domain.actions.progmodel.assoc.DemoItem; +import demoapp.dom.domain.progmodel.actions.assoc.assoc.DemoItem; import lombok.Getter; import lombok.Setter; diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/CausewayLocalResourcePaths.java b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/CausewayLocalResourcePaths.java index 7c7308da7f..e9c4b4c789 100644 --- a/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/CausewayLocalResourcePaths.java +++ b/examples/demo/domain/src/main/java/demoapp/dom/types/causeway/localresourcepaths/CausewayLocalResourcePaths.java @@ -46,7 +46,7 @@ import demoapp.dom.types.Samples; import demoapp.dom.types.causeway.localresourcepaths.persistence.CausewayLocalResourcePathEntity; import demoapp.dom.types.causeway.localresourcepaths.vm.CausewayLocalResourcePathVm; -@XmlRootElement(name = "Demo") +@XmlRootElement(name = "root") @XmlType @XmlAccessorType(XmlAccessType.FIELD) @Named("demo.CausewayLocalResourcePaths") diff --git a/examples/demo/domain/src/test/java/demoapp/dom/domain/objects/other/customvaluetypes/ComplexNumberJdo_Test.java b/examples/demo/domain/src/test/java/demoapp/dom/domain/objects/other/customvaluetypes/ComplexNumberJdo_Test.java index abbe28a49e..760f542c3a 100644 --- a/examples/demo/domain/src/test/java/demoapp/dom/domain/objects/other/customvaluetypes/ComplexNumberJdo_Test.java +++ b/examples/demo/domain/src/test/java/demoapp/dom/domain/objects/other/customvaluetypes/ComplexNumberJdo_Test.java @@ -23,7 +23,7 @@ package demoapp.dom.domain.objects.other.customvaluetypes; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import demoapp.dom.domain.objects.other.embedded.jdo.ComplexNumberJdo; +import demoapp.dom.domain.progmodel.objects.embedded.embedded.jdo.ComplexNumberJdo; import lombok.val; class ComplexNumberJdo_Test {
