This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 5c3d1b5acb ISIS-3123: migrate Markup
5c3d1b5acb is described below
commit 5c3d1b5acb65828df1ddf8502499ff620637c27d
Author: Andi Huber <[email protected]>
AuthorDate: Thu Sep 29 12:44:29 2022 +0200
ISIS-3123: migrate Markup
---
.../dom/types/isis/markups/IsisMarkups-common.adoc | 7 +++-
.../isis/markups/IsisMarkups-description.adoc | 10 ++---
.../dom/types/isis/markups/IsisMarkups.java | 13 +++---
.../dom/types/isis/markups/IsisMarkups.layout.xml | 2 +
.../isis/markups/holder/IsisMarkupHolder.java | 19 ++++-----
.../isis/markups/holder/IsisMarkupHolder2.java | 14 +++----
.../holder/IsisMarkupHolder_actionReturning.java | 5 +--
...IsisMarkupHolder_actionReturningCollection.java | 10 ++---
.../holder/IsisMarkupHolder_mixinProperty.java | 5 +--
...arkupHolder_updateReadOnlyOptionalProperty.java | 6 +--
...updateReadOnlyOptionalPropertyWithChoices.java} | 28 +++++++++----
.../IsisMarkupHolder_updateReadOnlyProperty.java | 6 +--
...upHolder_updateReadOnlyPropertyWithChoices.java | 17 ++++----
.../markups/jdo/IsisMarkupJdo-description.adoc | 9 ++--
.../dom/types/isis/markups/jdo/IsisMarkupJdo.java | 44 ++++++++-----------
.../isis/markups/jdo/IsisMarkupJdoEntities.java | 7 ++--
.../markups/jpa/IsisMarkupJpa-description.adoc | 18 +++-----
.../dom/types/isis/markups/jpa/IsisMarkupJpa.java | 49 ++++++++--------------
.../isis/markups/jpa/IsisMarkupJpaEntities.java | 7 ++--
.../isis/markups/persistence/IsisMarkupEntity.java | 6 +--
.../persistence/IsisMarkupEntity.layout.xml | 2 +
.../markups/persistence/IsisMarkupSeeding.java | 5 +--
.../isis/markups/samples/IsisMarkupSamples.java | 18 +++-----
.../isis/markups/vm/IsisMarkupVm-description.adoc | 8 ++--
.../dom/types/isis/markups/vm/IsisMarkupVm.java | 26 +++++-------
.../types/isis/markups/vm/IsisMarkupVm.layout.xml | 2 +
.../demoshowcases/value/ValueShowCase.java | 5 +++
27 files changed, 165 insertions(+), 183 deletions(-)
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups-common.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups-common.adoc
index 49e7dfaacc..47b06efcfc 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups-common.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups-common.adoc
@@ -1,8 +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 file was GENERATED by the showcase generator (tooling). Do NOT edit!
+
== Mixin actions
-A number of mixin actions contribute through the `IsisMarkupHolder` interface,
demonstrate the use of `Markup` as a parameter and as a return type.
+A number of mixin actions contribute through the `IsisMarkupHolder` interface,
demonstrate the use of `org.apache.isis.applib.value.Markup` as a parameter and
as a return type.
For example:
* the `updateReadOnlyProperty` action is:
@@ -48,7 +50,7 @@
include::holder/IsisMarkupHolder_mixinProperty.java[tags=class]
== @PropertyLayout(labelPosition=...)
-There is also an extended interface, `IsisMarkupHolder2`, with default methods
demonstrating the use of label positions:
+To demonstrate support for label positions using
`@PropertyLayout(labelPosition=...)`, the entity and view model objects both
implement the extended `IsisMarkupHolder2` interface:
[source,java]
----
@@ -63,3 +65,4 @@ include::holder/IsisMarkupHolder2.java[tags=class]
+
CAUTION: currently not supported
<.> Hide the label completely.
+
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups-description.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups-description.adoc
index 5341316af4..132251087c 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups-description.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups-description.adoc
@@ -1,13 +1,13 @@
: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 framework has built-in support for rendering HTML written using Markup,
using the `Markup` data type.
+// // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
-NOTE: This is an Apache Isis specific data type.
+The framework has built-in support for the
`org.apache.isis.applib.value.Markup` data type.
From here you can:
-* navigate to an entity that uses the `Markup` datatype
-* open a view model that uses the `Markup` datatype
+* navigate to an entity that uses the `org.apache.isis.applib.value.Markup`
datatype
+* open a view model that uses the `org.apache.isis.applib.value.Markup`
datatype
Some properties on these domain objects are mandatory, some optional.
@@ -28,4 +28,4 @@ include::holder/IsisMarkupHolder.java[tags=class]
The `IsisMarkupHolder2` interface is used to demonstrate support for label
positions using `@PropertyLayout(labelPosition=...)`.
-Further details, along with the effect of this annotation, can be seen on the
entity and view model object pages.
\ No newline at end of file
+Further details, along with the effect of this annotation, can be seen on the
entity and view model object pages.
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups.java
index b5c421baa3..58a8e1c135 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups.java
@@ -38,7 +38,6 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.ObjectSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.value.Markup;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
@@ -46,6 +45,7 @@ import demoapp.dom.types.Samples;
import demoapp.dom.types.isis.markups.persistence.IsisMarkupEntity;
import demoapp.dom.types.isis.markups.vm.IsisMarkupVm;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
@@ -55,16 +55,15 @@ import demoapp.dom.types.isis.markups.vm.IsisMarkupVm;
public class IsisMarkups implements HasAsciiDocDescription {
@ObjectSupport public String title() {
- return "Markup data type";
+ return "org.apache.isis.applib.value.Markup data type";
}
@Action(semantics = SemanticsOf.SAFE)
@ActionLayout(promptStyle = PromptStyle.DIALOG_MODAL)
- public IsisMarkupVm openViewModel(final Markup initialValue) {
+ public IsisMarkupVm openViewModel(final
org.apache.isis.applib.value.Markup initialValue) {
return new IsisMarkupVm(initialValue);
}
-
- @MemberSupport public Markup default0OpenViewModel() {
+ @MemberSupport public org.apache.isis.applib.value.Markup
default0OpenViewModel() {
return samples.single();
}
@@ -75,10 +74,10 @@ public class IsisMarkups implements HasAsciiDocDescription {
@Inject
@XmlTransient
- ValueHolderRepository<Markup, ? extends IsisMarkupEntity> entities;
+ ValueHolderRepository<org.apache.isis.applib.value.Markup, ? extends
IsisMarkupEntity> entities;
@Inject
@XmlTransient
- Samples<Markup> samples;
+ Samples<org.apache.isis.applib.value.Markup> samples;
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups.layout.xml
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups.layout.xml
index 74e0160a87..247ed17506 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups.layout.xml
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/IsisMarkups.layout.xml
@@ -15,6 +15,8 @@
xmlns:cpt="http://isis.apache.org/applib/layout/component";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <!-- This file was GENERATED by the showcase generator (tooling). Do
NOT edit! -->
+
<bs3:row>
<bs3:col span="10" unreferencedActions="true">
<cpt:domainObject />
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder.java
index f038114da6..6355e99ca2 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder.java
@@ -20,23 +20,22 @@ package demoapp.dom.types.isis.markups.holder;
import javax.inject.Named;
-import org.apache.isis.applib.value.Markup;
-
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Named("demo.IsisMarkupHolder")
//tag::class[]
public interface IsisMarkupHolder {
- Markup getReadOnlyProperty();
- void setReadOnlyProperty(Markup c);
+ org.apache.isis.applib.value.Markup getReadOnlyProperty();
+ void setReadOnlyProperty(org.apache.isis.applib.value.Markup c);
- Markup getReadWriteProperty();
- void setReadWriteProperty(Markup c);
+ org.apache.isis.applib.value.Markup getReadWriteProperty();
+ void setReadWriteProperty(org.apache.isis.applib.value.Markup c);
- Markup getReadOnlyOptionalProperty();
- void setReadOnlyOptionalProperty(Markup c);
+ org.apache.isis.applib.value.Markup getReadOnlyOptionalProperty();
+ void setReadOnlyOptionalProperty(org.apache.isis.applib.value.Markup c);
- Markup getReadWriteOptionalProperty();
- void setReadWriteOptionalProperty(Markup c);
+ org.apache.isis.applib.value.Markup getReadWriteOptionalProperty();
+ void setReadWriteOptionalProperty(org.apache.isis.applib.value.Markup c);
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder2.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder2.java
index 1d34b7953e..8eb8a95c78 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder2.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder2.java
@@ -22,10 +22,10 @@ import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.value.Markup;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
//tag::class[]
-public interface IsisMarkupHolder2 extends
demoapp.dom.types.isis.markups.holder.IsisMarkupHolder {
+public interface IsisMarkupHolder2 extends IsisMarkupHolder {
@Property // <.>
@PropertyLayout(
@@ -33,8 +33,8 @@ public interface IsisMarkupHolder2 extends
demoapp.dom.types.isis.markups.holder
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSetId = "label-positions", sequence = "1") // <.>
- default Markup getReadOnlyPropertyDerivedLabelPositionLeft() {
+ fieldSetId = "label-positions", sequence = "1") // <.>
+ default org.apache.isis.applib.value.Markup
getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -45,7 +45,7 @@ public interface IsisMarkupHolder2 extends
demoapp.dom.types.isis.markups.holder
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
fieldSetId = "label-positions", sequence = "2")
- default Markup getReadOnlyPropertyDerivedLabelPositionTop() {
+ default org.apache.isis.applib.value.Markup
getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -56,7 +56,7 @@ public interface IsisMarkupHolder2 extends
demoapp.dom.types.isis.markups.holder
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
fieldSetId = "label-positions", sequence = "3")
- default Markup getReadOnlyPropertyDerivedLabelPositionRight() {
+ default org.apache.isis.applib.value.Markup
getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -67,7 +67,7 @@ public interface IsisMarkupHolder2 extends
demoapp.dom.types.isis.markups.holder
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
fieldSetId = "label-positions", sequence = "4")
- default Markup getReadOnlyPropertyDerivedLabelPositionNone() {
+ default org.apache.isis.applib.value.Markup
getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_actionReturning.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_actionReturning.java
index 94f31a9cc6..e19732d0f6 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_actionReturning.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_actionReturning.java
@@ -20,11 +20,10 @@ package demoapp.dom.types.isis.markups.holder;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.value.Markup;
import lombok.RequiredArgsConstructor;
-
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
//tag::class[]
@Action(semantics = SemanticsOf.SAFE)
@RequiredArgsConstructor
@@ -32,7 +31,7 @@ public class IsisMarkupHolder_actionReturning {
private final IsisMarkupHolder holder;
- public Markup act() {
+ public org.apache.isis.applib.value.Markup act() {
return holder.getReadOnlyProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_actionReturningCollection.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_actionReturningCollection.java
index dfefd42300..0d1bf35dea 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_actionReturningCollection.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_actionReturningCollection.java
@@ -25,13 +25,11 @@ import javax.inject.Inject;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.value.Markup;
-
-import lombok.RequiredArgsConstructor;
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
-
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
//tag::class[]
@Action(semantics = SemanticsOf.SAFE)
@RequiredArgsConstructor
@@ -39,13 +37,13 @@ public class IsisMarkupHolder_actionReturningCollection {
private final IsisMarkupHolder holder;
- public Collection<Markup> act() {
+ public Collection<org.apache.isis.applib.value.Markup> act() {
return samples.stream()
.collect(Collectors.toList());
}
@Inject
- Samples<Markup> samples;
+ Samples<org.apache.isis.applib.value.Markup> samples;
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_mixinProperty.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_mixinProperty.java
index dad0a1ca6a..427a192f56 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_mixinProperty.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_mixinProperty.java
@@ -21,11 +21,10 @@ package demoapp.dom.types.isis.markups.holder;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Where;
-import org.apache.isis.applib.value.Markup;
import lombok.RequiredArgsConstructor;
-
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
//tag::class[]
@Property()
@PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "contributed",
sequence = "1")
@@ -34,7 +33,7 @@ public class IsisMarkupHolder_mixinProperty {
private final IsisMarkupHolder holder;
- public Markup prop() {
+ public org.apache.isis.applib.value.Markup prop() {
return holder.getReadOnlyProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyOptionalProperty.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyOptionalProperty.java
index 1b9004a220..3c7c2ed791 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyOptionalProperty.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyOptionalProperty.java
@@ -25,10 +25,10 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.value.Markup;
import lombok.RequiredArgsConstructor;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
//tag::class[]
@Action(
semantics = SemanticsOf.IDEMPOTENT
@@ -45,13 +45,13 @@ public class
IsisMarkupHolder_updateReadOnlyOptionalProperty {
@MemberSupport public IsisMarkupHolder act(
@Parameter(optionality = Optionality.OPTIONAL) // <.>
- final Markup newValue
+ final org.apache.isis.applib.value.Markup newValue
) {
holder.setReadOnlyOptionalProperty(newValue);
return holder;
}
- @MemberSupport public Markup default0Act() {
+ @MemberSupport public org.apache.isis.applib.value.Markup default0Act() {
return holder.getReadOnlyOptionalProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyOptionalProperty.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyOptionalPropertyWithChoices.java
similarity index 68%
copy from
examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyOptionalProperty.java
copy to
examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 1b9004a220..b2f7b79ed1 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyOptionalProperty.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@ -18,6 +18,11 @@
*/
package demoapp.dom.types.isis.markups.holder;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.MemberSupport;
@@ -25,35 +30,42 @@ import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.value.Markup;
+import demoapp.dom.types.Samples;
import lombok.RequiredArgsConstructor;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
//tag::class[]
@Action(
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
promptStyle = PromptStyle.INLINE
- , named = "Update"
+ , named = "Update with choices"
, associateWith = "readOnlyOptionalProperty"
- , sequence = "1")
+ , sequence = "2")
@RequiredArgsConstructor
-public class IsisMarkupHolder_updateReadOnlyOptionalProperty {
+public class IsisMarkupHolder_updateReadOnlyOptionalPropertyWithChoices {
private final IsisMarkupHolder holder;
@MemberSupport public IsisMarkupHolder act(
- @Parameter(optionality = Optionality.OPTIONAL) // <.>
- final Markup newValue
- ) {
+ @Parameter(optionality = Optionality.OPTIONAL)
+ final org.apache.isis.applib.value.Markup newValue) {
holder.setReadOnlyOptionalProperty(newValue);
return holder;
}
- @MemberSupport public Markup default0Act() {
+ @MemberSupport public org.apache.isis.applib.value.Markup default0Act() {
return holder.getReadOnlyOptionalProperty();
}
+ @MemberSupport public List<org.apache.isis.applib.value.Markup>
choices0Act() {
+ return samples.stream()
+ .collect(Collectors.toList());
+ }
+
+ @Inject
+ Samples<org.apache.isis.applib.value.Markup> samples;
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyProperty.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyProperty.java
index 11a1233543..8ee1c63432 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyProperty.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyProperty.java
@@ -23,10 +23,10 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.value.Markup;
import lombok.RequiredArgsConstructor;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
//tag::class[]
@Action(
semantics = SemanticsOf.IDEMPOTENT
@@ -41,12 +41,12 @@ public class IsisMarkupHolder_updateReadOnlyProperty {
private final IsisMarkupHolder holder;
- @MemberSupport public IsisMarkupHolder act(final Markup newValue) {
+ @MemberSupport public IsisMarkupHolder act(final
org.apache.isis.applib.value.Markup newValue) {
holder.setReadOnlyProperty(newValue);
return holder;
}
- @MemberSupport public Markup default0Act() {
+ @MemberSupport public org.apache.isis.applib.value.Markup default0Act() {
return holder.getReadOnlyProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyPropertyWithChoices.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyPropertyWithChoices.java
index d3f15c1cdf..f2eec5d695 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyPropertyWithChoices.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/holder/IsisMarkupHolder_updateReadOnlyPropertyWithChoices.java
@@ -21,17 +21,18 @@ package demoapp.dom.types.isis.markups.holder;
import java.util.List;
import java.util.stream.Collectors;
+import javax.inject.Inject;
+
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.applib.value.Markup;
-
-import lombok.RequiredArgsConstructor;
import demoapp.dom.types.Samples;
+import lombok.RequiredArgsConstructor;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
//tag::class[]
@Action(
semantics = SemanticsOf.IDEMPOTENT
@@ -46,20 +47,22 @@ public class
IsisMarkupHolder_updateReadOnlyPropertyWithChoices {
private final IsisMarkupHolder holder;
- @MemberSupport public IsisMarkupHolder act(final Markup newValue) {
+ @MemberSupport public IsisMarkupHolder act(final
org.apache.isis.applib.value.Markup newValue) {
holder.setReadOnlyProperty(newValue);
return holder;
}
- @MemberSupport public Markup default0Act() {
+ @MemberSupport public org.apache.isis.applib.value.Markup default0Act() {
return holder.getReadOnlyProperty();
}
- @MemberSupport public List<Markup> choices0Act() {
+ @MemberSupport public List<org.apache.isis.applib.value.Markup>
choices0Act() {
return samples.stream()
.collect(Collectors.toList());
}
- Samples<Markup> samples;
+ @Inject
+ Samples<org.apache.isis.applib.value.Markup> samples;
+
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdo-description.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdo-description.adoc
index 390bdc3ed0..d63a5d587d 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdo-description.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdo-description.adoc
@@ -1,9 +1,8 @@
: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 [...]
-Apache Isis implements the relevant JDO extension points to allow the `Markup`
type to be persisted.
-No special annotations are required, though `@Column` can be used to fine-tune
the mapping.
-The most common usage is to indicate whether the column can be null.
-Since the column ultimately maps down to a long string, the `jdbcType` should
also be specified:
+// // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
+
+JDO supports `org.apache.isis.applib.value.Markup` out-of-the-box, so no
special annotations are required.
[source,java]
----
@@ -18,4 +17,4 @@ Apache Isis assumes properties are mandatory, so no
additional annotation is req
<.> optional property as defined to JDO/DataNucleus
-include::../IsisMarkups-common.adoc[]
\ No newline at end of file
+include::../IsisMarkups-common.adoc[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdo.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdo.java
index 0a031379d6..d9accee1e8 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdo.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdo.java
@@ -18,7 +18,6 @@
*/
package demoapp.dom.types.isis.markups.jdo;
-import javax.inject.Inject;
import javax.inject.Named;
import javax.jdo.annotations.Column;
import javax.jdo.annotations.DatastoreIdentity;
@@ -30,19 +29,17 @@ import org.springframework.context.annotation.Profile;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
-import org.apache.isis.applib.annotation.ObjectSupport;
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.Where;
-import org.apache.isis.applib.services.bookmark.BookmarkService;
-import org.apache.isis.applib.value.Markup;
+import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
import demoapp.dom.types.isis.markups.persistence.IsisMarkupEntity;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
@@ -50,45 +47,38 @@ import
demoapp.dom.types.isis.markups.persistence.IsisMarkupEntity;
@Named("demo.IsisMarkupEntity")
@DomainObject
public class IsisMarkupJdo // <.>
-extends IsisMarkupEntity {
+ extends IsisMarkupEntity {
//end::class[]
- public IsisMarkupJdo(final Markup initialValue) {
+ public IsisMarkupJdo(final org.apache.isis.applib.value.Markup
initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
//tag::class[]
-
- @ObjectSupport public String title() {
- return "Markup JDO entity: " +
- bookmarkService.bookmarkForElseFail(this).getIdentifier();
- }
-
+ @Title(prepend = "org.apache.isis.applib.value.Markup JDO entity: ")
@PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
- @Column(allowsNull = "false", jdbcType = "CLOB") // <.>
+ @Column(allowsNull = "false")
// <.>
@Getter @Setter
- private Markup readOnlyProperty;
+ private org.apache.isis.applib.value.Markup readOnlyProperty;
- @Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId =
"editable-properties", sequence = "1")
- @Column(allowsNull = "false", jdbcType = "CLOB")
+ @Property(editing = Editing.ENABLED)
// <.>
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
+ @Column(allowsNull = "false")
@Getter @Setter
- private Markup readWriteProperty;
+ private org.apache.isis.applib.value.Markup readWriteProperty;
- @Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId =
"optional-properties", sequence = "1")
- @Column(allowsNull = "true") // <.>
+ @Property(optionality = Optionality.OPTIONAL)
// <.>
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
+ @Column(allowsNull = "true")
// <.>
@Getter @Setter
- private Markup readOnlyOptionalProperty;
+ private org.apache.isis.applib.value.Markup readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId =
"optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
- private Markup readWriteOptionalProperty;
+ private org.apache.isis.applib.value.Markup readWriteOptionalProperty;
- @Inject
- private transient BookmarkService bookmarkService;
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdoEntities.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdoEntities.java
index ee95dcb0db..8454b41eb1 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdoEntities.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jdo/IsisMarkupJdoEntities.java
@@ -21,21 +21,20 @@ package demoapp.dom.types.isis.markups.jdo;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.value.Markup;
-
import demoapp.dom._infra.values.ValueHolderRepository;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Profile("demo-jdo")
@Service
public class IsisMarkupJdoEntities
-extends ValueHolderRepository<Markup, IsisMarkupJdo> {
+extends ValueHolderRepository<org.apache.isis.applib.value.Markup,
IsisMarkupJdo> {
protected IsisMarkupJdoEntities() {
super(IsisMarkupJdo.class);
}
@Override
- protected IsisMarkupJdo newDetachedEntity(Markup value) {
+ protected IsisMarkupJdo
newDetachedEntity(org.apache.isis.applib.value.Markup value) {
return new IsisMarkupJdo(value);
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa-description.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa-description.adoc
index 069d527d00..bba0f04269 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa-description.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa-description.adoc
@@ -1,26 +1,20 @@
: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 [...]
-[WARNING]
-====
-TODO this yet is just a copy from JDO
-====
+// // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
-Apache Isis implements the relevant JDO extension points to allow the `Markup`
type to be persisted.
-No special annotations are required, though `@Column` can be used to fine-tune
the mapping.
-The most common usage is to indicate whether the column can be null.
-Since the column ultimately maps down to a long string, the `jdbcType` should
also be specified:
+JPA supports `org.apache.isis.applib.value.Markup` out-of-the-box, so no
special annotations are required.
[source,java]
----
include::IsisMarkupJpa.java[tags=class]
----
-<.> a no-arg constructor is introduced by JDO enhancer
-<.> required property as defined to JDO/DataNucleus.
+<.> a no-arg constructor for convenience
+<.> required property as defined to JPA.
+
Apache Isis assumes properties are mandatory, so no additional annotation is
required.
<.> directly editable property as defined to Apache Isis
<.> optional property as defined to Apache Isis
-<.> optional property as defined to JDO/DataNucleus
+<.> optional property as defined to JPA
-include::../IsisMarkups-common.adoc[]
\ No newline at end of file
+include::../IsisMarkups-common.adoc[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa.java
index 456c7d7f9c..7cc32c574e 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpa.java
@@ -18,30 +18,22 @@
*/
package demoapp.dom.types.isis.markups.jpa;
-import javax.inject.Inject;
import javax.inject.Named;
-import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EntityListeners;
-import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.Lob;
import javax.persistence.Table;
-import javax.persistence.Transient;
import org.springframework.context.annotation.Profile;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Editing;
-import org.apache.isis.applib.annotation.ObjectSupport;
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.Where;
-import org.apache.isis.applib.services.bookmark.BookmarkService;
-import org.apache.isis.applib.value.Markup;
+import org.apache.isis.applib.annotation.Title;
import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
import lombok.Getter;
@@ -50,6 +42,7 @@ import lombok.Setter;
import demoapp.dom.types.isis.markups.persistence.IsisMarkupEntity;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Profile("demo-jpa")
//tag::class[]
@Entity
@@ -60,12 +53,12 @@ import
demoapp.dom.types.isis.markups.persistence.IsisMarkupEntity;
@EntityListeners(IsisEntityListener.class)
@Named("demo.IsisMarkupEntity")
@DomainObject
-@NoArgsConstructor
+@NoArgsConstructor
// <.>
public class IsisMarkupJpa
extends IsisMarkupEntity {
//end::class[]
- public IsisMarkupJpa(final Markup initialValue) {
+ public IsisMarkupJpa(final org.apache.isis.applib.value.Markup
initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
@@ -75,35 +68,29 @@ public class IsisMarkupJpa
@GeneratedValue
private Long id;
- @ObjectSupport public String title() {
- return "Markup JPA entity: " +
- bookmarkService.bookmarkForElseFail(this).getIdentifier();
- }
-
+ @Title(prepend = "org.apache.isis.applib.value.Markup JPA entity: ")
@PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
- @Column(nullable = false) @Lob @Basic(fetch=FetchType.LAZY) // <.>
+ @Column(nullable = false)
// <.>
@Getter @Setter
- private Markup readOnlyProperty;
+ private org.apache.isis.applib.value.Markup readOnlyProperty;
- @Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId =
"editable-properties", sequence = "1")
- @Column(nullable = false) @Lob @Basic(fetch=FetchType.LAZY)
+ @Property(editing = Editing.ENABLED)
// <.>
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
+ @Column(nullable = false)
@Getter @Setter
- private Markup readWriteProperty;
+ private org.apache.isis.applib.value.Markup readWriteProperty;
- @Property(optionality = Optionality.OPTIONAL) // <.>
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId =
"optional-properties", sequence = "1")
- @Column(nullable = true) @Lob @Basic(fetch=FetchType.LAZY) // <.>
+ @Property(optionality = Optionality.OPTIONAL)
// <.>
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
+ @Column(nullable = true)
// <.>
@Getter @Setter
- private Markup readOnlyOptionalProperty;
+ private org.apache.isis.applib.value.Markup readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId =
"optional-properties", sequence = "2")
- @Column(nullable = true) @Lob @Basic(fetch=FetchType.LAZY)
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
+ @Column(nullable = true)
@Getter @Setter
- private Markup readWriteOptionalProperty;
+ private org.apache.isis.applib.value.Markup readWriteOptionalProperty;
- @Inject @Transient
- private transient BookmarkService bookmarkService;
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpaEntities.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpaEntities.java
index 7ac8492914..3494b61d96 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpaEntities.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/jpa/IsisMarkupJpaEntities.java
@@ -21,21 +21,20 @@ package demoapp.dom.types.isis.markups.jpa;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.value.Markup;
-
import demoapp.dom._infra.values.ValueHolderRepository;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Profile("demo-jpa")
@Service
public class IsisMarkupJpaEntities
-extends ValueHolderRepository<Markup, IsisMarkupJpa> {
+extends ValueHolderRepository<org.apache.isis.applib.value.Markup,
IsisMarkupJpa> {
protected IsisMarkupJpaEntities() {
super(IsisMarkupJpa.class);
}
@Override
- protected IsisMarkupJpa newDetachedEntity(Markup value) {
+ protected IsisMarkupJpa
newDetachedEntity(org.apache.isis.applib.value.Markup value) {
return new IsisMarkupJpa(value);
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.java
index 5cb4ac665a..541170203e 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.java
@@ -21,22 +21,22 @@ package demoapp.dom.types.isis.markups.persistence;
import javax.inject.Named;
import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.applib.value.Markup;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolder;
import demoapp.dom.types.isis.markups.holder.IsisMarkupHolder2;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Named("demo.IsisMarkupEntity") // shared permissions with concrete sub class
@DomainObject
public abstract class IsisMarkupEntity
implements
HasAsciiDocDescription,
IsisMarkupHolder2,
- ValueHolder<Markup> {
+ ValueHolder<org.apache.isis.applib.value.Markup> {
@Override
- public Markup value() {
+ public org.apache.isis.applib.value.Markup value() {
return getReadOnlyProperty();
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.layout.xml
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.layout.xml
index fe9ce77481..c58ffa61a0 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.layout.xml
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupEntity.layout.xml
@@ -15,6 +15,8 @@
xmlns:cpt="http://isis.apache.org/applib/layout/component";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <!-- This file was GENERATED by the showcase generator (tooling). Do
NOT edit! -->
+
<bs3:row>
<bs3:col span="10" unreferencedActions="true">
<cpt:domainObject />
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupSeeding.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupSeeding.java
index e0a5d0814d..b0139bcfd8 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupSeeding.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/persistence/IsisMarkupSeeding.java
@@ -22,17 +22,16 @@ import javax.inject.Inject;
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.value.Markup;
-
import demoapp.dom._infra.seed.SeedServiceAbstract;
import demoapp.dom._infra.values.ValueHolderRepository;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Service
public class IsisMarkupSeeding
extends SeedServiceAbstract {
@Inject
- public IsisMarkupSeeding(ValueHolderRepository<Markup, ? extends
IsisMarkupEntity> entities) {
+ public
IsisMarkupSeeding(ValueHolderRepository<org.apache.isis.applib.value.Markup, ?
extends IsisMarkupEntity> entities) {
super(entities);
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/samples/IsisMarkupSamples.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/samples/IsisMarkupSamples.java
index 6c67201d0b..b2b2841345 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/samples/IsisMarkupSamples.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/samples/IsisMarkupSamples.java
@@ -20,25 +20,19 @@ package demoapp.dom.types.isis.markups.samples;
import java.util.stream.Stream;
-import javax.inject.Inject;
-
import org.springframework.stereotype.Service;
-import org.apache.isis.applib.value.Markup;
-
-import demoapp.dom._infra.resources.MarkupReaderService;
import demoapp.dom.types.Samples;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Service
-public class IsisMarkupSamples implements Samples<Markup> {
+public class IsisMarkupSamples implements
Samples<org.apache.isis.applib.value.Markup> {
@Override
- public Stream<Markup> stream() {
- return Stream.of(1, 2, 3, 4)
- .map(x -> markupReaderService.readFor(getClass(), "sample" +
x));
+ public Stream<org.apache.isis.applib.value.Markup> stream() {
+ return new
org.apache.isis.core.metamodel.valuesemantics.MarkupValueSemantics()
+ .getExamples()
+ .stream();
}
- @Inject
- MarkupReaderService markupReaderService;
-
}
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm-description.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm-description.adoc
index feecc2fbf9..6888d8b148 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm-description.adoc
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm-description.adoc
@@ -1,6 +1,8 @@
: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 [...]
-JAXB supports `Markup` out-of-the-box, so no special annotations are required.
+// // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
+
+JAXB supports `org.apache.isis.applib.value.Markup` out-of-the-box, so no
special annotations are required.
[source,java]
----
@@ -8,10 +10,10 @@ include::IsisMarkupVm.java[tags=class]
----
<.> a no-arg constructor is required by JAXB
<.> required property as defined to JAXB
-//TODO: fix, <.> directly editable property as defined to Apache Isis
+<.> directly editable property as defined to Apache Isis
<.> optional property as defined to Apache Isis.
+
This is the default for JAXB so no additional annotation required.
-include::../IsisMarkups-common.adoc[]
\ No newline at end of file
+include::../IsisMarkups-common.adoc[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm.java
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm.java
index d78fe06c87..ce105fb21f 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm.java
@@ -28,12 +28,10 @@ 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.Nature;
-import org.apache.isis.applib.annotation.ObjectSupport;
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.Where;
-import org.apache.isis.applib.value.Markup;
+import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
@@ -41,6 +39,7 @@ import lombok.Setter;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom.types.isis.markups.holder.IsisMarkupHolder2;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
@@ -53,36 +52,33 @@ public class IsisMarkupVm
implements HasAsciiDocDescription, IsisMarkupHolder2 {
//end::class[]
- public IsisMarkupVm(final Markup initialValue) {
+ public IsisMarkupVm(final org.apache.isis.applib.value.Markup
initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
//tag::class[]
- @ObjectSupport public String title() {
- return "Markup view model";
- }
-
+ @Title(prepend = "org.apache.isis.applib.value.Markup view model: ")
@PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true)
// <.>
@Getter @Setter
- private Markup readOnlyProperty;
+ private org.apache.isis.applib.value.Markup readOnlyProperty;
@Property(editing = Editing.ENABLED)
// <.>
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId =
"editable-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
@XmlElement(required = true)
@Getter @Setter
- private Markup readWriteProperty;
+ private org.apache.isis.applib.value.Markup readWriteProperty;
@Property(optionality = Optionality.OPTIONAL)
// <.>
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId =
"optional-properties", sequence = "1")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
- private Markup readOnlyOptionalProperty;
+ private org.apache.isis.applib.value.Markup readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId =
"optional-properties", sequence = "2")
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Getter @Setter
- private Markup readWriteOptionalProperty;
+ private org.apache.isis.applib.value.Markup readWriteOptionalProperty;
}
//end::class[]
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm.layout.xml
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm.layout.xml
index fe9ce77481..c58ffa61a0 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm.layout.xml
+++
b/examples/demo/domain/src/main/java/demoapp/dom/types/isis/markups/vm/IsisMarkupVm.layout.xml
@@ -15,6 +15,8 @@
xmlns:cpt="http://isis.apache.org/applib/layout/component";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <!-- This file was GENERATED by the showcase generator (tooling). Do
NOT edit! -->
+
<bs3:row>
<bs3:col span="10" unreferencedActions="true">
<cpt:domainObject />
diff --git
a/tooling/metaprog/src/main/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueShowCase.java
b/tooling/metaprog/src/main/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueShowCase.java
index a7ef3a5aca..1f9b9a7a4b 100644
---
a/tooling/metaprog/src/main/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueShowCase.java
+++
b/tooling/metaprog/src/main/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueShowCase.java
@@ -30,6 +30,11 @@ import lombok.val;
@RequiredArgsConstructor
public enum ValueShowCase {
+ MARKUP(Config.builder()
+ .showcaseName("IsisMarkup")
+ .javaPackage("demoapp.dom.types.isis.markups")
+ .showcaseValueType("org.apache.isis.applib.value.Markup")
+
.showcaseValueSemantics("org.apache.isis.core.metamodel.valuesemantics.MarkupValueSemantics")),
UUID(Config.builder()
.showcaseName("JavaUtilUuid")
.javaPackage("demoapp.dom.types.javautil.uuids")
