You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/07/20 21:54:52 UTC
[2/4] isis git commit: ISIS-1521: fixing bad links
ISIS-1521: fixing bad links
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/06a469f3
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/06a469f3
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/06a469f3
Branch: refs/heads/master
Commit: 06a469f36140cd770dbc0c859b3c3b4ba28b5fe5
Parents: 1485720
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jul 20 19:59:14 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jul 20 19:59:14 2017 +0100
----------------------------------------------------------------------
.gitattributes | 1 +
adocs/documentation/README.adoc | 6 +-
adocs/documentation/preview-html.sh | 3 +-
.../src/main/asciidoc/doap_isis.rdf | 2 +-
.../src/main/asciidoc/documentation.adoc | 2 +-
.../_cgcom_asciidoc-publish-procedure.adoc | 2 +-
.../cgcom/_cgcom_post-release-successful.adoc | 8 +--
...om_release-process-for-interim-releases.adoc | 4 +-
.../src/main/asciidoc/guides/dg/_dg_agilej.adoc | 2 +-
.../asciidoc/guides/dg/_dg_asciidoc-syntax.adoc | 2 +-
.../guides/dg/_dg_asciidoc-templates.adoc | 6 +-
.../main/asciidoc/guides/dg/_dg_asciidoc.adoc | 2 +-
.../guides/dg/_dg_asciidoc_instant-rebuild.adoc | 4 +-
.../main/asciidoc/guides/dg/_dg_cmd-line.adoc | 2 +-
.../asciidoc/guides/dg/_dg_contributing.adoc | 5 +-
.../asciidoc/guides/dg/_dg_hints-and-tips.adoc | 2 +-
...nd-tips_how-run-fixtures-on-app-startup.adoc | 4 +-
.../src/main/asciidoc/guides/dg/_dg_ide.adoc | 2 +-
.../asciidoc/guides/dg/_dg_ide_eclipse.adoc | 16 ++---
.../asciidoc/guides/dg/_dg_ide_intellij.adoc | 4 +-
.../guides/dg/_dg_working-with-many-repos.adoc | 4 +-
.../guides/rgant/_rgant-CollectionLayout.adoc | 2 +-
.../_rgant-CollectionLayout_defaultView.adoc | 2 +-
.../rgant/_rgant-DomainService_nature.adoc | 2 +-
.../asciidoc/guides/rgant/_rgant-Property.adoc | 2 +-
.../guides/rgant/_rgant-PropertyLayout.adoc | 2 +-
.../guides/rgant/_rgant-XmlRootElement.adoc | 2 +-
...rgcms_classes_AppManifest-bootstrapping.adoc | 2 +-
...ntation-layer_ContentNegotiationService.adoc | 6 +-
...resentation-layer_RepresentationService.adoc | 2 +-
.../ContentNegotiationService/accept-json.png | Bin 0 -> 80775 bytes
.../ContentNegotiationService/accept-xml.png | Bin 0 -> 94207 bytes
.../facade-choices.png | Bin 0 -> 16635 bytes
.../facade-choices.pptx | Bin 0 -> 46685 bytes
.../service-collaborations.png | Bin 0 -> 28874 bytes
.../service-collaborations.pptx | Bin 0 -> 51472 bytes
.../asciidoc/guides/rgmvn/_rgmvn_intro.adoc | 4 +-
.../asciidoc/guides/rgmvn/_rgmvn_swagger.adoc | 2 +-
.../asciidoc/guides/rgmvn/_rgmvn_validate.adoc | 2 +-
.../main/asciidoc/guides/rgmvn/_rgmvn_xsd.adoc | 4 +-
...mainObjectContainer_object-creation-api.adoc | 2 +-
.../_rgsvc_integration-api_BookmarkService.adoc | 4 +-
...tadata-api_ApplicationFeatureRepository.adoc | 2 +-
.../rgsvc/_rgsvc_testing_SudoService.adoc | 2 +-
.../ContentNegotiationService/accept-json.png | Bin 80775 -> 0 bytes
.../ContentNegotiationService/accept-xml.png | Bin 94207 -> 0 bytes
.../facade-choices.png | Bin 16635 -> 0 bytes
.../facade-choices.pptx | Bin 46685 -> 0 bytes
.../service-collaborations.png | Bin 28874 -> 0 bytes
.../service-collaborations.pptx | Bin 51472 -> 0 bytes
.../guides/ugbtb/_ugbtb_hints-and-tips.adoc | 2 +-
.../_ugbtb_hints-and-tips_are-you-sure.adoc | 8 +--
...nd-tips_how-to-implement-a-spellchecker.adoc | 2 +-
.../_ugbtb_programming-model_finetuning.adoc | 2 +-
...types-of-domain-objects_domain-services.adoc | 2 +-
...-concepts_apache-isis-vs_event-sourcing.adoc | 2 +-
...fun_getting-started_simpleapp-archetype.adoc | 2 +-
...ings_1-to-m-bidirectional-relationships.adoc | 5 +-
.../src/main/asciidoc/guides/ugodn/ugodn.adoc | 2 +-
.../guides/ugsec/_ugsec_hints-and-tips.adoc | 2 +-
...o-realm-implementations_isis-ldap-realm.adoc | 10 ++--
.../_ugtst_fixture-scripts_api-and-usage.adoc | 2 +-
..._ugtst_integ-test-support_typical-usage.adoc | 2 +-
.../guides/ugvro/_ugvro_architecture.adoc | 2 +-
...ts-and-tips_i18n-label-in-wicket-viewer.adoc | 2 +-
.../asciidoc/guides/ugvw/_ugvw_isis-addons.adoc | 14 ++---
.../ugvw/_ugvw_layout_application-menu.adoc | 2 +-
.../guides/ugvw/_ugvw_layout_file-based.adoc | 2 +-
.../guides/ugvw/_ugvw_layout_table-columns.adoc | 2 +-
.../src/main/asciidoc/guides/ugvw/ugvw.adoc | 2 +-
adocs/documentation/src/main/asciidoc/help.adoc | 6 +-
.../_migration-notes_1.11.0-to-1.12.0.adoc | 2 +-
.../articles-and-presentations.adoc | 48 +++++++--------
.../src/main/asciidoc/pages/books/books.adoc | 6 +-
.../common-use-cases/common-use-cases.adoc | 2 +-
.../isis-in-pictures/isis-in-pictures.adoc | 58 +++++++++----------
.../pages/powered-by/_powered-by_commapp.adoc | 4 +-
.../pages/powered-by/_powered-by_estatio.adoc | 2 +-
.../_powered-by_gesconsultor-grc.adoc | 4 +-
.../pages/screencasts/screencasts-older.adoc | 4 +-
.../release-notes/_release-notes_1.12.0.adoc | 2 +-
.../release-notes/_release-notes_1.7.0.adoc | 2 +-
.../asciidoc/release-notes/release-notes.adoc | 2 +-
adocs/template/document.html.erb | 28 ++++-----
84 files changed, 183 insertions(+), 183 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
index b1eafb6..375375a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -16,6 +16,7 @@
*.xhtml text diff=html
*.xml text
*.txt text
+*.adoc text
*.jar binary
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/README.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/README.adoc b/adocs/documentation/README.adoc
index 9a406e9..9059b61 100644
--- a/adocs/documentation/README.adoc
+++ b/adocs/documentation/README.adoc
@@ -19,7 +19,7 @@ Notice: Licensed to the Apache Software Foundation (ASF) under one
under the License.
endif::env-github[]
-This directory contains the source documentation that constitutes both the Apache Isis' documentation (meaning the website and the users' guide, the reference guide and contributors' guide) It is written using http://www.methods.co.nz/asciidoc/[Asciidoc], specifically the link:asciidoctor.org/[Asciidoctor] implementation.
+This directory contains the source documentation that constitutes both the Apache Isis' documentation (meaning the website and the users' guide, the reference guide and contributors' guide) It is written using http://www.methods.co.nz/asciidoc/[Asciidoc], specifically the link:http://asciidoctor.org/[Asciidoctor] implementation.
The website is created by running build tools (documented below) which create the HTML version of the site and guides. You can therefore easily check the documentation before raising a pull request
@@ -83,8 +83,8 @@ The ruby script, `monitor.rb` emulates the `mvn site` command, regenerating any
To setup:
-* download and install ruby 2.0.0, from link:rubyinstaller.org/downloads[http://rubyinstaller.org/downloads/]
-* download devkit for the Ruby 2.0 installation, also from link:rubyinstaller.org/downloads[http://rubyinstaller.org/downloads/]. Then follow the link:https://github.com/oneclick/rubyinstaller/wiki/Development-Kit[installation instructions] on their wiki
+* download and install ruby 2.0.0, from link:http://rubyinstaller.org/downloads[http://rubyinstaller.org/downloads/]
+* download devkit for the Ruby 2.0 installation, also from link:http://rubyinstaller.org/downloads[http://rubyinstaller.org/downloads/]. Then follow the link:https://github.com/oneclick/rubyinstaller/wiki/Development-Kit[installation instructions] on their wiki
[NOTE]
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/preview-html.sh
----------------------------------------------------------------------
diff --git a/adocs/documentation/preview-html.sh b/adocs/documentation/preview-html.sh
index 2650e52..a3f6a88 100644
--- a/adocs/documentation/preview-html.sh
+++ b/adocs/documentation/preview-html.sh
@@ -1,5 +1,6 @@
#!/usr/bin/env bash
-mvn compile -Dreindex -o && python -m webbrowser -t http://localhost:4000 && pushd target/site && python -m http.server 4000 && popd
+mvn compile -o && python -m webbrowser -t http://localhost:4000 && pushd target/site && python -m http.server 4000 && popd
+#mvn compile -Dreindex -o && python -m webbrowser -t http://localhost:4000 && pushd target/site && python -m http.server 4000 && popd
#mvn compile -o && python -m webbrowser -t http://localhost:4000/guides/ugvw/ugvw.html && pushd target/site && python -m http.server 4000 && popd
#mvn compile -o -Dreindex && python -m webbrowser -t http://localhost:4000/guides/ugvw/ugvw.html && pushd target/site && python -m http.server 4000 && popd
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/doap_isis.rdf
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/doap_isis.rdf b/adocs/documentation/src/main/asciidoc/doap_isis.rdf
index 237898e..e6fe596 100644
--- a/adocs/documentation/src/main/asciidoc/doap_isis.rdf
+++ b/adocs/documentation/src/main/asciidoc/doap_isis.rdf
@@ -31,7 +31,7 @@
<description>Apache Isis is a framework for rapidly developing domain-driven apps in Java. Write your business logic in entities, domain services and repositories, and the framework dynamically (at runtime) generates a representation of that domain model as a webapp or as a RESTful API. For prototyping or production.</description>
<bug-database rdf:resource="https://issues.apache.org/jira/browse/ISIS" />
<mailing-list rdf:resource="http://isis.apache.org/support.html" />
- <download-page rdf:resource="http://isis.apache.org/download.html" />
+ <download-page rdf:resource="http://isis.apache.org/downloads.html" />
<programming-language>Java</programming-language>
<category rdf:resource="http://projects.apache.org/category/web-framework" />
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/documentation.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/documentation.adoc b/adocs/documentation/src/main/asciidoc/documentation.adoc
index ef0ca8c..fb3db2f 100644
--- a/adocs/documentation/src/main/asciidoc/documentation.adoc
+++ b/adocs/documentation/src/main/asciidoc/documentation.adoc
@@ -74,7 +74,7 @@ pass:[<br/>]
* link:./guides/rgcfg/rgcfg.html[Core Config'n Properties^] image:{_imagesdir}PDF-50.png[width="20px" link="./guides/rgcfg/rgcfg.pdf"]
* link:./guides/rgcms/rgcms.html[Classes, Methods and Schema^] image:{_imagesdir}PDF-50.png[width="20px" link="./guides/rgcms/rgcms.pdf"]
* link:./guides/rgmvn/rgmvn.html[Apache Isis Maven plugin^] image:{_imagesdir}PDF-50.png[width="20px" link="./guides/rgmvn/rgmvn.pdf"]
-* link:./guides/rgfis/rgfis.html[Framework Internal Services^] image:{_imagesdir}PDF-50.png[width="20px" link="./guides/fwsvc/rgfis.pdf"]
+* link:./guides/rgfis/rgfis.html[Framework Internal Services^] image:{_imagesdir}PDF-50.png[width="20px" link="./guides/rgfis/rgfis.pdf"]
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_asciidoc-publish-procedure.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_asciidoc-publish-procedure.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_asciidoc-publish-procedure.adoc
index f0c9b34..97d7bbb 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_asciidoc-publish-procedure.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_asciidoc-publish-procedure.adoc
@@ -6,7 +6,7 @@
:toc: right
-Apache Isis' documentation (meaning the website and the users' guide, the reference guide and this contributors' guide) is written using link:http://www.methods.co.nz/asciidoc/[Asciidoc], specifically the link:asciidoctor.org/[Asciidoctor] implementation.
+Apache Isis' documentation (meaning the website and the users' guide, the reference guide and this contributors' guide) is written using link:http://www.methods.co.nz/asciidoc/[Asciidoc], specifically the link:http://asciidoctor.org/[Asciidoctor] implementation.
The website and guides are created by running build tools (documented below) which create the HTML version of the site and guides.
You can therefore easily check the documentation before raising a pull request (as a contributor) or publishing the site (if a committer).
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc
index 0bb3870..909e017 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc
@@ -236,7 +236,7 @@ Update the Apache Isis (asciidoc) website:
+
A search for `archetypeGroupId=org.apache.isis.archetype` should find these pages.
-* update the link:../doap_isis.rdf[DOAP RDF] file (which provides a machine-parseable description of the project) should also be updated with details of the new release. Validate using the http://www.w3.org/RDF/Validator/[W3C RDF Validator] service. +
+* update the link:../../doap_isis.rdf[DOAP RDF] file (which provides a machine-parseable description of the project) should also be updated with details of the new release. Validate using the http://www.w3.org/RDF/Validator/[W3C RDF Validator] service. +
+
For more information on DOAP files, see these http://projects.apache.org/doap.html[Apache policy docs].
@@ -409,8 +409,8 @@ git push
There are two libraries of modules, both non-ASF but open source, that should be released.
-* link:http://isisaddons.org[Isis Addons] - modules addressing technical concerns
-* link:http://catalog.incodehq.org[Incode Catalog] - modules for various generic business subdomains
+* link:http://www.isisaddons.org[Isis Addons] - modules addressing technical concerns
+* link:http://catalog.incode.org[Incode Catalog] - modules for various generic business subdomains
These each use a common parent, `org.incode:incode-parent`.
This must be released first, then both set of modules afterwards.
@@ -495,7 +495,7 @@ foreach -g incodehq/mavendeps sh bumpver_isis.sh 1.15.0-SNAPSHOT
[[__cgcom_post-release-successful_release-non-asf-modules_isisaddons]]
=== Release Isis Addons
-Once the Apache Isis release is available, all of the (non-ASF) link:http://isisaddons.org[Isis Addons] should also be released.
+Once the Apache Isis release is available, all of the (non-ASF) link:http://www.isisaddons.org[Isis Addons] should also be released.
Using this link:https://gist.github.com/danhaywood/21b5b885433fd8bc440da3fab88c91cb[gist] to invoke operations across all (or selected) addons:
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_release-process-for-interim-releases.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_release-process-for-interim-releases.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_release-process-for-interim-releases.adoc
index 4966537..e3fad43 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_release-process-for-interim-releases.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_release-process-for-interim-releases.adoc
@@ -8,11 +8,11 @@
The intent of an "interim" release is to allow a developer team to release their application based on a `-SNAPSHOT` version of the framework. Since `-SNAPSHOT` changes on a day-to-day basis, the idea is to tag a particular revision and to release this, thereby providing stability/traceability for the application being developed.
-Whereas xref:../cgcom/cgcom.adoc#_cgcom_cutting-a-release.adoc[formal release]s and xref:../cgcom/cgcom.adoc#_cgcom_relesae-process-for-snapshots.adoc[snapshot release]s are public (released through the Maven repository maintained by Apache Software Foundation), interim releases are non-public and rely on infrastructure provided by a developer team. The tagged release resides _not_ in the link:../downloads.adoc#_downloads_source_code[official Apache Isis git repository], but instead in a fork/clone maintained by the developer team.
+Whereas xref:../cgcom/cgcom.adoc#_cgcom_cutting-a-release.adoc[formal release]s and xref:../cgcom/cgcom.adoc#_cgcom_relesae-process-for-snapshots.adoc[snapshot release]s are public (released through the Maven repository maintained by Apache Software Foundation), interim releases are non-public and rely on infrastructure provided by a developer team. The tagged release resides _not_ in the xref:../../downloads.adoc#_downloads_source_code[official Apache Isis git repository], but instead in a fork/clone maintained by the developer team.
[NOTE]
====
-The procedure developed here was put together for the team working on the link:../powered-by.adoc#_powered-by_estatio[Estatio app], which maintains its own link:https://github.com/incodehq/isis[fork on github] and uses link:https://www.cloudbees.com/[CloudBees] as a Jenkins build server/private Maven repo.
+The procedure developed here was put together for the team working on the xref:../../pages/powered-by.adoc#_powered-by_estatio[Estatio app], which maintains its own link:https://github.com/incodehq/isis[fork on github] and uses link:https://www.cloudbees.com/[CloudBees] as a Jenkins build server/private Maven repo.
====
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/dg/_dg_agilej.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_agilej.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_agilej.adoc
index a951fa4..58fdf78 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_agilej.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_agilej.adoc
@@ -1,7 +1,7 @@
[[_dg_agilej]]
= Appendix: AgileJ
: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 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.
-:_basedir: ../../../
+:_basedir: ../../
:_imagesdir: images/
:toc: right
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-syntax.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-syntax.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-syntax.adoc
index 9c4d74c..72c11b1 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-syntax.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-syntax.adoc
@@ -17,7 +17,7 @@ For more info, see:
* link:https://powerman.name/doc/asciidoc[online cheat sheet]
-* link:http://asciidoctor.org/docs/user-manual/[asciidoctor online user manual]
+* link:http://asciidoctor.org/docs/user-manual[asciidoctor online user manual]
* link:http://www.methods.co.nz/asciidoc/userguide.html[asciidoc online user manual]
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc
index 44b6549..1be5bc2 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc-templates.adoc
@@ -393,7 +393,7 @@ for example:
== Link to Isis Addons
-Links to (non-ASF) link:http://isisaddons.org[Isis Addons]
+Links to (non-ASF) link:http://www.isisaddons.org[Isis Addons]
[cols="1,4a,2a", options="header"]
|===
@@ -403,11 +403,11 @@ Links to (non-ASF) link:http://isisaddons.org[Isis Addons]
|`adlinkaddons`
-|`(non-ASF) \link:\http://isisaddons.org[[Isis Addons]]`
+|`(non-ASF) \link:\http://www.isisaddons.org[[Isis Addons]]`
link to the Isis Addons website.
-|(non-ASF) link:http://isisaddons.org[Isis Addons]
+|(non-ASF) link:http://www.isisaddons.org[Isis Addons]
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc.adoc
index 02d3d79..da6e97e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc.adoc
@@ -8,7 +8,7 @@
-Apache Isis' documentation (meaning the website and the users' guide, the reference guide and this contributors' guide) is written using link:http://www.methods.co.nz/asciidoc/[Asciidoc], specifically the link:asciidoctor.org/[Asciidoctor] implementation.
+Apache Isis' documentation (meaning the website and the users' guide, the reference guide and this contributors' guide) is written using link:http://www.methods.co.nz/asciidoc/[Asciidoc], specifically the link:http://asciidoctor.org/[Asciidoctor] implementation.
The website and guides are created by running build tools (documented below) which create the HTML version of the site and guides.
You can therefore easily check the documentation before raising a pull request (as a contributor) or publishing the site (if a committer).
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc_instant-rebuild.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc_instant-rebuild.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc_instant-rebuild.adoc
index ac7c140..474b892 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc_instant-rebuild.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc_instant-rebuild.adoc
@@ -15,8 +15,8 @@ The ruby script, `monitor.rb` emulates the `mvn compile` command, regenerating a
To setup:
-* download and install ruby 2.0.0, from link:rubyinstaller.org/downloads[http://rubyinstaller.org/downloads/]
-* download devkit for the Ruby 2.0 installation, also from link:rubyinstaller.org/downloads[http://rubyinstaller.org/downloads/]. Then follow the link:https://github.com/oneclick/rubyinstaller/wiki/Development-Kit[installation instructions] on their wiki
+* download and install ruby 2.0.0, from link:http://rubyinstaller.org/downloads[http://rubyinstaller.org/downloads/]
+* download devkit for the Ruby 2.0 installation, also from link:http://rubyinstaller.org/downloads[http://rubyinstaller.org/downloads/]. Then follow the link:https://github.com/oneclick/rubyinstaller/wiki/Development-Kit[installation instructions] on their wiki
[NOTE]
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/dg/_dg_cmd-line.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_cmd-line.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_cmd-line.adoc
index 109d81b..7a00ae9 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_cmd-line.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_cmd-line.adoc
@@ -1,7 +1,7 @@
[[_dg_cmd-line]]
= Command Line and CI
: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 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.
-:_basedir: ../../../
+:_basedir: ../../
:_imagesdir: images/
:toc: right
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/dg/_dg_contributing.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_contributing.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_contributing.adoc
index 3db485b..a163046 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_contributing.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_contributing.adoc
@@ -113,9 +113,6 @@ why this is a problem, and how the patch fixes the problem when applied.
-Once your git repo is setup, the next thing you'll most likely want to do is to setup your development environment. See link:development-environment.html[here] for more details.
-
-
@@ -151,7 +148,7 @@ git checkout master
git pull –ff-only
</pre>
-If the `merge` or `pull` fails, it means that you must have made commits and there have been changes meanwhile on the remote `master`'s branch. You can use `gitk --all` to confirm. If this fails, see our link:git-cookbook.html[git cookbook] page for a procedure to retrospectively sort out this situation.
+If the `merge` or `pull` fails, it means that you must have made commits and there have been changes meanwhile on the remote `master`'s branch. You can use `gitk --all` to confirm. If this fails, see our xref:_dg_git-cookbook.adoc#[git cookbook] page for a procedure to retrospectively sort out this situation.
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips.adoc
index f0ed4c6..0761d43 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips.adoc
@@ -1,7 +1,7 @@
[[_dg_hints-and-tips]]
= Hints and Tips
: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 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.
-:_basedir: ../../../
+:_basedir: ../../
:_imagesdir: images/
:toc: right
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips_how-run-fixtures-on-app-startup.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips_how-run-fixtures-on-app-startup.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips_how-run-fixtures-on-app-startup.adoc
index cc930e4..ac02ae3 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips_how-run-fixtures-on-app-startup.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips_how-run-fixtures-on-app-startup.adoc
@@ -14,8 +14,8 @@ Use events?_
The standard approach is to use xref:../ugtst/ugtst.adoc#_ugtst_fixture-scripts[fixture scripts].
-These can be run in on start-up typically by being specified in the xref:rgcsm.adoc#_rgcsm_classes_AppManifest-bootstrapping[`AppManifest`], see for
-example the xref:ug.adoc#_ug_getting-started_simpleapp-archetype[SimpleApp archetype].
+These can be run in on start-up typically by being specified in the xref:rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[`AppManifest`], see for
+example the xref:../ugfun/ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype].
Alternatively just set "isis.fixtures" and "isis.persistor.datanucleus.install-fixtures" properties.
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide.adoc
index ca81d39..94ebaa8 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide.adoc
@@ -1,7 +1,7 @@
[[_dg_ide]]
= Using an IDE
: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 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.
-:_basedir: ../../../
+:_basedir: ../../
:_imagesdir: images/
:toc: right
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_eclipse.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_eclipse.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_eclipse.adoc
index 43ff34f..7f23381 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_eclipse.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_eclipse.adoc
@@ -1,7 +1,7 @@
[[_dg_ide_eclipse]]
= Developing using Eclipse
: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 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.
-:_basedir: ../../../
+:_basedir: ../../
:_imagesdir: images/
:toc: right
@@ -83,11 +83,11 @@ See the earlier section on xref:../ugfun/ugfun.adoc#_ugfun_getting-started_datan
Then, tell DataNucleus to use the project classpath:
-image::{_imagesdir}eclipse/eclipse-010-windows-preferences.png[width="750px",link="{_imagesdir}/appendices/dev-env/eclipse/eclipse-010-windows-preferences.png"]
+image::{_imagesdir}eclipse/eclipse-010-windows-preferences.png[width="750px",link="{_imagesdir}eclipse/eclipse-010-windows-preferences.png"]
When the enhancer runs, it will print out to the console:
-image::{_imagesdir}eclipse/eclipse-120-console.png[width="500px",link="{_imagesdir}/appendices/dev-env/eclipse/eclipse-120-console.png"]
+image::{_imagesdir}eclipse/eclipse-120-console.png[width="500px",link="{_imagesdir}eclipse/eclipse-120-console.png"]
[[__dg_ide_eclipse_workaround-for-path-limits]]
@@ -99,7 +99,7 @@ To fix this, we configure the enhancer to read from the `persistence.xml` file.
As a prerequisite, first make sure that your domain object model has a `persistence.xml` file. Then specify the `persistence-unit` in the project properties:
-image::{_imagesdir}eclipse/eclipse-025-project-properties.png[width="750px",link="{_imagesdir}/appendices/dev-env/eclipse/eclipse-025-project-properties.png"]
+image::{_imagesdir}eclipse/eclipse-025-project-properties.png[width="750px",link="{_imagesdir}eclipse/eclipse-025-project-properties.png.png"]
=== Workaround: If the enhancer fails
@@ -107,20 +107,20 @@ image::{_imagesdir}eclipse/eclipse-025-project-properties.png[width="750px",link
On occasion it appears that Eclipse can attempt to run two instances of the DataNucleus enhancer. This is probably due to multiple Eclipse builders being defined; we've noticed multiple entries in the Eclipse's `Debug` view:
-image::{_imagesdir}eclipse/eclipse-210-enhancer-fails-duplicates.png[width="600px",link="{_imagesdir}/appendices/dev-env/eclipse/eclipse-210-enhancer-fails-duplicates.png"]
+image::{_imagesdir}eclipse/eclipse-210-enhancer-fails-duplicates.png[width="600px",link="{_imagesdir}eclipse/eclipse-210-enhancer-fails-duplicates.png"]
At any rate, you'll know you've encountered this error if you see the following in the console:
-image::{_imagesdir}eclipse/eclipse-200-enhancer-fails-duplicates.png[width="600px",link="{_imagesdir}/appendices/dev-env/eclipse/eclipse-200-enhancer-fails-duplicates.png"]
+image::{_imagesdir}eclipse/eclipse-200-enhancer-fails-duplicates.png[width="600px",link="{_imagesdir}eclipse/eclipse-200-enhancer-fails-duplicates.png"]
The best solution is to remove DataNucleus support and then to re-add it:
-image::{_imagesdir}eclipse/eclipse-220-enhancer-fails-duplicates.png[width="600px",link="{_imagesdir}/appendices/dev-env/eclipse/eclipse-220-enhancer-fails-duplicates.png"]
+image::{_imagesdir}eclipse/eclipse-220-enhancer-fails-duplicates.png[width="600px",link="{_imagesdir}eclipse/eclipse-220-enhancer-fails-duplicates.png"]
If you consistently hit problems, then the final recourse is to disable the automatic enhancement and to remember to manually enhance your domain object model before each run.
@@ -161,7 +161,7 @@ In this section are a couple of options that will reduce the length of the chang
=== Setting up DCEVM
-link:github.com/dcevm/dcevm[DCEVM] enhances the JVM with true hot-swap adding/removing of methods as well as more
+link:http://github.com/dcevm/dcevm[DCEVM] enhances the JVM with true hot-swap adding/removing of methods as well as more
reliable hot swapping of the implementation of existing methods.
In the context of Apache Isis, this is very useful for contributed actions and mixins and also view models; you should
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
index 19bf9a7..5e422cd 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide_intellij.adoc
@@ -1,7 +1,7 @@
[[_dg_ide_intellij]]
= Developing using IntelliJ IDEA
: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 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.
-:_basedir: ../../../
+:_basedir: ../../
:_imagesdir: images/
:toc: right
@@ -649,7 +649,7 @@ image::{_imagesdir}intellij-idea/070-advanced/006-livereload-js.png[width="800px
[[__dg_ide_intellij_advanced_dcevm]]
=== Setting up DCEVM
-link:github.com/dcevm/dcevm[DCEVM] enhances the JVM with true hot-swap adding/removing of methods as well as more
+link:http://github.com/dcevm/dcevm[DCEVM] enhances the JVM with true hot-swap adding/removing of methods as well as more
reliable hot swapping of the implementation of existing methods.
In the context of Apache Isis, this is very useful for contributed actions and mixins and also view models; you should
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/dg/_dg_working-with-many-repos.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_working-with-many-repos.adoc b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_working-with-many-repos.adoc
index 1e39537..dc57c02 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg/_dg_working-with-many-repos.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg/_dg_working-with-many-repos.adoc
@@ -1,12 +1,12 @@
[[_dg_working-with-many-repos]]
= Appendix: Working with Many Repos
: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 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.
-:_basedir: ../../../
+:_basedir: ../../
:_imagesdir: images/
:toc: right
-Applications built with Apache Isis often (should) consist of multiple modules, each in separate git repositories. For example, there are the various (non-ASF) link:http://isisaddons.org[Isis Addons] that provide various cross-cutting concerns/technical services (security, mail-merge etc), as well the modules eg as provided by the (non-ASF) link:http://catalog.incode.org[Incode Catalog], which provides generic business subdomains (communication channels, documents etc).
+Applications built with Apache Isis often (should) consist of multiple modules, each in separate git repositories. For example, there are the various (non-ASF) link:http://www.isisaddons.org[Isis Addons] that provide various cross-cutting concerns/technical services (security, mail-merge etc), as well the modules eg as provided by the (non-ASF) link:http://catalog.incode.org[Incode Catalog], which provides generic business subdomains (communication channels, documents etc).
In addition, your own application may well be structured as a number of distinct modules (probably with the entities in each module being mapped to a different schema), and using such techniques as the xref:../ugfun/ugfun.adoc#_ugfun_building-blocks_events_domain-events[event bus] and xref:../ugfun/ugfun.adoc#_ugfun_building-blocks_types-of-domain-objects_mixins[mixins] so that these modules are decoupled from each other.
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc
index f9891c3..e0403a1 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout.adoc
@@ -28,7 +28,7 @@ The table below summarizes the annotation's attributes.
|`table`, `excel`, `calendar`, `map`, ...
|Which view is selected by default, if multiple views are available.
-See (non-ASF) link:http://isisaddons.org[Isis Addons] for further views.
+See (non-ASF) link:http://www.isisaddons.org[Isis Addons] for further views.
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc
index afb01c0..b5339b8 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-CollectionLayout_defaultView.adoc
@@ -5,7 +5,7 @@
:_imagesdir: images/
-The xref:../ugvw/ugvw.adoc#[Wicket viewer] allows additional views to be configured to render collections of objects; at the time of writing thesee include the (non-ASF) (non-ASF) link:http://isisaddons.org[Isis Addons]' (non-ASF) http://github.com/isisaddons/isis-wicket-excel[excel] view, the http://github.com/isisaddons/isis-wicket-fullcalendar2[fullcalendar2] view, and the http://github.com/isisaddons/isis-wicket-gmap3[gmap3] view. If the objects to be rendered have the correct "shape", then the appropriate view will be made available. For example, objects with a date can be rendered using `calendar`; objects with locations can be rendered using `map`.
+The xref:../ugvw/ugvw.adoc#[Wicket viewer] allows additional views to be configured to render collections of objects; at the time of writing thesee include the (non-ASF) (non-ASF) link:http://www.isisaddons.org[Isis Addons]' (non-ASF) http://github.com/isisaddons/isis-wicket-excel[excel] view, the http://github.com/isisaddons/isis-wicket-fullcalendar2[fullcalendar2] view, and the http://github.com/isisaddons/isis-wicket-gmap3[gmap3] view. If the objects to be rendered have the correct "shape", then the appropriate view will be made available. For example, objects with a date can be rendered using `calendar`; objects with locations can be rendered using `map`.
The `defaultView()` attribute is used to select which of these views should be used by default for a given collection.
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_nature.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_nature.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_nature.adoc
index fa84ef3..f97bf6d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_nature.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_nature.adoc
@@ -32,7 +32,7 @@ The service's actions are intended only to be listed in the REST API exposed by
The service and its actions are only intended to be invoked programmatically; they are a domain layer responsibility.
-The actual class name of the domain service is only rendered for the `VIEW`, `VIEW_MENU_ONLY` and `VIEW_REST_ONLY` natures. Thus, you might also want to adopt naming conventions for your domain classes so you can infer the nature from the class. For example, the naming convention adopted (by and large) by the (non-ASF) link:http://isisaddons.org[Isis Addons] is `ProgrammaticServices` or `Repository` as a suffix for `DOMAIN` services, and `Contributions` as a suffix for `VIEW_CONTRIBUTIONS_ONLY` services.
+The actual class name of the domain service is only rendered for the `VIEW`, `VIEW_MENU_ONLY` and `VIEW_REST_ONLY` natures. Thus, you might also want to adopt naming conventions for your domain classes so you can infer the nature from the class. For example, the naming convention adopted (by and large) by the (non-ASF) link:http://www.isisaddons.org[Isis Addons] is `ProgrammaticServices` or `Repository` as a suffix for `DOMAIN` services, and `Contributions` as a suffix for `VIEW_CONTRIBUTIONS_ONLY` services.
For example:
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Property.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Property.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Property.adoc
index a77b0c3..bda8795 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Property.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Property.adoc
@@ -7,7 +7,7 @@
The `@Property` annotation applies to properties collecting together all domain semantics within a single annotation.
-It is also possible to apply the annotation to actions of domain services that are acting as link:../../more-advanced-topics/how-to-01-062-How-to-decouple-dependencies-using-contributions.html[contributed properties].
+It is also possible to apply the annotation to actions of domain services that are acting as contributed properties.
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout.adoc
index eca9f7a..d585ba2 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PropertyLayout.adoc
@@ -111,7 +111,7 @@ public class ToDoItem {
}
----
-It is also possible to apply the annotation to actions of domain services that are acting as link:../../more-advanced-topics/how-to-01-062-How-to-decouple-dependencies-using-contributions.html[contributed properties].
+It is also possible to apply the annotation to actions of domain services that are acting as contributed properties.
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-XmlRootElement.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-XmlRootElement.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-XmlRootElement.adoc
index 47b0405..6d989a2 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-XmlRootElement.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-XmlRootElement.adoc
@@ -42,7 +42,7 @@ The memento string for view models is converted into a form compatible with use
xref:../rgsvc/rgsvc.adoc#_rgsvc_presentation-layer-spi_UrlEncodingService[`UrlEncodingService`], the default implementation of which
simply encodes to base 64. If the view model XML graph is too large to be serialized to a string, then an alternative
implementation (eg which maps XML strings to a GUID, say) can be configured using the technique described in
-xref:rg.adoc#_ugfun_how-tos_replacing-default-service-implementations[here] in the user guide.
+xref:../ugbtb/ugbtb.adoc#_ugbtb_hints-and-tips_replacing-default-service-implementations[here] in the user guide.
====
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_AppManifest-bootstrapping.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_AppManifest-bootstrapping.adoc b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_AppManifest-bootstrapping.adoc
index b200e09..302b1c7 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_AppManifest-bootstrapping.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgcms/_rgcms_classes_AppManifest-bootstrapping.adoc
@@ -77,7 +77,7 @@ public List<Class<?>> getModules() {
}
----
-As can be seen, the various (non-ASF) link:http://isisaddons.org[Isis Addons] modules also each provide a module class that can be easily referenced.
+As can be seen, the various (non-ASF) link:http://www.isisaddons.org[Isis Addons] modules also each provide a module class that can be easily referenced.
=== `getAdditionalServices()`
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_presentation-layer_ContentNegotiationService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_presentation-layer_ContentNegotiationService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_presentation-layer_ContentNegotiationService.adoc
index 59333e1..89b6b43 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_presentation-layer_ContentNegotiationService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_presentation-layer_ContentNegotiationService.adoc
@@ -34,7 +34,7 @@ What all that means is that, if the underlying entities change, we are required
This diagram illustrates the three options available:
-image::{_imagesdir}reference-services-spi/ContentNegotiationService/facade-choices.png[width="700px",link="{_imagesdir}reference-services-spi/ContentNegotiationService/facade-choices.png"]
+image::{_imagesdir}ContentNegotiationService/facade-choices.png[width="700px",link="{_imagesdir}ContentNegotiationService/facade-choices.png"]
@@ -151,7 +151,7 @@ application/xml;profile=urn:org.restfulobjects:repr-types/object;x-ro-domain-typ
will result in an XML serialization of that class:
-image::{_imagesdir}reference-services-spi/ContentNegotiationService/accept-xml.png[width="700px",link="{_imagesdir}reference-services-spi/ContentNegotiationService/accept-xml.png"]
+image::{_imagesdir}ContentNegotiationService/accept-xml.png[width="700px",link="{_imagesdir}ContentNegotiationService/accept-xml.png"]
while similarly hitting the same URL with an `Accept` header of:
@@ -163,7 +163,7 @@ application/json;profile=urn:org.restfulobjects:repr-types/object;x-ro-domain-ty
will result in the JSON serialization of that class:
-image::{_imagesdir}reference-services-spi/ContentNegotiationService/accept-json.png[width="700px",link="{_imagesdir}reference-services-spi/ContentNegotiationService/accept-json.png"]
+image::{_imagesdir}ContentNegotiationService/accept-json.png[width="700px",link="{_imagesdir}ContentNegotiationService/accept-json.png"]
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_presentation-layer_RepresentationService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_presentation-layer_RepresentationService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_presentation-layer_RepresentationService.adoc
index a3777d8..0eb19f9 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_presentation-layer_RepresentationService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgfis/_rgfis_presentation-layer_RepresentationService.adoc
@@ -15,7 +15,7 @@ The principal motivation is to allow more flexible representations to be generat
In all there are three domain services that can influence the representations generated: this service, xref:../rgfis/rgfis.adoc#_rgfis_presentation-layer_ContentNegotiationService[`ContentNegotiationService`]and the xref:../rgsvc/rgsvc.adoc#_rgsvc_presentation-layer-spi_ContentMappingService[`ContentMappingService`]. The diagram below shows how these collaborate:
-image::{_imagesdir}reference-services-spi/RepresentationService/service-collaborations.png[width="700px",link="{_imagesdir}reference-services-spi/RepresentationService/service-collaborations.png"]
+image::{_imagesdir}RepresentationService/service-collaborations.png[width="700px",link="{_imagesdir}RepresentationService/service-collaborations.png"]
The `RepresentationServiceForRestfulObjects` is the default implementation of this service; likewise `ContentNegotiationServiceXRoDomainType` is the default implementation of the `ContentNegotiationService`. If you inspect the source code you'll see that the default implementation of this service's primary responsibility is to generate the default Restful Objects representations. Therefore, if you what you want to do is to generate a _different _representation then in many cases replacing either this service _or_ the `ContentNegotiationService` will be equivalent (you'll notice that their SPIs are very similar).
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgfis/images/ContentNegotiationService/accept-json.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgfis/images/ContentNegotiationService/accept-json.png b/adocs/documentation/src/main/asciidoc/guides/rgfis/images/ContentNegotiationService/accept-json.png
new file mode 100644
index 0000000..84778e9
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/rgfis/images/ContentNegotiationService/accept-json.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgfis/images/ContentNegotiationService/accept-xml.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgfis/images/ContentNegotiationService/accept-xml.png b/adocs/documentation/src/main/asciidoc/guides/rgfis/images/ContentNegotiationService/accept-xml.png
new file mode 100644
index 0000000..cfd2ef1
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/rgfis/images/ContentNegotiationService/accept-xml.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgfis/images/ContentNegotiationService/facade-choices.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgfis/images/ContentNegotiationService/facade-choices.png b/adocs/documentation/src/main/asciidoc/guides/rgfis/images/ContentNegotiationService/facade-choices.png
new file mode 100644
index 0000000..c6d5814
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/rgfis/images/ContentNegotiationService/facade-choices.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgfis/images/ContentNegotiationService/facade-choices.pptx
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgfis/images/ContentNegotiationService/facade-choices.pptx b/adocs/documentation/src/main/asciidoc/guides/rgfis/images/ContentNegotiationService/facade-choices.pptx
new file mode 100644
index 0000000..ddeec7d
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/rgfis/images/ContentNegotiationService/facade-choices.pptx differ
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgfis/images/RepresentationService/service-collaborations.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgfis/images/RepresentationService/service-collaborations.png b/adocs/documentation/src/main/asciidoc/guides/rgfis/images/RepresentationService/service-collaborations.png
new file mode 100644
index 0000000..859e5dd
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/rgfis/images/RepresentationService/service-collaborations.png differ
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgfis/images/RepresentationService/service-collaborations.pptx
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgfis/images/RepresentationService/service-collaborations.pptx b/adocs/documentation/src/main/asciidoc/guides/rgfis/images/RepresentationService/service-collaborations.pptx
new file mode 100644
index 0000000..7522518
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/rgfis/images/RepresentationService/service-collaborations.pptx differ
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_intro.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_intro.adoc b/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_intro.adoc
index 594747d..35fdf85 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_intro.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_intro.adoc
@@ -1,7 +1,7 @@
[[_rgmvn_intro]]
= Introduction
: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 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.
-:_basedir: ../../../
+:_basedir: ../../
:_imagesdir: images/
:toc: right
@@ -88,6 +88,6 @@ We recommend the following:
* run the `xsd` plugin in a new `xsd` submodule; contributed actions are irrelevant for this particular goal; having a
separate submodule allows the configuration of both the `xsd` goal (to generate the XSD schemas) and any other XSD-related configuration to be kept in a single place.
-The xref:ug.adoc#_ug_getting-started_simpleapp-archetype[SimpleApp archetype] reflects these recommendations for
+The xref:../ugfun/ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] reflects these recommendations for
the `validate` and `swagger` goals. You can find an example of the `xsd` plugin in the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp] application.
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_swagger.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_swagger.adoc b/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_swagger.adoc
index 5958a95..eb00a97 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_swagger.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_swagger.adoc
@@ -1,7 +1,7 @@
[[_rgmvn_swagger]]
= `swagger` goal
: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 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.
-:_basedir: ../../../
+:_basedir: ../../
:_imagesdir: images/
:toc: right
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_validate.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_validate.adoc b/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_validate.adoc
index 51546a2..0ddebca 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_validate.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_validate.adoc
@@ -1,7 +1,7 @@
[[_rgmvn_validate]]
= `validate` goal
: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 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.
-:_basedir: ../../../
+:_basedir: ../../
:_imagesdir: images/
:toc: right
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_xsd.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_xsd.adoc b/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_xsd.adoc
index 174ef72..5a127d7 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_xsd.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgmvn/_rgmvn_xsd.adoc
@@ -1,7 +1,7 @@
[[_rgmvn_xsd]]
= `xsd` goal
: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 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.
-:_basedir: ../../../
+:_basedir: ../../
:_imagesdir: images/
:toc: right
@@ -280,7 +280,7 @@ The `xjc` profile is defined as:
<1> enabled _unless_ `skip.xjc` property specified
<2> specifies the directory that the XSD schemas were generated to by the `isis-maven-plugin`
<3> specify each of the XSDs to be processed
-<4> catalog file indicates the location of the referenced link:_rgcms_schema-common[common schema] XSDs.
+<4> catalog file indicates the location of the referenced xref:../rgcms/rgcms.adoc#_rgcms_schema-common[common schema] XSDs.
<5> the `build-helper-maven-plugin` adds the Java source generated by the `xjc` plugin so that it can be compiled and
packaged as any other code
<6> the location that the `xjc` plugin generates its source code.
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_DomainObjectContainer_object-creation-api.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_DomainObjectContainer_object-creation-api.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_DomainObjectContainer_object-creation-api.adoc
index bd9d6fa..05026ab 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_DomainObjectContainer_object-creation-api.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_core-domain-api_DomainObjectContainer_object-creation-api.adoc
@@ -34,7 +34,7 @@ container.persist(cust);
----
As an alternative to using `newTransientInstance(...)` or `mixin(...)`, you could also simply `new()` up the object.
-Doing this will not inject any domain services, but they can be injected manually using xref:rg .adoc#_rgsvc_core-domain-api_DomainObjectContainer_services-api[#injectServicesInto(...)`].
+Doing this will not inject any domain services, but they can be injected manually using xref:rg.adoc#_rgsvc_core-domain-api_DomainObjectContainer_services-api[#injectServicesInto(...)`].
[NOTE]
====
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api_BookmarkService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api_BookmarkService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api_BookmarkService.adoc
index 4a286b8..b441536 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api_BookmarkService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_integration-api_BookmarkService.adoc
@@ -23,7 +23,7 @@ For example, a `Bookmark` could be converted into a barcode, and then this used
``Bookmark``s are used by several other domain services as a means of storing areference to an arbitrary object
(a polymorphic relationship). For example, the (non-ASF)
-http://github.com/isisaddons/isis-module-auditing[Isis addons' auditing] module's implementation of
+http://github.com/isisaddons/isis-module-audit[Isis addons' auditing] module's implementation of
xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`] uses bookmarks to capture the object
that is being audited.
@@ -105,7 +105,7 @@ bookmark to capture the target object on which an action will be invoked subsequ
Bookmarks are also used by the (non-ASF) http://github.com/isisaddons/isis-module-publishing[Isis addons' publishing]
module's implementation of xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublishingService[`PublishingService`], and by the
-(non-ASF) http://github.com/isisaddons/isis-module-auditing[Isis addons' auditing] module's implementation of
+(non-ASF) http://github.com/isisaddons/isis-module-audit[Isis addons' auditing] module's implementation of
xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`].
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_ApplicationFeatureRepository.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_ApplicationFeatureRepository.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_ApplicationFeatureRepository.adoc
index 7ec18f7..e82cbbc 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_ApplicationFeatureRepository.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_metadata-api_ApplicationFeatureRepository.adoc
@@ -11,7 +11,7 @@ class members (collectively: "application features") of the domain classes withi
[TIP]
====
-This functionality was originally implemented as part of (non-ASF) link:http://isisaddons.org[Isis Addons] security
+This functionality was originally implemented as part of (non-ASF) link:http://www.isisaddons.org[Isis Addons] security
module, where the string representations of the various features are used to represent permissions.
====
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_testing_SudoService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_testing_SudoService.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_testing_SudoService.adoc
index 5036283..91acd83 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_testing_SudoService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc/_rgsvc_testing_SudoService.adoc
@@ -120,7 +120,7 @@ public interface SudoService {
<1> Called by `SudoService#sudo(...)`, prior to invoking its `Runnable` or `Callable`.
<2> Called by `SudoService#sudo(...)`, after its `Runnable` or `Callable` has been invoked.
-The names of these methods were chosen based on link:href:https://shiro.apache.org/static/1.2.6/apidocs/org/apache/shiro/subject/Subject.html#runAs-org.apache.shiro.subject.PrincipalCollection-[similar names within Shiro].
+The names of these methods were chosen based on link:https://shiro.apache.org/static/1.2.6/apidocs/org/apache/shiro/subject/Subject.html#runAs-org.apache.shiro.subject.PrincipalCollection-[similar names within Shiro].
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/ContentNegotiationService/accept-json.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/ContentNegotiationService/accept-json.png b/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/ContentNegotiationService/accept-json.png
deleted file mode 100644
index 84778e9..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/ContentNegotiationService/accept-json.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/ContentNegotiationService/accept-xml.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/ContentNegotiationService/accept-xml.png b/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/ContentNegotiationService/accept-xml.png
deleted file mode 100644
index cfd2ef1..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/ContentNegotiationService/accept-xml.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/ContentNegotiationService/facade-choices.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/ContentNegotiationService/facade-choices.png b/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/ContentNegotiationService/facade-choices.png
deleted file mode 100644
index c6d5814..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/ContentNegotiationService/facade-choices.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/ContentNegotiationService/facade-choices.pptx
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/ContentNegotiationService/facade-choices.pptx b/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/ContentNegotiationService/facade-choices.pptx
deleted file mode 100644
index ddeec7d..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/ContentNegotiationService/facade-choices.pptx and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/RepresentationService/service-collaborations.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/RepresentationService/service-collaborations.png b/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/RepresentationService/service-collaborations.png
deleted file mode 100644
index 859e5dd..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/RepresentationService/service-collaborations.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/RepresentationService/service-collaborations.pptx
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/RepresentationService/service-collaborations.pptx b/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/RepresentationService/service-collaborations.pptx
deleted file mode 100644
index 7522518..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/rgsvc/images/reference-services-spi/RepresentationService/service-collaborations.pptx and /dev/null differ
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips.adoc b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips.adoc
index 6286cf7..7bf516f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips.adoc
@@ -1,7 +1,7 @@
[[_ugbtb_hints-and-tips]]
= Hints and Tips
: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 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.
-:_basedir: ../../../
+:_basedir: ../../
:_imagesdir: images/
:toc: right
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips_are-you-sure.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips_are-you-sure.adoc b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips_are-you-sure.adoc
index be0e1b4..23f2348 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips_are-you-sure.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips_are-you-sure.adoc
@@ -29,7 +29,7 @@ public SimpleObject updateName(
This will render as:
-image::{_imagesdir}/hints-and-tips/action-semantics-are-you-sure.png[]
+image::{_imagesdir}hints-and-tips/action-semantics-are-you-sure.png[]
== Using a checkbox
@@ -38,7 +38,7 @@ An alternative approach (for all versions of the framework) is to require the en
For example:
-image::{_imagesdir}/hints-and-tips/are-you-sure.png[]
+image::{_imagesdir}hints-and-tips/are-you-sure.png[]
[NOTE]
====
@@ -47,13 +47,13 @@ Note that these screenshots shows an earlier version of the xref:../ugvw/ugvw.ad
If the user checks the box:
-image::{_imagesdir}/hints-and-tips/are-you-sure-happy-case.png[]
+image::{_imagesdir}hints-and-tips/are-you-sure-happy-case.png[]
then the action will complete.
However, if the user fails to check the box, then a validation message is shown:
-image::{_imagesdir}/hints-and-tips/are-you-sure-sad-case.png[]
+image::{_imagesdir}hints-and-tips/are-you-sure-sad-case.png[]
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips_how-to-implement-a-spellchecker.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips_how-to-implement-a-spellchecker.adoc b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips_how-to-implement-a-spellchecker.adoc
index 0a4274e..52ad23d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips_how-to-implement-a-spellchecker.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_hints-and-tips_how-to-implement-a-spellchecker.adoc
@@ -13,7 +13,7 @@ From this link:http://isis.markmail.org/thread/dduarjscrbnodfsi[thread] on the A
One way to implement is to use the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[event bus]:
-* Set up a xref:rgcsm.adoc#_rgcsm_classes_domainevent[domain event] xref:rgcsm.adoc#_rgcsm_classes_super_AbstractSubscriber[subscriber] that can veto the changes.
+* Set up a xref:rgcms.adoc#_rgcms_classes_domainevent[domain event] xref:rgcms.adoc#_rgcms_classes_super_AbstractSubscriber[subscriber] that can veto the changes.
* if the change is made through an action, you can use xref:../rgant/rgant.adoc#_rgant-Action_domainEvent[`@Action#domainEvent()`].
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_programming-model_finetuning.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_programming-model_finetuning.adoc b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_programming-model_finetuning.adoc
index cf77b50..6ef1299 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_programming-model_finetuning.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugbtb/_ugbtb_programming-model_finetuning.adoc
@@ -47,7 +47,7 @@ Suppose that you wanted to completely remove support for the (already deprecated
isis.reflector.facets.exclude=org.apache.isis.core.metamodel.facets.object.actionorder.annotation.ActionOrderFacetAnnotationFactory
----
-Or, suppose you wanted to use the example https://github.com/apache/isis/blob/master/mothballed/misc/metamodel/namefile/src/main/java/org/apache/isis/example/metamodel/namefile/facets/NameFileFacetFactory.java["namefile"] `FacetFactory` as part of your programming conventions, use:
+Or, suppose you wanted to use the example https://github.com/apache/isis/blob/master/mothballed/misc/metamodel/namefile/src/main/java/org/apache/isis/metamodel/example/facets/NameFileFacetFactory.java["namefile"] `FacetFactory` as part of your programming conventions, use:
[source,ini]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_building-blocks_types-of-domain-objects_domain-services.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_building-blocks_types-of-domain-objects_domain-services.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_building-blocks_types-of-domain-objects_domain-services.adoc
index 726c004..b13731e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_building-blocks_types-of-domain-objects_domain-services.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_building-blocks_types-of-domain-objects_domain-services.adoc
@@ -59,7 +59,7 @@ It's worth extending the xref:../ugfun/ugfun.adoc#_ugfun_core-concepts_philosoph
.The hexagonal architecture with Isis addons
image::{_imagesdir}core-concepts/philosophy/hexagonal-architecture-addons.png[width="700px"]
-The (non-ASF) link:http://isisaddons.org[Isis Addons] provide SPI implementations of the common cross-cutting concerns.
+The (non-ASF) link:http://www.isisaddons.org[Isis Addons] provide SPI implementations of the common cross-cutting concerns.
They also provide a number of APIs for domain objects to invoke (not shown in the diagram).
You can also write your own domain services as well, for example to interface with some external CMS system, say.
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_apache-isis-vs_event-sourcing.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_apache-isis-vs_event-sourcing.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_apache-isis-vs_event-sourcing.adoc
index 81c3208..a622e36 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_apache-isis-vs_event-sourcing.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_core-concepts_apache-isis-vs_event-sourcing.adoc
@@ -6,7 +6,7 @@
-The link:_ugfun_core-concepts_principles_apache-isis-vs_cqrs[CQRS architecture], discussed above, is often combined with _Event Sourcing_ pattern, though they are separate ideas.
+The xref:_ugfun_core-concepts_principles_apache-isis-vs_cqrs#[CQRS architecture], discussed above, is often combined with _Event Sourcing_ pattern, though they are separate ideas.
With event sourcing, each business operation emits a domain event (or possibly events) that allow other objects in the system to act accordingly.
For example, if a customer places an order then this might emit the `OrderPlacedEvent`.
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_getting-started_simpleapp-archetype.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_getting-started_simpleapp-archetype.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_getting-started_simpleapp-archetype.adoc
index 9ee535d..c2b51a9 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_getting-started_simpleapp-archetype.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_getting-started_simpleapp-archetype.adoc
@@ -234,7 +234,7 @@ To log in, use `sven/pass`.
== Modifying the App
-Once you are familiar with the generated app, you'll want to start modifying it. There is plenty of guidance on this site; check out the 'programming model how-tos' section on the main link:../documentation.html[documentation] page first).
+Once you are familiar with the generated app, you'll want to start modifying it. There is plenty of guidance on this site; check out the 'programming model how-tos' section on the main xref:../../documentation.adoc#[documentation] page first).
If you use IntelliJ IDEA or Eclipse, do also install the xref:../dg/dg.adoc#__dg_ide_intellij_live-templates[live templates (for IntelliJ)] / xref:../dg/dg.adoc#__dg_ide_eclipse_editor-templates[editor templates (for Eclipse)]; these will help you follow the Apache Isis naming conventions.
http://git-wip-us.apache.org/repos/asf/isis/blob/06a469f3/adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_jdo-mappings_1-to-m-bidirectional-relationships.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_jdo-mappings_1-to-m-bidirectional-relationships.adoc b/adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_jdo-mappings_1-to-m-bidirectional-relationships.adoc
index ee6f943..2f5ecd1 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_jdo-mappings_1-to-m-bidirectional-relationships.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugodn/_ugodn_jdo-mappings_1-to-m-bidirectional-relationships.adoc
@@ -209,8 +209,9 @@ public Batch transfer(final FermentationVessel vessel) {
It's not clear if this is a bug in `dn-core 4.1.7`/`dn-rdbms 4.19`; an earlier thread on the mailing list from 2014 actually gave
the opposite advice, see http://isis.markmail.org/thread/ipu2lzqqikqdglox[this thread] and in particular this http://markmail.org/message/hblptpw675mlw723[message].
-In fact we also have http://markmail.org/message/agnwmzocvdfht32f[a different case] which argues that the parent
-should only be set on the child, and the child _not_ added to the parent's collection. This concurs with the most recent testing.
+In fact we also have link:http://markmail.org/message/agnwmzocvdfht32f[a different case] which argues that the parent
+should only be set on the child, and the child _not_ added to the parent's collection.
+This concurs with the most recent testing.
====
Therefore, the simple advice is that, for bidirectional associations, simply set the parent on the child, and this will work