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 2019/06/02 16:48:39 UTC
[isis] 25/47: ISIS-2062: fixes xrefs for rgfis
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2062-antora
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 5708ec38a64635de479056cb433fcb08a6876992
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sun Jun 2 12:31:47 2019 +0100
ISIS-2062: fixes xrefs for rgfis
---
.../components/rg/modules/fis/pages/application-layer.adoc | 6 +++---
.../pages/application-layer/CommandDtoServiceInternal.adoc | 2 +-
.../application-layer/InteractionDtoServiceInternal.adoc | 2 +-
.../components/rg/modules/fis/pages/persistence-layer.adoc | 14 +++++++-------
.../pages/persistence-layer/AuditingServiceInternal.adoc | 6 +++---
.../persistence-layer/ChangedObjectsServiceInternal.adoc | 8 ++++----
.../pages/persistence-layer/PublishingServiceInternal.adoc | 6 +++---
.../rg/modules/fis/pages/presentation-layer.adoc | 6 +++---
.../presentation-layer/ContentNegotiationService.adoc | 2 +-
.../pages/presentation-layer/RepresentationService.adoc | 8 ++++----
.../svc/pages/application-layer-api/BackgroundService.adoc | 4 ++--
antora/components/rg/modules/svc/pages/intro.adoc | 8 ++++----
.../svc/pages/persistence-layer-api/MetricsService.adoc | 2 +-
.../svc/pages/persistence-layer-spi/PublisherService.adoc | 4 ++--
.../pages/presentation-layer-api/AcceptHeaderService.adoc | 2 +-
.../presentation-layer-spi/ContentMappingService.adoc | 6 +++---
.../rg/modules/svc/pages/testing/SudoService.adoc | 4 ++--
antora/components/ug/modules/vro/pages/architecture.adoc | 4 ++--
18 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/antora/components/rg/modules/fis/pages/application-layer.adoc b/antora/components/rg/modules/fis/pages/application-layer.adoc
index 5b672a0..c5657e3 100644
--- a/antora/components/rg/modules/fis/pages/application-layer.adoc
+++ b/antora/components/rg/modules/fis/pages/application-layer.adoc
@@ -24,7 +24,7 @@ Impl'n (g: a:)
-|xref:rg:fis:rgfis.adoc#_rgfis_application-layer_AuthenticationSessionProvider[`o.a.i.core.commons.` +
+|xref:rg:fis:application-layer/AuthenticationSessionProvider.adoc[`o.a.i.core.commons.` +
`authentication.` +
`AuthenticationSessionProvider`]
|Simply responsible for obtaining the current `AuthenticationSession` (the framework's internal representation of the currently logged-in user).
@@ -34,7 +34,7 @@ Impl'n (g: a:)
|Default implementation looks up from `IsisSessionFactory` singleton's thread-local
-|xref:rg:fis:rgfis.adoc#_rgfis_application-layer_CommandDtoServiceInternal[`o.a.i.c.m.s.command` +
+|xref:rg:fis:application-layer/CommandDtoServiceInternal.adoc[`o.a.i.c.m.s.command` +
`CommandDtoServiceInternal`]
|Creates memento of current action invocation, for use as a serializable XML reified command. The
most notable usage of this is to allow the execution of the `Command` to be deferred to run in the background (via
@@ -46,7 +46,7 @@ xref:rg:ant:Property/command.adoc[`@Property#commandExecuteIn()`].
|
-|xref:rg:fis:rgfis.adoc#_rgfis_application-layer_InteractionDtoServiceInternal[`o.a.i.c.m.s.ixn` +
+|xref:rg:fis:application-layer/InteractionDtoServiceInternal.adoc[`o.a.i.c.m.s.ixn` +
`InteractionDtoServiceInternal`]
|Creates DTO for the current execution of an action invocation or property edit, for use either as a reified command or for implementations of the xref:rg:svc:rgsvc.adoc#_rgsvc_persistence-layer-spi_PublisherService[`PublisherService`].
|`CommandDtoService-` +
diff --git a/antora/components/rg/modules/fis/pages/application-layer/CommandDtoServiceInternal.adoc b/antora/components/rg/modules/fis/pages/application-layer/CommandDtoServiceInternal.adoc
index 6dd2430..7d22ab4 100644
--- a/antora/components/rg/modules/fis/pages/application-layer/CommandDtoServiceInternal.adoc
+++ b/antora/components/rg/modules/fis/pages/application-layer/CommandDtoServiceInternal.adoc
@@ -51,5 +51,5 @@ The SPI is implemented by `o.a.i.c.r.s.command.CommandDtoServiceInternalServiceD
== Related Services
The design of this service is similar to that of
-xref:rg:fis:rgfis.adoc#_rgfis_application-layer_InteractionDtoServiceInternal[`InteractionDtoServiceInternal`], used to create the
+xref:rg:fis:application-layer/InteractionDtoServiceInternal.adoc[`InteractionDtoServiceInternal`], used to create the
`MemberExecutionDto` (from the xref:rg:cms:schema/ixn.adoc["ixn" schema]).
diff --git a/antora/components/rg/modules/fis/pages/application-layer/InteractionDtoServiceInternal.adoc b/antora/components/rg/modules/fis/pages/application-layer/InteractionDtoServiceInternal.adoc
index 6916cce..5fd3b89 100644
--- a/antora/components/rg/modules/fis/pages/application-layer/InteractionDtoServiceInternal.adoc
+++ b/antora/components/rg/modules/fis/pages/application-layer/InteractionDtoServiceInternal.adoc
@@ -38,5 +38,5 @@ The service is implemented by `o.a.i.core.runtime.services.ixn.InteractionDtoSer
== Related Services
The design of this service is similar to that of
-xref:rg:fis:rgfis.adoc#_rgfis_application-layer_CommandDtoServiceInternal[`CommandDtoServiceInternal`], used to create the `CommandDto`
+xref:rg:fis:application-layer/CommandDtoServiceInternal.adoc[`CommandDtoServiceInternal`], used to create the `CommandDto`
(from the xref:rg:cms:schema/cmd.adoc["cmd" schema]).
diff --git a/antora/components/rg/modules/fis/pages/persistence-layer.adoc b/antora/components/rg/modules/fis/pages/persistence-layer.adoc
index da43d97..075794a 100644
--- a/antora/components/rg/modules/fis/pages/persistence-layer.adoc
+++ b/antora/components/rg/modules/fis/pages/persistence-layer.adoc
@@ -24,23 +24,23 @@ Impl'n (g: a:)
-|xref:rg:fis:rgfis.adoc#_rgfis_persistence-layer_AuditingServiceInternal[`o.a.i.c.r.s.auditing.` +
+|xref:rg:fis:persistence-layer/AuditingServiceInternal.adoc[`o.a.i.c.r.s.auditing.` +
`AuditingServiceInternal`]
|Co-ordinates between
-xref:rg:fis:rgfis.adoc#_rgfis_persistence-layer_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`] and
-xref:rg:fis:rgfis.adoc#_rgfis_spi_AuditerService[`AuditerService`].
+xref:rg:fis:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`] and
+xref:rg:fis:spi/AuditerService.adoc[`AuditerService`].
|concrete class.
|
-|xref:rg:fis:rgfis.adoc#_rgfis_persistence-layer_ChangedObjectsServiceInternal[`o.a.i.c.r.s.changes.` +
+|xref:rg:fis:persistence-layer/ChangedObjectsServiceInternal.adoc[`o.a.i.c.r.s.changes.` +
`ChangedObjectsServiceInternal`]
|Request-scoped service holding objects enlisted into current transaction.
|concrete class.
|
-|xref:rg:fis:rgfis.adoc#_rgfis_persistence-layer_PersistenceSessionServiceInternal[`o.a.i.c.m.s.` +
+|xref:rg:fis:persistence-layer/PersistenceSessionServiceInternal.adoc[`o.a.i.c.m.s.` +
`persistsession.` +
`PersistenceSessionServiceInternal`]
|Acts as a facade to the underlying JDO persistence session / database connection. As such it provides methods for
@@ -51,10 +51,10 @@ querying and for persisting objects.
|
-|xref:rg:fis:rgfis.adoc#_rgfis_persistence-layer_PublishingServiceInternal[`o.a.i.c.m.s.publishing.` +
+|xref:rg:fis:persistence-layer/PublishingServiceInternal.adoc[`o.a.i.c.m.s.publishing.` +
`PublishingServiceInternal`]
|Co-ordinates between
-xref:rg:fis:rgfis.adoc#_rgfis_persistence-layer_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`] and
+xref:rg:fis:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`] and
xref:rg:svc:rgsvc.adoc#_rgsvc_persistence-layer-api_MetricsService[`MetricsService`] and the SPI services, and the
xref:rg:svc:rgsvc.adoc#_rgsvc_persistence-layer-spi_PublisherService[`PublisherService`].
|`PublishingService-` +
diff --git a/antora/components/rg/modules/fis/pages/persistence-layer/AuditingServiceInternal.adoc b/antora/components/rg/modules/fis/pages/persistence-layer/AuditingServiceInternal.adoc
index 13652d7..dce26e9 100644
--- a/antora/components/rg/modules/fis/pages/persistence-layer/AuditingServiceInternal.adoc
+++ b/antora/components/rg/modules/fis/pages/persistence-layer/AuditingServiceInternal.adoc
@@ -21,7 +21,7 @@ public class AuditingServiceInternal {
}
----
<1> minor performance optimization as to whether any auditing services are actually enabled; checks to see if any xref:rg:svc:rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`] are enabled.
-<2> uses the xref:rg:fis:rgfis.adoc#_rgfis_persistence-layer_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`] to obtain details of the changed properties, then call the configured xref:rg:svc:rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`](s).
+<2> uses the xref:rg:fis:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`] to obtain details of the changed properties, then call the configured xref:rg:svc:rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`](s).
The service implementation is `o.a.i.c.r.s.auditing.AuditingServiceInternal`.
@@ -34,7 +34,7 @@ Apache Isis' default implementation of `AuditingServiceInternal` class is automa
== Related Classes
-The service delegates between the (internal) xref:rg:fis:rgfis.adoc#_rgfis_persistence-layer_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`] domain service to the configured xref:rg:svc:rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`](s).
+The service delegates between the (internal) xref:rg:fis:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`] domain service to the configured xref:rg:svc:rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`](s).
If no such service(s) are configured, then _this_ service is in effect a no-op.
-The (internal) xref:rg:fis:rgfis.adoc#_rgfis_persistence-layer_PublishingServiceInternal[`PublishingServiceInternal`] performs a similar function for the xref:rg:svc:rgsvc.adoc#_rgsvc_persistence-layer-spi_PublisherService[`PublisherService`], also collating details of the changed objects from `ChangedObjectsServiceInternal`.
+The (internal) xref:rg:fis:persistence-layer/PublishingServiceInternal.adoc[`PublishingServiceInternal`] performs a similar function for the xref:rg:svc:rgsvc.adoc#_rgsvc_persistence-layer-spi_PublisherService[`PublisherService`], also collating details of the changed objects from `ChangedObjectsServiceInternal`.
diff --git a/antora/components/rg/modules/fis/pages/persistence-layer/ChangedObjectsServiceInternal.adoc b/antora/components/rg/modules/fis/pages/persistence-layer/ChangedObjectsServiceInternal.adoc
index 070eb6b..b054b94 100644
--- a/antora/components/rg/modules/fis/pages/persistence-layer/ChangedObjectsServiceInternal.adoc
+++ b/antora/components/rg/modules/fis/pages/persistence-layer/ChangedObjectsServiceInternal.adoc
@@ -4,7 +4,7 @@ include::_attributes.adoc[]
The `ChangedObjectsServiceInternal` class is an (internal) request-scoped domain service that is responsible for collecting the details of all changes to domain objects within an interaction.
-This is then used by various other (internal) domain services, notably xref:rg:fis:rgfis.adoc#_rgfis_persistence-layer_AuditingServiceInternal[`AuditingServiceInternal`] and xref:rg:fis:rgfis.adoc#_rgfis_persistence-layer_PublishingServiceInternal[`PublishingServiceInternal`].
+This is then used by various other (internal) domain services, notably xref:rg:fis:persistence-layer/AuditingServiceInternal.adoc[`AuditingServiceInternal`] and xref:rg:fis:persistence-layer/PublishingServiceInternal.adoc[`PublishingServiceInternal`].
@@ -33,9 +33,9 @@ public class ChangedObjectsServiceInternal {
----
<1> Enlists an object that has just been created, updated or deleted, capturing the pre-modification values of the properties.
<2> Used by the framework to determine whether to set the "persist hint" on the `Command` object (as per xref:rg:svc:rgsvc.adoc#_rgsvc_application-layer-api_CommandContext[`CommandContext`]).
-<3> Used by xref:rg:fis:rgfis.adoc#_rgfis_persistence-layer_PublishingServiceInternal[`PublishingServiceInternal`] to obtain details of and
+<3> Used by xref:rg:fis:persistence-layer/PublishingServiceInternal.adoc[`PublishingServiceInternal`] to obtain details of and
counters of all objects changed within the transaction.
-<4> Used by xref:rg:fis:rgfis.adoc#_rgfis_persistence-layer_AuditingServiceInternal[`AuditingServiceInternal`] to obtain all pairs of
+<4> Used by xref:rg:fis:persistence-layer/AuditingServiceInternal.adoc[`AuditingServiceInternal`] to obtain all pairs of
pre/post values of changed properties
<5> Called by the framework to for clean up after auditing and publishing has completed.
@@ -56,4 +56,4 @@ Apache Isis' default implementation of `ChangedObjectsServiceInternal` class is
== Related Classes
-Both the xref:rg:fis:rgfis.adoc#_rgfis_persistence-layer_AuditingServiceInternal[`AuditingServiceInternal`] and xref:rg:fis:rgfis.adoc#_rgfis_persistence-layer_PublishingServiceInternal[`PublishingServiceInternal`] (internal) domain services query this object.
+Both the xref:rg:fis:persistence-layer/AuditingServiceInternal.adoc[`AuditingServiceInternal`] and xref:rg:fis:persistence-layer/PublishingServiceInternal.adoc[`PublishingServiceInternal`] (internal) domain services query this object.
diff --git a/antora/components/rg/modules/fis/pages/persistence-layer/PublishingServiceInternal.adoc b/antora/components/rg/modules/fis/pages/persistence-layer/PublishingServiceInternal.adoc
index 63d95fc..5d4a854 100644
--- a/antora/components/rg/modules/fis/pages/persistence-layer/PublishingServiceInternal.adoc
+++ b/antora/components/rg/modules/fis/pages/persistence-layer/PublishingServiceInternal.adoc
@@ -7,7 +7,7 @@ The (internal) `PublishingServiceInternal` domain service acts as an internal fa
For published action invocations/ property edits, it provides an API for those member executions to call.
-For published objects, it provides an API for the framework to call at the end of the interaction; it obtains details of the changed objects (from the xref:rg:fis:rgfis.adoc#_rgfis_persistence-layer_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`]) and filters them to just those objects that are to be published; these are then passed through to any configured `PublisherService` implementations.
+For published objects, it provides an API for the framework to call at the end of the interaction; it obtains details of the changed objects (from the xref:rg:fis:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`]) and filters them to just those objects that are to be published; these are then passed through to any configured `PublisherService` implementations.
== SPI and Implementation
@@ -44,6 +44,6 @@ To use an alternative implementation, use xref:rg:ant:DomainServiceLayout/menuOr
== Related Classes
-The service delegates between the (internal) xref:rg:fis:rgfis.adoc#_rgfis_persistence-layer_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`] domain service to the configured xref:rg:svc:rgsvc.adoc#_rgsvc_persistence-layer-spi_PublisherService[`PublisherService`].
+The service delegates between the (internal) xref:rg:fis:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`] domain service to the configured xref:rg:svc:rgsvc.adoc#_rgsvc_persistence-layer-spi_PublisherService[`PublisherService`].
-The (internal) xref:rg:fis:rgfis.adoc#_rgfis_persistence-layer_AuditingServiceInternal[`AuditingServiceInternal`] performs a similar function for the xref:rg:svc:rgsvc.adoc#_rgsvc_persistence-layer-spi_PublisherService[`PublisherService`], also collating details of the changed objects from `ChangedObjectsServiceInternal`.
+The (internal) xref:rg:fis:persistence-layer/AuditingServiceInternal.adoc[`AuditingServiceInternal`] performs a similar function for the xref:rg:svc:rgsvc.adoc#_rgsvc_persistence-layer-spi_PublisherService[`PublisherService`], also collating details of the changed objects from `ChangedObjectsServiceInternal`.
diff --git a/antora/components/rg/modules/fis/pages/presentation-layer.adoc b/antora/components/rg/modules/fis/pages/presentation-layer.adoc
index aad1210..f8a412b 100644
--- a/antora/components/rg/modules/fis/pages/presentation-layer.adoc
+++ b/antora/components/rg/modules/fis/pages/presentation-layer.adoc
@@ -24,7 +24,7 @@ Impl'n (g: a:)
|Notes
-|xref:rg:fis:rgfis.adoc#_rgfis_presentation-layer_ContentNegotiationService[`o.a.i.v.ro.` +
+|xref:rg:fis:presentation-layer/ContentNegotiationService.adoc[`o.a.i.v.ro.` +
`rendering.service.conneg.` +
`ContentNegotiationService`]
|Encodes the algorithm that delegates to any registered xref:rg:svc:rgsvc.adoc#_rgsvc_presentation-layer-spi_ContentMappingService[`ContentMappingService`]s.
@@ -35,10 +35,10 @@ Impl'n (g: a:)
|
-|xref:rg:fis:rgfis.adoc#_rgfis_presentation-layer_RepresentationService[`o.a.i.v.ro.` +
+|xref:rg:fis:presentation-layer/RepresentationService.adoc[`o.a.i.v.ro.` +
`rendering.service.` +
`RepresentationService`]
-|Generates the representations, delegating to any registered xref:rg:fis:rgfis.adoc#_rgfis_presentation-layer_ContentNegotiationService[`ContentNegotiationService`]s.
+|Generates the representations, delegating to any registered xref:rg:fis:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`]s.
|`RepresentationService-` +
`ForRestfulObjects` +
``o.a.i.core`` +
diff --git a/antora/components/rg/modules/fis/pages/presentation-layer/ContentNegotiationService.adoc b/antora/components/rg/modules/fis/pages/presentation-layer/ContentNegotiationService.adoc
index 685dfa6..bb97142 100644
--- a/antora/components/rg/modules/fis/pages/presentation-layer/ContentNegotiationService.adoc
+++ b/antora/components/rg/modules/fis/pages/presentation-layer/ContentNegotiationService.adoc
@@ -202,4 +202,4 @@ To use an alternative implementation, use xref:rg:ant:DomainServiceLayout/menuOr
The default implementation of `ContentNegotiationService` delegates to xref:rg:svc:rgsvc.adoc#_rgsvc_presentation-layer-spi_ContentMappingService[`ContentMappingService`] (if present) to convert domain entities into a stable form (eg DTO).
-The `ContentNegotiationService` is itself called by the (default implementation of) xref:rg:fis:rgfis.adoc#_rgfis_presentation-layer_RepresentationService[`RepresentationService`].
\ No newline at end of file
+The `ContentNegotiationService` is itself called by the (default implementation of) xref:rg:fis:presentation-layer/RepresentationService.adoc[`RepresentationService`].
\ No newline at end of file
diff --git a/antora/components/rg/modules/fis/pages/presentation-layer/RepresentationService.adoc b/antora/components/rg/modules/fis/pages/presentation-layer/RepresentationService.adoc
index d3c43c9..a1f2e9e 100644
--- a/antora/components/rg/modules/fis/pages/presentation-layer/RepresentationService.adoc
+++ b/antora/components/rg/modules/fis/pages/presentation-layer/RepresentationService.adoc
@@ -8,10 +8,10 @@ include::_attributes.adoc[]
The `RepresentationService` is the main plug-in point for the xref:ug:vro:ugvro.adoc#[RestfulObjects viewer] to generate representations.
The default implementations ultimately generate representations according to the link:http://restfulobjects.org[Restful Objects spec] v1.0.
-However, it also delegates to the xref:rg:fis:rgfis.adoc#_rgfis_presentation-layer_ContentNegotiationService[`ContentNegotiationService`] which provides a mechanism for altering representations according to the HTTP `Accept` header.
+However, it also delegates to the xref:rg:fis:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`] which provides a mechanism for altering representations according to the HTTP `Accept` header.
This allows more flexible representations to be generated for REST clients that (perhaps through their use of a certain Javascript library, say) expect, or at least works best with, a certain style of representation.
-In all there are three domain services that can influence the representations generated: this service, xref:rg:fis:rgfis.adoc#_rgfis_presentation-layer_ContentNegotiationService[`ContentNegotiationService`] and the xref:rg:svc:rgsvc.adoc#_rgsvc_presentation-layer-spi_ContentMappingService[`ContentMappingService`].
+In all there are three domain services that can influence the representations generated: this service, xref:rg:fis:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`] and the xref:rg:svc:rgsvc.adoc#_rgsvc_presentation-layer-spi_ContentMappingService[`ContentMappingService`].
The diagram below shows how these collaborate:
image::RepresentationService/service-collaborations.png[width="700px",link="{imagesdir}RepresentationService/service-collaborations.png"]
@@ -77,7 +77,7 @@ ie `MemberReprMode`
== Implementation
As discussed in the introduction, the framework provides a default implementation, `o.a.i.v.ro.rendering.service.RepresentationServiceContentNegotiator`.
-This delegates to xref:rg:fis:rgfis.adoc#_rgfis_presentation-layer_ContentNegotiationService[`ContentNegotiationService`] to generate an alternative representation; but if none is provided then it falls back on generating the representations as defined in the link:http://restfulobjects.org[Restful Objects spec] v1.0.
+This delegates to xref:rg:fis:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`] to generate an alternative representation; but if none is provided then it falls back on generating the representations as defined in the link:http://restfulobjects.org[Restful Objects spec] v1.0.
To use an alternative implementation, use xref:rg:ant:DomainServiceLayout/menuOrder.adoc[`@DomainServiceLayout#menuOrder()`] (as explained in the xref:rg:svc:rgsvc.adoc#__rgsvc_intro_overriding-the-services[introduction] to this guide).
@@ -90,4 +90,4 @@ Apache Isis' default implementation of `RepresentationService` service is automa
== Related Services
-The default implementation delegates to xref:rg:fis:rgfis.adoc#_rgfis_presentation-layer_ContentNegotiationService[`ContentNegotiationService`], whose default implementation may delegate in turn to xref:rg:svc:rgsvc.adoc#_rgsvc_presentation-layer-spi_ContentMappingService[`ContentMappingService`] (if present).
\ No newline at end of file
+The default implementation delegates to xref:rg:fis:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`], whose default implementation may delegate in turn to xref:rg:svc:rgsvc.adoc#_rgsvc_presentation-layer-spi_ContentMappingService[`ContentMappingService`] (if present).
\ No newline at end of file
diff --git a/antora/components/rg/modules/svc/pages/application-layer-api/BackgroundService.adoc b/antora/components/rg/modules/svc/pages/application-layer-api/BackgroundService.adoc
index 371e376..6a5725a 100644
--- a/antora/components/rg/modules/svc/pages/application-layer-api/BackgroundService.adoc
+++ b/antora/components/rg/modules/svc/pages/application-layer-api/BackgroundService.adoc
@@ -9,7 +9,7 @@ The `BackgroundService2` is responsible for capturing a memento representing the
The default `BackgroundServiceDefault` implementation works by using a proxy wrapper around the target so that it can capture the action to invoke and its arguments.
-This is done using xref:rg:fis:rgfis.adoc#_rgfis_application-layer_CommandDtoServiceInternal[`CommandDtoServiceInternal`].
+This is done using xref:rg:fis:application-layer/CommandDtoServiceInternal.adoc[`CommandDtoServiceInternal`].
The persistence delegates the persistence of the memento to an appropriate implementation of the companion `BackgroundCommandService2`.
One such implementation of `BackgroundCommandService` is provided by (non-ASF) http://github.com/isisaddons/isis-module-command[Isis addons' command] module.
@@ -113,7 +113,7 @@ The latter is analogous to the way in which the `BackgroundCommandService` persi
The implementations of `CommandService` and `BackgroundCommandService` go together; typically both parent `Command`s and child background `Command`s will be persisted in the same way.
The (non-ASF) link:http://platform.incode.org[Incode Platform^]'s command module provides implementations of both (see xref:rg:svc:rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`] and xref:rg:svc:rgsvc.adoc#_rgsvc_application-layer-spi_BackgroundCommandService[`BackgroundCommandService`]).
-The xref:rg:fis:rgfis.adoc#_rgfis_application-layer_CommandDtoServiceInternal[`CommandDtoServiceInternal`] is used to obtain a memento of the command such that it can be persisted.
+The xref:rg:fis:application-layer/CommandDtoServiceInternal.adoc[`CommandDtoServiceInternal`] is used to obtain a memento of the command such that it can be persisted.
(In earlier versions, xref:rg:svc:rgsvc.adoc#_rgsvc_integration-api_MementoService[`MementoService`] was used for this purpose).
diff --git a/antora/components/rg/modules/svc/pages/intro.adoc b/antora/components/rg/modules/svc/pages/intro.adoc
index 6369d61..5f45d79 100644
--- a/antora/components/rg/modules/svc/pages/intro.adoc
+++ b/antora/components/rg/modules/svc/pages/intro.adoc
@@ -171,15 +171,15 @@ Whether this occurs depends on whether the action/property has been annotated (u
+
(Note that susbcribers will also receive events for vetoing the action/property; this is not shown on the diagram).
-* As each execution progresses, and objects that are modified are "enlisted" into the (internal) xref:rg:fis:rgfis.adoc#_rgfis_persistence-layer_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`] domain service.
+* As each execution progresses, and objects that are modified are "enlisted" into the (internal) xref:rg:fis:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`] domain service.
Metrics as to which objects are merely loaded into memory are also captured using the xref:rg:svc:rgsvc.adoc#_rgsvc_persistence-layer-api_MetricsService[`MetricsService`] (not shown on the diagram).
* At the end of each execution, details of that execution are published through the (internal)
-xref:rg:fis:rgfis.adoc#_rgfis_spi_PublisherServiceInternal[`PublisherServiceInternal`] domain service. This is only done for actions/properties annotated appropriate (with xref:rg:ant:Action/publishing.adoc[`@Action#publishing()`] or xref:rg:ant:Property/publishing.adoc[`@Property#publishing()`]).
+xref:rg:fis:spi/PublisherServiceInternal.adoc[`PublisherServiceInternal`] domain service. This is only done for actions/properties annotated appropriate (with xref:rg:ant:Action/publishing.adoc[`@Action#publishing()`] or xref:rg:ant:Property/publishing.adoc[`@Property#publishing()`]).
+
The internal service delegates in turn to any registered xref:rg:svc:rgsvc.adoc#_rgsvc_persistence-layer-spi_PublisherService[`PublisherService`]s (there may be more than one).
-* At the end of each transaction, details of all changed objects are published, again through the (internal) xref:rg:fis:rgfis.adoc#_rgfis_spi_PublisherServiceInternal[`PublisherServiceInternal`] to any registered `PublisherService` implementations.
+* At the end of each transaction, details of all changed objects are published, again through the (internal) xref:rg:fis:spi/PublisherServiceInternal.adoc[`PublisherServiceInternal`] to any registered `PublisherService` implementations.
Only domain objects specified to be published with xref:rg:ant:DomainObject/publishing.adoc[`@DomainObject#publishing()`] are published. +
+
[NOTE]
@@ -187,7 +187,7 @@ Only domain objects specified to be published with xref:rg:ant:DomainObject/publ
Note that it's possible for there to be more than one transaction per top-level interaction, by virtue of the xref:rg:svc:rgsvc.adoc#_rgsvc_application-layer-api_TransactionService[`TransactionService`].
====
-* Also at the end of each transaction, details of all changed properties are passed to any registered xref:rg:svc:rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`](s) by way of the (internal) xref:rg:fis:rgfis.adoc#_rgfis_persistence-layer_AuditingServiceInternal[`AuditingServiceInternal`] domain service.
+* Also at the end of each transaction, details of all changed properties are passed to any registered xref:rg:svc:rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`](s) by way of the (internal) xref:rg:fis:persistence-layer/AuditingServiceInternal.adoc[`AuditingServiceInternal`] domain service.
Implementations of xref:rg:svc:rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`] can use the `Command#getMemento()` method to obtain a XML equivalent of that `Command`, reified using the xref:rg:cms:schema/cmd.adoc[`cmd.xsd`] schema.
This can be converted back into a `CommandDto` using the `CommandDtoUtils` utility class (part of the applib).
diff --git a/antora/components/rg/modules/svc/pages/persistence-layer-api/MetricsService.adoc b/antora/components/rg/modules/svc/pages/persistence-layer-api/MetricsService.adoc
index 9e8453a..4cef63e 100644
--- a/antora/components/rg/modules/svc/pages/persistence-layer-api/MetricsService.adoc
+++ b/antora/components/rg/modules/svc/pages/persistence-layer-api/MetricsService.adoc
@@ -6,7 +6,7 @@ include::_attributes.adoc[]
The `MetricsService` is a request-scoped domain service that hooks into the JDO/DataNucleus ObjectStore to provide a number of counters relating to numbers of object loaded, dirtied etc.
-The service is used by the xref:rg:svc:rgsvc.adoc#_rgsvc_application-layer-api_InteractionContext[`InteractionContext`] domain service (to populate the DTO held by the `Interaction.Execution`) and also by the (internal) xref:rg:fis:rgfis.adoc#_rgfis_persistence-layer_PublishingServiceInternal[`PublishingServiceInternal`] domain service (to populate the `PublishedObjects` class.
+The service is used by the xref:rg:svc:rgsvc.adoc#_rgsvc_application-layer-api_InteractionContext[`InteractionContext`] domain service (to populate the DTO held by the `Interaction.Execution`) and also by the (internal) xref:rg:fis:persistence-layer/PublishingServiceInternal.adoc[`PublishingServiceInternal`] domain service (to populate the `PublishedObjects` class.
== API & Implementation
diff --git a/antora/components/rg/modules/svc/pages/persistence-layer-spi/PublisherService.adoc b/antora/components/rg/modules/svc/pages/persistence-layer-spi/PublisherService.adoc
index a82c9d3..227a8ea 100644
--- a/antora/components/rg/modules/svc/pages/persistence-layer-spi/PublisherService.adoc
+++ b/antora/components/rg/modules/svc/pages/persistence-layer-spi/PublisherService.adoc
@@ -120,9 +120,9 @@ To support these use cases several other services are involved:
* the xref:rg:svc:rgsvc.adoc#_rgsvc_application-layer-api_InteractionContext[`InteractionContext`] is used to obtain the `Interaction` from which the member executions are published.
-* the (internal) xref:rg:fis:rgfis.adoc#_rgfis_persistence-layer_ChangedObjectsServiceInternal[`ChangedObjectsServiceInternal`] domain service is used to obtain the set of objects modified throughout the transaction
+* the (internal) xref:rg:fis:persistence-layer/ChangedObjectsServiceInternal.adoc[`ChangedObjectsServiceInternal`] domain service is used to obtain the set of objects modified throughout the transaction
-* the (internal) xref:rg:fis:rgfis.adoc#_rgfis_spi_PublisherServiceInternal[`PublisherServiceInternal`] domain service filters these down to those changed objects that are also published (as per xref:rg:ant:DomainObject/publishing.adoc[`@DomainObject#publishing()`]) and delegates to the `PublisherService`.
+* the (internal) xref:rg:fis:spi/PublisherServiceInternal.adoc[`PublisherServiceInternal`] domain service filters these down to those changed objects that are also published (as per xref:rg:ant:DomainObject/publishing.adoc[`@DomainObject#publishing()`]) and delegates to the `PublisherService`.
* the xref:rg:svc:rgsvc.adoc#_rgsvc_persistence-layer-api_MetricsService[`MetricsService`] is used to obtain the objects that are loaded throughout the transaction; this info is used in order to instantiate the `PublishedObjects` object passed through to the `PublisherService`.
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-api/AcceptHeaderService.adoc b/antora/components/rg/modules/svc/pages/presentation-layer-api/AcceptHeaderService.adoc
index 0de2fa0..b0cf32f 100644
--- a/antora/components/rg/modules/svc/pages/presentation-layer-api/AcceptHeaderService.adoc
+++ b/antora/components/rg/modules/svc/pages/presentation-layer-api/AcceptHeaderService.adoc
@@ -8,7 +8,7 @@ simply exposes the HTTP `Accept` header to the domain. Its intended use is to s
[NOTE]
====
-As an alternative to performing content negotiation within the domain classes, the xref:rg:fis:rgfis.adoc#_rgfis_presentation-layer_ContentNegotiationService[`ContentNegotiationService`] and
+As an alternative to performing content negotiation within the domain classes, the xref:rg:fis:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`] and
xref:rg:svc:rgsvc.adoc#_rgsvc_presentation-layer-spi_ContentMappingService[`ContentMappingService`] SPI domain services allow the framework to perform the content negotiation responsibility.
====
diff --git a/antora/components/rg/modules/svc/pages/presentation-layer-spi/ContentMappingService.adoc b/antora/components/rg/modules/svc/pages/presentation-layer-spi/ContentMappingService.adoc
index 68e16ce..4bea768 100644
--- a/antora/components/rg/modules/svc/pages/presentation-layer-spi/ContentMappingService.adoc
+++ b/antora/components/rg/modules/svc/pages/presentation-layer-spi/ContentMappingService.adoc
@@ -4,9 +4,9 @@ include::_attributes.adoc[]
-The `ContentMappingService` supports the (default implementation of the) xref:rg:fis:rgfis.adoc#_rgfis_presentation-layer_ContentNegotiationService[`ContentNegotiationService`] enabling the xref:ug:vro:ugvro.adoc#[RestfulObjects viewer] to represent domain objects in some other format as specified by the HTTP `Accept` header.
+The `ContentMappingService` supports the (default implementation of the) xref:rg:fis:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`] enabling the xref:ug:vro:ugvro.adoc#[RestfulObjects viewer] to represent domain objects in some other format as specified by the HTTP `Accept` header.
-See xref:rg:fis:rgfis.adoc#_rgfis_presentation-layer_ContentNegotiationService[`ContentNegotiationService`] for further discussion.
+See xref:rg:fis:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`] for further discussion.
[NOTE]
@@ -72,6 +72,6 @@ public static class Util {
== Related Services
-This service is a companion to the default implementation of the xref:rg:fis:rgfis.adoc#_rgfis_presentation-layer_ContentNegotiationService[`ContentNegotiationService`].
+This service is a companion to the default implementation of the xref:rg:fis:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`].
The framework implementations of `ContentMappingService` use the xref:rgsvc.adoc#_rgsvc_metadata-api_MetamodelService[`MetaModelService`] to lookup any custom implementations of `CommandDtoProcessor`.
\ No newline at end of file
diff --git a/antora/components/rg/modules/svc/pages/testing/SudoService.adoc b/antora/components/rg/modules/svc/pages/testing/SudoService.adoc
index 8d5902b..334a4ae 100644
--- a/antora/components/rg/modules/svc/pages/testing/SudoService.adoc
+++ b/antora/components/rg/modules/svc/pages/testing/SudoService.adoc
@@ -30,7 +30,7 @@ which will run the provided block of code (a `Runnable` or a `Callable`) in a wa
`UserService#getUser()` will return the specified user (and roles, if specified).
(If roles are not specified, then the roles of the current user are preserved).
-The current user/role reported by the internal xref:rg:fis:rgfis.adoc#_rgfis_application-layer_AuthenticationSessionProvider[`AuthenticationSessionProvider`] will also return the specified user/roles.
+The current user/role reported by the internal xref:rg:fis:application-layer/AuthenticationSessionProvider.adoc[`AuthenticationSessionProvider`] will also return the specified user/roles.
[IMPORTANT]
====
@@ -67,7 +67,7 @@ protected void execute(final ExecutionContext ec) {
=== ACCESS_ALL_ROLE
-When `sudo(...)` is called the "effective user" is reported by both xref:rg:svc:rgsvc.adoc#_rgsvc_core-domain-api_UserService[`UserService`] and by xref:rg:fis:rgfis.adoc#_rgfis_application-layer_AuthenticationSessionProvider[`AuthenticationSessionProvider`], but does not propagate through to the xref:ug:sec:ugsec.adoc#[Shiro security mechanism].
+When `sudo(...)` is called the "effective user" is reported by both xref:rg:svc:rgsvc.adoc#_rgsvc_core-domain-api_UserService[`UserService`] and by xref:rg:fis:application-layer/AuthenticationSessionProvider.adoc[`AuthenticationSessionProvider`], but does not propagate through to the xref:ug:sec:ugsec.adoc#[Shiro security mechanism].
These continue to be evaluated according to the permissions of the current user.
This can be a problem in certain use cases.
diff --git a/antora/components/ug/modules/vro/pages/architecture.adoc b/antora/components/ug/modules/vro/pages/architecture.adoc
index f9c3d90..1114644 100644
--- a/antora/components/ug/modules/vro/pages/architecture.adoc
+++ b/antora/components/ug/modules/vro/pages/architecture.adoc
@@ -15,7 +15,7 @@ the `Content-Type` header which the client can use to know how to process the re
* `RepresentationService` +
+
-The xref:rg:fis:rgfis.adoc#_rgfis_presentation-layer_RepresentationService[`RepresentationService`] is an SPI domain service (plugin-point)
+The xref:rg:fis:presentation-layer/RepresentationService.adoc[`RepresentationService`] is an SPI domain service (plugin-point)
that allows an arbitrary representation to be generated for any of the resources defined in the RO spec. +
+
Normally this SPI service need not be replaced, because the default implementation
@@ -27,7 +27,7 @@ is able to handle the request (per the chain of responsibliity pattern).
* `ContentNegotiationService` +
+
As noted above, there can be multiple implementations of the
-xref:rg:fis:rgfis.adoc#_rgfis_presentation-layer_ContentNegotiationService[`ContentNegotiationService`], each one handling a particular
+xref:rg:fis:presentation-layer/ContentNegotiationService.adoc[`ContentNegotiationService`], each one handling a particular
HTTP `Accept` header. If the implementation does not recognize the value of the header, if can simply return `null`. +
+
The framework provides a number of implementations; an implementation that handles the