[isis] 03/04: ISIS-2062: fixes includes for simplified-representations

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch ISIS-2062
in repository https://gitbox.apache.org/repos/asf/isis.git

commit e6e4f229aa87c564dcbde98ca7c1c471e195d817
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 8 07:13:06 2019 +0100

    ISIS-2062: fixes includes for simplified-representations
---
 antora/components/refguide/modules/ROOT/pages/about.adoc     |  2 +-
 .../_adoc/modules/ROOT/pages/simplified-representations.adoc | 12 ++++++------
 examples/apps/demo/pom.xml                                   |  3 +++
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/antora/components/refguide/modules/ROOT/pages/about.adoc b/antora/components/refguide/modules/ROOT/pages/about.adoc
index f4aaf71..9c5c6e7 100644
--- a/antora/components/refguide/modules/ROOT/pages/about.adoc
+++ b/antora/components/refguide/modules/ROOT/pages/about.adoc
@@ -6,7 +6,7 @@ The reference guides are:
 * xref:applib:ant:about.adoc[Annotations]
 * xref:applib:svc:about.adoc[Domain Services]
 * xref:applib:cms:about.adoc[Classes & Methods]
-* xref:schema:ROOT:about.adoc[Schemas]
 * xref:cfg:ROOT:about.adoc[Configuration]
+* xref:schema:ROOT:about.adoc[Schemas]
 
 
diff --git a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations.adoc b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations.adoc
index 5795e48..f84a59d 100644
--- a/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations.adoc
+++ b/core/viewer-restfulobjects/_adoc/modules/ROOT/pages/simplified-representations.adoc
@@ -18,9 +18,9 @@ xref:vro:ROOT:architecture.adoc[architecture] chapter.
 
 
 
-include::vro:ROOT:simplified-representations/apache-isis-profile.adoc[leveloffset=+1]
-include::vro:ROOT:simplified-representations/domain-object.adoc[leveloffset=+1]
-include::vro:ROOT:simplified-representations/object-collection.adoc[leveloffset=+1]
-include::vro:ROOT:simplified-representations/action-invocation.adoc[leveloffset=+1]
-include::vro:ROOT:simplified-representations/other-representations.adoc[leveloffset=+1]
-include::vro:ROOT:simplified-representations/configuration-properties.adoc[leveloffset=+1]
+include::simplified-representations/apache-isis-profile.adoc[leveloffset=+1]
+include::simplified-representations/domain-object.adoc[leveloffset=+1]
+include::simplified-representations/object-collection.adoc[leveloffset=+1]
+include::simplified-representations/action-invocation.adoc[leveloffset=+1]
+include::simplified-representations/other-representations.adoc[leveloffset=+1]
+include::simplified-representations/configuration-properties.adoc[leveloffset=+1]
diff --git a/examples/apps/demo/pom.xml b/examples/apps/demo/pom.xml
index 1b117b3..cfbec9b 100644
--- a/examples/apps/demo/pom.xml
+++ b/examples/apps/demo/pom.xml
@@ -32,6 +32,9 @@
 
 		<maven-war-plugin.warName>${project.artifactId}</maven-war-plugin.warName>
 
+		<!-- this can be overridden using -Dflavor=... -->
+		<flavor>payara</flavor>
+
 		<docker-plugin.imageName>apacheisis/isis-2-demo</docker-plugin.imageName>
 		<docker-plugin.imageTag>${flavor}</docker-plugin.imageTag>
 		<docker-plugin.resource.include>${maven-war-plugin.warName}.war</docker-plugin.resource.include>