You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/09/29 11:35:54 UTC
[isis] branch master updated: ISIS-3123: relocate Markdown/AsciiDoc demoapp.dom.types.isisext->isisval
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 f6fdcd0df3 ISIS-3123: relocate Markdown/AsciiDoc demoapp.dom.types.isisext->isisval
f6fdcd0df3 is described below
commit f6fdcd0df3c081fe822f81e2d6010727c578762c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Sep 29 13:35:45 2022 +0200
ISIS-3123: relocate Markdown/AsciiDoc demoapp.dom.types.isisext->isisval
---
.../src/main/java/demoapp/dom/DemoModuleJpa.java | 4 +-
.../dom/types/isisext/IsisExtTypesMenu.java | 4 +-
.../persistence/IsisAsciiDocEntity.layout.xml | 56 ----------------------
.../isisext/asciidocs/vm/IsisAsciiDocVm.layout.xml | 56 ----------------------
.../samples/IsisMarkdownSamples-sample1.md | 21 --------
.../samples/IsisMarkdownSamples-sample2.md | 11 -----
.../samples/IsisMarkdownSamples-sample3.md | 11 -----
.../samples/IsisMarkdownSamples-sample4.md | 6 ---
.../samples/IsisMarkdownSamples-sample5.md | 6 ---
.../samples/IsisMarkdownSamples-sample6.md | 16 -------
.../asciidocs/IsisAsciiDocs-common.adoc | 0
.../asciidocs/IsisAsciiDocs-description.adoc | 0
.../asciidocs/IsisAsciiDocs.java | 19 ++++----
.../asciidocs/IsisAsciiDocs.layout.xml | 0
.../asciidocs/holder/IsisAsciiDocHolder.java | 21 ++++----
.../asciidocs/holder/IsisAsciiDocHolder2.java | 26 +++++-----
.../holder/IsisAsciiDocHolder_actionReturning.java | 7 ++-
...isAsciiDocHolder_actionReturningCollection.java | 12 ++---
.../holder/IsisAsciiDocHolder_mixinProperty.java | 7 ++-
...iiDocHolder_updateReadOnlyOptionalProperty.java | 8 ++--
...updateReadOnlyOptionalPropertyWithChoices.java} | 16 +++----
.../IsisAsciiDocHolder_updateReadOnlyProperty.java | 8 ++--
...ocHolder_updateReadOnlyPropertyWithChoices.java | 19 ++++----
.../asciidocs/jdo/IsisAsciiDocJdo-description.adoc | 6 ++-
.../asciidocs/jdo/IsisAsciiDocJdo.java | 45 +++++++----------
.../asciidocs/jdo/IsisAsciiDocJdoEntities.java | 11 ++---
.../asciidocs/jpa/IsisAsciiDocJpa-description.adoc | 10 ++--
.../asciidocs/jpa/IsisAsciiDocJpa.java | 53 ++++++++------------
.../asciidocs/jpa/IsisAsciiDocJpaEntities.java | 11 ++---
.../asciidocs/persistence/IsisAsciiDocEntity.java | 10 ++--
.../persistence/IsisAsciiDocEntity.layout.xml} | 0
.../asciidocs/persistence/IsisAsciiDocSeeding.java | 9 ++--
.../asciidocs/vm/IsisAsciiDocVm-description.adoc | 6 ++-
.../asciidocs/vm/IsisAsciiDocVm.java | 28 +++++------
.../asciidocs/vm/IsisAsciiDocVm.layout.xml} | 0
.../markdowns/IsisMarkdowns-common.adoc | 0
.../markdowns/IsisMarkdowns-description.adoc | 0
.../markdowns/IsisMarkdowns.java | 6 +--
.../markdowns/IsisMarkdowns.layout.xml | 0
.../markdowns/holder/IsisMarkdownHolder.java | 2 +-
.../markdowns/holder/IsisMarkdownHolder2.java | 2 +-
.../holder/IsisMarkdownHolder_actionReturning.java | 2 +-
...isMarkdownHolder_actionReturningCollection.java | 2 +-
.../holder/IsisMarkdownHolder_mixinProperty.java | 2 +-
...kdownHolder_updateReadOnlyOptionalProperty.java | 2 +-
..._updateReadOnlyOptionalPropertyWithChoices.java | 2 +-
.../IsisMarkdownHolder_updateReadOnlyProperty.java | 2 +-
...wnHolder_updateReadOnlyPropertyWithChoices.java | 2 +-
.../markdowns/jdo/IsisMarkdownJdo-description.adoc | 0
.../markdowns/jdo/IsisMarkdownJdo.java | 4 +-
.../markdowns/jdo/IsisMarkdownJdoEntities.java | 2 +-
.../markdowns/jpa/IsisMarkdownJpa-description.adoc | 0
.../markdowns/jpa/IsisMarkdownJpa.java | 4 +-
.../markdowns/jpa/IsisMarkdownJpaEntities.java | 2 +-
.../markdowns/persistence/IsisMarkdownEntity.java | 4 +-
.../persistence/IsisMarkdownEntity.layout.xml | 0
.../markdowns/persistence/IsisMarkdownSeeding.java | 2 +-
.../markdowns/samples/IsisMarkdownSamples.java | 2 +-
.../markdowns/vm/IsisMarkdownVm-description.adoc | 0
.../markdowns/vm/IsisMarkdownVm.java | 4 +-
.../markdowns/vm/IsisMarkdownVm.layout.xml | 0
.../demoshowcases/value/ValueShowCase.java | 4 +-
.../value/ValueTypeGenTemplateTest.java | 2 +
63 files changed, 183 insertions(+), 394 deletions(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java
index bb3ad8b134..202f97478d 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/DemoModuleJpa.java
@@ -45,9 +45,9 @@ import demoapp.dom.types.isis.clobs.jpa.IsisClobJpa;
import demoapp.dom.types.isis.localresourcepaths.jpa.IsisLocalResourcePathJpa;
import demoapp.dom.types.isis.markups.jpa.IsisMarkupJpa;
import demoapp.dom.types.isis.passwords.jpa.IsisPasswordJpa;
-import demoapp.dom.types.isisext.asciidocs.jpa.IsisAsciiDocJpa;
import demoapp.dom.types.isisext.cal.jpa.IsisCalendarEventJpa;
-import demoapp.dom.types.isisext.markdowns.jpa.IsisMarkdownJpa;
+import demoapp.dom.types.isisval.asciidocs.jpa.IsisAsciiDocJpa;
+import demoapp.dom.types.isisval.markdowns.jpa.IsisMarkdownJpa;
import demoapp.dom.types.javaawt.images.jpa.JavaAwtBufferedImageJpa;
import demoapp.dom.types.javalang.booleans.jpa.WrapperBooleanJpa;
import demoapp.dom.types.javalang.bytes.jpa.WrapperByteJpa;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/IsisExtTypesMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/IsisExtTypesMenu.java
index 880a47b99a..65e01baba2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/IsisExtTypesMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/IsisExtTypesMenu.java
@@ -29,9 +29,9 @@ import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.PriorityPrecedence;
import org.apache.isis.applib.annotation.SemanticsOf;
-import demoapp.dom.types.isisext.asciidocs.IsisAsciiDocs;
import demoapp.dom.types.isisext.cal.IsisCalendarEvents;
-import demoapp.dom.types.isisext.markdowns.IsisMarkdowns;
+import demoapp.dom.types.isisval.asciidocs.IsisAsciiDocs;
+import demoapp.dom.types.isisval.markdowns.IsisMarkdowns;
@Named("demo.IsisExtTypesMenu")
@DomainService(
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/persistence/IsisAsciiDocEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/persistence/IsisAsciiDocEntity.layout.xml
deleted file mode 100644
index fe9ce77481..0000000000
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/persistence/IsisAsciiDocEntity.layout.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
-<bs3:grid
- xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
- xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
- xmlns:cpt="http://isis.apache.org/applib/layout/component"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <bs3:row>
- <bs3:col span="10" unreferencedActions="true">
- <cpt:domainObject />
- <cpt:action id="actionReturning"/>
- <cpt:action id="actionReturningCollection"/>
- </bs3:col>
- <bs3:col span="2">
- <cpt:fieldSet name="" id="sources" />
- </bs3:col>
- </bs3:row>
-
- <bs3:row>
- <bs3:col span="6">
- <cpt:fieldSet name="Read Only Properties" id="read-only-properties"/>
- <cpt:fieldSet name="Editable Properties" id="editable-properties"/>
- <cpt:fieldSet name="Optional Properties" id="optional-properties"/>
- <cpt:fieldSet name="Contributed by Mixins" id="contributed"/>
- <cpt:fieldSet name="@PropertyLayout(labelPosition=...)" id="label-positions"/>
- <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
- </bs3:col>
- <bs3:col span="6">
- <cpt:fieldSet name="Description" id="description" >
- <cpt:action id="clearHints" position="PANEL" />
- <cpt:action id="downloadLayoutXml" position="PANEL_DROPDOWN"/>
- <cpt:action id="rebuildMetamodel" position="PANEL"/>
- <cpt:action id="downloadMetamodelXml" position="PANEL_DROPDOWN"/>
- <cpt:action id="inspectMetamodel" position="PANEL_DROPDOWN"/>
- <cpt:action id="recentCommands" position="PANEL_DROPDOWN"/>
- <cpt:action id="downloadJdoMetadata" position="PANEL_DROPDOWN"/>
- <cpt:action id="openRestApi" position="PANEL_DROPDOWN" />
- <cpt:property id="description"/>
- </cpt:fieldSet>
- </bs3:col>
- </bs3:row>
- <bs3:row>
- <bs3:col span="12" unreferencedCollections="true"/>
- </bs3:row>
-
-</bs3:grid>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/vm/IsisAsciiDocVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/vm/IsisAsciiDocVm.layout.xml
deleted file mode 100644
index fe9ce77481..0000000000
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/vm/IsisAsciiDocVm.layout.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
-<bs3:grid
- xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
- xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
- xmlns:cpt="http://isis.apache.org/applib/layout/component"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
- <bs3:row>
- <bs3:col span="10" unreferencedActions="true">
- <cpt:domainObject />
- <cpt:action id="actionReturning"/>
- <cpt:action id="actionReturningCollection"/>
- </bs3:col>
- <bs3:col span="2">
- <cpt:fieldSet name="" id="sources" />
- </bs3:col>
- </bs3:row>
-
- <bs3:row>
- <bs3:col span="6">
- <cpt:fieldSet name="Read Only Properties" id="read-only-properties"/>
- <cpt:fieldSet name="Editable Properties" id="editable-properties"/>
- <cpt:fieldSet name="Optional Properties" id="optional-properties"/>
- <cpt:fieldSet name="Contributed by Mixins" id="contributed"/>
- <cpt:fieldSet name="@PropertyLayout(labelPosition=...)" id="label-positions"/>
- <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
- </bs3:col>
- <bs3:col span="6">
- <cpt:fieldSet name="Description" id="description" >
- <cpt:action id="clearHints" position="PANEL" />
- <cpt:action id="downloadLayoutXml" position="PANEL_DROPDOWN"/>
- <cpt:action id="rebuildMetamodel" position="PANEL"/>
- <cpt:action id="downloadMetamodelXml" position="PANEL_DROPDOWN"/>
- <cpt:action id="inspectMetamodel" position="PANEL_DROPDOWN"/>
- <cpt:action id="recentCommands" position="PANEL_DROPDOWN"/>
- <cpt:action id="downloadJdoMetadata" position="PANEL_DROPDOWN"/>
- <cpt:action id="openRestApi" position="PANEL_DROPDOWN" />
- <cpt:property id="description"/>
- </cpt:fieldSet>
- </bs3:col>
- </bs3:row>
- <bs3:row>
- <bs3:col span="12" unreferencedCollections="true"/>
- </bs3:row>
-
-</bs3:grid>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/samples/IsisMarkdownSamples-sample1.md b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/samples/IsisMarkdownSamples-sample1.md
deleted file mode 100644
index ff342ff0ea..0000000000
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/samples/IsisMarkdownSamples-sample1.md
+++ /dev/null
@@ -1,21 +0,0 @@
-## Lists
-
-Unordered
-
-* this
-* is
-* a
-* bulleted
-* list
-
-
-Ordered
-
-1. Lorem ipsum dolor sit amet
-2. Consectetur adipiscing elit
-3. Integer molestie lorem at massa
-
-
-1. You can use sequential numbers...
-1. ...or keep all the numbers as `1.`
-
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/samples/IsisMarkdownSamples-sample2.md b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/samples/IsisMarkdownSamples-sample2.md
deleted file mode 100644
index 14e2cf5067..0000000000
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/samples/IsisMarkdownSamples-sample2.md
+++ /dev/null
@@ -1,11 +0,0 @@
-## Typographic replacements
-
-Enable typographer option to see result.
-
-(c) (C) (r) (R) (tm) (TM) (p) (P) +-
-
-test.. test... test..... test?..... test!....
-
-!!!!!! ???? ,, -- ---
-
-"Smartypants, double quotes" and 'single quotes'
\ No newline at end of file
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/samples/IsisMarkdownSamples-sample3.md b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/samples/IsisMarkdownSamples-sample3.md
deleted file mode 100644
index c0ab48a094..0000000000
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/samples/IsisMarkdownSamples-sample3.md
+++ /dev/null
@@ -1,11 +0,0 @@
-## Emphasis
-
-**This is bold text**
-
-__This is bold text__
-
-*This is italic text*
-
-_This is italic text_
-
-~~Strikethrough~~
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/samples/IsisMarkdownSamples-sample4.md b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/samples/IsisMarkdownSamples-sample4.md
deleted file mode 100644
index 373f070dac..0000000000
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/samples/IsisMarkdownSamples-sample4.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## Blockquotes
-
-
-> Blockquotes can also be nested...
->> ...by using additional greater-than signs right next to each other...
-> > > ...or with spaces between arrows.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/samples/IsisMarkdownSamples-sample5.md b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/samples/IsisMarkdownSamples-sample5.md
deleted file mode 100644
index 373f070dac..0000000000
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/samples/IsisMarkdownSamples-sample5.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## Blockquotes
-
-
-> Blockquotes can also be nested...
->> ...by using additional greater-than signs right next to each other...
-> > > ...or with spaces between arrows.
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/samples/IsisMarkdownSamples-sample6.md b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/samples/IsisMarkdownSamples-sample6.md
deleted file mode 100644
index aaed9d1815..0000000000
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/samples/IsisMarkdownSamples-sample6.md
+++ /dev/null
@@ -1,16 +0,0 @@
-## Tables
-
-| Option | Description |
-| ------ | ----------- |
-| data | path to data files to supply the data that will be passed into templates. |
-| engine | engine to be used for processing templates. Handlebars is the default. |
-| ext | extension to be used for dest files. |
-
-
-Right aligned columns
-
-| Option | Description |
-| ------:| -----------:|
-| data | path to data files to supply the data that will be passed into templates. |
-| engine | engine to be used for processing templates. Handlebars is the default. |
-| ext | extension to be used for dest files. |
\ No newline at end of file
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/IsisAsciiDocs-common.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/IsisAsciiDocs-common.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/IsisAsciiDocs-common.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/IsisAsciiDocs-common.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/IsisAsciiDocs-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/IsisAsciiDocs-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/IsisAsciiDocs-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/IsisAsciiDocs-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/IsisAsciiDocs.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/IsisAsciiDocs.java
similarity index 76%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/IsisAsciiDocs.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/IsisAsciiDocs.java
index f141a9ae3c..afce3fa6fd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/IsisAsciiDocs.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/IsisAsciiDocs.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.asciidocs;
+package demoapp.dom.types.isisval.asciidocs;
import java.util.List;
@@ -38,14 +38,14 @@ 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.valuetypes.asciidoc.applib.value.AsciiDoc;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
import demoapp.dom.types.Samples;
-import demoapp.dom.types.isisext.asciidocs.persistence.IsisAsciiDocEntity;
-import demoapp.dom.types.isisext.asciidocs.vm.IsisAsciiDocVm;
+import demoapp.dom.types.isisval.asciidocs.persistence.IsisAsciiDocEntity;
+import demoapp.dom.types.isisval.asciidocs.vm.IsisAsciiDocVm;
+/* 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.isisext.asciidocs.vm.IsisAsciiDocVm;
public class IsisAsciiDocs implements HasAsciiDocDescription {
@ObjectSupport public String title() {
- return "AsciiDoc data type";
+ return "org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc data type";
}
@Action(semantics = SemanticsOf.SAFE)
@ActionLayout(promptStyle = PromptStyle.DIALOG_MODAL)
- public IsisAsciiDocVm openViewModel(final AsciiDoc initialValue) {
+ public IsisAsciiDocVm openViewModel(final org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc initialValue) {
return new IsisAsciiDocVm(initialValue);
}
-
- @MemberSupport public AsciiDoc default0OpenViewModel() {
+ @MemberSupport public org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc default0OpenViewModel() {
return samples.single();
}
@@ -75,10 +74,10 @@ public class IsisAsciiDocs implements HasAsciiDocDescription {
@Inject
@XmlTransient
- ValueHolderRepository<AsciiDoc, ? extends IsisAsciiDocEntity> entities;
+ ValueHolderRepository<org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc, ? extends IsisAsciiDocEntity> entities;
@Inject
@XmlTransient
- Samples<AsciiDoc> samples;
+ Samples<org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc> samples;
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/IsisAsciiDocs.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/IsisAsciiDocs.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/IsisAsciiDocs.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/IsisAsciiDocs.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder.java
similarity index 52%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder.java
index 54b926a2fa..bfd6c72bed 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder.java
@@ -16,27 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.asciidocs.holder;
+package demoapp.dom.types.isisval.asciidocs.holder;
import javax.inject.Named;
-import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc;
-
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Named("demo.IsisAsciiDocHolder")
//tag::class[]
public interface IsisAsciiDocHolder {
- AsciiDoc getReadOnlyProperty();
- void setReadOnlyProperty(AsciiDoc c);
+ org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc getReadOnlyProperty();
+ void setReadOnlyProperty(org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc c);
- AsciiDoc getReadWriteProperty();
- void setReadWriteProperty(AsciiDoc c);
+ org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc getReadWriteProperty();
+ void setReadWriteProperty(org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc c);
- AsciiDoc getReadOnlyOptionalProperty();
- void setReadOnlyOptionalProperty(AsciiDoc c);
+ org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc getReadOnlyOptionalProperty();
+ void setReadOnlyOptionalProperty(org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc c);
- AsciiDoc getReadWriteOptionalProperty();
- void setReadWriteOptionalProperty(AsciiDoc c);
+ org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc getReadWriteOptionalProperty();
+ void setReadWriteOptionalProperty(org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc c);
}
//end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder2.java
similarity index 70%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder2.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder2.java
index 88f0481e30..9234f2ff40 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder2.java
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.asciidocs.holder;
+package demoapp.dom.types.isisval.asciidocs.holder;
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.valuetypes.asciidoc.applib.value.AsciiDoc;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
//tag::class[]
-public interface IsisAsciiDocHolder2 extends demoapp.dom.types.isisext.asciidocs.holder.IsisAsciiDocHolder {
+public interface IsisAsciiDocHolder2 extends IsisAsciiDocHolder {
@Property // <.>
@PropertyLayout(
@@ -33,9 +33,8 @@ public interface IsisAsciiDocHolder2 extends demoapp.dom.types.isisext.asciidocs
describedAs =
"@PropertyLayout(labelPosition=LEFT)",
hidden = Where.ALL_TABLES,
- fieldSetId = "label-positions",
- sequence = "1") // <.>
- default AsciiDoc getReadOnlyPropertyDerivedLabelPositionLeft() {
+ fieldSetId = "label-positions", sequence = "1") // <.>
+ default org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc getReadOnlyPropertyDerivedLabelPositionLeft() {
return getReadOnlyProperty();
}
@@ -45,9 +44,8 @@ public interface IsisAsciiDocHolder2 extends demoapp.dom.types.isisext.asciidocs
describedAs =
"@PropertyLayout(labelPosition=TOP)",
hidden = Where.ALL_TABLES,
- fieldSetId = "label-positions",
- sequence = "2")
- default AsciiDoc getReadOnlyPropertyDerivedLabelPositionTop() {
+ fieldSetId = "label-positions", sequence = "2")
+ default org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc getReadOnlyPropertyDerivedLabelPositionTop() {
return getReadOnlyProperty();
}
@@ -57,9 +55,8 @@ public interface IsisAsciiDocHolder2 extends demoapp.dom.types.isisext.asciidocs
describedAs =
"@PropertyLayout(labelPosition=RIGHT)",
hidden = Where.ALL_TABLES,
- fieldSetId = "label-positions",
- sequence = "3")
- default AsciiDoc getReadOnlyPropertyDerivedLabelPositionRight() {
+ fieldSetId = "label-positions", sequence = "3")
+ default org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc getReadOnlyPropertyDerivedLabelPositionRight() {
return getReadOnlyProperty();
}
@@ -69,9 +66,8 @@ public interface IsisAsciiDocHolder2 extends demoapp.dom.types.isisext.asciidocs
describedAs =
"@PropertyLayout(labelPosition=NONE)",
hidden = Where.ALL_TABLES,
- fieldSetId = "label-positions",
- sequence = "4")
- default AsciiDoc getReadOnlyPropertyDerivedLabelPositionNone() {
+ fieldSetId = "label-positions", sequence = "4")
+ default org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc getReadOnlyPropertyDerivedLabelPositionNone() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder_actionReturning.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_actionReturning.java
similarity index 85%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder_actionReturning.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_actionReturning.java
index 3f4a7934af..1b68abdf32 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder_actionReturning.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_actionReturning.java
@@ -16,15 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.asciidocs.holder;
+package demoapp.dom.types.isisval.asciidocs.holder;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.SemanticsOf;
-import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc;
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 IsisAsciiDocHolder_actionReturning {
private final IsisAsciiDocHolder holder;
- public AsciiDoc act() {
+ public org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc act() {
return holder.getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_actionReturningCollection.java
similarity index 82%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder_actionReturningCollection.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_actionReturningCollection.java
index ea27440ada..1bd6fc3004 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_actionReturningCollection.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.asciidocs.holder;
+package demoapp.dom.types.isisval.asciidocs.holder;
import java.util.Collection;
import java.util.stream.Collectors;
@@ -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.valuetypes.asciidoc.applib.value.AsciiDoc;
-
-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 IsisAsciiDocHolder_actionReturningCollection {
private final IsisAsciiDocHolder holder;
- public Collection<AsciiDoc> act() {
+ public Collection<org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc> act() {
return samples.stream()
.collect(Collectors.toList());
}
@Inject
- Samples<AsciiDoc> samples;
+ Samples<org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc> samples;
}
//end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_mixinProperty.java
similarity index 86%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder_mixinProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_mixinProperty.java
index 132777f265..a52edff5c9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_mixinProperty.java
@@ -16,16 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.asciidocs.holder;
+package demoapp.dom.types.isisval.asciidocs.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.valuetypes.asciidoc.applib.value.AsciiDoc;
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 IsisAsciiDocHolder_mixinProperty {
private final IsisAsciiDocHolder holder;
- public AsciiDoc prop() {
+ public org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc prop() {
return holder.getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyOptionalProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyOptionalProperty.java
similarity index 85%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyOptionalProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyOptionalProperty.java
index 6509379f45..613bd48ff4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyOptionalProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyOptionalProperty.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.asciidocs.holder;
+package demoapp.dom.types.isisval.asciidocs.holder;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.ActionLayout;
@@ -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.valuetypes.asciidoc.applib.value.AsciiDoc;
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 IsisAsciiDocHolder_updateReadOnlyOptionalProperty {
@MemberSupport public IsisAsciiDocHolder act(
@Parameter(optionality = Optionality.OPTIONAL) // <.>
- final AsciiDoc newValue
+ final org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc newValue
) {
holder.setReadOnlyOptionalProperty(newValue);
return holder;
}
- @MemberSupport public AsciiDoc default0Act() {
+ @MemberSupport public org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc default0Act() {
return holder.getReadOnlyOptionalProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyOptionalPropertyWithChoices.java
similarity index 77%
copy from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices.java
copy to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 84c646adc1..5d7fce3b42 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.markdowns.holder;
+package demoapp.dom.types.isisval.asciidocs.holder;
import java.util.List;
import java.util.stream.Collectors;
@@ -45,27 +45,27 @@ import lombok.RequiredArgsConstructor;
, associateWith = "readOnlyOptionalProperty"
, sequence = "2")
@RequiredArgsConstructor
-public class IsisMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices {
+public class IsisAsciiDocHolder_updateReadOnlyOptionalPropertyWithChoices {
- private final IsisMarkdownHolder holder;
+ private final IsisAsciiDocHolder holder;
- @MemberSupport public IsisMarkdownHolder act(
+ @MemberSupport public IsisAsciiDocHolder act(
@Parameter(optionality = Optionality.OPTIONAL)
- final org.apache.isis.valuetypes.markdown.applib.value.Markdown newValue) {
+ final org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc newValue) {
holder.setReadOnlyOptionalProperty(newValue);
return holder;
}
- @MemberSupport public org.apache.isis.valuetypes.markdown.applib.value.Markdown default0Act() {
+ @MemberSupport public org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc default0Act() {
return holder.getReadOnlyOptionalProperty();
}
- @MemberSupport public List<org.apache.isis.valuetypes.markdown.applib.value.Markdown> choices0Act() {
+ @MemberSupport public List<org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc> choices0Act() {
return samples.stream()
.collect(Collectors.toList());
}
@Inject
- Samples<org.apache.isis.valuetypes.markdown.applib.value.Markdown> samples;
+ Samples<org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc> samples;
}
//end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyProperty.java
similarity index 82%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyProperty.java
index 56a7c2c24a..d302016aaa 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyProperty.java
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.asciidocs.holder;
+package demoapp.dom.types.isisval.asciidocs.holder;
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.valuetypes.asciidoc.applib.value.AsciiDoc;
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 IsisAsciiDocHolder_updateReadOnlyProperty {
private final IsisAsciiDocHolder holder;
- @MemberSupport public IsisAsciiDocHolder act(final AsciiDoc newValue) {
+ @MemberSupport public IsisAsciiDocHolder act(final org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc newValue) {
holder.setReadOnlyProperty(newValue);
return holder;
}
- @MemberSupport public AsciiDoc default0Act() {
+ @MemberSupport public org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc default0Act() {
return holder.getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyPropertyWithChoices.java
similarity index 75%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyPropertyWithChoices.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyPropertyWithChoices.java
index 8eb155bb02..deb7577cfd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/holder/IsisAsciiDocHolder_updateReadOnlyPropertyWithChoices.java
@@ -16,22 +16,23 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.asciidocs.holder;
+package demoapp.dom.types.isisval.asciidocs.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.valuetypes.asciidoc.applib.value.AsciiDoc;
-
-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 IsisAsciiDocHolder_updateReadOnlyPropertyWithChoices {
private final IsisAsciiDocHolder holder;
- @MemberSupport public IsisAsciiDocHolder act(final AsciiDoc newValue) {
+ @MemberSupport public IsisAsciiDocHolder act(final org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc newValue) {
holder.setReadOnlyProperty(newValue);
return holder;
}
- @MemberSupport public AsciiDoc default0Act() {
+ @MemberSupport public org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc default0Act() {
return holder.getReadOnlyProperty();
}
- @MemberSupport public List<AsciiDoc> choices0Act() {
+ @MemberSupport public List<org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc> choices0Act() {
return samples.stream()
.collect(Collectors.toList());
}
- Samples<AsciiDoc> samples;
+ @Inject
+ Samples<org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc> samples;
+
}
//end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jdo/IsisAsciiDocJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jdo/IsisAsciiDocJdo-description.adoc
similarity index 82%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jdo/IsisAsciiDocJdo-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jdo/IsisAsciiDocJdo-description.adoc
index a2899f9d3a..f6528470f7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jdo/IsisAsciiDocJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jdo/IsisAsciiDocJdo-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 [...]
-JDO supports `AsciiDoc` out-of-the-box, so no special annotations are required.
+// // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
+
+JDO supports `org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc` out-of-the-box, so no special annotations are required.
[source,java]
----
@@ -15,4 +17,4 @@ Apache Isis assumes properties are mandatory, so no additional annotation is req
<.> optional property as defined to JDO/DataNucleus
-include::../IsisAsciiDocs-common.adoc[]
\ No newline at end of file
+include::../IsisAsciiDocs-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jdo/IsisAsciiDocJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jdo/IsisAsciiDocJdo.java
similarity index 64%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jdo/IsisAsciiDocJdo.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jdo/IsisAsciiDocJdo.java
index 16e3aaf868..4bacaad659 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jdo/IsisAsciiDocJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jdo/IsisAsciiDocJdo.java
@@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.asciidocs.jdo;
+package demoapp.dom.types.isisval.asciidocs.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.valuetypes.asciidoc.applib.value.AsciiDoc;
+import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.isisext.asciidocs.persistence.IsisAsciiDocEntity;
+import demoapp.dom.types.isisval.asciidocs.persistence.IsisAsciiDocEntity;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Profile("demo-jdo")
//tag::class[]
@PersistenceCapable(identityType = IdentityType.DATASTORE, schema = "demo")
@@ -53,41 +50,35 @@ public class IsisAsciiDocJdo // <.>
extends IsisAsciiDocEntity {
//end::class[]
- public IsisAsciiDocJdo(final AsciiDoc initialValue) {
+ public IsisAsciiDocJdo(final org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
//tag::class[]
- @ObjectSupport public String title() {
- return "AsciiDoc JDO entity: " +
- bookmarkService.bookmarkForElseFail(this).getIdentifier();
- }
-
+ @Title(prepend = "org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc JDO entity: ")
@PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
- @Column(allowsNull = "false", jdbcType = "CLOB") // <.>
+ @Column(allowsNull = "false") // <.>
@Getter @Setter
- private AsciiDoc readOnlyProperty;
+ private org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc readOnlyProperty;
- @Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "editable-properties", sequence = "1", multiLine = 5)
- @Column(allowsNull = "false", jdbcType = "CLOB")
+ @Property(editing = Editing.ENABLED) // <.>
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
+ @Column(allowsNull = "false")
@Getter @Setter
- private AsciiDoc readWriteProperty;
+ private org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc 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 AsciiDoc readOnlyOptionalProperty;
+ private org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "optional-properties", sequence = "2", multiLine = 5)
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
@Column(allowsNull = "true")
@Getter @Setter
- private AsciiDoc readWriteOptionalProperty;
+ private org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc readWriteOptionalProperty;
- @Inject
- private transient BookmarkService bookmarkService;
}
//end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jdo/IsisAsciiDocJdoEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jdo/IsisAsciiDocJdoEntities.java
similarity index 77%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jdo/IsisAsciiDocJdoEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jdo/IsisAsciiDocJdoEntities.java
index 8e807f42c8..5e6d8c7841 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jdo/IsisAsciiDocJdoEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jdo/IsisAsciiDocJdoEntities.java
@@ -16,27 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.asciidocs.jdo;
+package demoapp.dom.types.isisval.asciidocs.jdo;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service;
-import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc;
-
import demoapp.dom._infra.values.ValueHolderRepository;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Profile("demo-jdo")
@Service
public class IsisAsciiDocJdoEntities
-extends ValueHolderRepository<AsciiDoc, IsisAsciiDocJdo> {
+extends ValueHolderRepository<org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc, IsisAsciiDocJdo> {
protected IsisAsciiDocJdoEntities() {
super(IsisAsciiDocJdo.class);
}
@Override
- protected IsisAsciiDocJdo newDetachedEntity(AsciiDoc value) {
+ protected IsisAsciiDocJdo newDetachedEntity(org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc value) {
return new IsisAsciiDocJdo(value);
}
-}
\ No newline at end of file
+}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jpa/IsisAsciiDocJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jpa/IsisAsciiDocJpa-description.adoc
similarity index 76%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jpa/IsisAsciiDocJpa-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jpa/IsisAsciiDocJpa-description.adoc
index 391de105f2..8af38dfff6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jpa/IsisAsciiDocJpa-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jpa/IsisAsciiDocJpa-description.adoc
@@ -1,18 +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 [...]
-JPA supports `AsciiDoc` out-of-the-box, so no special annotations are required.
+// // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
+
+JPA supports `org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc` out-of-the-box, so no special annotations are required.
[source,java]
----
include::IsisAsciiDocJpa.java[tags=class]
----
-<.> a no-arg constructor is required
-<.> required property as defined to JPA/EclipseLink
+<.> 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 JPA/EclipseLink
+<.> optional property as defined to JPA
include::../IsisAsciiDocs-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jpa/IsisAsciiDocJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jpa/IsisAsciiDocJpa.java
similarity index 60%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jpa/IsisAsciiDocJpa.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jpa/IsisAsciiDocJpa.java
index fbbac406ca..df59c517c3 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jpa/IsisAsciiDocJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jpa/IsisAsciiDocJpa.java
@@ -16,40 +16,33 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.asciidocs.jpa;
+package demoapp.dom.types.isisval.asciidocs.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.annotation.Title;
import org.apache.isis.persistence.jpa.applib.integration.IsisEntityListener;
-import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.types.isisext.asciidocs.persistence.IsisAsciiDocEntity;
+import demoapp.dom.types.isisval.asciidocs.persistence.IsisAsciiDocEntity;
+/* 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.isisext.asciidocs.persistence.IsisAsciiDocEntity;
@EntityListeners(IsisEntityListener.class)
@Named("demo.IsisAsciiDocEntity")
@DomainObject
-@NoArgsConstructor // <.>
+@NoArgsConstructor // <.>
public class IsisAsciiDocJpa
extends IsisAsciiDocEntity {
//end::class[]
- public IsisAsciiDocJpa(final AsciiDoc initialValue) {
+ public IsisAsciiDocJpa(final org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
@@ -75,35 +68,29 @@ public class IsisAsciiDocJpa
@GeneratedValue
private Long id;
- @ObjectSupport public String title() {
- return "AsciiDoc JPA entity: " +
- bookmarkService.bookmarkForElseFail(this).getIdentifier();
- }
-
+ @Title(prepend = "org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc JPA entity: ")
@PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
- @Column(nullable = false) @Lob @Basic(fetch=FetchType.LAZY) // <.>
+ @Column(nullable = false) // <.>
@Getter @Setter
- private AsciiDoc readOnlyProperty;
+ private org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc readOnlyProperty;
- @Property(editing = Editing.ENABLED) // <.>
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "editable-properties", sequence = "1", multiLine = 5)
- @Column(nullable = false) @Lob @Basic(fetch=FetchType.LAZY)
+ @Property(editing = Editing.ENABLED) // <.>
+ @PropertyLayout(fieldSetId = "editable-properties", sequence = "1")
+ @Column(nullable = false)
@Getter @Setter
- private AsciiDoc readWriteProperty;
+ private org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc 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 AsciiDoc readOnlyOptionalProperty;
+ private org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc readOnlyOptionalProperty;
@Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
- @PropertyLayout(hidden = Where.ALL_TABLES, fieldSetId = "optional-properties", sequence = "2", multiLine = 5)
- @Column(nullable = true) @Lob @Basic(fetch=FetchType.LAZY)
+ @PropertyLayout(fieldSetId = "optional-properties", sequence = "2")
+ @Column(nullable = true)
@Getter @Setter
- private AsciiDoc readWriteOptionalProperty;
+ private org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc readWriteOptionalProperty;
- @Inject @Transient
- private transient BookmarkService bookmarkService;
}
//end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jpa/IsisAsciiDocJpaEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jpa/IsisAsciiDocJpaEntities.java
similarity index 77%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jpa/IsisAsciiDocJpaEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jpa/IsisAsciiDocJpaEntities.java
index 460a391e69..fea0a7c6da 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/jpa/IsisAsciiDocJpaEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/jpa/IsisAsciiDocJpaEntities.java
@@ -16,27 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.asciidocs.jpa;
+package demoapp.dom.types.isisval.asciidocs.jpa;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service;
-import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc;
-
import demoapp.dom._infra.values.ValueHolderRepository;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Profile("demo-jpa")
@Service
public class IsisAsciiDocJpaEntities
-extends ValueHolderRepository<AsciiDoc, IsisAsciiDocJpa> {
+extends ValueHolderRepository<org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc, IsisAsciiDocJpa> {
protected IsisAsciiDocJpaEntities() {
super(IsisAsciiDocJpa.class);
}
@Override
- protected IsisAsciiDocJpa newDetachedEntity(AsciiDoc value) {
+ protected IsisAsciiDocJpa newDetachedEntity(org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc value) {
return new IsisAsciiDocJpa(value);
}
-}
\ No newline at end of file
+}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/persistence/IsisAsciiDocEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/persistence/IsisAsciiDocEntity.java
similarity index 78%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/persistence/IsisAsciiDocEntity.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/persistence/IsisAsciiDocEntity.java
index 982c2d6ed4..a0e0f67a8e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/persistence/IsisAsciiDocEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/persistence/IsisAsciiDocEntity.java
@@ -16,27 +16,27 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.asciidocs.persistence;
+package demoapp.dom.types.isisval.asciidocs.persistence;
import javax.inject.Named;
import org.apache.isis.applib.annotation.DomainObject;
-import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolder;
-import demoapp.dom.types.isisext.asciidocs.holder.IsisAsciiDocHolder2;
+import demoapp.dom.types.isisval.asciidocs.holder.IsisAsciiDocHolder2;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Named("demo.IsisAsciiDocEntity") // shared permissions with concrete sub class
@DomainObject
public abstract class IsisAsciiDocEntity
implements
HasAsciiDocDescription,
IsisAsciiDocHolder2,
- ValueHolder<AsciiDoc> {
+ ValueHolder<org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc> {
@Override
- public AsciiDoc value() {
+ public org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc value() {
return getReadOnlyProperty();
}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/persistence/IsisMarkdownEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/persistence/IsisAsciiDocEntity.layout.xml
similarity index 100%
copy from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/persistence/IsisMarkdownEntity.layout.xml
copy to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/persistence/IsisAsciiDocEntity.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/persistence/IsisAsciiDocSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/persistence/IsisAsciiDocSeeding.java
similarity index 79%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/persistence/IsisAsciiDocSeeding.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/persistence/IsisAsciiDocSeeding.java
index 033c76bf3e..5a2bac6453 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/persistence/IsisAsciiDocSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/persistence/IsisAsciiDocSeeding.java
@@ -16,24 +16,23 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.asciidocs.persistence;
+package demoapp.dom.types.isisval.asciidocs.persistence;
import javax.inject.Inject;
import org.springframework.stereotype.Service;
-import org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc;
-
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 IsisAsciiDocSeeding
extends SeedServiceAbstract {
@Inject
- public IsisAsciiDocSeeding(ValueHolderRepository<AsciiDoc, ? extends IsisAsciiDocEntity> entities) {
+ public IsisAsciiDocSeeding(ValueHolderRepository<org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc, ? extends IsisAsciiDocEntity> entities) {
super(entities);
}
-}
\ No newline at end of file
+}
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/vm/IsisAsciiDocVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/vm/IsisAsciiDocVm-description.adoc
similarity index 81%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/vm/IsisAsciiDocVm-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/vm/IsisAsciiDocVm-description.adoc
index ff3f9dd419..2abeb3f841 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/vm/IsisAsciiDocVm-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/vm/IsisAsciiDocVm-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 `AsciiDoc` 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.valuetypes.asciidoc.applib.value.AsciiDoc` out-of-the-box, so no special annotations are required.
[source,java]
----
@@ -14,4 +16,4 @@ include::IsisAsciiDocVm.java[tags=class]
This is the default for JAXB so no additional annotation required.
-include::../IsisAsciiDocs-common.adoc[]
\ No newline at end of file
+include::../IsisAsciiDocs-common.adoc[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/vm/IsisAsciiDocVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/vm/IsisAsciiDocVm.java
similarity index 73%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/vm/IsisAsciiDocVm.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/vm/IsisAsciiDocVm.java
index 9ad314aced..8a01d1da14 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/vm/IsisAsciiDocVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/vm/IsisAsciiDocVm.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.asciidocs.vm;
+package demoapp.dom.types.isisval.asciidocs.vm;
import javax.inject.Named;
import javax.xml.bind.annotation.XmlAccessType;
@@ -28,19 +28,18 @@ 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.valuetypes.asciidoc.applib.value.AsciiDoc;
+import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.isisext.asciidocs.holder.IsisAsciiDocHolder2;
+import demoapp.dom.types.isisval.asciidocs.holder.IsisAsciiDocHolder2;
+/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
//tag::class[]
@XmlRootElement(name = "root")
@XmlType
@@ -53,36 +52,33 @@ public class IsisAsciiDocVm
implements HasAsciiDocDescription, IsisAsciiDocHolder2 {
//end::class[]
- public IsisAsciiDocVm(final AsciiDoc initialValue) {
+ public IsisAsciiDocVm(final org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc initialValue) {
this.readOnlyProperty = initialValue;
this.readWriteProperty = initialValue;
}
//tag::class[]
- @ObjectSupport public String title() {
- return "AsciiDoc view model";
- }
-
+ @Title(prepend = "org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc view model: ")
@PropertyLayout(fieldSetId = "read-only-properties", sequence = "1")
@XmlElement(required = true) // <.>
@Getter @Setter
- private AsciiDoc readOnlyProperty;
+ private org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc 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 AsciiDoc readWriteProperty;
+ private org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc readWriteProperty;
@Property(optionality = Optionality.OPTIONAL) // <.>
@PropertyLayout(fieldSetId = "optional-properties", sequence = "1")
@Getter @Setter
- private AsciiDoc readOnlyOptionalProperty;
+ private org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc 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 AsciiDoc readWriteOptionalProperty;
+ private org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc readWriteOptionalProperty;
}
//end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/vm/IsisMarkdownVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/vm/IsisAsciiDocVm.layout.xml
similarity index 100%
copy from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/vm/IsisMarkdownVm.layout.xml
copy to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/asciidocs/vm/IsisAsciiDocVm.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/IsisMarkdowns-common.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/IsisMarkdowns-common.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/IsisMarkdowns-common.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/IsisMarkdowns-common.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/IsisMarkdowns-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/IsisMarkdowns-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/IsisMarkdowns-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/IsisMarkdowns-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/IsisMarkdowns.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/IsisMarkdowns.java
similarity index 94%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/IsisMarkdowns.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/IsisMarkdowns.java
index 370ce29fbc..e2ba2bb391 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/IsisMarkdowns.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/IsisMarkdowns.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.markdowns;
+package demoapp.dom.types.isisval.markdowns;
import java.util.List;
@@ -42,8 +42,8 @@ import org.apache.isis.applib.annotation.SemanticsOf;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolderRepository;
import demoapp.dom.types.Samples;
-import demoapp.dom.types.isisext.markdowns.persistence.IsisMarkdownEntity;
-import demoapp.dom.types.isisext.markdowns.vm.IsisMarkdownVm;
+import demoapp.dom.types.isisval.markdowns.persistence.IsisMarkdownEntity;
+import demoapp.dom.types.isisval.markdowns.vm.IsisMarkdownVm;
/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@XmlRootElement(name = "Demo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/IsisMarkdowns.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/IsisMarkdowns.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/IsisMarkdowns.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/IsisMarkdowns.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder.java
index 19ff9de0e5..5e5144cc96 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.markdowns.holder;
+package demoapp.dom.types.isisval.markdowns.holder;
import javax.inject.Named;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder2.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder2.java
similarity index 98%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder2.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder2.java
index bef08c9ab1..9b5f637116 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder2.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder2.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.markdowns.holder;
+package demoapp.dom.types.isisval.markdowns.holder;
import org.apache.isis.applib.annotation.LabelPosition;
import org.apache.isis.applib.annotation.Property;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_actionReturning.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_actionReturning.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_actionReturning.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_actionReturning.java
index b8591db1f5..31a7a2aae1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_actionReturning.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_actionReturning.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.markdowns.holder;
+package demoapp.dom.types.isisval.markdowns.holder;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.SemanticsOf;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_actionReturningCollection.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_actionReturningCollection.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_actionReturningCollection.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_actionReturningCollection.java
index 7002e89de2..5acfc6be19 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_actionReturningCollection.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_actionReturningCollection.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.markdowns.holder;
+package demoapp.dom.types.isisval.markdowns.holder;
import java.util.Collection;
import java.util.stream.Collectors;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_mixinProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_mixinProperty.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_mixinProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_mixinProperty.java
index be05d2301b..dc0a6584f6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_mixinProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_mixinProperty.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.markdowns.holder;
+package demoapp.dom.types.isisval.markdowns.holder;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_updateReadOnlyOptionalProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyOptionalProperty.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_updateReadOnlyOptionalProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyOptionalProperty.java
index 600d10bd71..4cd471c724 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_updateReadOnlyOptionalProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyOptionalProperty.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.markdowns.holder;
+package demoapp.dom.types.isisval.markdowns.holder;
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/types/isisext/markdowns/holder/IsisMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices.java
similarity index 98%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices.java
index 84c646adc1..452e8f9e87 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyOptionalPropertyWithChoices.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.markdowns.holder;
+package demoapp.dom.types.isisval.markdowns.holder;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_updateReadOnlyProperty.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyProperty.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_updateReadOnlyProperty.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyProperty.java
index 3dca588b7d..bf1964eacc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_updateReadOnlyProperty.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyProperty.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.markdowns.holder;
+package demoapp.dom.types.isisval.markdowns.holder;
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/types/isisext/markdowns/holder/IsisMarkdownHolder_updateReadOnlyPropertyWithChoices.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyPropertyWithChoices.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_updateReadOnlyPropertyWithChoices.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyPropertyWithChoices.java
index 1a874b6655..7d5b994bf7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/holder/IsisMarkdownHolder_updateReadOnlyPropertyWithChoices.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/holder/IsisMarkdownHolder_updateReadOnlyPropertyWithChoices.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.markdowns.holder;
+package demoapp.dom.types.isisval.markdowns.holder;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jdo/IsisMarkdownJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jdo/IsisMarkdownJdo-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jdo/IsisMarkdownJdo-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jdo/IsisMarkdownJdo-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jdo/IsisMarkdownJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jdo/IsisMarkdownJdo.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jdo/IsisMarkdownJdo.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jdo/IsisMarkdownJdo.java
index e8bcd03e64..2cda1cdb6c 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jdo/IsisMarkdownJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jdo/IsisMarkdownJdo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.markdowns.jdo;
+package demoapp.dom.types.isisval.markdowns.jdo;
import javax.inject.Named;
import javax.jdo.annotations.Column;
@@ -37,7 +37,7 @@ import org.apache.isis.applib.annotation.Title;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom.types.isisext.markdowns.persistence.IsisMarkdownEntity;
+import demoapp.dom.types.isisval.markdowns.persistence.IsisMarkdownEntity;
/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Profile("demo-jdo")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jdo/IsisMarkdownJdoEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jdo/IsisMarkdownJdoEntities.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jdo/IsisMarkdownJdoEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jdo/IsisMarkdownJdoEntities.java
index 5cbd91e0dc..254a52cce1 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jdo/IsisMarkdownJdoEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jdo/IsisMarkdownJdoEntities.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.markdowns.jdo;
+package demoapp.dom.types.isisval.markdowns.jdo;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jpa/IsisMarkdownJpa-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jpa/IsisMarkdownJpa-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jpa/IsisMarkdownJpa-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jpa/IsisMarkdownJpa-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jpa/IsisMarkdownJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jpa/IsisMarkdownJpa.java
similarity index 97%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jpa/IsisMarkdownJpa.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jpa/IsisMarkdownJpa.java
index 31bfc6b41e..8c9d8c6d47 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jpa/IsisMarkdownJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jpa/IsisMarkdownJpa.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.markdowns.jpa;
+package demoapp.dom.types.isisval.markdowns.jpa;
import javax.inject.Named;
import javax.persistence.Column;
@@ -40,7 +40,7 @@ import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
-import demoapp.dom.types.isisext.markdowns.persistence.IsisMarkdownEntity;
+import demoapp.dom.types.isisval.markdowns.persistence.IsisMarkdownEntity;
/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Profile("demo-jpa")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jpa/IsisMarkdownJpaEntities.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jpa/IsisMarkdownJpaEntities.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jpa/IsisMarkdownJpaEntities.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jpa/IsisMarkdownJpaEntities.java
index 983843e11d..a8090960b2 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/jpa/IsisMarkdownJpaEntities.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/jpa/IsisMarkdownJpaEntities.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.markdowns.jpa;
+package demoapp.dom.types.isisval.markdowns.jpa;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/persistence/IsisMarkdownEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/persistence/IsisMarkdownEntity.java
similarity index 92%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/persistence/IsisMarkdownEntity.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/persistence/IsisMarkdownEntity.java
index 70d922ad8b..b3f3f59875 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/persistence/IsisMarkdownEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/persistence/IsisMarkdownEntity.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.markdowns.persistence;
+package demoapp.dom.types.isisval.markdowns.persistence;
import javax.inject.Named;
@@ -24,7 +24,7 @@ import org.apache.isis.applib.annotation.DomainObject;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import demoapp.dom._infra.values.ValueHolder;
-import demoapp.dom.types.isisext.markdowns.holder.IsisMarkdownHolder2;
+import demoapp.dom.types.isisval.markdowns.holder.IsisMarkdownHolder2;
/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
@Named("demo.IsisMarkdownEntity") // shared permissions with concrete sub class
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/persistence/IsisMarkdownEntity.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/persistence/IsisMarkdownEntity.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/persistence/IsisMarkdownEntity.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/persistence/IsisMarkdownEntity.layout.xml
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/persistence/IsisMarkdownSeeding.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/persistence/IsisMarkdownSeeding.java
similarity index 95%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/persistence/IsisMarkdownSeeding.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/persistence/IsisMarkdownSeeding.java
index 7edba673d4..de21b45225 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/persistence/IsisMarkdownSeeding.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/persistence/IsisMarkdownSeeding.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.markdowns.persistence;
+package demoapp.dom.types.isisval.markdowns.persistence;
import javax.inject.Inject;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/samples/IsisMarkdownSamples.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/samples/IsisMarkdownSamples.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/samples/IsisMarkdownSamples.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/samples/IsisMarkdownSamples.java
index 2021872f2e..1326998c4e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/samples/IsisMarkdownSamples.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/samples/IsisMarkdownSamples.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.markdowns.samples;
+package demoapp.dom.types.isisval.markdowns.samples;
import java.util.stream.Stream;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/vm/IsisMarkdownVm-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/vm/IsisMarkdownVm-description.adoc
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/vm/IsisMarkdownVm-description.adoc
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/vm/IsisMarkdownVm-description.adoc
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/vm/IsisMarkdownVm.java b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/vm/IsisMarkdownVm.java
similarity index 96%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/vm/IsisMarkdownVm.java
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/vm/IsisMarkdownVm.java
index 6016ec5ed7..3235086eec 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/vm/IsisMarkdownVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/vm/IsisMarkdownVm.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.markdowns.vm;
+package demoapp.dom.types.isisval.markdowns.vm;
import javax.inject.Named;
import javax.xml.bind.annotation.XmlAccessType;
@@ -37,7 +37,7 @@ import lombok.Getter;
import lombok.Setter;
import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-import demoapp.dom.types.isisext.markdowns.holder.IsisMarkdownHolder2;
+import demoapp.dom.types.isisval.markdowns.holder.IsisMarkdownHolder2;
/* This file was GENERATED by the showcase generator (tooling). Do NOT edit! */
//tag::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/vm/IsisMarkdownVm.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/vm/IsisMarkdownVm.layout.xml
similarity index 100%
rename from examples/demo/domain/src/main/java/demoapp/dom/types/isisext/markdowns/vm/IsisMarkdownVm.layout.xml
rename to examples/demo/domain/src/main/java/demoapp/dom/types/isisval/markdowns/vm/IsisMarkdownVm.layout.xml
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 94f703d4b4..10a705d87f 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
@@ -37,12 +37,12 @@ public enum ValueShowCase {
.showcaseValueSemantics("org.apache.isis.core.metamodel.valuesemantics.MarkupValueSemantics")),
MARKDOWN(Config.builder()
.showcaseName("IsisMarkdown")
- .javaPackage("demoapp.dom.types.isisext.markdowns")
+ .javaPackage("demoapp.dom.types.isisval.markdowns")
.showcaseValueType("org.apache.isis.valuetypes.markdown.applib.value.Markdown")
.showcaseValueSemantics("org.apache.isis.valuetypes.markdown.metamodel.semantics.MarkdownValueSemantics")),
ASCIIDOC(Config.builder()
.showcaseName("IsisAsciiDoc")
- .javaPackage("demoapp.dom.types.isisext.asciidocs")
+ .javaPackage("demoapp.dom.types.isisval.asciidocs")
.showcaseValueType("org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc")
.showcaseValueSemantics("org.apache.isis.valuetypes.asciidoc.metamodel.semantics.AsciiDocValueSemantics")
.templates(Template.REGULAR_SET_NO_SAMPLES)), // demo provides its own AsciiDocSamples
diff --git a/tooling/metaprog/src/test/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java b/tooling/metaprog/src/test/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java
index 5bc593f080..ff79c872ed 100644
--- a/tooling/metaprog/src/test/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java
+++ b/tooling/metaprog/src/test/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueTypeGenTemplateTest.java
@@ -118,6 +118,7 @@ class ValueTypeGenTemplateTest {
private void copyFiles(final Collection<File> generatedFiles, final File sourceRoot, final File destinationRoot) {
generatedFiles.forEach(src->{
val dest = new File(destinationRoot, _Files.realtiveFileName(sourceRoot, src));
+ _Files.makeDir(dest.getParentFile());
_Files.copy(src, dest);
});
}
@@ -127,6 +128,7 @@ class ValueTypeGenTemplateTest {
generatedFiles.forEach(src->{
val dest = new File(destinationRoot, _Files.realtiveFileName(sourceRoot, src));
if(!dest.exists()) {
+ _Files.makeDir(dest.getParentFile());
_Files.copy(src, dest);
}
});