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/05/12 10:26:07 UTC

[18/18] isis git commit: ISIS-1594: updates domain service .adoc names and ids, so that the edit buttons are added correctly to subdocuments. Also some further minor improvements on scrolling.

ISIS-1594: updates domain service .adoc names and ids, so that the edit buttons are added correctly to subdocuments.  Also some further minor improvements on scrolling.


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/20b83ae7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/20b83ae7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/20b83ae7

Branch: refs/heads/master
Commit: 20b83ae7f212c0958eb34a78af605d855177139b
Parents: 1f92fdf
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri May 12 11:01:15 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri May 12 11:01:15 2017 +0100

----------------------------------------------------------------------
 adocs/documentation/check-includes.sh           |  23 ++
 .../asciidoc/guides/rgant/_rgant-Action.adoc    |  10 +-
 .../guides/rgant/_rgant-Action_command.adoc     |  16 +-
 .../guides/rgant/_rgant-Action_domainEvent.adoc |   8 +-
 .../guides/rgant/_rgant-Action_publishing.adoc  |   8 +-
 .../guides/rgant/_rgant-Action_semantics.adoc   |   2 +-
 .../guides/rgant/_rgant-Collection.adoc         |   2 +-
 .../rgant/_rgant-Collection_domainEvent.adoc    |   8 +-
 .../rgant/_rgant-Collection_notPersisted.adoc   |   2 +-
 .../guides/rgant/_rgant-Discriminator.adoc      |   4 +-
 .../guides/rgant/_rgant-DomainObject.adoc       |  18 +-
 .../guides/rgant/_rgant-DomainObjectLayout.adoc |   6 +-
 ...gant-DomainObjectLayout_cssClassUiEvent.adoc |   8 +-
 .../_rgant-DomainObjectLayout_iconUiEvent.adoc  |   8 +-
 .../_rgant-DomainObjectLayout_titleUiEvent.adoc |   8 +-
 .../rgant/_rgant-DomainObject_auditing.adoc     |   2 +-
 ...gant-DomainObject_createdLifecycleEvent.adoc |   8 +-
 ...rgant-DomainObject_loadedLifecycleEvent.adoc |   4 +-
 .../rgant/_rgant-DomainObject_objectType.adoc   |   4 +-
 ...nt-DomainObject_persistedLifecycleEvent.adoc |   4 +-
 ...t-DomainObject_persistingLifecycleEvent.adoc |   4 +-
 .../rgant/_rgant-DomainObject_publishing.adoc   |   8 +-
 ...ant-DomainObject_removingLifecycleEvent.adoc |   4 +-
 ...gant-DomainObject_updatedLifecycleEvent.adoc |   4 +-
 ...ant-DomainObject_updatingLifecycleEvent.adoc |   4 +-
 .../rgant/_rgant-DomainService_objectType.adoc  |   2 +-
 .../asciidoc/guides/rgant/_rgant-Inject.adoc    |   4 +-
 .../guides/rgant/_rgant-PersistenceCapable.adoc |   4 +-
 .../guides/rgant/_rgant-PostConstruct.adoc      |   4 +-
 .../guides/rgant/_rgant-PreDestroy.adoc         |   2 +-
 .../guides/rgant/_rgant-PrimaryKey.adoc         |   2 +-
 .../guides/rgant/_rgant-Programmatic.adoc       |   2 +-
 .../asciidoc/guides/rgant/_rgant-Property.adoc  |   2 +-
 .../rgant/_rgant-Property_domainEvent.adoc      |   6 +-
 .../rgant/_rgant-Property_notPersisted.adoc     |   2 +-
 .../rgant/_rgant-Property_publishing.adoc       |   4 +-
 .../guides/rgant/_rgant-RequestScoped.adoc      |   2 +-
 .../asciidoc/guides/rgant/_rgant-ViewModel.adoc |   2 +-
 .../rgant/_rgant-ViewModel_objectType.adoc      |   4 +-
 .../guides/rgant/_rgant-XmlJavaTypeAdapter.adoc |   2 +-
 .../guides/rgant/_rgant-XmlRootElement.adoc     |   4 +-
 .../asciidoc/guides/rgant/_rgant_aaa_jee.adoc   |   2 +-
 .../guides/rgcfg/_rgcfg_configuring-core.adoc   |  18 +-
 ...ms_classes_contributee_HasTransactionId.adoc |   2 +-
 .../rgcms/_rgcms_classes_domainevent.adoc       |   2 +-
 ...s_classes_domainevent_ActionDomainEvent.adoc |   4 +-
 .../guides/rgcms/_rgcms_classes_layout.adoc     |   2 +-
 .../rgcms/_rgcms_classes_lifecycleevent.adoc    |  12 +-
 ...asses_lifecycleevent_ObjectCreatedEvent.adoc |   2 +-
 ...ses_lifecycleevent_ObjectPersistedEvent.adoc |   2 +-
 ...es_lifecycleevent_ObjectPersistingEvent.adoc |   2 +-
 ...sses_lifecycleevent_ObjectRemovingEvent.adoc |   2 +-
 ...asses_lifecycleevent_ObjectUpdatedEvent.adoc |   2 +-
 ...sses_lifecycleevent_ObjectUpdatingEvent.adoc |   2 +-
 .../guides/rgcms/_rgcms_classes_mixins_Dto.adoc |   2 +-
 .../rgcms/_rgcms_classes_mixins_Object.adoc     |  10 +-
 .../_rgcms_classes_mixins_Persistable.adoc      |   2 +-
 .../_rgcms_classes_roles_HoldsUpdatedAt.adoc    |   2 +-
 ...s_classes_super_AbstractContainedObject.adoc |   4 +-
 ...gcms_classes_super_AbstractDomainObject.adoc |   2 +-
 .../_rgcms_classes_super_AbstractService.adoc   |   2 +-
 ..._rgcms_classes_super_AbstractSubscriber.adoc |   4 +-
 .../_rgcms_classes_super_FixtureScripts.adoc    |   4 +-
 .../guides/rgcms/_rgcms_classes_uievent.adoc    |   2 +-
 .../guides/rgcms/_rgcms_methods_lifecycle.adoc  |   2 +-
 .../rgcms/_rgcms_methods_lifecycle_created.adoc |   4 +-
 .../rgcms/_rgcms_methods_lifecycle_jdo-api.adoc |   4 +-
 .../rgcms/_rgcms_methods_lifecycle_loaded.adoc  |   2 +-
 .../_rgcms_methods_lifecycle_persisted.adoc     |   2 +-
 .../_rgcms_methods_lifecycle_persisting.adoc    |   2 +-
 .../rgcms/_rgcms_methods_lifecycle_removed.adoc |   2 +-
 .../_rgcms_methods_lifecycle_removing.adoc      |   2 +-
 .../rgcms/_rgcms_methods_lifecycle_updated.adoc |   2 +-
 .../_rgcms_methods_lifecycle_updating.adoc      |   2 +-
 .../rgcms/_rgcms_methods_prefixes_default.adoc  |   4 +-
 .../rgcms/_rgcms_methods_reserved_getId.adoc    |   2 +-
 .../rgcms/_rgcms_methods_reserved_title.adoc    |   2 +-
 .../guides/rgcms/_rgcms_schema-aim.adoc         |   2 +-
 .../guides/rgcms/_rgcms_schema-chg.adoc         |   2 +-
 .../guides/rgcms/_rgcms_schema-common.adoc      |   2 +-
 .../guides/rgcms/_rgcms_schema-ixn.adoc         |   4 +-
 .../guides/rgfis/_rgfis_application-layer.adoc  |  20 +-
 ...ion-layer_AuthenticationSessionProvider.adoc |  34 ++
 ...ication-layer_CommandDtoServiceInternal.adoc |  62 +++
 ...ion-layer_InteractionDtoServiceInternal.adoc |  44 ++
 ...tion-layer_MessageBrokerServiceInternal.adoc |  42 ++
 .../guides/rgfis/_rgfis_persistence-layer.adoc  |  30 +-
 ...rsistence-layer_AuditingServiceInternal.adoc |  54 +++
 ...nce-layer_ChangedObjectsServiceInternal.adoc |  69 ++++
 ...layer_PersistenceSessionServiceInternal.adoc |  96 +++++
 ...istence-layer_PublishingServiceInternal.adoc |  76 ++++
 ...-layer_TransactionStateProviderInternal.adoc |  38 ++
 .../guides/rgfis/_rgfis_presentation-layer.adoc |  12 +-
 ...ntation-layer_ContentNegotiationService.adoc | 204 ++++++++++
 ...resentation-layer_RepresentationService.adoc |  95 +++++
 .../_rgfis_spi_AuditingServiceInternal.adoc     |  54 ---
 ...rgfis_spi_AuthenticationSessionProvider.adoc |  34 --
 ...rgfis_spi_ChangedObjectsServiceInternal.adoc |  69 ----
 .../_rgfis_spi_CommandDtoServiceInternal.adoc   |  62 ---
 .../_rgfis_spi_ContentNegotiationService.adoc   | 204 ----------
 ...rgfis_spi_InteractionDtoServiceInternal.adoc |  44 --
 ..._rgfis_spi_MessageBrokerServiceInternal.adoc |  42 --
 ...s_spi_PersistenceSessionServiceInternal.adoc |  96 -----
 .../_rgfis_spi_PublishingServiceInternal.adoc   |  76 ----
 .../rgfis/_rgfis_spi_RepresentationService.adoc |  95 -----
 ...is_spi_TransactionStateProviderInternal.adoc |  38 --
 .../asciidoc/guides/rgmvn/_rgmvn_intro.adoc     |   4 +-
 .../asciidoc/guides/rgmvn/_rgmvn_swagger.adoc   |   2 +-
 .../main/asciidoc/guides/rgmvn/_rgmvn_xsd.adoc  |   4 +-
 .../rgsvc/_rgsvc_api_AcceptHeaderService.adoc   |  79 ----
 .../_rgsvc_api_ActionInvocationContext.adoc     |  99 -----
 ..._rgsvc_api_ApplicationFeatureRepository.adoc |  66 ---
 .../rgsvc/_rgsvc_api_BackgroundService.adoc     | 134 ------
 ...roundService_BackgroundCommandExecution.adoc |  25 --
 .../_rgsvc_api_BackgroundService_Quartz.adoc    | 162 --------
 .../rgsvc/_rgsvc_api_BookmarkService.adoc       | 125 ------
 .../_rgsvc_api_BulkInteractionContext.adoc      |   9 -
 .../guides/rgsvc/_rgsvc_api_ClockService.adoc   | 101 -----
 .../guides/rgsvc/_rgsvc_api_CommandContext.adoc | 243 -----------
 .../rgsvc/_rgsvc_api_ConfigurationService.adoc  |  94 -----
 .../rgsvc/_rgsvc_api_DeepLinkService.adoc       |  56 ---
 .../rgsvc/_rgsvc_api_DomainObjectContainer.adoc |  51 ---
 ...nObjectContainer_generic-repository-api.adoc |  84 ----
 ..._api_DomainObjectContainer_messages-api.adoc |  45 ---
 ...mainObjectContainer_object-creation-api.adoc |  47 ---
 ...nObjectContainer_object-persistence-api.adoc |  56 ---
 ..._DomainObjectContainer_presentation-api.adoc |  47 ---
 ...pi_DomainObjectContainer_properties-api.adoc |  50 ---
 ..._api_DomainObjectContainer_security-api.adoc |  47 ---
 ..._api_DomainObjectContainer_services-api.adoc |  36 --
 ...pi_DomainObjectContainer_validation-api.adoc |  28 --
 .../guides/rgsvc/_rgsvc_api_EmailService.adoc   | 122 ------
 .../rgsvc/_rgsvc_api_EventBusService.adoc       | 405 -------------------
 .../_rgsvc_api_ExecutionParametersService.adoc  |  30 --
 .../guides/rgsvc/_rgsvc_api_FactoryService.adoc |  79 ----
 .../rgsvc/_rgsvc_api_FixtureScriptsDefault.adoc |  50 ---
 .../rgsvc/_rgsvc_api_GuiceBeanProvider.adoc     |  91 -----
 .../_rgsvc_api_HomePageProviderService.adoc     |  40 --
 .../rgsvc/_rgsvc_api_InteractionContext.adoc    | 205 ----------
 .../guides/rgsvc/_rgsvc_api_IsisJdoSupport.adoc | 276 -------------
 .../guides/rgsvc/_rgsvc_api_JaxbService.adoc    |  68 ----
 .../guides/rgsvc/_rgsvc_api_LayoutService.adoc  | 107 -----
 .../guides/rgsvc/_rgsvc_api_MementoService.adoc | 146 -------
 .../guides/rgsvc/_rgsvc_api_MessageService.adoc |  74 ----
 .../rgsvc/_rgsvc_api_MetamodelService.adoc      |  68 ----
 .../guides/rgsvc/_rgsvc_api_MetricsService.adoc |  49 ---
 .../rgsvc/_rgsvc_api_QueryResultsCache.adoc     | 126 ------
 .../rgsvc/_rgsvc_api_RepositoryService.adoc     | 271 -------------
 .../guides/rgsvc/_rgsvc_api_Scratchpad.adoc     | 128 ------
 .../rgsvc/_rgsvc_api_ServiceRegistry.adoc       |  75 ----
 .../_rgsvc_api_SessionManagementService.adoc    |  56 ---
 .../guides/rgsvc/_rgsvc_api_SudoService.adoc    | 137 -------
 .../guides/rgsvc/_rgsvc_api_SwaggerService.adoc |  69 ----
 .../rgsvc/_rgsvc_api_SwitchUserService.adoc     |  42 --
 .../guides/rgsvc/_rgsvc_api_TitleService.adoc   |  74 ----
 .../rgsvc/_rgsvc_api_TransactionService.adoc    |  97 -----
 .../guides/rgsvc/_rgsvc_api_UserService.adoc    |  85 ----
 .../guides/rgsvc/_rgsvc_api_WrapperFactory.adoc | 162 --------
 .../rgsvc/_rgsvc_api_XmlSnapshotService.adoc    | 219 ----------
 .../rgsvc/_rgsvc_application-layer-api.adoc     |  52 +--
 ...plication-layer-api_AcceptHeaderService.adoc |  79 ++++
 ...ation-layer-api_ActionInvocationContext.adoc |  99 +++++
 ...application-layer-api_BackgroundService.adoc | 134 ++++++
 ...roundService_BackgroundCommandExecution.adoc |  25 ++
 ...tion-layer-api_BackgroundService_Quartz.adoc | 162 ++++++++
 ...cation-layer-api_BulkInteractionContext.adoc |   9 +
 ...vc_application-layer-api_CommandContext.adoc | 243 +++++++++++
 ...pplication-layer-api_InteractionContext.adoc | 205 ++++++++++
 ...vc_application-layer-api_MessageService.adoc |  74 ++++
 ...tion-layer-api_SessionManagementService.adoc |  56 +++
 ...gsvc_application-layer-api_TitleService.adoc |  74 ++++
 ...pplication-layer-api_TransactionService.adoc |  97 +++++
 ...vc_application-layer-api_WrapperFactory.adoc | 162 ++++++++
 .../rgsvc/_rgsvc_application-layer-spi.adoc     |  14 +-
 ...tion-layer-spi_BackgroundCommandService.adoc | 132 ++++++
 ...vc_application-layer-spi_CommandService.adoc | 121 ++++++
 ...ation-layer-spi_HomePageProviderService.adoc |  40 ++
 .../guides/rgsvc/_rgsvc_bootstrapping-spi.adoc  |   4 +-
 ...bootstrapping-spi_ClassDiscoveryService.adoc |  82 ++++
 .../guides/rgsvc/_rgsvc_core-domain-api.adoc    |  36 +-
 .../_rgsvc_core-domain-api_ClockService.adoc    | 101 +++++
 ...vc_core-domain-api_ConfigurationService.adoc |  94 +++++
 ...c_core-domain-api_DomainObjectContainer.adoc |  51 +++
 ...nObjectContainer_generic-repository-api.adoc |  84 ++++
 ...-api_DomainObjectContainer_messages-api.adoc |  45 +++
 ...mainObjectContainer_object-creation-api.adoc |  47 +++
 ...nObjectContainer_object-persistence-api.adoc |  56 +++
 ..._DomainObjectContainer_presentation-api.adoc |  47 +++
 ...pi_DomainObjectContainer_properties-api.adoc |  50 +++
 ...-api_DomainObjectContainer_security-api.adoc |  47 +++
 ...-api_DomainObjectContainer_services-api.adoc |  36 ++
 ...pi_DomainObjectContainer_validation-api.adoc |  28 ++
 .../_rgsvc_core-domain-api_EventBusService.adoc | 405 +++++++++++++++++++
 .../_rgsvc_core-domain-api_FactoryService.adoc  |  79 ++++
 .../_rgsvc_core-domain-api_Scratchpad.adoc      | 128 ++++++
 .../_rgsvc_core-domain-api_UserService.adoc     |  85 ++++
 .../guides/rgsvc/_rgsvc_integration-api.adoc    |  30 +-
 .../_rgsvc_integration-api_BookmarkService.adoc | 125 ++++++
 .../_rgsvc_integration-api_DeepLinkService.adoc |  56 +++
 .../_rgsvc_integration-api_EmailService.adoc    | 122 ++++++
 ...rgsvc_integration-api_GuiceBeanProvider.adoc |  91 +++++
 .../_rgsvc_integration-api_JaxbService.adoc     |  68 ++++
 .../_rgsvc_integration-api_MementoService.adoc  | 146 +++++++
 ...gsvc_integration-api_XmlSnapshotService.adoc | 219 ++++++++++
 .../asciidoc/guides/rgsvc/_rgsvc_intro.adoc     |  48 +--
 .../guides/rgsvc/_rgsvc_metadata-api.adoc       |  22 +-
 ...tadata-api_ApplicationFeatureRepository.adoc |  66 +++
 .../_rgsvc_metadata-api_LayoutService.adoc      | 107 +++++
 .../_rgsvc_metadata-api_MetamodelService.adoc   |  68 ++++
 .../_rgsvc_metadata-api_ServiceRegistry.adoc    |  75 ++++
 .../_rgsvc_metadata-api_SwaggerService.adoc     |  69 ++++
 .../rgsvc/_rgsvc_persistence-layer-api.adoc     |  18 +-
 ...vc_persistence-layer-api_IsisJdoSupport.adoc | 276 +++++++++++++
 ...vc_persistence-layer-api_MetricsService.adoc |  49 +++
 ...persistence-layer-api_QueryResultsCache.adoc | 126 ++++++
 ...persistence-layer-api_RepositoryService.adoc | 271 +++++++++++++
 .../rgsvc/_rgsvc_persistence-layer-spi.adoc     |  30 +-
 ...vc_persistence-layer-spi_AuditerService.adoc | 134 ++++++
 ...c_persistence-layer-spi_AuditingService.adoc |  83 ++++
 ...c_persistence-layer-spi_EventSerializer.adoc |  80 ++++
 ..._persistence-layer-spi_PublisherService.adoc | 165 ++++++++
 ...persistence-layer-spi_PublishingService.adoc | 204 ++++++++++
 ...tence-layer-spi_UserRegistrationService.adoc |  98 +++++
 .../rgsvc/_rgsvc_presentation-layer-spi.adoc    |  74 ++--
 ...ntation-layer-spi_ContentMappingService.adoc | 102 +++++
 ...tion-layer-spi_EmailNotificationService.adoc |  81 ++++
 ...ntation-layer-spi_ErrorReportingService.adoc | 106 +++++
 ...sentation-layer-spi_ExceptionRecognizer.adoc | 119 ++++++
 ...resentation-layer-spi_GridLoaderService.adoc |  53 +++
 ...gsvc_presentation-layer-spi_GridService.adoc |  72 ++++
 ...resentation-layer-spi_GridSystemService.adoc |  75 ++++
 ..._rgsvc_presentation-layer-spi_HintStore.adoc | 110 +++++
 ...c_presentation-layer-spi_LocaleProvider.adoc |  70 ++++
 ...c_presentation-layer-spi_RoutingService.adoc |  79 ++++
 ...ation-layer-spi_TableColumnOrderService.adoc |  49 +++
 ...esentation-layer-spi_TranslationService.adoc |  87 ++++
 ...entation-layer-spi_TranslationsResolver.adoc |  67 +++
 ...esentation-layer-spi_UrlEncodingService.adoc |  59 +++
 ...esentation-layer-spi_UserProfileService.adoc |  47 +++
 .../guides/rgsvc/_rgsvc_spi_AuditerService.adoc | 134 ------
 .../rgsvc/_rgsvc_spi_AuditingService.adoc       |  83 ----
 .../_rgsvc_spi_BackgroundCommandService.adoc    | 132 ------
 .../rgsvc/_rgsvc_spi_ClassDiscoveryService.adoc |  82 ----
 .../guides/rgsvc/_rgsvc_spi_CommandService.adoc | 121 ------
 .../rgsvc/_rgsvc_spi_ContentMappingService.adoc | 102 -----
 .../_rgsvc_spi_EmailNotificationService.adoc    |  81 ----
 .../rgsvc/_rgsvc_spi_ErrorReportingService.adoc | 106 -----
 .../rgsvc/_rgsvc_spi_EventSerializer.adoc       |  80 ----
 .../rgsvc/_rgsvc_spi_ExceptionRecognizer.adoc   | 119 ------
 ...spi_FixtureScriptsSpecificationProvider.adoc |  76 ----
 .../rgsvc/_rgsvc_spi_GridLoaderService.adoc     |  53 ---
 .../guides/rgsvc/_rgsvc_spi_GridService.adoc    |  72 ----
 .../rgsvc/_rgsvc_spi_GridSystemService.adoc     |  75 ----
 .../guides/rgsvc/_rgsvc_spi_HintStore.adoc      | 110 -----
 .../guides/rgsvc/_rgsvc_spi_LocaleProvider.adoc |  70 ----
 .../rgsvc/_rgsvc_spi_PublisherService.adoc      | 165 --------
 .../rgsvc/_rgsvc_spi_PublishingService.adoc     | 204 ----------
 .../guides/rgsvc/_rgsvc_spi_RoutingService.adoc |  79 ----
 .../_rgsvc_spi_TableColumnOrderService.adoc     |  49 ---
 .../rgsvc/_rgsvc_spi_TranslationService.adoc    |  87 ----
 .../rgsvc/_rgsvc_spi_TranslationsResolver.adoc  |  67 ---
 .../rgsvc/_rgsvc_spi_UrlEncodingService.adoc    |  59 ---
 .../rgsvc/_rgsvc_spi_UserProfileService.adoc    |  47 ---
 .../_rgsvc_spi_UserRegistrationService.adoc     |  98 -----
 .../asciidoc/guides/rgsvc/_rgsvc_testing.adoc   |  24 +-
 ...gsvc_testing_ExecutionParametersService.adoc |  30 ++
 .../_rgsvc_testing_FixtureScriptsDefault.adoc   |  50 +++
 ...ing_FixtureScriptsSpecificationProvider.adoc |  76 ++++
 .../rgsvc/_rgsvc_testing_SudoService.adoc       | 137 +++++++
 .../rgsvc/_rgsvc_testing_SwitchUserService.adoc |  42 ++
 .../guides/ugbtb/_ugbtb_deployment_tomcat.adoc  |   2 +-
 .../guides/ugbtb/_ugbtb_headless-access.adoc    |   2 +-
 ...dless-access_BackgroundCommandExecution.adoc |   6 +-
 ...ips_how-to-handle-void-and-null-results.adoc |   2 +-
 ...nd-tips_how-to-implement-a-spellchecker.adoc |   2 +-
 ..._hints-and-tips_transactions-and-errors.adoc |   8 +-
 ...ugbtb_hints-and-tips_vetoing-visibility.adoc |   2 +-
 .../main/asciidoc/guides/ugbtb/_ugbtb_i18n.adoc |   6 +-
 ...able-domain-services_framework-provided.adoc | 118 +++---
 .../ugfun/_ugfun_building-blocks_events.adoc    |   6 +-
 ...un_building-blocks_events_domain-events.adoc |   2 +-
 .../_ugfun_building-blocks_identifiers_oid.adoc |   8 +-
 ...ugfun_core-concepts_apache-isis-vs_cqrs.adoc |   4 +-
 ...-concepts_apache-isis-vs_event-sourcing.adoc |   2 +-
 ..._ugfun_core-concepts_deployment-options.adoc |   2 +-
 ...e-concepts_principles_for-the-long-term.adoc |   2 +-
 .../main/asciidoc/guides/ugfun/_ugfun_crud.adoc |   4 +-
 .../guides/ugfun/_ugfun_crud_deleting.adoc      |   4 +-
 .../guides/ugfun/_ugfun_crud_finding.adoc       |   6 +-
 .../guides/ugfun/_ugfun_crud_instantiating.adoc |   4 +-
 .../guides/ugfun/_ugfun_crud_persisting.adoc    |   4 +-
 .../guides/ugfun/_ugfun_crud_updating.adoc      |   4 +-
 ...model_domain-services_event-subscribers.adoc |   4 +-
 ..._domain-services_repository-and-factory.adoc |   2 +-
 ...g-model_domain-services_scoped-services.adoc |   2 +-
 ...ugfun_programming-model_inject-services.adoc |   2 +-
 ...ramming-model_mixins_programmatic-usage.adoc |   2 +-
 ...ing-model_view-models_dto_dto-consumers.adoc |   6 +-
 ...g-model_view-models_dto_generating-xsds.adoc |   2 +-
 ...gfun_programming-model_view-models_jaxb.adoc |   4 +-
 ...models_jaxb_referencing-domain-entities.adoc |   4 +-
 .../ugsec/_ugsec_api-for-applications.adoc      |   2 +-
 .../ugsec/_ugsec_usage-by-isis-viewers.adoc     |   2 +-
 .../src/main/asciidoc/guides/ugsec/ugsec.adoc   |   8 +-
 .../_ugtst_fixture-scripts_api-and-usage.adoc   |   6 +-
 ..._ugtst_integ-test-support_bootstrapping.adoc |   6 +-
 ...gtst_integ-test-support_wrapper-factory.adoc |   4 +-
 .../asciidoc/guides/ugtst/_ugtst_overview.adoc  |   2 +-
 .../guides/ugvro/_ugvro_architecture.adoc       |   6 +-
 .../asciidoc/guides/ugvro/_ugvro_ro-spec.adoc   |   2 +-
 .../ugvw/_ugvw_extending_custom-pages.adoc      |   4 +-
 .../ugvw/_ugvw_features_user-registration.adoc  |  10 +-
 ...ts-and-tips_i18n-label-in-wicket-viewer.adoc |   2 +-
 .../guides/ugvw/_ugvw_layout_file-based.adoc    |  10 +-
 .../guides/ugvw/_ugvw_layout_table-columns.adoc |   2 +-
 .../main/asciidoc/js/toc-scroll/toc-scroll.js   |   4 +-
 .../_migration-notes_1.10.0-to-1.11.0.adoc      |   6 +-
 .../_migration-notes_1.11.0-to-1.12.0.adoc      |   8 +-
 .../_migration-notes_1.12.0-to-1.13.0.adoc      |  22 +-
 ...tes_1.8.0-to-1.9.0_exception-recognizer.adoc |   2 +-
 ..._fixture-scripts-specification-provider.adoc |   2 +-
 .../_migration-notes_1.9.0-to-1.10.0.adoc       |   4 +-
 .../asciidoc/pages/screencasts/screencasts.adoc |   4 +-
 .../tg/_tg_stop-scaffolding-start-coding.adoc   |  16 +-
 .../release-notes/_release-notes_1.12.0.adoc    |  20 +-
 .../release-notes/_release-notes_1.13.0.adoc    |  12 +-
 adocs/template/document.html.erb                |   7 +-
 327 files changed, 8801 insertions(+), 8779 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/check-includes.sh
----------------------------------------------------------------------
diff --git a/adocs/documentation/check-includes.sh b/adocs/documentation/check-includes.sh
new file mode 100644
index 0000000..0bc1d56
--- /dev/null
+++ b/adocs/documentation/check-includes.sh
@@ -0,0 +1,23 @@
+
+root="src/main/asciidoc/guides/cgcom/cgcom.adoc"
+root="src"
+
+for adoc in $(find $root -name "*.adoc" -print) ; do
+
+    base_adoc=$(basename $adoc .adoc)
+    dir_adoc=$(dirname $adoc)
+
+    for incl in $(grep "^include::" $adoc ); do
+
+        match=$(echo $incl | grep "^include::_$base_adoc" )
+        if [ -z "$match" ] ; then 
+            match2=$(echo $incl | grep "^include::$base_adoc" )
+            if [ -z "$match2" ] ; then 
+                echo "$adoc : $incl"
+            fi
+        fi
+
+    done
+
+
+done

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action.adoc
index 907d042..3b8f5c9 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action.adoc
@@ -22,25 +22,25 @@ The table below summarizes the annotation's attributes.
 |`AS_CONFIGURED`, `ENABLED`, `DISABLED` +
 (`AS_CONFIGURED`)
 |whether the action invocation should be reified into a `o.a.i.applib.` +
-`services.command.Command` object through the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_CommandContext[`CommandContext`] service.
+`services.command.Command` object through the xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-api_CommandContext[`CommandContext`] service.
 
 
 |`commandExecuteIn()`
 |`FOREGROUND`,`BACKGROUND` +
 (`FOREGROUND`)
-|whether to execute the command immediately, or to persist it (assuming that an appropriate implementation of xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_CommandService[`CommandService`] has been configured) such that a background scheduler can execute the command asynchronously
+|whether to execute the command immediately, or to persist it (assuming that an appropriate implementation of xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`] has been configured) such that a background scheduler can execute the command asynchronously
 
 
 |`commandPersistence()`
 |`PERSISTED`, `NOT_PERSISTED`, `IF_HINTED` +
 (`PERSISTED`)
-|whether the reified `Command` (as provided by the `CommandContext` domain service) should actually be persisted (assuming an appropriate implementation of xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_CommandService[`CommandService`] has been configured).
+|whether the reified `Command` (as provided by the `CommandContext` domain service) should actually be persisted (assuming an appropriate implementation of xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`] has been configured).
 
 
 |xref:../rgant/rgant.adoc#_rgant-Action_domainEvent[`domainEvent()`]
 |subtype of `ActionDomainEvent` +
 (`ActionDomainEvent.Default`)
-|the event type to be posted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] to
+|the event type to be posted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] to
 broadcast the action's business rule checking (hide, disable, validate) and its invocation (pre-execute and
 post-execute).
 
@@ -62,7 +62,7 @@ Currently this is only supported for no-arg actions.
 |xref:../rgant/rgant.adoc#_rgant-Action_publishing[`publishing()`]
 |`AS_CONFIGURED`, `ENABLED`, `DISABLED` +
 (`AS_CONFIGURED`)
-|whether the action invocation should be published to the registered xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_PublishingService[`PublishingService`].
+|whether the action invocation should be published to the registered xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublishingService[`PublishingService`].
 
 |`publishing-` +
 `PayloadFactory()`

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_command.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_command.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_command.adoc
index 70bcb77..1c4bcc0 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_command.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_command.adoc
@@ -9,13 +9,13 @@ The `@Action(command=...)` attribute (and the related `@Action(commandPersistenc
 
 The annotation works with (and is influenced by the behaviour of) a number of domain services:
 
-* xref:../rgsvc/rgsvc.adoc#_rgsvc_api_CommandContext[`CommandContext`]
-* xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_CommandService[`CommandService`]
+* xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-api_CommandContext[`CommandContext`]
+* xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`]
 * xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_BackgroundService[`BackgroundService`] and
-* xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_BackgroundCommandService[`BackgroundCommandService`]
+* xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_BackgroundCommandService[`BackgroundCommandService`]
 
 
-Each action invocation is reified by the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_CommandContext[`CommandContext`] service into a `Command` object, capturing details of the target object, the action, the parameter arguments, the user, a timestamp and so on.
+Each action invocation is reified by the xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-api_CommandContext[`CommandContext`] service into a `Command` object, capturing details of the target object, the action, the parameter arguments, the user, a timestamp and so on.
 
 If an appropriate `CommandService` is configured (for example using (non-ASF) http://github.com/isisaddons/isis-module-command[Isis addons' command] module), then the `Command` itself is persisted.
 
@@ -28,7 +28,7 @@ If background ``Command``s are used, then an external scheduler, using xref:../u
 
 
 
-The `command()` attribute determines whether the action invocation should be reified into a `Command` object (by the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_CommandContext[`CommandContext`] service).
+The `command()` attribute determines whether the action invocation should be reified into a `Command` object (by the xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-api_CommandContext[`CommandContext`] service).
 
 The default is `AS_CONFIGURED`, meaning that the xref:../rgcfg/rgcfg.adoc#_rgcfg_configuring-core[configuration property] `isis.services.command.actions` is used to determine the whether the action is reified:
 
@@ -48,7 +48,7 @@ If there is no configuration property in `isis.properties` then all actions are
 
 [NOTE]
 ====
-Note: `Command` reification does not necessarily imply that `Command` objects will be persisted; that depends on whether there is a xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_CommandService[`CommandService`] configured that will persist said ``Command``s.
+Note: `Command` reification does not necessarily imply that `Command` objects will be persisted; that depends on whether there is a xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_CommandService[`CommandService`] configured that will persist said ``Command``s.
 ====
 
 This default can be overridden on an action-by-action basis; if `command()` is set to `ENABLED` then the action is reified irrespective of the configured value; if set to `DISABLED` then the action is NOT reified irrespective of the configured value.
@@ -86,7 +86,7 @@ public class Order {
 }
 ----
 
-will suppress the persistence of the `Command` object _unless_ a child background `Command` has been created in the body of the action by way of the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_BackgroundService[`BackgroundService`].
+will suppress the persistence of the `Command` object _unless_ a child background `Command` has been created in the body of the action by way of the xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-api_BackgroundService[`BackgroundService`].
 
 On the other hand:
 
@@ -112,7 +112,7 @@ will prevent the parent `Command` object from being persisted, _even if_ a child
 
 For persisted commands, the `commandExecuteIn()` attribute determines whether the `Command` should be executed in the foreground (the default) or executed in the background.
 
-Background execution means that the command is not executed immediately, but is available for a configured xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_BackgroundCommandService[`BackgroundCommandService`] to execute, eg by way of an in-memory scheduler such as Quartz.  See xref:../ugbtb/ugbtb.adoc#_ugbtb_headless-access_BackgroundCommandExecution[here] for further information on this topic.
+Background execution means that the command is not executed immediately, but is available for a configured xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-spi_BackgroundCommandService[`BackgroundCommandService`] to execute, eg by way of an in-memory scheduler such as Quartz.  See xref:../ugbtb/ugbtb.adoc#_ugbtb_headless-access_BackgroundCommandExecution[here] for further information on this topic.
 
 For example:
 

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_domainEvent.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_domainEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_domainEvent.adoc
index af488f5..289130e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_domainEvent.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_domainEvent.adoc
@@ -13,7 +13,7 @@ Whenever a domain object (or list of domain objects) is to be rendered, the fram
 * pre-execute phase: before the invocation of the action
 * post-execute: after the invocation of the action
 
-Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] using either link:https://github.com/google/guava[Guava] or link:http://www.axonframework.org/[Axon Framework] annotations and can influence each of these phases.
+Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] using either link:https://github.com/google/guava[Guava] or link:http://www.axonframework.org/[Axon Framework] annotations and can influence each of these phases.
 
 By default the event raised is `ActionDomainEvent.Default`. For example:
 
@@ -60,7 +60,7 @@ rather than through the constructor.  This substantially reduces the boilerplate
 
 == Subscribers
 
-Subscribers (which must be domain services) subscribe using either the link:https://github.com/google/guava[Guava] API or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] has been appropriately configured) using the link:http://www.axonframework.org/[Axon Framework] API.  The examples below use the Guava API.
+Subscribers (which must be domain services) subscribe using either the link:https://github.com/google/guava[Guava] API or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] has been appropriately configured) using the link:http://www.axonframework.org/[Axon Framework] API.  The examples below use the Guava API.
 
 Subscribers can be either coarse-grained (if they subscribe to the top-level event type):
 
@@ -155,8 +155,8 @@ then no event will be posted.
 
 == Raising events programmatically
 
-Normally events are only raised for interactions through the UI. However, events can be raised programmatically either by calling the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] API directly, or by emulating the UI by
-wrapping the target object using the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_WrapperFactory[`WrapperFactory`] domain service.
+Normally events are only raised for interactions through the UI. However, events can be raised programmatically either by calling the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] API directly, or by emulating the UI by
+wrapping the target object using the xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-api_WrapperFactory[`WrapperFactory`] domain service.
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_publishing.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_publishing.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_publishing.adoc
index 3c10f3c..f305d97 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_publishing.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_publishing.adoc
@@ -8,8 +8,8 @@
 
 
 The `publishing()` attribute determines whether and how an action invocation is published via the registered
-implementation of a xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_PublishingService[`PublishingService`]) or
-xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`].  This attribute is also
+implementation of a xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublishingService[`PublishingService`]) or
+xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublisherService[`PublisherService`].  This attribute is also
 supported for xref:../rgant/rgant.adoc#_rgant-DomainObject_publishing[domain objects], where it controls whether changed objects
 are published as events, and for xref:../rgant/rgant.adoc#_rgant_Property_publishing[`@Property#publishing()`], where it controls
 whether property edits are published as events.
@@ -62,8 +62,8 @@ this should avoid the necessity to query back for additional information.
 
 [WARNING]
 ====
-Be aware that this attribute is only honoured by the (deprecated) xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_PublishingService[`PublishingService`], so should itself be considered as deprecated.  It
-is ignored by the replacement xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`],
+Be aware that this attribute is only honoured by the (deprecated) xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublishingService[`PublishingService`], so should itself be considered as deprecated.  It
+is ignored by the replacement xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublisherService[`PublisherService`],
 ====
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_semantics.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_semantics.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_semantics.adoc
index 9a10041..7339495 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_semantics.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Action_semantics.adoc
@@ -66,7 +66,7 @@ public class Customer {
 }
 ----
 
-Actions that are safe and request-cacheable automatically use the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_QueryResultsCache[`QueryResultsCache`] service to cache the result of the method.  Note though that the results of this caching will only be apparent if the action is invoked from another method using the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_WrapperFactory[`WrapperFactory`] service.
+Actions that are safe and request-cacheable automatically use the xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-api_QueryResultsCache[`QueryResultsCache`] service to cache the result of the method.  Note though that the results of this caching will only be apparent if the action is invoked from another method using the xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-api_WrapperFactory[`WrapperFactory`] service.
 
 Continuing the example above, imagine code that loops over a set of ``Order``s where each `Order` has an associated `Customer`.  We want to check the credit rating of each `Customer` (a potentially expensive operation) but we don't want to do it more than once per `Customer`.  Invoking through the `WrapperFactory` will allow us to accomplish this by exploiting the semantics of `checkCredit()` action:
 

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection.adoc
index 6b508ce..07f6a50 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection.adoc
@@ -21,7 +21,7 @@ The table below summarizes the annotation's attributes.
 |xref:../rgant/rgant.adoc#_rgant-Collection_domainEvent[`domainEvent()`]
 |subtype of `CollectionDomainEvent` +
 (`CollectionDomainEvent.Default`)
-|the event type to be posted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] to broadcast the collection's business rule checking (hide, disable, validate) and its modification (before and after).
+|the event type to be posted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] to broadcast the collection's business rule checking (hide, disable, validate) and its modification (before and after).
 
 
 |xref:../rgant/rgant.adoc#_rgant-Collection_editing[`editing()`]

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_domainEvent.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_domainEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_domainEvent.adoc
index 801a584..e0d4398 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_domainEvent.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_domainEvent.adoc
@@ -13,7 +13,7 @@ Whenever a domain object (or list of domain objects) is to be rendered, the fram
 * pre-execute phase: before the modification of the collection
 * post-execute: after the modification of the collection
 
-Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] using either link:https://github.com/google/guava[Guava] or link:http://www.axonframework.org/[Axon Framework] annotations and can influence each of these phases.
+Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] using either link:https://github.com/google/guava[Guava] or link:http://www.axonframework.org/[Axon Framework] annotations and can influence each of these phases.
 
 
 [WARNING]
@@ -73,7 +73,7 @@ rather than through the constructor.  This substantially reduces the boilerplate
 
 == Subscribers
 
-Subscribers (which must be domain services) subscribe using either the link:https://github.com/google/guava[Guava] API or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] has been appropriately configured) using the link:http://www.axonframework.org/[Axon Framework] API.  The examples below use the Guava API.
+Subscribers (which must be domain services) subscribe using either the link:https://github.com/google/guava[Guava] API or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] has been appropriately configured) using the link:http://www.axonframework.org/[Axon Framework] API.  The examples below use the Guava API.
 
 Subscribers can be either coarse-grained (if they subscribe to the top-level event type):
 
@@ -166,8 +166,8 @@ then no event will be posted.
 
 == Raising events programmatically
 
-Normally events are only raised for interactions through the UI. However, events can be raised programmatically either by calling the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] API directly, or by emulating the UI by
-wrapping the target object using the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_WrapperFactory[`WrapperFactory`] domain service.
+Normally events are only raised for interactions through the UI. However, events can be raised programmatically either by calling the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] API directly, or by emulating the UI by
+wrapping the target object using the xref:../rgsvc/rgsvc.adoc#_rgsvc_application-layer-api_WrapperFactory[`WrapperFactory`] domain service.
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_notPersisted.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_notPersisted.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_notPersisted.adoc
index 0f6c19c..0a9b149 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_notPersisted.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Collection_notPersisted.adoc
@@ -6,7 +6,7 @@
 
 
 
-The (somewhat misnamed) `notPersisted()` attribute indicates that the collection should be excluded from any snapshots generated by the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_XmlSnapshotService[`XmlSnapshotService`].  This attribute is also supported for xref:../rgant/rgant.adoc#_rgant-Property_notPersisted[properties].
+The (somewhat misnamed) `notPersisted()` attribute indicates that the collection should be excluded from any snapshots generated by the xref:../rgsvc/rgsvc.adoc#_rgsvc_integration-api_XmlSnapshotService[`XmlSnapshotService`].  This attribute is also supported for xref:../rgant/rgant.adoc#_rgant-Property_notPersisted[properties].
 
 
 [WARNING]

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Discriminator.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Discriminator.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Discriminator.adoc
index 450534c..e0b29ec 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Discriminator.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Discriminator.adoc
@@ -21,12 +21,12 @@ This value is used internally to generate a string representation of an objects
 This can appear in several contexts, including:
 
 * as the value of `Bookmark#getObjectType()` and in the `toString()` value of `Bookmark`
- (see xref:../rgsvc/rgsvc.adoc#_rgsvc_api_BookmarkService[`BookmarkService`])
+ (see xref:../rgsvc/rgsvc.adoc#_rgsvc_integration-api_BookmarkService[`BookmarkService`])
  ** and thus in the "table-of-two-halves" pattern, as per (non-ASF) http://github.com/isisaddons/isis-module-poly[Isis addons' poly] module
 * in the serialization of `OidDto` in the xref:../rgcms/rgcms.adoc#_rgcms_schema-cmd[command] and xref:../rgcms/rgcms.adoc#_rgcms_schema-ixn[interaction] schemas
 * in the URLs of the xref:../ugvro/ugvro.adoc#[RestfulObjects viewer]
 * in the URLs of the xref:../ugvw/ugvw.adoc#[Wicket viewer] (in general and in particular if xref:../ugvw/ugvw.adoc#_ugvw_features_hints-and-copy-url[copying URLs])
-* in XML snapshots generated by the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_XmlSnapshotService[`XmlSnapshotService`]
+* in XML snapshots generated by the xref:../rgsvc/rgsvc.adoc#_rgsvc_integration-api_XmlSnapshotService[`XmlSnapshotService`]
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject.adoc
index acd363ac..d456528 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject.adoc
@@ -23,8 +23,8 @@ The table below summarizes the annotation's attributes.
 |`AS_CONFIGURED`, `ENABLED`, `DISABLED` +
 (`AS_CONFIGURED`)
 |indicates whether each of the changed properties of an object should be submitted to the registered
-xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_AuditingService[`AuditingService`] (deprecated) or (its replacement)
-xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_AuditerService[`AuditerService`]
+xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditingService[`AuditingService`] (deprecated) or (its replacement)
+xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditerService[`AuditerService`]
 
 
 |xref:../rgant/rgant.adoc#_rgant-DomainObject_autoCompleteRepository[`autoCompleteRepository()`]
@@ -47,7 +47,7 @@ xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_AuditerService[`AuditerService`]
 `LifecycleEvent()`]
 |subtype of `ObjectCreatedEvent` +
 (`ObjectCreatedEvent.Default`)
-|the event type to be posted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] whenever an instance is created
+|the event type to be posted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] whenever an instance is created
 
 |xref:../rgant/rgant.adoc#_rgant-DomainObject_editing[`editing()`]
 |`AS_CONFIGURED`, `ENABLED`, `DISABLED` +
@@ -76,18 +76,18 @@ The default "reserved" method name is `$$`.
 `LifecycleEvent()`]
 |subtype of `ObjectPersistedEvent` +
 (`ObjectPersistedEvent.Default`)
-|the event type to be posted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] whenever an instance has just been persisted
+|the event type to be posted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] whenever an instance has just been persisted
 
 |xref:../rgant/rgant.adoc#_rgant-DomainObject_persistingLifecycleEvent[`persisting-` +
 `LifecycleEvent()`]
 |subtype of `ObjectPersistingEvent` +
 (`ObjectPersistingEvent.Default`)
-|the event type to be posted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] whenever an instance is about to be persisted
+|the event type to be posted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] whenever an instance is about to be persisted
 
 |xref:../rgant/rgant.adoc#_rgant-DomainObject_publishing[`publishing()`]
 |`AS_CONFIGURED`, `ENABLED`, `DISABLED` +
 (`AS_CONFIGURED`)
-|whether changes to the object should be published to the registered xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_PublishingService[`PublishingService`].
+|whether changes to the object should be published to the registered xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublishingService[`PublishingService`].
 
 
 |`publishing-` +
@@ -99,19 +99,19 @@ The default "reserved" method name is `$$`.
 `LifecycleEvent()`]
 |subtype of `ObjectRemovingEvent` +
 (`ObjectRemovingEvent.Default`)
-|the event type to be posted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] whenever an instance is about to be deleted
+|the event type to be posted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] whenever an instance is about to be deleted
 
 |xref:../rgant/rgant.adoc#_rgant-DomainObject_updatedLifecycleEvent[`updated-` +
 `LifecycleEvent()`]
 |subtype of `ObjectUpdatedEvent` +
 (`ObjectUpdatedEvent.Default`)
-|the event type to be posted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] whenever an instance has just been updated
+|the event type to be posted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] whenever an instance has just been updated
 
 |xref:../rgant/rgant.adoc#_rgant-DomainObject_updatingLifecycleEvent[`updating-` +
 `LifecycleEvent()`]
 |subtype of `ObjectUpdatingEvent` +
 (`ObjectUpdatingEvent.Default`)
-|the event type to be posted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] whenever an instance is about to be updated
+|the event type to be posted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] whenever an instance is about to be updated
 
 |===
 

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout.adoc
index 7bef931..99035be 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout.adoc
@@ -51,7 +51,7 @@ The table below summarizes the annotation's attributes.
 |xref:../rgant/rgant.adoc#_rgant-DomainObjectLayout_cssClassUiEvent[`cssClassUiEvent()`]
 |subtype of `CssClassUiEvent` +
 (`CssClassUiEvent.Default`)
-|the event type to be posted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] to obtain a CSS class for the domain object.
+|the event type to be posted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] to obtain a CSS class for the domain object.
 
 |xref:../rgant/rgant.adoc#_rgant-DomainObjectLayout_describedAs[`describedAs()`]
 |String.
@@ -60,7 +60,7 @@ The table below summarizes the annotation's attributes.
 |xref:../rgant/rgant.adoc#_rgant-DomainObjectLayout_iconUiEvent[`iconUiEvent()`]
 |subtype of `IconUiEvent` +
 (`IconUiEvent.Default`)
-|the event type to be posted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] to obtain the icon (name) for the domain object.
+|the event type to be posted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] to obtain the icon (name) for the domain object.
 
 |xref:../rgant/rgant.adoc#_rgant-DomainObjectLayout_named[`named()`]
 |String.
@@ -82,7 +82,7 @@ A typical use case is if the desired name is a reserved Java keyword, such as `d
 |xref:../rgant/rgant.adoc#_rgant-DomainObjectLayout_titleUiEvent[`titleUiEvent()`]
 |subtype of `TitleUiEvent` +
 (`TitleUiEvent.Default`)
-|the event type to be posted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] to obtain the title for the domain object.
+|the event type to be posted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] to obtain the title for the domain object.
 
 |===
 

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_cssClassUiEvent.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_cssClassUiEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_cssClassUiEvent.adoc
index de5d393..dbaf844 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_cssClassUiEvent.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_cssClassUiEvent.adoc
@@ -10,7 +10,7 @@ in any wrapping ``<div>``s and ``<span>``s that render the domain object.  This
 xref:../rgcms/rgcms.adoc#_rgcms_methods_reserved_cssClass[`cssClass()`] reserved method.  (If `cssClass()` is present, then
 it will take precedence).
 
-Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] and can
+Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] and can
 use obtain a reference to the domain object from the event.  From this they can, if they wish, specify a CSS class for
 the domain object using the event's API.
 
@@ -56,7 +56,7 @@ The benefit is that subscribers can be more targeted as to the events that they
 == Subscribers
 
 Subscribers (which must be domain services) subscribe using either the link:https://github.com/google/guava[Guava] API
-or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] has been appropriately configured)
+or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] has been appropriately configured)
 using the link:http://www.axonframework.org/[Axon Framework] API.  The examples below use the Guava API.
 
 Subscribers can be either coarse-grained (if they subscribe to the top-level event type):
@@ -119,8 +119,8 @@ then no event will be posted.
 == Raising events programmatically
 
 Normally events are only raised for interactions through the UI. However, events can be raised programmatically either
-by calling the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] API directly, or as a result
-of calling the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_DomainObjectContainer[`DomainObjectContainer`]'s
+by calling the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] API directly, or as a result
+of calling the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_DomainObjectContainer[`DomainObjectContainer`]'s
 `cssClassOf(...)` method.
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_iconUiEvent.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_iconUiEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_iconUiEvent.adoc
index 418ed07..8a60a28 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_iconUiEvent.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_iconUiEvent.adoc
@@ -10,7 +10,7 @@ object (if possible). This is as an alternative to implementing
 xref:../rgcms/rgcms.adoc#_rgcms_methods_reserved_iconName[`iconName()`] reserved method.  (If `iconName()` is present, then
 it will take precedence).
 
-Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] and can
+Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] and can
 use obtain a reference to the domain object from the event.  From this they can, if they wish, specify an icon name for
 the domain object using the event's API.
 
@@ -57,7 +57,7 @@ The benefit is that subscribers can be more targeted as to the events that they
 == Subscribers
 
 Subscribers (which must be domain services) subscribe using either the link:https://github.com/google/guava[Guava] API
-or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] has been appropriately configured)
+or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] has been appropriately configured)
 using the link:http://www.axonframework.org/[Axon Framework] API.  The examples below use the Guava API.
 
 Subscribers can be either coarse-grained (if they subscribe to the top-level event type):
@@ -115,8 +115,8 @@ then no event will be posted.
 == Raising events programmatically
 
 Normally events are only raised for interactions through the UI. However, events can be raised programmatically either
-by calling the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] API directly, or as a result
-of calling the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_DomainObjectContainer[`DomainObjectContainer`]'s
+by calling the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] API directly, or as a result
+of calling the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_DomainObjectContainer[`DomainObjectContainer`]'s
 `iconNameOf(...)` method.
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_titleUiEvent.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_titleUiEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_titleUiEvent.adoc
index 12f13f7..9b27de4 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_titleUiEvent.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObjectLayout_titleUiEvent.adoc
@@ -10,7 +10,7 @@ This is as an alternative to implementing xref:../rgcms/rgcms.adoc#_rgcms_method
 using the xref:../rgant/rgant.adoc#_rgant-Title[`@Title`] annotation, within the class itself.  (If either
 `title()` or `@Title` are present, then they will take precedence).
 
-Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] and can
+Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] and can
 use obtain a reference to the domain object from the event.  From this they can, if they wish, specify a title for
 the domain object using the event's API.
 
@@ -56,7 +56,7 @@ The benefit is that subscribers can be more targeted as to the events that they
 == Subscribers
 
 Subscribers (which must be domain services) subscribe using either the link:https://github.com/google/guava[Guava] API
-or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] has been appropriately configured)
+or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] has been appropriately configured)
 using the link:http://www.axonframework.org/[Axon Framework] API.  The examples below use the Guava API.
 
 Subscribers can be either coarse-grained (if they subscribe to the top-level event type):
@@ -115,6 +115,6 @@ thn no event will be posted.
 == Raising events programmatically
 
 Normally events are only raised for interactions through the UI. However, events can be raised programmatically either
-by calling the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] API directly, or as a result
-of calling the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_DomainObjectContainer[`DomainObjectContainer`]'s
+by calling the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] API directly, or as a result
+of calling the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_DomainObjectContainer[`DomainObjectContainer`]'s
 `titleOf(...)` method.

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_auditing.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_auditing.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_auditing.adoc
index 82a0d41..f9610a8 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_auditing.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_auditing.adoc
@@ -6,7 +6,7 @@
 
 
 The `auditing()` attribute indicates that if the object is modified, then each of its changed properties should be
-submitted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_AuditingService[`AuditingService`] (if one has been configured), or to
+submitted to the xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_AuditingService[`AuditingService`] (if one has been configured), or to
 any
 
 The default value for the attribute is `AS_CONFIGURED`, meaning that the

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_createdLifecycleEvent.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_createdLifecycleEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_createdLifecycleEvent.adoc
index 71355d5..f3a58e7 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_createdLifecycleEvent.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_createdLifecycleEvent.adoc
@@ -5,11 +5,11 @@
 :_imagesdir: images/
 
 
-Whenever a domain object is instantiated or otherwise becomes known to the framework, a "created" lifecycle event is fired.  This is typically when the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_DomainObjectContainer[`DomainObjectContainer`]'s xref:../rgsvc/rgsvc.adoc#_rgsvc_api_DomainObjectContainer_object-creation-api[`newTransientInstance()`] is called;
+Whenever a domain object is instantiated or otherwise becomes known to the framework, a "created" lifecycle event is fired.  This is typically when the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_DomainObjectContainer[`DomainObjectContainer`]'s xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_DomainObjectContainer_object-creation-api[`newTransientInstance()`] is called;
 it will also happen if the object is simply instantiated with `new(...)`, and then the container's
-xref:../rgsvc/rgsvc.adoc#_rgsvc_api_DomainObjectContainer_services-api[`injectServicesInto(...)`] method is called.
+xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_DomainObjectContainer_services-api[`injectServicesInto(...)`] method is called.
 
-Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] and can
+Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] and can
 use the event to obtain a reference to the object just created.  The subscriber could then, for example, update the
 object, eg looking up state from some external datastore.
 
@@ -49,7 +49,7 @@ The benefit is that subscribers can be more targeted as to the events that they
 == Subscribers
 
 Subscribers (which must be domain services) subscribe using either the link:https://github.com/google/guava[Guava] API
-or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] has been appropriately configured)
+or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] has been appropriately configured)
 using the link:http://www.axonframework.org/[Axon Framework] API.  The examples below use the Guava API.
 
 Subscribers can be either coarse-grained (if they subscribe to the top-level event type):

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_loadedLifecycleEvent.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_loadedLifecycleEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_loadedLifecycleEvent.adoc
index 4c4536b..d064997 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_loadedLifecycleEvent.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_loadedLifecycleEvent.adoc
@@ -7,7 +7,7 @@
 
 Whenever a persistent domain object is loaded from the database, a "loaded" lifecycle event is fired.
 
-Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] and can
+Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] and can
 use the event to obtain a reference to the domain object just loaded.  The subscriber could then, for example, update
 or default values on the object (eg to support on-the-fly migration scenarios).
 
@@ -46,7 +46,7 @@ The benefit is that subscribers can be more targeted as to the events that they
 == Subscribers
 
 Subscribers (which must be domain services) subscribe using either the link:https://github.com/google/guava[Guava] API
-or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] has been appropriately configured)
+or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] has been appropriately configured)
 using the link:http://www.axonframework.org/[Axon Framework] API.  The examples below use the Guava API.
 
 Subscribers can be either coarse-grained (if they subscribe to the top-level event type):

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_objectType.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_objectType.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_objectType.adoc
index 78804b1..f922b54 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_objectType.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_objectType.adoc
@@ -11,12 +11,12 @@ This value is used internally to generate a string representation of an objects
 This can appear in several contexts, including:
 
 * as the value of `Bookmark#getObjectType()` and in the `toString()` value of `Bookmark`
- (see xref:../rgsvc/rgsvc.adoc#_rgsvc_api_BookmarkService[`BookmarkService`])
+ (see xref:../rgsvc/rgsvc.adoc#_rgsvc_integration-api_BookmarkService[`BookmarkService`])
  ** and thus in the "table-of-two-halves" pattern, as per (non-ASF) http://github.com/isisaddons/isis-module-poly[Isis addons' poly] module
 * in the serialization of `OidDto` in the xref:../rgcms/rgcms.adoc#_rgcms_schema-cmd[command] and xref:../rgcms/rgcms.adoc#_rgcms_schema-ixn[interaction] schemas
 * in the URLs of the xref:../ugvro/ugvro.adoc#[RestfulObjects viewer]
 * in the URLs of the xref:../ugvw/ugvw.adoc#[Wicket viewer] (in general and in particular if xref:../ugvw/ugvw.adoc#_ugvw_features_hints-and-copy-url[copying URLs])
-* in XML snapshots generated by the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_XmlSnapshotService[`XmlSnapshotService`]
+* in XML snapshots generated by the xref:../rgsvc/rgsvc.adoc#_rgsvc_integration-api_XmlSnapshotService[`XmlSnapshotService`]
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_persistedLifecycleEvent.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_persistedLifecycleEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_persistedLifecycleEvent.adoc
index a948b48..ce3b0ea 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_persistedLifecycleEvent.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_persistedLifecycleEvent.adoc
@@ -8,7 +8,7 @@
 Whenever a (just created, still transient) domain object has been saved (INSERTed in)to the database, a "persisted" lifecycle
 event is fired.
 
-Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] and can
+Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] and can
 use the event to obtain a reference to the domain object.  The subscriber could then, for example, maintain an
 external datastore.
 
@@ -52,7 +52,7 @@ The benefit is that subscribers can be more targeted as to the events that they
 == Subscribers
 
 Subscribers (which must be domain services) subscribe using either the link:https://github.com/google/guava[Guava] API
-or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] has been appropriately configured)
+or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] has been appropriately configured)
 using the link:http://www.axonframework.org/[Axon Framework] API.  The examples below use the Guava API.
 
 Subscribers can be either coarse-grained (if they subscribe to the top-level event type):

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_persistingLifecycleEvent.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_persistingLifecycleEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_persistingLifecycleEvent.adoc
index 20a5194..9d0b89d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_persistingLifecycleEvent.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_persistingLifecycleEvent.adoc
@@ -8,7 +8,7 @@
 Whenever a (just created, still transient) domain object is about to be saved (INSERTed in)to the database, a "persisting" lifecycle
 event is fired.
 
-Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] and can
+Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] and can
 use the event to obtain a reference to the domain object.  The subscriber could then, for example, update the object,
 or it could use it maintain an external datastore.  One possible application is to maintain a full-text search database using
 link:https://lucene.apache.org/[Apache Lucene] or similar.
@@ -55,7 +55,7 @@ The benefit is that subscribers can be more targeted as to the events that they
 == Subscribers
 
 Subscribers (which must be domain services) subscribe using either the link:https://github.com/google/guava[Guava] API
-or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] has been appropriately configured)
+or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] has been appropriately configured)
 using the link:http://www.axonframework.org/[Axon Framework] API.  The examples below use the Guava API.
 
 Subscribers can be either coarse-grained (if they subscribe to the top-level event type):

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_publishing.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_publishing.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_publishing.adoc
index b4263a4..7cd7f3d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_publishing.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_publishing.adoc
@@ -7,8 +7,8 @@
 
 
 The `publishing()` attribute determines whether and how a modified object instance is published via the registered
-implementation of a xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_PublishingService[`PublishingService`]) or
-xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`].  This attribute is also supported
+implementation of a xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublishingService[`PublishingService`]) or
+xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublisherService[`PublisherService`].  This attribute is also supported
 for xref:../rgant/rgant.adoc#_rgant-Action_publishing[actions], where it controls whether action invocations are published as
 events, and for xref:../rgant/rgant.adoc#_rgant_Property_publishing[`@Property#publishing()`], where it controls whether
 property edits are published as events.
@@ -58,6 +58,6 @@ this should avoid the necessity to query back for additional information.
 [WARNING]
 ====
 Be aware that this attribute is only honoured by the (deprecated)
-xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_PublishingService[`PublishingService`], so should itself be considered as deprecated.  It
-is ignored by the replacement xref:../rgsvc/rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`],
+xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublishingService[`PublishingService`], so should itself be considered as deprecated.  It
+is ignored by the replacement xref:../rgsvc/rgsvc.adoc#_rgsvc_persistence-layer-spi_PublisherService[`PublisherService`],
 ====

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_removingLifecycleEvent.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_removingLifecycleEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_removingLifecycleEvent.adoc
index fa7e0f2..8482838 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_removingLifecycleEvent.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_removingLifecycleEvent.adoc
@@ -8,7 +8,7 @@
 Whenever a (persistent) domain object is about to be removed (DELETEd) from the database, a "removing"
 lifecycle event is fired.
 
-Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] and can
+Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] and can
 use the event to obtain a reference to the domain object.  The subscriber could then, for example, could use it
 maintain an external datastore.  One possible application is to maintain a full-text search database
 using link:https://lucene.apache.org/[Apache Lucene] or similar.
@@ -55,7 +55,7 @@ The benefit is that subscribers can be more targeted as to the events that they
 == Subscribers
 
 Subscribers (which must be domain services) subscribe using either the link:https://github.com/google/guava[Guava] API
-or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] has been appropriately configured)
+or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] has been appropriately configured)
 using the link:http://www.axonframework.org/[Axon Framework] API.  The examples below use the Guava API.
 
 Subscribers can be either coarse-grained (if they subscribe to the top-level event type):

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_updatedLifecycleEvent.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_updatedLifecycleEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_updatedLifecycleEvent.adoc
index 6996a45..899d5f8 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_updatedLifecycleEvent.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_updatedLifecycleEvent.adoc
@@ -8,7 +8,7 @@
 Whenever a (persistent) domain object has been modified and has been updated in the database, an "updated" lifecycle
 event is fired.
 
-Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] and can
+Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] and can
 use the event to obtain a reference to the domain object.
 
 [WARNING]
@@ -51,7 +51,7 @@ The benefit is that subscribers can be more targeted as to the events that they
 == Subscribers
 
 Subscribers (which must be domain services) subscribe using either the link:https://github.com/google/guava[Guava] API
-or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] has been appropriately configured)
+or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] has been appropriately configured)
 using the link:http://www.axonframework.org/[Axon Framework] API.  The examples below use the Guava API.
 
 Subscribers can be either coarse-grained (if they subscribe to the top-level event type):

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_updatingLifecycleEvent.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_updatingLifecycleEvent.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_updatingLifecycleEvent.adoc
index d824947..cdd82a0 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_updatingLifecycleEvent.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainObject_updatingLifecycleEvent.adoc
@@ -8,7 +8,7 @@
 Whenever a (persistent) domain object has been modified and is about to be updated to the database, an "updating"
 lifecycle event is fired.
 
-Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] and can
+Subscribers subscribe through the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] and can
 use the event to obtain a reference to the domain object.  The subscriber could then, for example, update the object,
 or it could use it maintain an external datastore.  One possible application is to maintain a full-text search database
 using link:https://lucene.apache.org/[Apache Lucene] or similar.
@@ -55,7 +55,7 @@ The benefit is that subscribers can be more targeted as to the events that they
 == Subscribers
 
 Subscribers (which must be domain services) subscribe using either the link:https://github.com/google/guava[Guava] API
-or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] has been appropriately configured)
+or (if the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] has been appropriately configured)
 using the link:http://www.axonframework.org/[Axon Framework] API.  The examples below use the Guava API.
 
 Subscribers can be either coarse-grained (if they subscribe to the top-level event type):

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_objectType.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_objectType.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_objectType.adoc
index 0509a99..76da53b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_objectType.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-DomainService_objectType.adoc
@@ -11,7 +11,7 @@ This value is used internally to generate a string representation of an service
 This can appear in several contexts, including:
 
 * as the value of `Bookmark#getObjectType()` and in the `toString()` value of `Bookmark`
- (see xref:../rgsvc/rgsvc.adoc#_rgsvc_api_BookmarkService[`BookmarkService`])
+ (see xref:../rgsvc/rgsvc.adoc#_rgsvc_integration-api_BookmarkService[`BookmarkService`])
 * in the serialization of `OidDto` in the xref:../rgcms/rgcms.adoc#_rgcms_schema-cmd[command] and xref:../rgcms/rgcms.adoc#_rgcms_schema-ixn[interaction] schemas
 * in the URLs of the xref:../ugvro/ugvro.adoc#[RestfulObjects viewer]
 * in the URLs of the xref:../ugvw/ugvw.adoc#[Wicket viewer] (specifically, for bookmarked actions)

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Inject.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Inject.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Inject.adoc
index faebc82..2b34bd4 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Inject.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-Inject.adoc
@@ -94,7 +94,7 @@ public class Customer {
 
 [NOTE]
 ====
-An alternative and almost equivalent design would be to publish an event using the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] and implement the domain services as subscribers to
+An alternative and almost equivalent design would be to publish an event using the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`] and implement the domain services as subscribers to
 the event.  This alternative design is used in the (non-ASF) http://github.com/isisaddons/isis-module-poly[Isis addons' poly] module, for example.
 ====
 
@@ -114,7 +114,7 @@ Customer cust = container.newTransientInstance(Customer.class);  <1>
 // initialize state of "cust"
 container.persist(cust);
 ----
-<1> where `container` is an instance of xref:../rgsvc/rgsvc.adoc#_rgsvc_api_DomainObjectContainer[`DomainObjectContainer`].
+<1> where `container` is an instance of xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_DomainObjectContainer[`DomainObjectContainer`].
 
 View models are created similarly:
 

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PersistenceCapable.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PersistenceCapable.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PersistenceCapable.adoc
index f363421..0ac5778 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PersistenceCapable.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PersistenceCapable.adoc
@@ -22,12 +22,12 @@ This value is used internally to generate a string representation of an objects
 This can appear in several contexts, including:
 
 * as the value of `Bookmark#getObjectType()` and in the `toString()` value of `Bookmark`
- (see xref:../rgsvc/rgsvc.adoc#_rgsvc_api_BookmarkService[`BookmarkService`])
+ (see xref:../rgsvc/rgsvc.adoc#_rgsvc_integration-api_BookmarkService[`BookmarkService`])
  ** and thus in the "table-of-two-halves" pattern, as per (non-ASF) http://github.com/isisaddons/isis-module-poly[Isis addons' poly] module
 * in the serialization of `OidDto` in the xref:../rgcms/rgcms.adoc#_rgcms_schema-cmd[command] and xref:../rgcms/rgcms.adoc#_rgcms_schema-ixn[interaction] schemas
 * in the URLs of the xref:../ugvro/ugvro.adoc#[RestfulObjects viewer]
 * in the URLs of the xref:../ugvw/ugvw.adoc#[Wicket viewer] (in general and in particular if xref:../ugvw/ugvw.adoc#_ugvw_features_hints-and-copy-url[copying URLs])
-* in XML snapshots generated by the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_XmlSnapshotService[`XmlSnapshotService`]
+* in XML snapshots generated by the xref:../rgsvc/rgsvc.adoc#_rgsvc_integration-api_XmlSnapshotService[`XmlSnapshotService`]
 
 
 The actual format of the object type used by Apache Isis for the concatenation of `schema()` and `@PersistenceCapable#table()`.

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PostConstruct.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PostConstruct.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PostConstruct.adoc
index 7b5cba3..6717df7 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PostConstruct.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PostConstruct.adoc
@@ -33,10 +33,10 @@ Isis uses argument to pass in the configuration properties read from all xref:..
 
 [TIP]
 ====
-Alternatively, you could inject xref:../rgsvc/rgsvc.adoc#_rgsvc_api_DomainObjectContainer[`DomainObjectContainer`] into the service and read configuration properties using `DomainObjectContainer#getProperty(...)` and related methods.  Note that when using this latter API only those configuration properties prefixes `application.` key are provided.
+Alternatively, you could inject xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_DomainObjectContainer[`DomainObjectContainer`] into the service and read configuration properties using `DomainObjectContainer#getProperty(...)` and related methods.  Note that when using this latter API only those configuration properties prefixes `application.` key are provided.
 ====
 
-A common use case is for domain services that interact with the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`].  For example:
+A common use case is for domain services that interact with the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`].  For example:
 
 [source,java]
 ----

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PreDestroy.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PreDestroy.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PreDestroy.adoc
index 13c6c0b..6113acf 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PreDestroy.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PreDestroy.adoc
@@ -21,7 +21,7 @@ public void deinit() { ... }    <2>
 <1> It is not necessary to annotate the method with xref:../rgant/rgant.adoc#_rgant-Programmatic[`@Programmatic`]; it will be automatically excluded from the Apache Isis metamodel.
 <2> the method can have any name, but must have `public` visibility, and accept no arguments.
 
-A common use case is for domain services that interact with the xref:../rgsvc/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`].  For example:
+A common use case is for domain services that interact with the xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_EventBusService[`EventBusService`].  For example:
 
 [source,java]
 ----

http://git-wip-us.apache.org/repos/asf/isis/blob/20b83ae7/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PrimaryKey.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PrimaryKey.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PrimaryKey.adoc
index 4bbfbb9..064c8dc 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PrimaryKey.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant/_rgant-PrimaryKey.adoc
@@ -8,7 +8,7 @@
 
 The `@javax.jdo.annotation.PrimaryKey` annotation is used by JDO/DataNucleus to indicate that a property is used as the primary key for an entity with application-managed identity.
 
-Apache Isis also uses this annotation in a very minimal way: to ensure that the framework's own logic to initialize newly instantiated objects (eg using xref:../rgsvc/rgsvc.adoc#_rgsvc_api_DomainObjectContainer[`DomainObjectContainer#newTransientInstance(...)`] does not touch the primary key, and also to ensure that the primary key property is always disabled (read-only).
+Apache Isis also uses this annotation in a very minimal way: to ensure that the framework's own logic to initialize newly instantiated objects (eg using xref:../rgsvc/rgsvc.adoc#_rgsvc_core-domain-api_DomainObjectContainer[`DomainObjectContainer#newTransientInstance(...)`] does not touch the primary key, and also to ensure that the primary key property is always disabled (read-only).
 
 [NOTE]
 ====