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 06:50:46 UTC
[isis] branch ISIS-2222 updated (1bc8434 -> bb8484e)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch ISIS-2222
in repository https://gitbox.apache.org/repos/asf/isis.git.
discard 1bc8434 ISIS-2222: renames pom.xml names so group together more conveniently in the IDE
discard 5f51889 ISIS-2222: moves some packages around, is all
add 6e1997f ISIS-2340: minor test improvements + comments
add 3d8348d ISIS-2399: fixes this issue (QueryResultsCache singleton/service)
new dd860c9 ISIS-2222: moves some packages around, is all
new bb8484e ISIS-2222: renames pom.xml names so group together more conveniently in the IDE
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (1bc8434)
\
N -- N -- N refs/heads/ISIS-2222 (bb8484e)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 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:
.../isis/testdomain/interact/InteractionTest.java | 13 +++-----
.../interact/InteractionTestAbstract.java | 37 +++++++++++++++++++++
.../testdomain/interact/SimulatedUiComponent.java | 9 +++--
.../facets/TenantedAuthorizationFacetDefault.java | 10 +++---
.../facets/TenantedAuthorizationFacetFactory.java | 38 +++++++++++++---------
5 files changed, 75 insertions(+), 32 deletions(-)
copy core/config/src/main/java/org/apache/isis/core/config/beans/IsisBeanTypeRegistryHolder.java => examples/smoketests/stable/src/test/java/org/apache/isis/testdomain/interact/SimulatedUiComponent.java (73%)
[isis] 02/02: 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 ISIS-2222
in repository https://gitbox.apache.org/repos/asf/isis.git
commit bb8484ea691459bcdc342c78898e27df384f401a
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>
[isis] 01/02: 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 ISIS-2222
in repository https://gitbox.apache.org/repos/asf/isis.git
commit dd860c9ade1521190ff7e874778e05da9f7a2ef4
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>