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/06/26 07:06:17 UTC
[isis] 01/05: ISIS-2222: standardize objectType prefix to just
'demo.'
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 fc312577f0c94696b990f3b0b93d63992ef8f8e3
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jun 26 06:40:34 2020 +0100
ISIS-2222: standardize objectType prefix to just 'demo.'
---
.../java/demoapp/dom/homepage/DemoHomePage-description.adoc | 2 +-
.../src/main/java/demoapp/dom/homepage/DemoHomePage.java | 2 +-
.../domain/src/main/java/demoapp/dom/menubars.layout.xml | 12 ++++++------
.../dom/types/{FeaturedTypesMenu.java => DataTypesMenu.java} | 6 +++---
.../demoapp/dom/types/primitive/bytes/PrimitiveBytes.java | 2 +-
.../bytes/jdo/PrimitiveByteJdoEntity-description.adoc | 2 +-
.../types/primitive/bytes/jdo/PrimitiveByteJdoEntity.java | 2 +-
.../bytes/vm/PrimitiveByteViewModel-description.adoc | 4 ++--
.../dom/types/primitive/bytes/vm/PrimitiveByteViewModel.java | 4 ++--
.../demoapp/dom/types/primitive/chars/PrimitiveChars.java | 2 +-
.../chars/jdo/PrimitiveCharJdoEntity-description.adoc | 2 +-
.../types/primitive/chars/jdo/PrimitiveCharJdoEntity.java | 2 +-
.../chars/vm/PrimitiveCharViewModel-description.adoc | 4 ++--
.../dom/types/primitive/chars/vm/PrimitiveCharViewModel.java | 4 ++--
.../src/main/java/demoapp/dom/viewmodels/ViewModels.java | 2 +-
.../jaxbrefentity/StatefulViewModelJaxbRefsEntity.java | 4 ++--
.../usingjaxb/StatefulViewModelUsingJaxb-description.adoc | 4 ++--
.../dom/viewmodels/usingjaxb/StatefulViewModelUsingJaxb.java | 6 +++---
18 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage-description.adoc
index d08f1ac..6a62c18 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage-description.adoc
@@ -4,7 +4,7 @@ Apache Isis applications can nominate a view model to act as the home page, usin
----
@DomainObject(
nature=Nature.VIEW_MODEL,
- objectType = "demoapp.Homepage"
+ objectType = "demo.Homepage"
)
@HomePage // <.>
public class DemoHomePage {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.java b/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.java
index b0ea11a..dd751b9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/homepage/DemoHomePage.java
@@ -46,7 +46,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
@DomainObject(
nature=Nature.VIEW_MODEL
- , objectType = "demoapp.Homepage"
+ , objectType = "demo.Homepage"
)
@HomePage
public class DemoHomePage implements HasAsciiDocDescription {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml
index 222c44b..5effb74 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/menubars.layout.xml
@@ -8,19 +8,19 @@
<mb3:menu>
<mb3:named>View Models</mb3:named>
<mb3:section>
- <mb3:serviceAction objectType="demoapp.ViewModels" id="openStateful"/>
- <mb3:serviceAction objectType="demoapp.ViewModels" id="openStatefulRefsEntity"/>
+ <mb3:serviceAction objectType="demo.ViewModels" id="openStateful"/>
+ <mb3:serviceAction objectType="demo.ViewModels" id="openStatefulRefsEntity"/>
</mb3:section>
</mb3:menu>
<mb3:menu>
- <mb3:named>Featured Types</mb3:named>
+ <mb3:named>Data Types</mb3:named>
<mb3:section>
- <mb3:serviceAction objectType="demo.FeaturedTypesMenu" id="primitiveBytes"/>
- <mb3:serviceAction objectType="demo.FeaturedTypesMenu" id="primitiveChars"/>
+ <mb3:serviceAction objectType="demo.DataTypesMenu" id="primitiveBytes"/>
+ <mb3:serviceAction objectType="demo.DataTypesMenu" id="primitiveChars"/>
</mb3:section>
<mb3:section>
- <mb3:serviceAction objectType="demo.FeaturedTypesMenu" id="text">
+ <mb3:serviceAction objectType="demo.DataTypesMenu" id="text">
<cpt:named>Text</cpt:named>
</mb3:serviceAction>
<mb3:serviceAction objectType="demo.FeaturedTypesMenu" id="primitives">
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/FeaturedTypesMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/types/DataTypesMenu.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/FeaturedTypesMenu.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/DataTypesMenu.java
index 81c957d..37ae410 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/FeaturedTypesMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/DataTypesMenu.java
@@ -55,10 +55,10 @@ import demoapp.dom.types.text.TextDemo;
import demoapp.dom.types.time.TemporalDemo;
import demoapp.dom.types.uuid.UuidDemo;
-@DomainService(nature=NatureOfService.VIEW, objectType = "demo.FeaturedTypesMenu")
-@DomainObjectLayout(named="Featured Types")
+@DomainService(nature=NatureOfService.VIEW, objectType = "demo.DataTypesMenu")
+@DomainObjectLayout(named="DataTypes")
@Log4j2
-public class FeaturedTypesMenu {
+public class DataTypesMenu {
@Inject private FactoryService factoryService;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/PrimitiveBytes.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/PrimitiveBytes.java
index c410fe5..b39907e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/PrimitiveBytes.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/PrimitiveBytes.java
@@ -46,7 +46,7 @@ import demoapp.dom.types.primitive.bytes.vm.PrimitiveByteViewModel;
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
-@DomainObject(nature=Nature.VIEW_MODEL, objectType = "demoapp.PrimitiveBytes", editing=Editing.ENABLED)
+@DomainObject(nature=Nature.VIEW_MODEL, objectType = "demo.PrimitiveBytes", editing=Editing.ENABLED)
@Log4j2
public class PrimitiveBytes implements HasAsciiDocDescription {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/jdo/PrimitiveByteJdoEntity-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/jdo/PrimitiveByteJdoEntity-description.adoc
index c45f434..3f6b01a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/jdo/PrimitiveByteJdoEntity-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/jdo/PrimitiveByteJdoEntity-description.adoc
@@ -5,7 +5,7 @@ JDO supports `byte` out-of-the-box, so no special annotations are required.
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
@DomainObject(
- objectType = "demoapp.PrimitiveByteJdoEntity"
+ objectType = "demo.PrimitiveByteJdoEntity"
)
public class PrimitiveByteJdoEntity
implements HasAsciiDocDescription, PrimitiveByteHolder { // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/jdo/PrimitiveByteJdoEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/jdo/PrimitiveByteJdoEntity.java
index 50011cd..8a4dbe4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/jdo/PrimitiveByteJdoEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/jdo/PrimitiveByteJdoEntity.java
@@ -39,7 +39,7 @@ import demoapp.dom.types.primitive.bytes.holder.PrimitiveByteHolder;
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
@DomainObject(
- objectType = "demoapp.PrimitiveByteJdoEntity"
+ objectType = "demo.PrimitiveByteJdoEntity"
)
public class PrimitiveByteJdoEntity
implements HasAsciiDocDescription,
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/vm/PrimitiveByteViewModel-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/vm/PrimitiveByteViewModel-description.adoc
index 9ed7fff..7f19251 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/vm/PrimitiveByteViewModel-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/vm/PrimitiveByteViewModel-description.adoc
@@ -2,12 +2,12 @@ JAXB supports `byte` out-of-the-box, so no special annotations are required.
[source,java]
----
-@XmlRootElement(name = "demoapp.PrimitiveByteViewModel")
+@XmlRootElement(name = "demo.PrimitiveByteViewModel")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
@DomainObject(
nature=Nature.VIEW_MODEL,
- objectType = "demoapp.PrimitiveByteViewModel"
+ objectType = "demo.PrimitiveByteViewModel"
)
@lombok.NoArgsConstructor // <.>
public class PrimitiveByteViewModel
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/vm/PrimitiveByteViewModel.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/vm/PrimitiveByteViewModel.java
index c8772e2..0195e3a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/vm/PrimitiveByteViewModel.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/bytes/vm/PrimitiveByteViewModel.java
@@ -37,12 +37,12 @@ import lombok.Setter;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.primitive.bytes.holder.PrimitiveByteHolder;
-@XmlRootElement(name = "demoapp.PrimitiveByteViewModel")
+@XmlRootElement(name = "demo.PrimitiveByteViewModel")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
@DomainObject(
nature=Nature.VIEW_MODEL,
- objectType = "demoapp.PrimitiveByteViewModel"
+ objectType = "demo.PrimitiveByteViewModel"
)
@lombok.NoArgsConstructor
public class PrimitiveByteViewModel
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars.java
index 18889d6..34d131a 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/PrimitiveChars.java
@@ -51,7 +51,7 @@ import demoapp.dom.types.primitive.chars.vm.PrimitiveCharViewModel;
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
-@DomainObject(nature=Nature.VIEW_MODEL, objectType = "demoapp.PrimitiveChars", editing=Editing.ENABLED)
+@DomainObject(nature=Nature.VIEW_MODEL, objectType = "demo.PrimitiveChars", editing=Editing.ENABLED)
@Log4j2
public class PrimitiveChars implements HasAsciiDocDescription {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdoEntity-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdoEntity-description.adoc
index 6ae7268..f5fb89f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdoEntity-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdoEntity-description.adoc
@@ -5,7 +5,7 @@ JDO supports `char` out-of-the-box, so no special annotations are required.
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
@DomainObject(
- objectType = "demoapp.PrimitiveCharJdoEntity"
+ objectType = "demo.PrimitiveCharJdoEntity"
)
public class PrimitiveCharJdoEntity
implements HasAsciiDocDescription, PrimitiveCharHolder { // <.>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdoEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdoEntity.java
index 9a0b4d5..36cc28d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdoEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/jdo/PrimitiveCharJdoEntity.java
@@ -39,7 +39,7 @@ import demoapp.dom.types.primitive.chars.holder.PrimitiveCharHolder;
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
@DatastoreIdentity(strategy = IdGeneratorStrategy.IDENTITY, column = "id")
@DomainObject(
- objectType = "demoapp.PrimitiveCharJdoEntity"
+ objectType = "demo.PrimitiveCharJdoEntity"
)
public class PrimitiveCharJdoEntity
implements HasAsciiDocDescription,
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharViewModel-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharViewModel-description.adoc
index 9135e5e..6fa722e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharViewModel-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharViewModel-description.adoc
@@ -2,12 +2,12 @@ JAXB supports `char` out-of-the-box, so no special annotations are required.
[source,java]
----
-@XmlRootElement(name = "demoapp.PrimitiveCharViewModel")
+@XmlRootElement(name = "demo.PrimitiveCharViewModel")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
@DomainObject(
nature=Nature.VIEW_MODEL,
- objectType = "demoapp.PrimitiveCharViewModel"
+ objectType = "demo.PrimitiveCharViewModel"
)
@lombok.NoArgsConstructor // <.>
public class PrimitiveCharViewModel
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharViewModel.java b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharViewModel.java
index e52dd71..cfea06f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharViewModel.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/primitive/chars/vm/PrimitiveCharViewModel.java
@@ -37,12 +37,12 @@ import lombok.Setter;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.primitive.chars.holder.PrimitiveCharHolder;
-@XmlRootElement(name = "demoapp.PrimitiveCharViewModel")
+@XmlRootElement(name = "demo.PrimitiveCharViewModel")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
@DomainObject(
nature=Nature.VIEW_MODEL,
- objectType = "demoapp.PrimitiveCharViewModel"
+ objectType = "demo.PrimitiveCharViewModel"
)
@lombok.NoArgsConstructor
public class PrimitiveCharViewModel
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/ViewModels.java b/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/ViewModels.java
index 35f3156..eaa5141 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/ViewModels.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/ViewModels.java
@@ -28,7 +28,7 @@ import demoapp.dom.viewmodels.jaxbrefentity.StatefulViewModelJaxbRefsEntity;
import demoapp.dom.viewmodels.usingjaxb.StatefulViewModelUsingJaxb;
@DomainService(
- objectType = "demoapp.ViewModels"
+ objectType = "demo.ViewModels"
)
public class ViewModels {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/jaxbrefentity/StatefulViewModelJaxbRefsEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/jaxbrefentity/StatefulViewModelJaxbRefsEntity.java
index 0d55b11..dc6fe6e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/jaxbrefentity/StatefulViewModelJaxbRefsEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/jaxbrefentity/StatefulViewModelJaxbRefsEntity.java
@@ -42,14 +42,14 @@ import lombok.Setter;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-@XmlRootElement(name = "demoapp.StatefulViewModelJaxbRefsEntity")
+@XmlRootElement(name = "demo.StatefulViewModelJaxbRefsEntity")
@XmlType(
propOrder = {"message", "favoriteChild", "children"}
)
@XmlAccessorType(XmlAccessType.FIELD)
@DomainObject(
nature=Nature.VIEW_MODEL
- , objectType = "demoapp.StatefulViewModelJaxbRefsEntity"
+ , objectType = "demo.StatefulViewModelJaxbRefsEntity"
)
public class StatefulViewModelJaxbRefsEntity implements HasAsciiDocDescription {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/usingjaxb/StatefulViewModelUsingJaxb-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/usingjaxb/StatefulViewModelUsingJaxb-description.adoc
index c54d745..b472425 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/usingjaxb/StatefulViewModelUsingJaxb-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/usingjaxb/StatefulViewModelUsingJaxb-description.adoc
@@ -7,12 +7,12 @@ The framework provides a number of ways to serialize this state, but the most fl
[source,java]
----
-@XmlRootElement(name = "demoapp.DemoStatefulViewModel") // <.>
+@XmlRootElement(name = "demo.DemoStatefulViewModel") // <.>
@XmlType // <.>
@XmlAccessorType(XmlAccessType.FIELD) // <.>
@DomainObject(
nature=Nature.VIEW_MODEL
- , objectType = "demoapp.DemoStatefulViewModel"
+ , objectType = "demo.DemoStatefulViewModel"
)
public class StatefulViewModelUsingJaxb implements HasAsciiDocDescription {
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/usingjaxb/StatefulViewModelUsingJaxb.java b/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/usingjaxb/StatefulViewModelUsingJaxb.java
index bf3ba9f..832ff1e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/usingjaxb/StatefulViewModelUsingJaxb.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/usingjaxb/StatefulViewModelUsingJaxb.java
@@ -44,13 +44,13 @@ import lombok.val;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-@XmlRootElement(name = "demoapp.StatefulViewModelUsingJaxb")
+@XmlRootElement(name = "demo.StatefulViewModelUsingJaxb")
@XmlType(
)
@XmlAccessorType(XmlAccessType.FIELD)
@DomainObject(
nature=Nature.VIEW_MODEL
- , objectType = "demoapp.StatefulViewModelUsingJaxb"
+ , objectType = "demo.StatefulViewModelUsingJaxb"
)
public class StatefulViewModelUsingJaxb implements HasAsciiDocDescription {
@@ -63,7 +63,7 @@ public class StatefulViewModelUsingJaxb implements HasAsciiDocDescription {
@XmlElement
private String message;
- @XmlRootElement(name = "child")
+ @XmlRootElement(name = "demo.StatefulViewModelUsingJaxb.Child")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
@Data