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 850f79211d ISIS-3123: migrate AsciiDoc
850f79211d is described below
commit 850f79211d8f3c5127e803c391c87d8caf339fff
Author: Andi Huber <[email protected]>
AuthorDate: Thu Sep 29 13:18:13 2022 +0200
ISIS-3123: migrate AsciiDoc
---
.../samples/asciidoc}/IsisAsciiDocSamples-sample1.adoc | 0
.../samples/asciidoc}/IsisAsciiDocSamples-sample10.adoc | 0
.../samples/asciidoc}/IsisAsciiDocSamples-sample2.adoc | 0
.../samples/asciidoc}/IsisAsciiDocSamples-sample3.adoc | 0
.../samples/asciidoc}/IsisAsciiDocSamples-sample4.adoc | 0
.../samples/asciidoc}/IsisAsciiDocSamples-sample5.adoc | 0
.../samples/asciidoc}/IsisAsciiDocSamples-sample6.adoc | 0
.../samples/asciidoc}/IsisAsciiDocSamples-sample7.adoc | 0
.../samples/asciidoc}/IsisAsciiDocSamples-sample8.adoc | 0
.../samples/asciidoc}/IsisAsciiDocSamples-sample9.adoc | 0
.../samples/asciidoc}/IsisAsciiDocSamples.java | 7 ++++---
.../dom/types/isisext/asciidocs/IsisAsciiDocs-common.adoc | 7 +++++--
.../dom/types/isisext/asciidocs/IsisAsciiDocs-description.adoc | 10 +++++-----
.../dom/types/isisext/asciidocs/IsisAsciiDocs.layout.xml | 2 ++
.../tooling/metaprog/demoshowcases/value/ValueShowCase.java | 6 ++++++
15 files changed, 22 insertions(+), 10 deletions(-)
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/IsisAsciiDocSamples-sample1.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/IsisAsciiDocSamples-sample1.adoc
similarity index 100%
rename from
examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/IsisAsciiDocSamples-sample1.adoc
rename to
examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/IsisAsciiDocSamples-sample1.adoc
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/IsisAsciiDocSamples-sample10.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/IsisAsciiDocSamples-sample10.adoc
similarity index 100%
rename from
examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/IsisAsciiDocSamples-sample10.adoc
rename to
examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/IsisAsciiDocSamples-sample10.adoc
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/IsisAsciiDocSamples-sample2.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/IsisAsciiDocSamples-sample2.adoc
similarity index 100%
rename from
examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/IsisAsciiDocSamples-sample2.adoc
rename to
examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/IsisAsciiDocSamples-sample2.adoc
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/IsisAsciiDocSamples-sample3.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/IsisAsciiDocSamples-sample3.adoc
similarity index 100%
rename from
examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/IsisAsciiDocSamples-sample3.adoc
rename to
examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/IsisAsciiDocSamples-sample3.adoc
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/IsisAsciiDocSamples-sample4.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/IsisAsciiDocSamples-sample4.adoc
similarity index 100%
rename from
examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/IsisAsciiDocSamples-sample4.adoc
rename to
examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/IsisAsciiDocSamples-sample4.adoc
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/IsisAsciiDocSamples-sample5.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/IsisAsciiDocSamples-sample5.adoc
similarity index 100%
rename from
examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/IsisAsciiDocSamples-sample5.adoc
rename to
examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/IsisAsciiDocSamples-sample5.adoc
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/IsisAsciiDocSamples-sample6.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/IsisAsciiDocSamples-sample6.adoc
similarity index 100%
rename from
examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/IsisAsciiDocSamples-sample6.adoc
rename to
examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/IsisAsciiDocSamples-sample6.adoc
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/IsisAsciiDocSamples-sample7.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/IsisAsciiDocSamples-sample7.adoc
similarity index 100%
rename from
examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/IsisAsciiDocSamples-sample7.adoc
rename to
examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/IsisAsciiDocSamples-sample7.adoc
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/IsisAsciiDocSamples-sample8.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/IsisAsciiDocSamples-sample8.adoc
similarity index 100%
rename from
examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/IsisAsciiDocSamples-sample8.adoc
rename to
examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/IsisAsciiDocSamples-sample8.adoc
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/IsisAsciiDocSamples-sample9.adoc
b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/IsisAsciiDocSamples-sample9.adoc
similarity index 100%
rename from
examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/IsisAsciiDocSamples-sample9.adoc
rename to
examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/IsisAsciiDocSamples-sample9.adoc
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/IsisAsciiDocSamples.java
b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/IsisAsciiDocSamples.java
similarity index 85%
rename from
examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/IsisAsciiDocSamples.java
rename to
examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/IsisAsciiDocSamples.java
index 7e0eced602..55c144efd5 100644
---
a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/samples/IsisAsciiDocSamples.java
+++
b/examples/demo/domain/src/main/java/demoapp/dom/_infra/samples/asciidoc/IsisAsciiDocSamples.java
@@ -16,8 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package demoapp.dom.types.isisext.asciidocs.samples;
+package demoapp.dom._infra.samples.asciidoc;
+import java.util.stream.IntStream;
import java.util.stream.Stream;
import javax.inject.Inject;
@@ -34,8 +35,8 @@ public class IsisAsciiDocSamples implements Samples<AsciiDoc>
{
@Override
public Stream<AsciiDoc> stream() {
- return Stream.of(1,2,3,4,5,6,7,8,9,10)
- .map(x -> asciiDocReaderService.readFor(getClass(), "sample" +
x));
+ return IntStream.rangeClosed(1, 10)
+ .mapToObj(x -> asciiDocReaderService.readFor(getClass(),
"sample" + x));
}
@Inject
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/isisext/asciidocs/IsisAsciiDocs-common.adoc
index 79ab2320db..dc27b9d116 100644
---
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/isisext/asciidocs/IsisAsciiDocs-common.adoc
@@ -1,8 +1,10 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with this work
for additional information regarding copyright ownership. The ASF licenses this
file to you under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance with the License. You may obtain a copy of
the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by
applicable law or ag [...]
+// // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
+
== Mixin actions
-A number of mixin actions contribute through the `IsisAsciiDocHolder`
interface, demonstrate the use of `AsciiDoc` as a parameter and as a return
type.
+A number of mixin actions contribute through the `IsisAsciiDocHolder`
interface, demonstrate the use of
`org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc` as a parameter and
as a return type.
For example:
* the `updateReadOnlyProperty` action is:
@@ -48,7 +50,7 @@
include::holder/IsisAsciiDocHolder_mixinProperty.java[tags=class]
== @PropertyLayout(labelPosition=...)
-There is also an extended interface, `IsisAsciiDocHolder2`, with default
methods demonstrating the use of label positions:
+To demonstrate support for label positions using
`@PropertyLayout(labelPosition=...)`, the entity and view model objects both
implement the extended `IsisAsciiDocHolder2` interface:
[source,java]
----
@@ -63,3 +65,4 @@ include::holder/IsisAsciiDocHolder2.java[tags=class]
+
CAUTION: currently not supported
<.> Hide the label completely.
+
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/isisext/asciidocs/IsisAsciiDocs-description.adoc
index 8b90ab78d5..31860e8755 100644
---
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/isisext/asciidocs/IsisAsciiDocs-description.adoc
@@ -1,13 +1,13 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with this work
for additional information regarding copyright ownership. The ASF licenses this
file to you under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance with the License. You may obtain a copy of
the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by
applicable law or ag [...]
-The framework has built-in support for rendering HTML written including
link:https://asciidoctor.org/[Asciidoctor], using the `AsciiDoc` data type.
+// // This file was GENERATED by the showcase generator (tooling). Do NOT edit!
-NOTE: This is an Apache Isis specific data type.
+The framework has built-in support for the
`org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc` data type.
From here you can:
-* navigate to an entity that uses the `AsciiDoc` datatype
-* open a view model that uses the `AsciiDoc` datatype
+* navigate to an entity that uses the
`org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc` datatype
+* open a view model that uses the
`org.apache.isis.valuetypes.asciidoc.applib.value.AsciiDoc` datatype
Some properties on these domain objects are mandatory, some optional.
@@ -28,4 +28,4 @@ include::holder/IsisAsciiDocHolder.java[tags=class]
The `IsisAsciiDocHolder2` interface is used to demonstrate support for label
positions using `@PropertyLayout(labelPosition=...)`.
-Further details, along with the effect of this annotation, can be seen on the
entity and view model object pages.
\ No newline at end of file
+Further details, along with the effect of this annotation, can be seen on the
entity and view model object pages.
diff --git
a/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/IsisAsciiDocs.layout.xml
b/examples/demo/domain/src/main/java/demoapp/dom/types/isisext/asciidocs/IsisAsciiDocs.layout.xml
index 74e0160a87..247ed17506 100644
---
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/isisext/asciidocs/IsisAsciiDocs.layout.xml
@@ -15,6 +15,8 @@
xmlns:cpt="http://isis.apache.org/applib/layout/component";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <!-- This file was GENERATED by the showcase generator (tooling). Do
NOT edit! -->
+
<bs3:row>
<bs3:col span="10" unreferencedActions="true">
<cpt:domainObject />
diff --git
a/tooling/metaprog/src/main/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueShowCase.java
b/tooling/metaprog/src/main/java/org/apache/isis/tooling/metaprog/demoshowcases/value/ValueShowCase.java
index d6d2b53ffb..94f703d4b4 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
@@ -40,6 +40,12 @@ public enum ValueShowCase {
.javaPackage("demoapp.dom.types.isisext.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")
+
.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
UUID(Config.builder()
.showcaseName("JavaUtilUuid")
.javaPackage("demoapp.dom.types.javautil.uuids")
