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 2016/07/12 07:28:16 UTC

[8/8] isis git commit: ISIS-1335: migration notes and release notes for 1.13.0

ISIS-1335: migration notes and release notes for 1.13.0

Also fixes bad links for some of the previous migration and release notes of earlier releases


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

Branch: refs/heads/release-1.13.0-RC1
Commit: 1d0c45988fa6fa27cc0c67d440206b41982f88a5
Parents: 9f85bdf
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Jul 12 06:35:27 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Jul 12 06:35:27 2016 +0100

----------------------------------------------------------------------
 .../_migration-notes_1.11.0-to-1.12.0.adoc      |  38 +--
 .../_migration-notes_1.12.0-to-1.13.0.adoc      | 267 +++++++++++++++++--
 .../_migration-notes_1.7.0-to-1.8.0.adoc        |   2 +-
 ...o-1.9.0_bootstrapping-using-AppManifest.adoc |   6 +-
 ...tes_1.8.0-to-1.9.0_exception-recognizer.adoc |  18 +-
 ..._fixture-scripts-specification-provider.adoc |   4 +-
 ...1.8.0-to-1.9.0_specify-all-dom-packages.adoc |   6 +-
 ...n-notes_1.8.0-to-1.9.0_upgrading-to-dn4.adoc |   2 +-
 ...tion-notes_1.8.0-to-1.9.0_war-packaging.adoc |   4 +-
 .../_migration-notes_1.9.0-to-1.10.0.adoc       |   8 +-
 .../main/asciidoc/_release-notes_1.12.0.adoc    |  44 +--
 .../main/asciidoc/_release-notes_1.13.0.adoc    |  21 +-
 .../main/asciidoc/guides/_dg_ide_intellij.adoc  |   4 +-
 ..._ugtst_integ-test-support_bootstrapping.adoc |  36 +++
 .../guides/_ugvw_configuration-properties.adoc  |  14 +-
 .../src/main/asciidoc/release-notes.adoc        | 113 ++++----
 16 files changed, 420 insertions(+), 167 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/1d0c4598/adocs/documentation/src/main/asciidoc/_migration-notes_1.11.0-to-1.12.0.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/_migration-notes_1.11.0-to-1.12.0.adoc b/adocs/documentation/src/main/asciidoc/_migration-notes_1.11.0-to-1.12.0.adoc
index 7c5c39f..8595015 100644
--- a/adocs/documentation/src/main/asciidoc/_migration-notes_1.11.0-to-1.12.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/_migration-notes_1.11.0-to-1.12.0.adoc
@@ -14,14 +14,14 @@ issues here.
 
 == Dynamic XML Layouts
 
-The major new feature in 1.12.0 is xref:ugfun.adoc#_ugfun_object-layout_dynamic_xml[dynamic XML layouts], providing
+The major new feature in 1.12.0 is xref:guides/ugfun.adoc#_ugfun_object-layout_dynamic_xml[dynamic XML layouts], providing
 much enhanced support for custom layouts.
 
 The new `Xxx.layout.xml` file is optional; without it domain objects will
-continue to be rendered as before, using metadata from annotations (xref:rgant.adoc#_rgant-DomainObjectLayout[`@DomainObjectLayout`],
-xref:rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`], xref:rgant.adoc#_rgant-CollectionLayout[`@CollectionLayout`],
-xref:rgant.adoc#_rgant-ActionLayout[`@ActionLayout`], xref:rgant.adoc#_rgant-MemberOrder[`@MemberOrder`] and
-xref:rgant.adoc#_rgant-MemberGroupLayout[`@MemberGroupLayout`]), and also from any xref:ugfun.adoc#_ugfun_object-layout_dynamic[`Xxx.layout.json`]
+continue to be rendered as before, using metadata from annotations (xref:guides/rgant.adoc#_rgant-DomainObjectLayout[`@DomainObjectLayout`],
+xref:guides/rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`], xref:guides/rgant.adoc#_rgant-CollectionLayout[`@CollectionLayout`],
+xref:guides/rgant.adoc#_rgant-ActionLayout[`@ActionLayout`], xref:guides/rgant.adoc#_rgant-MemberOrder[`@MemberOrder`] and
+xref:guides/rgant.adoc#_rgant-MemberGroupLayout[`@MemberGroupLayout`]), and also from any xref:guides/ugfun.adoc#_ugfun_object-layout_dynamic[`Xxx.layout.json`]
 file that might already exist.  There is therefore no requirement to move to the new more flexible XML-based layout.
 
 If you do want to start using the new format, then you will find that 1.12.0 provides a mixin action (available in
@@ -37,51 +37,51 @@ If you wish to migrate all your domain objects to use XML layouts, this can be d
 
 (As mentioned above), 1.12.0 provides a number of new mixin actions and properties:
 
-* xref:rgcms.adoc#_rgcms_classes_mixins_Object_clearHints[clear hints] action
+* xref:guides/rgcms.adoc#_rgcms_classes_mixins_Object_clearHints[clear hints] action
 
-* xref:rgcms.adoc#_rgcms_classes_mixins_Object_downloadLayoutXml[download Layout XML] action (prototype mode)
+* xref:guides/rgcms.adoc#_rgcms_classes_mixins_Object_downloadLayoutXml[download Layout XML] action (prototype mode)
 
-* xref:rgcms.adoc#_rgcms_classes_mixins_Object_rebuildMetamodel[rebuild metamodel] action (prototype mode)
+* xref:guides/rgcms.adoc#_rgcms_classes_mixins_Object_rebuildMetamodel[rebuild metamodel] action (prototype mode)
 
-* xref:rgcms.adoc#_rgcms_classes_mixins_Persistable_datanucleusXxx[id and version] properties (for domain entities only)
+* xref:guides/rgcms.adoc#_rgcms_classes_mixins_Persistable_datanucleusXxx[id and version] properties (for domain entities only)
 
-These are in addition to the xref:rgcms.adoc#_rgcms_classes_mixins_Persistable_downloadJdoMetadata[download JDO metadata] mixin action (prototype mode) provided in earlier versions of the framework.
+These are in addition to the xref:guides/rgcms.adoc#_rgcms_classes_mixins_Persistable_downloadJdoMetadata[download JDO metadata] mixin action (prototype mode) provided in earlier versions of the framework.
 
 The properties are grouped in a "metadata" fieldset, and the mixin actions associated with that fieldset.  If the
 domain object is a view model rather than an entity (that is, has no id or version) then the actions will instead be rendered
 as top-level actions.
 
 Most of these mixin object members are visible only in prototype mode, though some are visible in production mode and
-so potentially visible to end-users.  If you wish to suppress these members from the view, you can either use xref:ugsec.adoc[security],
-or alternatively you can write xref:rgcms.adoc#_rgcms_classes_super_AbstractSubscriber[subscriber]s to veto the visibility
+so potentially visible to end-users.  If you wish to suppress these members from the view, you can either use xref:guides/ugsec.adoc[security],
+or alternatively you can write xref:guides/rgcms.adoc#_rgcms_classes_super_AbstractSubscriber[subscriber]s to veto the visibility
 of these members by subscribing to their respective domain events.
 
 
 
 == JAXB view models are editable
 
-All xref:rgant.adoc#_rgant-XmlRootElement[`@XmlRootElement`] view models are now implicitly editable.  Therefore any
-view models that should be read-only should have editing attribute disabled using xref:rgant.adoc#_rgant-DomainObject_editing[`@DomainObject#editing()`] (or use a xref:rgcms.adoc#_rgcms_classes_super_AbstractSubscriber[subscriber] to veto editability).
+All xref:guides/rgant.adoc#_rgant-XmlRootElement[`@XmlRootElement`] view models are now implicitly editable.  Therefore any
+view models that should be read-only should have editing attribute disabled using xref:guides/rgant.adoc#_rgant-DomainObject_editing[`@DomainObject#editing()`] (or use a xref:guides/rgcms.adoc#_rgcms_classes_super_AbstractSubscriber[subscriber] to veto editability).
 
 
 
 == `DomainObjectContainer` domain service
 
-The xref:rgsvc.adoc#_rgsvc_api_DomainObjectContainer[`DomainObjectContainer`]domain service has been deprecated, with
+The xref:guides/rgsvc.adoc#_rgsvc_api_DomainObjectContainer[`DomainObjectContainer`]domain service has been deprecated, with
 its methods moved to a new set of more fine-grained domain services, such as
-xref:rgsvc.adoc#_rgsvc_api_RepositoryService[`RepositoryService`] and
-xref:rgsvc.adoc#_rgsvc_api_MessageService[`MessageService`].
+xref:guides/rgsvc.adoc#_rgsvc_api_RepositoryService[`RepositoryService`] and
+xref:guides/rgsvc.adoc#_rgsvc_api_MessageService[`MessageService`].
 
 The `DomainObjectContainer` service will continue to be supported until Apache Isis v2.0.0, but in the meantime, consider
 changing existing application code to use these new domain services.
 
-Please note that when migrating from _rgsvc_api_DomainObjectContainer_object-persistence-api.adoc#_rgsvc_api_DomainObjectContainer_object-persistence-api[`DomainObjectContainer#persist()`] to xref:_rgsvc_api_RepositoryService.adoc.adoc#_rgsvc_api_RepositoryService[`RepositoryService#persist()`], no exception will be thrown if the Domain Object is already persisted, so the behavior of xref:_rgsvc_api_RepositoryService.adoc#_rgsvc_api_RepositoryService[`RepositoryService#persist()`] will be the same as that of _rgsvc_api_DomainObjectContainer_object-persistence-api.adoc#_rgsvc_api_DomainObjectContainer_object-persistence-api[`DomainObjectContainer#persistIfNotAlready()`].
+Please note that when migrating from _rgsvc_api_DomainObjectContainer_object-persistence-api.adoc#_rgsvc_api_DomainObjectContainer_object-persistence-api[`DomainObjectContainer#persist()`] to xref:guides/_rgsvc_api_RepositoryService.adoc.adoc#_rgsvc_api_RepositoryService[`RepositoryService#persist()`], no exception will be thrown if the Domain Object is already persisted, so the behavior of xref:guides/_rgsvc_api_RepositoryService.adoc#_rgsvc_api_RepositoryService[`RepositoryService#persist()`] will be the same as that of _rgsvc_api_DomainObjectContainer_object-persistence-api.adoc#_rgsvc_api_DomainObjectContainer_object-persistence-api[`DomainObjectContainer#persistIfNotAlready()`].
 
 
 
 == Removal of the `self-host` profile
 
-The `self-host` profile has been removed from the xref:ug.adoc#_ug_getting-started_simpleapp-archetype[SimpleApp archetype].
+The `self-host` profile has been removed from the xref:guides/ug.adoc#_ug_getting-started_simpleapp-archetype[SimpleApp archetype].
 Instead, run the application using either the `org.apache.isis.WebServer` main class, or `mvn jetty:run`, or build the
 WAR and deploy to a servlet container such as Tomcat.
 

http://git-wip-us.apache.org/repos/asf/isis/blob/1d0c4598/adocs/documentation/src/main/asciidoc/_migration-notes_1.12.0-to-1.13.0.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/_migration-notes_1.12.0-to-1.13.0.adoc b/adocs/documentation/src/main/asciidoc/_migration-notes_1.12.0-to-1.13.0.adoc
index 134bbc2..811788a 100644
--- a/adocs/documentation/src/main/asciidoc/_migration-notes_1.12.0-to-1.13.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/_migration-notes_1.12.0-to-1.13.0.adoc
@@ -1,45 +1,262 @@
 [[_migration-notes_1.12.0-to-1.13.0]]
-= From v1.12.0 to 1.13.0
+= From v1.12.x to 1.13.0
 :Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR  CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
 :_basedir: ../
 :_imagesdir: images/
 
 
 
-Existing projects written against v1.12.x should run against v1.13.0 with few if any changes.  If you *do* encounter
-any difficulties then let us know via the link:support.html[users mailing list], so we can support you and document
-issues here.
+Most applications written against v1.12.x should run against v1.13.0 with few if any changes.  That said, this release
+has removed a small number of features that were dependent on internal APIs, and some configuration properties are
+now removed/unsupported.  We therefore do recommend that you read and keep in mind these notes when you upgrade your app.
 
+If you *do* encounter any difficulties then let us know via the link:support.html[users mailing list], so we can
+support you and document issues here.
 
 
-== Faster startup times
+== Command changes
 
-Several new configuration settings influence application startup times:
+The main feature in `1.13.0` is the xref:guides/rgsvc.adoc#_rgsvc_api_InteractionContext[`InteractionContext`] domain service
+to represent an action invocation/property edit, with the re-positioning of
+xref:guides/rgsvc.adoc#_rgsvc_api_CommandContext[`CommandContext`] to represent the _intention_ to invoke an action/edit a
+property.  You can read more about this design in the reference guide on domain services, in the
+xref:guides/rgsvc.adoc#_rgsvc_intro_commands-and-events[commands and events] section.
 
-* `isis.services.applicationFeatures.init` +
+This refactoring completely overhauls the structure of the XML mementos passed to
+xref:guides/rgsvc.adoc#_rgsvc_spi_CommandService[`CommandService`] (to persist) and to
+xref:guides/rgsvc.adoc#_rgsvc_spi_BackgroundCommandService[`BackgroundCommandService`] (to invoke persisted commands in the
+background).  If you are using these services then ensure that there are no pending commands at the point at which you
+cut-over.  If you have any code that makes assumptions on the format of the XML, it will also need to be rewritten.
+Note that the XML which is persisted henceforth is well-defined and any future changes to it will be backward
+compatible; see xref:guides/rgcms.adoc#_rgcms_schema[schema reference guide].  In fact, there are three schema: for commands
+(`cmd.xsd`), inteactions (`ixn.xsd`) and for changes (`chg.xsd`).  These replace the earlier `aim.xsd` schema (which
+was an amalgam of `cmd.xsd` and `ixn.xsd`).
+
+The reworked `CommandService` now properly supports property edits in the exact same way as action invocations.
+
+As a side-effect of this work, note also that the `CommandService#startTransaction(...)` SPI is *NO LONGER CALLED* by
+the framework.
+
+
+== Auditing
+
+The xref:guides/rgsvc.adoc#_rgsvc_spi_AuditingService[`AuditingService`] SPI service has been deprecated, instead replaced
+by the xref:guides/rgsvc.adoc#_rgsvc_spi_AuditerService[`AuditerService`].
+
+There can be more than one implementation of this new SPI, and a framework-provided implementation
+(`AuditerServiceLogging`) will log to a file.  The (non-ASF)
+http://github.com/isisaddons/isis-module-audit[Isis addons' audit] module also implements the new SPI.
+
+
+== Publishing
+
+The xref:guides/rgsvc.adoc#_rgsvc_spi_PublishingService[`PublishingService`] SPI service and its supporting
+xref:guides/rgsvc.adoc#_rgsvc_spi_EventSerializer[`EventSerializer`] domain service, have both deprecated, instead
+replaced by the xref:guides/rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`].
+
+There can be more than one implementation of this new SPI, and a framework-provided implementation
+(`PublisherServiceLogging`) will log to a file.  The (non-ASF)
+http://github.com/isisaddons/isis-module-publishmq[Isis addons' publishmq] module also implements the new SPI.
+
+The new service also supports the notion of published property edits; the new
+xref:guides/rgant.adoc#_rgant_Property_publishing[`@Property#publishing()`] annotation attribute can be used to specify.  The `
+isis.services.publish.properties` configuration property can be used to specify a fallback default for properties where
+the attribute is not set explicitly.
+
+Conversely, neither the xref:guides/rgant.adoc#_rgant_Action_publishingPayloadFactory[`@Action#publishingPayloadFactory()`]
+nor the xref:guides/rgant.adoc#_rgant_DomainObject_publishingPayloadFactory[`@DomainObject#publishingPayloadFactory()`] are
+supported by `PublisherService`; instead the consumers of the events are expected to callback for any additional
+information, eg using xref:guides/ugvro.adoc[Resful Objects] viewer.
+
+
+== Auto-logout
+
+The new configuration property `isis.authentication.shiro.autoLogoutIfAlreadyAuthenticated` (documented more fully in
+the  xref:guides/ugsec.adoc#_ugsec_configuring-isis-to-use-shiro[security guide]) is by default set to false, thereby
+disabling auto-logout behaviour that is believed to be the root cause of some exceptions thrown by the
+xref:guides/ugvro.adoc#[Restful Objects viewer] during a race condition.  The *previous behaviour can be re-enabled* by setting
+to `true`.
+
+
+== Safe 'rememberMe' cookies
+
+Apache Isis leverages link:http://wicket.apache.org[Apache Wicket]'s rememberMe support which holds remembered
+user/passwords in an encrypted cookie.
+
+If a hard-coded and publicly known value were to be used (as was the case prior to `1.13.0`), then it would be
+possible for rememberMe user/password to be intercepted and decrypted, possibly compromising access.  The
+`isis.viewer.wicket.rememberMe.encryptionKey` configuration property therefore allows a private key to be specified,
+baked into the application.
+
+If no value is set then (for safety) a random UUID will be used as the encryption key.  (The net effect of this
+fallback behaviour is that 'rememberMe' will work, but only until the webapp is restarted (after which the end-user
+will have to log in again).
+
+Related, the `isis.viewer.wicket.suppressRememberMe` configuration property has been replaced by
+`isis.viewer.wicket.rememberMe.suppress` (though the old configuration property is still supported).
+
+
+== Custom programming models
+
+In previous releases the `isis.reflector.facets` configuration property could be used to specify a new implementation
+of the (internal) `ProgrammingModel` API.  This configuration property is no longer supported.  See the
+xref:guides/ugbtb.adoc#_ugbtb_programming-model_finetuning[beyond the basics] guide for an alternative broadly equivalent
+approach.
+
+
+
+== injectXxx() no longer supported
+
+Apache Isis automatically injects domain services into other domain objects, supporting the
+xref:guides/rgant.adoc#_rgant-Inject[`@Inject`] annotation, also injection to `set...()` setter methods and finally injection
+into `inject...()` methods.  This last method is now no longer supported by default.  It can be re-enabled if necessary
+using the `isis.services.injector.injectPrefix` configuration property.
+
+It is also possible to disable injection to `set...()` methods (using the `isis.services.injector.setPrefix`
+configuration property), though this is enabled by default.
+
+Disabling auto-wiring has a positive impact on bootstrap times, as well as standarding Apache Isis' conventions to be
+more in line with JEE.
+
+
+== Optionally ignore deprecated facets
+
+The `isis.reflector.facets.ignoreDeprecated` configuration property indicates whether to continue to honour or to simply
+ignore any deprecated annotations and other semantics that make up the programming model.
+
+This is disabled by default, in other words deprecated facets continue to be recognized.  Be aware that enabling this
+setting could substantially alter the semantics of your application.  To be safe, we recommend that you first run the
+application using `isis.reflector.validator.allowDeprecated` set to `false`; if any deprecated annotations etc. are
+in use, then the app will fail-fast and refuse to start.
+
+
+== ApplicationFeatureRepository
+
+The `isis.services.applicationFeatures.init` configuration property is used to control whether the
+xref:guides/rgsvc.adoc#_rgsvc_api_ApplicationFeatureRepository[`ApplicationFeatureRepository`] domain service lazily or
+eagerly initializes itself based on the framework's internal metamodel.
+
+Previously this service eagerly initialized itself, causing the framework to have to traverse the domain object
+model graph for all types, noticeably increasing the bootstrap time.  For `1.13.0` this service now initializes itself
+lazily.  The previous behaviour (of eager initialization) can be re-enabled by setting this property to `eager`.
+
+
+
+== Integration testing
+
+There are two sets of changes relating to integration tests.
+
+=== Builder
+
+The `IsisSystemForTest.Builder` class is used to xref:guides/ugtst.adoc#_ugtst_integ-test-support_bootstrapping[bootstrap integration tests].
+
+A number of the clauses within this class have been removed:
+
+* `with(PersistenceMechanismInstaller persistenceMechanismInstaller)` +
 +
-This xref:rgcfg.adoc#_rgcfg_configuring-core_services[setting] can be used to control whether the
-xref:rgsvc.adoc#_rgsvc_api_ApplicationFeatureRepository[`ApplicationFeatureRepository`] domain service lazily or
-eagerly initializes itself based on the framework's internal metamodel. +
+Apache Isis has for many releases only supported a single implementation of persistence mechanism (JDO/DataNucleus),
+so this builder method is redundant.
+
+* `with(ProgrammingModel programmingModel)` +
 +
-Prior to `1.13.0` this service eagerly initialized itself, causing the framework to have to traverse the domain object
-model graph for all types.  This could add noticeable overhead.  For `1.13.0` this service now initializes itself
-lazily.  The previous behaviour (of eager initialization) can be re-enabled by setting this property to `eager`.
+Instead, use `AppManifest#getConfiguration()` to xref:guides/ugbtb.adoc#_ugbtb_programming-model_finetuning[include/exclude facets]
+
+* `with(MetaModelValidator metaModelValidator)` +
++
+Instead, use `AppManifest#getConfiguration()` to specify a xref:guides/ugbtb.adoc#_ugbtb_programming-model_custom-validator[custom validator].
+
+* `withServicesIn(String... packagePrefixes)` and `withServices(Object... services)` +
++
+Instead, use `AppManifest#getAdditionalServices()`
+
+* `withFixtures(InstallableFixture... fixtures)` +
++
+Instead, use `AppManifest#getFixtures()`
+
+
+=== Centralizing configuration
 
-* `isis.services.injector.injectPrefix` and `isis.services.injector.setPrefix` +
+Previously when bootstrapping the integration tests, the `IsisConfigurationForJdoIntegTests` was provided as a custom
+implementation of `IsisConfiguration`, providing a number of configuration settings specifically for running
+integration tests (eg run using an in-memory database).  This design split the responsiblity of providing the
+configuration properties between that class and `AppManifest`.
+
+A new `AppManifest.Util` helper class now allows these responsibilities to belong exlusively to the `AppManifest`.
+For example:
+
+[source,java]
+----
+public class DomainAppSystemInitializer {
+    public static void initIsft() {
+        IsisSystemForTest isft = IsisSystemForTest.getElseNull();
+        if(isft == null) {
+            isft = new IsisSystemForTest.Builder()
+                    .withLoggingAt(org.apache.log4j.Level.INFO)
+                    .with(new DomainAppAppManifest() {
+                        @Override
+                        public Map<String, String> getConfigurationProperties() {
+                            final Map<String, String> map = Maps.newHashMap();
+                            Util.withJavaxJdoRunInMemoryProperties(map);
+                            Util.withDataNucleusProperties(map);
+                            Util.withIsisIntegTestProperties(map);
+                            return map;
+                        }
+                    })
+                    .build();
+            isft.setUpSystem();
+            IsisSystemForTest.set(isft);
+        }
+    }
+}
+----
+
+
+== web.xml
+
+In the xref:guides/ugbtb.adoc#_ugbtb_web-xml[`web.xml`], the "isis.viewers" context-param is now ignored.  Instead the
+`viewer_wicket.properties` and `viewer_restfulobjects.properties` will both be loaded if present (but neither need be present).
+
+
+
+== `HasTransactionId` mixin
+
+The xref:guides/rgcms.adoc#_rgcms_classes_mixins_HasTransactionId[`HasTransactionId`] mixin interface has subtly changed its
+meaning (and is now somewhat mis-named).  Prior to `1.13.0`, this identifier was the GUID of the Isis transaction in
+which the object was created.  As of `1.13.0`, this identifier actually is for the request/interaction (as per the new
+xref:guides/rgsvc.adoc#_rgsvc_api_InteractionContext[`InteractionContext`] service) in which the object was created.
+
+
+
+== Notable new features
+
+The following are new features so do not impact in themselves impact any migration effort, but you may wish to start
+taking advantage of once you have upgraded.
+
+* `@Nullable` annotation +
 +
-These xref:rgcfg.adoc#_rgcfg_configuring-core_services[settings] can be used to control the styles of injection of domain services that the framework supports. +
+The xref:guides/rgant.adoc#_rgant_Nullable[`@Nullable`] annotation can now be used to specify the optionality of properties
+and parameters.
+
+* `ActionDomainEvent` for mixins +
 +
-Prior to `1.13.0` the framework supported the injection of fields using xref:rgant.adoc#_rgant-Inject[`@Inject`], and
-also injection to `set...()` setter methods and also `inject...()` methods.  In `1.13.0` the injection through `@Inject`
-remains, and injection through setters is enabled by default.  Injection through `inject...()` is disabled however.
-For faster start-up times still, consider disabling injection through `set...()`.
+Previously it was not possible to discover the mixed-in domain object when an `ActionDomainEvent` was raised by a
+mixin action.  This is now possible, through the xref:guides/rgcms.adoc#_rgcms_classes_domainevent_ActionDomainEvent[`mixedIn()`] method.
 
-* `isis.reflector.facets.ignoreDeprecated` +
+* `Blob` and `Clob` file types +
 +
-This xref:rgcfg.adoc#_rgcfg_configuring-core_services[setting] indicates whether to continue to honour or to simply ignore any deprecated annotations and other
-semantics that make up the programming model. +
+The xref:guides/rgant.adoc#_rgant_Property_fileAccept[`@Property#fileAccept()`] and
+xref:guides/rgant.adoc#_rgant_Parameter_fileAccept[`@Parameter#fileAccept()`] annotation attributes can be used to hint at
+the file type to upload for a blob or clob.
+
+* Live reloading +
++
+The `isis.viewer.wicket.liveReloadUrl` configuration property allows live reloading of objects if the layout is updated,
+reducing feedback times.  Further guidance on setting this up can be found
+xref:guides/dg.adoc#_dg_ide_intellij_advanced_gradle-liveReload[here].
+
+* Docker support +
 +
-Be aware that enabling this setting could substantially alter the semantics of your application.  To be safe, we
-recommend that you first run the application using `isis.reflector.validator.allowDeprecated` set to `false`; if any
-deprecated annotations etc. are in use, then the app will fail-fast and refuse to start.
+The `overrides.properties` configuration file, if present, is loaded last as the configuration property file, with
+its contents overriding any previously defined configuration properties.  This simple idea makes it easy to create Docker
+container images; see xref:guides/ugbtb.adoc#_ugbtb_deployment_docker[here] for further discussion.
+

http://git-wip-us.apache.org/repos/asf/isis/blob/1d0c4598/adocs/documentation/src/main/asciidoc/_migration-notes_1.7.0-to-1.8.0.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/_migration-notes_1.7.0-to-1.8.0.adoc b/adocs/documentation/src/main/asciidoc/_migration-notes_1.7.0-to-1.8.0.adoc
index c641322..6be9b67 100644
--- a/adocs/documentation/src/main/asciidoc/_migration-notes_1.7.0-to-1.8.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/_migration-notes_1.7.0-to-1.8.0.adoc
@@ -12,7 +12,7 @@ Existing projects written against v1.7.0 should run against v1.8.0 without any c
 then let us know via the link:support.html[users mailing list], so we can support you and document issues here.
 
 That said, many of the existing annotations have been deprecated in 1.8.0, replaced with a simplified and rationalized
- set of annotations; see link:../../reference/recognized-annotations/about.html[here].  To help you migrate your application
+ set of annotations; see xref:guides/rgant.adoc#[here].  To help you migrate your application
  over to the new annotations, there is a new configuration property that can be set in `isis.properties`:
 
 [source,ini]

http://git-wip-us.apache.org/repos/asf/isis/blob/1d0c4598/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_bootstrapping-using-AppManifest.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_bootstrapping-using-AppManifest.adoc b/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_bootstrapping-using-AppManifest.adoc
index 121bb73..98b9b29 100644
--- a/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_bootstrapping-using-AppManifest.adoc
+++ b/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_bootstrapping-using-AppManifest.adoc
@@ -8,7 +8,7 @@
 
 Apache Isis 1.9.0 provides a simplified programmatic way of bootstrapping the application, that also unifies bootstrapping for integration tests.
 
-For now this new bootstrapping mechanism is optional (you don't have to change your code), but it may become mandatory in future releases.  The xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] has been updated to use this new mechanism.
+For now this new bootstrapping mechanism is optional (you don't have to change your code), but it may become mandatory in future releases.  The xref:guides/ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] has been updated to use this new mechanism.
 
 The instructions below assume that your application is structured as per the simpleapp archetype.  Adjust accordingly.
 
@@ -80,7 +80,7 @@ Since `myapp-fixture` will reference `myapp-dom` there's no need for a direct re
 </dependency>
 ----
 
-* if your application uses any of the (non-ASF) link:http://isisaddons.org[Isis Addons] modules, then add dependencies to these modules in the `pom.xml`.  You should be able to copy-and-paste the dependencies from the `pom.xml` of your `myapp-webapp` module.
+* if your application uses any of the (non-ASF) link:http://www.isisaddons.org[Isis Addons] modules, then add dependencies to these modules in the `pom.xml`.  You should be able to copy-and-paste the dependencies from the `pom.xml` of your `myapp-webapp` module.
 
 Create a module class for the `myapp` module also:
 
@@ -118,7 +118,7 @@ public class MyAppAppManifest implements AppManifest {
     public Map<String, String> getConfigurationProperties() { return null; }
 }
 ----
-<1> the module classes, whose packages specify the existence of domain services and/or persistent entities.  If your app uses (non-ASF) link:http://isisaddons.org[Isis Addons] modules, then include the module classes for these addons in `getModules()`.   For example, the (non-ASF) http://github.com/isisaddons/isis-module-security[Isis addons' security] module provides the `org.isisaddons.module.security.SecurityModule` class.
+<1> the module classes, whose packages specify the existence of domain services and/or persistent entities.  If your app uses (non-ASF) link:http://www.isisaddons.org[Isis Addons] modules, then include the module classes for these addons in `getModules()`.   For example, the (non-ASF) http://github.com/isisaddons/isis-module-security[Isis addons' security] module provides the `org.isisaddons.module.security.SecurityModule` class.
 <2> any additional services, as per `isis.services` configuration property.
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/1d0c4598/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_exception-recognizer.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_exception-recognizer.adoc b/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_exception-recognizer.adoc
index 308fe7f..59b2c57 100644
--- a/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_exception-recognizer.adoc
+++ b/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_exception-recognizer.adoc
@@ -6,23 +6,13 @@
 
 
 
-The `ExceptionRecognizerCompositeForJdoObjectStore` service (an implementation of the xref:rgsvc.adoc#_rgsvc_spi_ExceptionRecognizer[`ExceptionRecognizer`] SPI) recognizes certain expected exceptions thrown by the JDO objectstore (for example, violations of uniqueness) and converts them into meaningful messages for the end-user.
+The `ExceptionRecognizerCompositeForJdoObjectStore` service (an implementation of the xref:guides/rgsvc.adoc#_rgsvc_spi_ExceptionRecognizer[`ExceptionRecognizer`] SPI) recognizes certain expected exceptions thrown by the JDO objectstore (for example, violations of uniqueness) and converts them into meaningful messages for the end-user.
 
-Prior to 1.9.0 this implementation was _not_ annotated with xref:rgant.adoc#_rgant-DomainService[`@DomainService`] and thus needed to be explicitly registered in `isis.properties`.
+Prior to 1.9.0 this implementation was _not_ annotated with xref:guides/rgant.adoc#_rgant-DomainService[`@DomainService`] and thus needed to be explicitly registered in `isis.properties`.
 
 In 1.9.0 the service has been annotated with `@DomainService` meaning that:
 
-* it must be removed from `isis.properties`: +
-+
-[source,ini]
-----
-isis.services = \
-    # \
-    #org.apache.isis.objectstore.jdo.applib.service.exceprecog.ExceptionRecognizerCompositeForJdoObjectStore,\   # <1>
-    #
-----
-<1> remove this line (or comment it out, as shown)
-
+* it must be removed from `isis.services` property in `isis.properties` configuration file
 
 * in integration tests, if the service is explicitly registered, then it should be removed; for example: +
 +
@@ -42,7 +32,7 @@ public class EstatioIntegTestBuilder extends IsisSystemForTest.Builder {
 
 If you fail to do this you will get an exception to the effect of duplicate service Ids being registered.
 
-Now that the `ExceptionRecognizerCompositeForJdoObjectStore` no longer needs to be explicitly registered, you might (very rarely) require the opposite situation, namely to disable the service.  As this can't be done by just removing it from `isis.poperties`, you instead can set a new xref:rgcfg.adoc#_rgcfg_configuring-core[configuration property] `isis.services.ExceptionRecognizerCompositeForJdoObjectStore.disable`:
+Now that the `ExceptionRecognizerCompositeForJdoObjectStore` no longer needs to be explicitly registered, you might (very rarely) require the opposite situation, namely to disable the service.  As this can't be done by just removing it from `isis.properties`, you instead can set a new xref:guides/rgcfg.adoc#_rgcfg_configuring-core[configuration property] `isis.services.ExceptionRecognizerCompositeForJdoObjectStore.disable`:
 
 [source,ini]
 ----

http://git-wip-us.apache.org/repos/asf/isis/blob/1d0c4598/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_fixture-scripts-specification-provider.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_fixture-scripts-specification-provider.adoc b/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_fixture-scripts-specification-provider.adoc
index fcb4cee..2c9f4e4 100644
--- a/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_fixture-scripts-specification-provider.adoc
+++ b/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_fixture-scripts-specification-provider.adoc
@@ -6,8 +6,8 @@
 
 
 
-The `FixtureScriptsSpecificationProvider` SPI service is an alternative to subclassing the xref:rgcms.adoc#_rgcms_classes_super_FixtureScripts[`FixtureScripts`] domain service.  The logic that would normally be in the subclass moves to the provider service instead, and the framework instantiates a fallback default instance, xref:rgsvc.adoc#_rgsvc_api_FixtureScriptsDefault[`FixtureScriptsDefault`].
+The `FixtureScriptsSpecificationProvider` SPI service is an alternative to subclassing the xref:guides/rgcms.adoc#_rgcms_classes_super_FixtureScripts[`FixtureScripts`] domain service.  The logic that would normally be in the subclass moves to the provider service instead, and the framework instantiates a fallback default instance, xref:guides/rgsvc.adoc#_rgsvc_api_FixtureScriptsDefault[`FixtureScriptsDefault`].
 
 This new design is optional; if you continue to provide your own subclass then everything will continue as before.  However the new design is more flexible and involves less code.
 
-See xref:ugtst.adoc#_ugtst_fixture-scripts_api-and-usage[user guide] for further discussion.
\ No newline at end of file
+See xref:guides/ugtst.adoc#_ugtst_fixture-scripts_api-and-usage[user guide] for further discussion.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/isis/blob/1d0c4598/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_specify-all-dom-packages.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_specify-all-dom-packages.adoc b/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_specify-all-dom-packages.adoc
index faac52c..39e25d6 100644
--- a/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_specify-all-dom-packages.adoc
+++ b/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_specify-all-dom-packages.adoc
@@ -8,11 +8,11 @@
 
 Apache Isis automatically scans for certain classes on the classpath in order to configure itself.  Specifically these are:
 
-* searching for classes annotated with xref:rgant.adoc#_rgant-DomainService[`@DomainService`].
+* searching for classes annotated with xref:guides/rgant.adoc#_rgant-DomainService[`@DomainService`].
 
-* searching for classes extending xref:rgcms.adoc#_rgcms_classes_super_FixtureScript[`FixtureScript`]
+* searching for classes extending xref:guides/rgcms.adoc#_rgcms_classes_super_FixtureScript[`FixtureScript`]
 
-* searching for classes annotated with xref:rgant.adoc#_rgant-PersistenceCapable[`@PersistenceCapable`].
+* searching for classes annotated with xref:guides/rgant.adoc#_rgant-PersistenceCapable[`@PersistenceCapable`].
 
 For the last of these we have tightened up the validation, to ensure that each package specified in the `isis.persistor.datanucleus.RegisterEntities.packagePrefix` key does indeed include at least one annotated entity.  This should include any domain classes for addon modules.
 

http://git-wip-us.apache.org/repos/asf/isis/blob/1d0c4598/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_upgrading-to-dn4.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_upgrading-to-dn4.adoc b/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_upgrading-to-dn4.adoc
index b868f3f..3071208 100644
--- a/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_upgrading-to-dn4.adoc
+++ b/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_upgrading-to-dn4.adoc
@@ -8,7 +8,7 @@
 
 Apache Isis 1.9.0 updates to DataNucleus 4.0.0, which requires some changes (simplifications) to the Maven configuration.
 
-If you starting a new app then you can start from the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]; its Maven configuration has been updated.
+If you starting a new app then you can start from the xref:guides/ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]; its Maven configuration has been updated.
 
 If you have an existing Apache Isis app that you want to upgrade, then you'll need to make some changes.
 

http://git-wip-us.apache.org/repos/asf/isis/blob/1d0c4598/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_war-packaging.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_war-packaging.adoc b/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_war-packaging.adoc
index e137657..c886cbb 100644
--- a/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_war-packaging.adoc
+++ b/adocs/documentation/src/main/asciidoc/_migration-notes_1.8.0-to-1.9.0_war-packaging.adoc
@@ -6,7 +6,7 @@
 
 
 
-As discussed in xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] and elsewhere, the `org.apache.isis.WebServer` provides the ability to run your app from an embedded jetty.  This is great for prototyping.  The class resides in the `isis-core-webserver` module, which also has the dependency on jetty.
+As discussed in xref:guides/ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] and elsewhere, the `org.apache.isis.WebServer` provides the ability to run your app from an embedded jetty.  This is great for prototyping.  The class resides in the `isis-core-webserver` module, which also has the dependency on jetty.
 
 In 1.9.0 we have upgraded the jetty dependency to use Jetty 9.2.0 (`org.eclipse.jetty.aggregate:jetty-all:9.2.11.v20150529`, to be precise).  One consequence of this is that the packaged WAR file will not boot on Tomcat.
 
@@ -31,4 +31,4 @@ Alternatively you can change your webapp's `pom.xml` so that when the war is pac
 ----
 
 
-For future projects the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] has been updated with this change.
+For future projects the xref:guides/ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] has been updated with this change.

http://git-wip-us.apache.org/repos/asf/isis/blob/1d0c4598/adocs/documentation/src/main/asciidoc/_migration-notes_1.9.0-to-1.10.0.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/_migration-notes_1.9.0-to-1.10.0.adoc b/adocs/documentation/src/main/asciidoc/_migration-notes_1.9.0-to-1.10.0.adoc
index 5da3897..a9475aa 100644
--- a/adocs/documentation/src/main/asciidoc/_migration-notes_1.9.0-to-1.10.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/_migration-notes_1.9.0-to-1.10.0.adoc
@@ -40,7 +40,7 @@ Therefore, in the parent `pom.xml` of your own domain applications, remove:
 
 == `allowLateRegistration`
 
-One possible issue is that (as per link:https://issues.apache.org/jira/browse/ISIS-830[ISIS-830]) the xref:rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] is now initialized as one of the first domain
+One possible issue is that (as per link:https://issues.apache.org/jira/browse/ISIS-830[ISIS-830]) the xref:guides/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] is now initialized as one of the first domain
 services; this is to ensure that any object lifecycle events caused by domain services initializing themselves can be
 posted on the event bus for subscribers.  The typical case for such lifecycle events to occur is from domain services
 that seed reference data; one such example can be found in the (non-ASF)
@@ -75,7 +75,7 @@ org.apache.isis.core.runtime.runner.IsisInjectModule.provideIsisSystem(IsisInjec
 ----
 
 
-To ensure that subscriber domain services are initialized before "seed" domain services, the xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] attribute can be used.
+To ensure that subscriber domain services are initialized before "seed" domain services, the xref:guides/rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] attribute can be used.
 Normally this attribute is just used to order UI-visible services on the menu bars, but it also is used
 internally to sequence the internal list of services being initialized.
 
@@ -88,7 +88,7 @@ isis.services.eventbus.allowLateRegistration=true
 
 If you do that, be aware that not all subscribers may not receive some events generated by other domain services.
 
-For more details, see the xref:rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] man page.
+For more details, see the xref:guides/rgsvc.adoc#_rgsvc_api_EventBusService[`EventBusService`] man page.
 
 
 
@@ -131,6 +131,6 @@ public class ToDoItem {
 == isis-maven-plugin
 
 The way that the Isis Maven plugin is configured has changed slightly; check out its
-xref:rgmvn.adoc[documentation] for full details.
+xref:guides/rgmvn.adoc[documentation] for full details.
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/1d0c4598/adocs/documentation/src/main/asciidoc/_release-notes_1.12.0.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/_release-notes_1.12.0.adoc b/adocs/documentation/src/main/asciidoc/_release-notes_1.12.0.adoc
index 8d5e1c2..afd0542 100644
--- a/adocs/documentation/src/main/asciidoc/_release-notes_1.12.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/_release-notes_1.12.0.adoc
@@ -17,13 +17,13 @@ similar to the action prompt dialogs; in a future release we hope to support "in
 
 Another notable change in this release include various new domain services.  Some of these are in support of the dynamic layouts
 functionality, others including new access into Apache Isis' metamodel.  (Some of these new services were originally part of the (non-ASF)
-link:http://isisaddons.org[Isis Addons]). In addition, the xref:rgsvc.adoc#_rgsvc_api_DomainObjectContainer[`DomainObjectContainer`]
+link:http://isisaddons.org[Isis Addons]). In addition, the xref:guides/rgsvc.adoc#_rgsvc_api_DomainObjectContainer[`DomainObjectContainer`]
 service has been deprecated, replaced by a number of fine-grained services
-(such as xref:rgsvc.adoc#_rgsvc_api_RepositoryService[`RepositoryService`] and xref:rgsvc.adoc#_rgsvc_api_MessageService[`MessageService`]).
+(such as xref:guides/rgsvc.adoc#_rgsvc_api_RepositoryService[`RepositoryService`] and xref:guides/rgsvc.adoc#_rgsvc_api_MessageService[`MessageService`]).
 
 The release also includes a number of new mixins, to automatically surface in the UI an entity's id, version (if any), and to download the
 layout XML and rebuild the metamodel for a given domain entity.  There is also a mixin to clear any UI hints (part of the dynamic layouts
-functionality).  In all cases these mixins can be hidden using either security or by writing a xref:rgcms.adoc#_rgcms_classes_super_AbstractSubscriber[subscriber] to veto the visibility of the
+functionality).  In all cases these mixins can be hidden using either security or by writing a xref:guides/rgcms.adoc#_rgcms_classes_super_AbstractSubscriber[subscriber] to veto the visibility of the
 corresponding domain event.
 
 
@@ -32,43 +32,43 @@ corresponding domain event.
 
 == New Feature
 
-* link:https://issues.apache.org/jira/browse/ISIS-1351[ISIS-1351] - Extend xref:rgsvc.adoc#_rgsvc_api_ConfigurationService[`ConfigurationService`] to list all configuration properties in the UI
-* link:https://issues.apache.org/jira/browse/ISIS-1325[ISIS-1325] - New xref:rgsvc.adoc#_rgsvc_api_SessionManagementService[`SessionManagementService`]
+* link:https://issues.apache.org/jira/browse/ISIS-1351[ISIS-1351] - Extend xref:guides/rgsvc.adoc#_rgsvc_api_ConfigurationService[`ConfigurationService`] to list all configuration properties in the UI
+* link:https://issues.apache.org/jira/browse/ISIS-1325[ISIS-1325] - New xref:guides/rgsvc.adoc#_rgsvc_api_SessionManagementService[`SessionManagementService`]
 * link:https://issues.apache.org/jira/browse/ISIS-1317[ISIS-1317] - Allow single domain object class to be invalidated through a mixin.
-* link:https://issues.apache.org/jira/browse/ISIS-1313[ISIS-1313] - Enhancement to xref:rgmvn.adoc#_rgmvn_xsd[xsd] goal of the isis-maven-plugin to ignore/include the Isis common schemas.
-* link:https://issues.apache.org/jira/browse/ISIS-1292[ISIS-1292] - Extend xref:rgsvc.adoc#_rgsvc_api_MetaModelService[`MetaModelService`] to surface packages, classes etc (as used by the security module).
-* link:https://issues.apache.org/jira/browse/ISIS-993[ISIS-993] - Show different object members on multiple tabs (xref:rgfun.adoc#_ugfun_object-layout_dynamic_xml[dynamic XML layouts])
+* link:https://issues.apache.org/jira/browse/ISIS-1313[ISIS-1313] - Enhancement to xref:guides/rgmvn.adoc#_rgmvn_xsd[xsd] goal of the isis-maven-plugin to ignore/include the Isis common schemas.
+* link:https://issues.apache.org/jira/browse/ISIS-1292[ISIS-1292] - Extend xref:guides/rgsvc.adoc#_rgsvc_api_MetaModelService[`MetaModelService`] to surface packages, classes etc (as used by the security module).
+* link:https://issues.apache.org/jira/browse/ISIS-993[ISIS-993] - Show different object members on multiple tabs (xref:guides/ugfun.adoc#_ugfun_object-layout_dynamic_xml[dynamic XML layouts])
 * link:https://issues.apache.org/jira/browse/ISIS-784[ISIS-784] - Change Wicket viewer to get rid of edit mode, instead allow individual fields to be edited by clicking on them (similar to the way that JIRA works).
 
 
 == Improvement
 
 * link:https://issues.apache.org/jira/browse/ISIS-1333[ISIS-1333] - Remove self-host profile from the archetype
-* link:https://issues.apache.org/jira/browse/ISIS-1332[ISIS-1332] - Factor out a xref:rgsvc.adoc#_rgsvc_spi_HintStore[`HintStore`] service, so that this is pluggable.
+* link:https://issues.apache.org/jira/browse/ISIS-1332[ISIS-1332] - Factor out a xref:guides/rgsvc.adoc#_rgsvc_spi_HintStore[`HintStore`] service, so that this is pluggable.
 * link:https://issues.apache.org/jira/browse/ISIS-1330[ISIS-1330] - Add CSS classes for table cells and for collections to make it easier to fine tune pages using CSS.
 * link:https://issues.apache.org/jira/browse/ISIS-1329[ISIS-1329] - Extend hint support for "show all"
 * link:https://issues.apache.org/jira/browse/ISIS-1327[ISIS-1327] - Change the view mode of the select2 (value drop down) to be a simple text field.
-* link:https://issues.apache.org/jira/browse/ISIS-1324[ISIS-1324] - Allow multiple different views of same collection in a layout (xref:rgfun.adoc#_ugfun_object-layout_dynamic_xml[dynamic XML layouts])
-* link:https://issues.apache.org/jira/browse/ISIS-1323[ISIS-1323] - Deprecate @CollectionLayout#renderType, since is duplicated by xref:rgant.adoc#_rgant-CollectionLayout_defaultView[`@CollectionLayout#defaultView()`]
+* link:https://issues.apache.org/jira/browse/ISIS-1324[ISIS-1324] - Allow multiple different views of same collection in a layout (xref:guides/ugfun.adoc#_ugfun_object-layout_dynamic_xml[dynamic XML layouts])
+* link:https://issues.apache.org/jira/browse/ISIS-1323[ISIS-1323] - Deprecate @CollectionLayout#renderType, since is duplicated by xref:guides/rgant.adoc#_rgant-CollectionLayout_defaultView[`@CollectionLayout#defaultView()`]
 * link:https://issues.apache.org/jira/browse/ISIS-1322[ISIS-1322] - Mixins not exposing the mixedin object in events (for subscribers to veto).
-* link:https://issues.apache.org/jira/browse/ISIS-1321[ISIS-1321] - Extend xref:rgsvc.adoc#_rgsvc_api_MetaModelService[`MetaModelService`] to allow CSV of metamodel to be downloaded.
-* link:https://issues.apache.org/jira/browse/ISIS-1320[ISIS-1320] - Move xref:rgsvc.adoc#_rgsvc_spi_ContentMappingService[`ContentMappingService`] to applib (and simplify)
-* link:https://issues.apache.org/jira/browse/ISIS-1312[ISIS-1312] - Improve xref:rgsvc.adoc#_rgsvc_api_JaxbService[`JaxbServiceDefault#xsd(...)`] to correctly reference the Isis common schema imports.
+* link:https://issues.apache.org/jira/browse/ISIS-1321[ISIS-1321] - Extend xref:guides/rgsvc.adoc#_rgsvc_api_MetaModelService[`MetaModelService`] to allow CSV of metamodel to be downloaded.
+* link:https://issues.apache.org/jira/browse/ISIS-1320[ISIS-1320] - Move xref:guides/rgsvc.adoc#_rgsvc_spi_ContentMappingService[`ContentMappingService`] to applib (and simplify)
+* link:https://issues.apache.org/jira/browse/ISIS-1312[ISIS-1312] - Improve xref:guides/rgsvc.adoc#_rgsvc_api_JaxbService[`JaxbServiceDefault#xsd(...)`] to correctly reference the Isis common schema imports.
 * link:https://issues.apache.org/jira/browse/ISIS-1300[ISIS-1300] - Allow the enablement of the WicketSource plugin to be configurable, and disabled by default
-* link:https://issues.apache.org/jira/browse/ISIS-1299[ISIS-1299] - xref:rgant.adoc#_rgant-ViewModel[`@ViewModel`] and xref:rgant.adoc#_rgant-XmlRootElement[`@XmlRootElement`] view models should automatically support isCloneable.
+* link:https://issues.apache.org/jira/browse/ISIS-1299[ISIS-1299] - xref:guides/rgant.adoc#_rgant-ViewModel[`@ViewModel`] and xref:guides/rgant.adoc#_rgant-XmlRootElement[`@XmlRootElement`] view models should automatically support isCloneable.
 * link:https://issues.apache.org/jira/browse/ISIS-1298[ISIS-1298] - Fix deprecated annotation use for ViewModel.Cloneable#clone
 * link:https://issues.apache.org/jira/browse/ISIS-1295[ISIS-1295] - Run integration tests using thread-local, to allow "complete" tests that also exercise, eg Quartz jobs.
 * link:https://issues.apache.org/jira/browse/ISIS-1240[ISIS-1240] - Derive icon from service when not provided
-* link:https://issues.apache.org/jira/browse/ISIS-1239[ISIS-1239] - For wicket ui, use a cookie or similar to remember the hint from last time (xref:rgfun.adoc#_ugfun_object-layout_dynamic_xml[dynamic XML layouts])
-* link:https://issues.apache.org/jira/browse/ISIS-1228[ISIS-1228] - Reorganizing/splitting out xref:rgant.adoc#_rgant-DomainObjectContainer[`@DomainObjectContainer`] service.
-* link:https://issues.apache.org/jira/browse/ISIS-1048[ISIS-1048] - Make view model URLs more secure, eg through a private key (xref:rgsvc.adoc#_rgsvc_spi_UrlEncodingService[`UrlEncodingService`]).
-* link:https://issues.apache.org/jira/browse/ISIS-1037[ISIS-1037] - Support layout.xml as well as layout.json (xref:rgfun.adoc#_ugfun_object-layout_dynamic_xml[dynamic XML layouts])
+* link:https://issues.apache.org/jira/browse/ISIS-1239[ISIS-1239] - For wicket ui, use a cookie or similar to remember the hint from last time (xref:guides/ugfun.adoc#_ugfun_object-layout_dynamic_xml[dynamic XML layouts])
+* link:https://issues.apache.org/jira/browse/ISIS-1228[ISIS-1228] - Reorganizing/splitting out xref:guides/rgant.adoc#_rgant-DomainObjectContainer[`@DomainObjectContainer`] service.
+* link:https://issues.apache.org/jira/browse/ISIS-1048[ISIS-1048] - Make view model URLs more secure, eg through a private key (xref:guides/rgsvc.adoc#_rgsvc_spi_UrlEncodingService[`UrlEncodingService`]).
+* link:https://issues.apache.org/jira/browse/ISIS-1037[ISIS-1037] - Support layout.xml as well as layout.json (xref:guides/ugfun.adoc#_ugfun_object-layout_dynamic_xml[dynamic XML layouts])
 * link:https://issues.apache.org/jira/browse/ISIS-806[ISIS-806] - In Wicket viewer, shouldn't be possible to invoke an action if editing a form.
 
 
 == Bug
 
-* link:https://issues.apache.org/jira/browse/ISIS-1348[ISIS-1348] - Bug with xref:ugtst.adoc#_ugtst_unit-test-support_soap-fake-server-junit-rule[SoapEndpointPublishingRule] when multiple endpoints.
+* link:https://issues.apache.org/jira/browse/ISIS-1348[ISIS-1348] - Bug with xref:guides/ugtst.adoc#_ugtst_unit-test-support_soap-fake-server-junit-rule[SoapEndpointPublishingRule] when multiple endpoints.
 * link:https://issues.apache.org/jira/browse/ISIS-1347[ISIS-1347] - Missing annotation in SimpleObject
 * link:https://issues.apache.org/jira/browse/ISIS-1346[ISIS-1346] - ActionInvocationContext isn't populated properly
 * link:https://issues.apache.org/jira/browse/ISIS-1342[ISIS-1342] - The metamodel validation error page doesn't reliably render itself if there are errors.
@@ -76,8 +76,8 @@ corresponding domain event.
 * link:https://issues.apache.org/jira/browse/ISIS-1340[ISIS-1340] - Rebuild metamodel mixin action isn't working reliably
 * link:https://issues.apache.org/jira/browse/ISIS-1328[ISIS-1328] - Bookmark hints are not being honoured
 * link:https://issues.apache.org/jira/browse/ISIS-1319[ISIS-1319] - Input dialog for action label for mandatory parameter not shown when the parameter is an view model
-* link:https://issues.apache.org/jira/browse/ISIS-1318[ISIS-1318] - contributed actions/mixins breaks publishing; also flush any pending actions to be published as the result of doing a wrapped action via the xref:rgsvc.adoc#_rgsvc_api_WrapperFactory[`WrapperFactory`]
-* link:https://issues.apache.org/jira/browse/ISIS-1315[ISIS-1315] - Can't generate xref:rgmvn.adoc#_rgmvn_swagger[swagger] specs, where actions are contributed.
+* link:https://issues.apache.org/jira/browse/ISIS-1318[ISIS-1318] - contributed actions/mixins breaks publishing; also flush any pending actions to be published as the result of doing a wrapped action via the xref:guides/rgsvc.adoc#_rgsvc_api_WrapperFactory[`WrapperFactory`]
+* link:https://issues.apache.org/jira/browse/ISIS-1315[ISIS-1315] - Can't generate xref:guides/rgmvn.adoc#_rgmvn_swagger[swagger] specs, where actions are contributed.
 * link:https://issues.apache.org/jira/browse/ISIS-1314[ISIS-1314] - Filename parameter label missing for DTO mixins
 * link:https://issues.apache.org/jira/browse/ISIS-1311[ISIS-1311] - Mixins for Persistable metadata causes exception when rendering.
 * link:https://issues.apache.org/jira/browse/ISIS-1310[ISIS-1310] - DomainObjectContainer#titleOf(..) does not resolve @Title annotated on private field

http://git-wip-us.apache.org/repos/asf/isis/blob/1d0c4598/adocs/documentation/src/main/asciidoc/_release-notes_1.13.0.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/_release-notes_1.13.0.adoc b/adocs/documentation/src/main/asciidoc/_release-notes_1.13.0.adoc
index e61e576..6cc46fd 100644
--- a/adocs/documentation/src/main/asciidoc/_release-notes_1.13.0.adoc
+++ b/adocs/documentation/src/main/asciidoc/_release-notes_1.13.0.adoc
@@ -11,22 +11,27 @@ interaction.  A command now represents the _intention_ to interact with the appl
 to edit a property.  This is captured as a JAXB DTO.  An interaction on the other hand captures the fact that a
 command has been performed.  Interactions are also captured as DTOs.  Interactions can include sub-interactions,
 representing the fact that an action can invoke another action by way of the
-xref:rgsvc.adoc#_rgsvc_api_WrapperFactory[`WrapperFactory`].
+xref:guides/rgsvc.adoc#_rgsvc_api_WrapperFactory[`WrapperFactory`].
 
-The existing xref:rgsvc.adoc#_rgsvc_spi_AuditingService[`AuditingService`] and
-xref:rgsvc.adoc#_rgsvc_spi_PublishingService[`PublishingService`] SPI services have both been deprecated, instead
-replaced by xref:rgsvc.adoc#_rgsvc_spi_AuditerService[`AuditerService`] and
-xref:rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`].  It is now possible to have multiple implementations
+The existing xref:guides/rgsvc.adoc#_rgsvc_spi_AuditingService[`AuditingService`] and
+xref:guides/rgsvc.adoc#_rgsvc_spi_PublishingService[`PublishingService`] SPI services have both been deprecated, instead
+replaced by xref:guides/rgsvc.adoc#_rgsvc_spi_AuditerService[`AuditerService`] and
+xref:guides/rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`].  It is now possible to have multiple implementations
 of each.
 
 The (non-ASF) http://github.com/isisaddons/isis-module-auditing[Isis addons' auditing] module has been reworked to
-implement xref:rgsvc.adoc#_rgsvc_spi_AuditService[`AuditService`], while the new (non-ASF)
+implement xref:guides/rgsvc.adoc#_rgsvc_spi_AuditService[`AuditService`], while the new (non-ASF)
 http://github.com/isisaddons/isis-module-publishmq[Isis addons' publishmq] module implements
-xref:rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`] to publish interaction events to an ActiveMQ bus (and
+xref:guides/rgsvc.adoc#_rgsvc_spi_PublisherService[`PublisherService`] to publish interaction events to an ActiveMQ bus (and
 to allow such events to be replayed if necessary).
 
 The release also includes a great deal of internal refactorings and simplifications.
 
+Most applications written against v1.12.x should run against v1.13.0 with few if any changes.  That said, this release
+has removed a small number of features that were dependent on internal APIs, and some configuration properties are
+now removed/unsupported.  We therefore do recommend that you read and keep in mind the xref:migration-notes#_migration-notes_1.12.0-to-1.13.0.adoc[migration notes] when you upgrade your app.
+
+
 
 
 
@@ -145,3 +150,5 @@ The release also includes a great deal of internal refactorings and simplificati
 == Task
 
 * link:https://issues.apache.org/jira/browse/ISIS-1335[ISIS-1335] - Release activities for v1.13.0
+
+

http://git-wip-us.apache.org/repos/asf/isis/blob/1d0c4598/adocs/documentation/src/main/asciidoc/guides/_dg_ide_intellij.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_dg_ide_intellij.adoc b/adocs/documentation/src/main/asciidoc/guides/_dg_ide_intellij.adoc
index ec0d388..27e4731 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_dg_ide_intellij.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_dg_ide_intellij.adoc
@@ -562,7 +562,7 @@ image::{_imagesdir}appendices/dev-env/intellij-idea/070-advanced/004-gradle-outp
 
 
 [[_dg_ide_intellij_advanced_gradle-liveReload]]
-=== Using Grade for liveReload
+=== Using Gradle for liveReload
 
 Similarly, gradle can be run to reduce the turn-around time when tweaking the UI (defined by the
  xref:ugfun.adoc#_ugfun_object-layout_dynamic_xml[`*.layout.xml`] file for each domain class), when the app is running.
@@ -574,7 +574,7 @@ by invoking `Run > Reload Changed Classes`.  Once the browser is refreshed, the
 [NOTE]
 ====
 We've occasionally noticed that this interferes with Wicket's own javascript - switching tabs becomes unresponsive.
- The work-around is just to reload the page.
+The work-around is just to reload the page.
 ====
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/1d0c4598/adocs/documentation/src/main/asciidoc/guides/_ugtst_integ-test-support_bootstrapping.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugtst_integ-test-support_bootstrapping.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugtst_integ-test-support_bootstrapping.adoc
index 18466a0..a3dd6c7 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugtst_integ-test-support_bootstrapping.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugtst_integ-test-support_bootstrapping.adoc
@@ -20,6 +20,42 @@ The example code in this section is taken from the app generated by the xref:ugf
 
 The bootstrapping itself is performed by a "system initializer" class.  This is responsible for instantiating the Apache Isis runtime, and binding it to a thread-local.
 
+=== 1.13.0 (Improved intent)
+
+As of `1.13.0`, the `IsisConfigurationForJdoIntegTests` (which provides a number of configuration settings specifically for running integration tests) can be removed; instead all configuration properties can be defined through the `AppManifest`:
+
+For example:
+[source,java]
+----
+public class DomainAppSystemInitializer {
+    public static void initIsft() {
+        IsisSystemForTest isft = IsisSystemForTest.getElseNull();
+        if(isft == null) {
+            isft = new IsisSystemForTest.Builder()
+                    .withLoggingAt(org.apache.log4j.Level.INFO)
+                    .with(new DomainAppAppManifest() {
+                        @Override
+                        public Map<String, String> getConfigurationProperties() {
+                            final Map<String, String> map = Maps.newHashMap();
+                            Util.withJavaxJdoRunInMemoryProperties(map);
+                            Util.withDataNucleusProperties(map);
+                            Util.withIsisIntegTestProperties(map);
+                            return map;
+                        }
+                    })
+                    .build();
+            isft.setUpSystem();
+            IsisSystemForTest.set(isft);
+        }
+    }
+}
+----
+
+While the code is slightly longer than previously, the responsibilities for returning the configuration properties to
+use for the test now reside in a single location.  The new `AppManifest.Util` class provides the helper methods to
+actually add in the appropriate config properties.
+
+
 === 1.9.0 (`AppManifest`)
 
 As of 1.9.0, the code (using `AppManifest`) is:

http://git-wip-us.apache.org/repos/asf/isis/blob/1d0c4598/adocs/documentation/src/main/asciidoc/guides/_ugvw_configuration-properties.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugvw_configuration-properties.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugvw_configuration-properties.adoc
index 619ac65..3e4a738 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugvw_configuration-properties.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugvw_configuration-properties.adoc
@@ -127,12 +127,16 @@ Valid values as per link:http://stackoverflow.com/a/1969339/56880[this StackOver
 | any string (a random UUID each time)
 |Encryption key is used to encrypt the rememberMe user/password.  +
 
-It should be set to a unique and private value.  If a hard-coded and publicly known value is used, then it would be
-possible for rememberMe user/password to be intercepted and decrypted, compromising access.
+Apache Isis leverages link:http://wicket.apache.org[Apache Wicket]'s rememberMe support which holds remembered
+user/passwords in an encrypted cookie.
 
-If no value is set then (for safety) a random UUID will be used as the encryption key.  The net effect of this
-default is that 'rememberMe' will work, but only until the webapp is restarted (after which the end-user will have
-to log in again).
+If a hard-coded and publicly known value were to be used (as was the case prior to `1.13.0`), then it would be
+possible for rememberMe user/password to be intercepted and decrypted, possibly compromising access.  This
+configuration property therefore allows a private key to be specified, baked into the application.
+
+If no value is set then (for safety) a random UUID will be used as the encryption key.  (The net effect of this
+fallback behaviour is that 'rememberMe' will work, but only until the webapp is restarted (after which the end-user
+will have to log in again).
 
 |`isis.viewer.wicket.` +
 `rememberMe.suppress`

http://git-wip-us.apache.org/repos/asf/isis/blob/1d0c4598/adocs/documentation/src/main/asciidoc/release-notes.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/release-notes.adoc b/adocs/documentation/src/main/asciidoc/release-notes.adoc
index 6070672..3cc567c 100644
--- a/adocs/documentation/src/main/asciidoc/release-notes.adoc
+++ b/adocs/documentation/src/main/asciidoc/release-notes.adoc
@@ -11,114 +11,117 @@
 
 This table summarises all releases of Apache Isis to date.
 
-[cols="1,1,2a,2a,>1,>1,>1"]
+[cols="1,2,4a,>1,>1,>1,3a"]
 |===
 | Version
 | Date
-| Components
 | Release notes
 | Features
 | Improves
 | Bugs
+| JIRA relnotes
 
 | xref:r1.13.0[1.13.0]
-| xx-jul-2016 +
-(RC1 voting underway)
-| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12335362
+| 11-jul-2016
 | Commands, interactions and internal refactorings
 | 27
 | 50
 | 23
+| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12335362[Release notes for v1.13.0]
 
 | xref:r1.12.2[1.12.2]
 | 06-jun-2016
-| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12335949[Release notes for v1.12.2]
 | Bug-fix release
 | 0
 | 0
 | 2
+| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12335949[Release notes for v1.12.2]
 
 | xref:r1.12.1[1.12.1]
 | 12-apr-2016
-| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12335484[Release notes for v1.12.1]
 | Bug-fix release
 | 0
 | 0
 | 4
+| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12335484[Release notes for v1.12.1]
 
 | xref:r1.12.0[1.12.0]
 | 29-mar-2016
-| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12327483[Release notes for v1.12.0]
 | Dynamic XML layouts
 | 7
 | 21
 | 21
+| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12327483[Release notes for v1.12.0]
 
 | xref:r1.11.1[1.11.1]
 | 17-jan-2016
-| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12334640[Release notes for v1.11.1]
 | Re-release under Java 1.7 (using toolchains plugin).
 | 0
 | 0
 | 1
+| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12334640[Release notes for v1.11.1]
 
 | xref:r1.11.0[1.11.0]
 | 02-jan-2016
-| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12333974[Release notes for v1.11.0]
 | More flexible REST API, view models using JAXB.
 | 9
 | 19
 | 12
+| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12333974[Release notes for v1.11.0]
 
 | xref:r1.10.0[1.10.0]
 | 10-nov-2015
-| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12333354[Release notes for 1.10.0]
 | New domain services, multi-tenancy support and mixins.
 | 7
 | 18
 | 12
+| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12333354[Release notes for 1.10.0]
 
 | xref:r1.9.0[1.9.0]
 | 1-sep-2015
-| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12332806[Release notes for 1.9.0]
 | AppManifest, Restful Objects representations and other "under-the-cover" improvements.
 | 18
 | 50
 | 25
+| https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12332806[Release notes for 1.9.0]
 
 | xref:r1.8.0[1.8.0]
 | 24-feb-2015
-| * link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12328845[core-1.8.0]
-* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12328847[archetype-1.8.0]
 | Wicket viewer moved into core; todoapp archetype moved to link:http://www.isisaddons.org[Isis Addons] (non-ASF).
 | 27
 | 41
 | 20
+| * link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12328845[core-1.8.0]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12328847[archetype-1.8.0]
 
 | xref:r1.7.0[1.7.0]
 | 18-oct-2014
-| * link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326453[core-1.7.0]
-* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326460[viewer-wicket-1.7.0]
-* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12327441[archetype-simpleapp-1.7.0]
-* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12327440[archetype-todoapp-1.7.0]
 | Module functionality previously in 1.6.0 now retired; use http://isisaddons.org[Isis Addons] (non-ASF) instead.
 | 4
 | 9
 | 20
+| * link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326453[core-1.7.0]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326460[viewer-wicket-1.7.0]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12327441[archetype-simpleapp-1.7.0]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12327440[archetype-todoapp-1.7.0]
 
 | xref:r1.6.0[1.6.0]
 | 28-jul-2014
-| * link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12325314[core-1.6.0]
-* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12325318[viewer-wicket-1.6.0]
-* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326462[archetype-simpleapp-1.6.0]
-* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326461[archetype-todoapp-1.6.0]
 | Restful Objects viewer, JDO/Datanucleus Objectstore and Shiro Security all moved into core.  Quickstart-wrj archetype renamed to todoapp; simple-wrj archetype renamed to simpleapp.  Some functionality copied/refactored as link:http://www.isisaddons.org[Isis Addons] (non-ASF).
 | 6
 | 12
 | 15
+| * link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12325314[core-1.6.0]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12325318[viewer-wicket-1.6.0]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326462[archetype-simpleapp-1.6.0]
+* link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326461[archetype-todoapp-1.6.0]
 
 | xref:r1.5.0[1.5.0]
 | 08-jun-2014
+| No longer releasing security-file
+| 3
+| 19
+| 13
 | * link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326524[core-1.5.0]
 * link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326525[objectstore-jdo-1.5.0]
 * link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326529[security-shiro-1.5.0]
@@ -126,24 +129,24 @@ This table summarises all releases of Apache Isis to date.
 * link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326526[viewer-wicket-1.5.0]
 * link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326528[archetype-simple-wrj-1.5.0]
 * link:https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311171&version=12326527[archetype-quickstart-wrj-1.5.0]
-| No longer releasing security-file
-| 3
-| 19
-| 13
 
 | xref:r1.4.1[1.4.1]
 | 14-mar-2014
-| * objectstore-jdo-1.4.1
-* viewer-wicket-1.4.1
-* archetype-simple-wrj-1.4.1
-* archetype-quickstart-wrj-1.4.1
 | Patch release
 | 0
 | 2
 | 2
+| * objectstore-jdo-1.4.1
+* viewer-wicket-1.4.1
+* archetype-simple-wrj-1.4.1
+* archetype-quickstart-wrj-1.4.1
 
 | xref:r1.4.0[1.4.0]
 | 11-mar-2014
+|
+| 56
+| 62
+| 26
 | * core-1.4.0
 * objectstore-jdo-1.4.0
 * security-file-1.4.0
@@ -152,23 +155,23 @@ This table summarises all releases of Apache Isis to date.
 * viewer-wicket-1.4.0
 * archetype-simple-wrj-1.4.0
 * archetype-quickstart-wrj-1.4.0
-|
-| 56
-| 62
-| 26
 
 | xref:r1.3.1[1.3.1]
 | 7-nov-2013
-| * viewer-wicket-1.3.1
-* archetype-simple-wrj-1.3.1
-* archetype-quickstart-wrj-1.3.1
 | Patch release
 | 1
 | 0
 | 3
+| * viewer-wicket-1.3.1
+* archetype-simple-wrj-1.3.1
+* archetype-quickstart-wrj-1.3.1
 
 | xref:r1.8.0[1.3.0]
 | 25-oct-2013
+| WRJ archetype renamed to Quickstart WRJ.  Simple WRJ archetype added.
+| 52
+| 61
+| 30
 | * core-1.3.0
 * objectstore-jdo-1.3.0
 * security-file-1.0.2
@@ -177,13 +180,13 @@ This table summarises all releases of Apache Isis to date.
 * viewer-wicket-1.3.0
 * archetype-simple-wrj-1.3.0
 * archetype-quickstart-wrj-1.3.0
-| WRJ archetype renamed to Quickstart WRJ.  Simple WRJ archetype added.
-| 52
-| 61
-| 30
 
 | xref:r1.2.0[1.2.0]
 | 30-may-2013
+|
+| 22
+| 41
+| 15
 | * core-1.2.0
 * objectstore-jdo-1.2.0
 * security-file-1.0.1
@@ -191,59 +194,55 @@ This table summarises all releases of Apache Isis to date.
 * viewer-restfulobjects-2.0.0
 * viewer-wicket-1.2.0
 * archetype-wrj-1.0.3
-|
-| 22
-| 41
-| 15
 
 | xref:r1.1.0[1.1.0]
 | 31-jan-2013
-|* core-1.1.0
-* security-shiro-1.1.0
-* viewer-wicket-1.1.0
-* archetype-wrj-1.0.2
 |
 | 9
 | 18
 | 8
+|* core-1.1.0
+* security-shiro-1.1.0
+* viewer-wicket-1.1.0
+* archetype-wrj-1.0.2
 
 | xref:r1.0.1[1.0.1]
 | 10-jan-2013
-| * security-shiro-1.0.0
-* archetype-wrj-1.0.1
 | Combining RestfulObjects and Wicket viewers into a single webapp, along with Shiro security
 | 1
 |
 |
+| * security-shiro-1.0.0
+* archetype-wrj-1.0.1
 
 | xref:r1.0.0[1.0.0]
 | 24-dec-2012
+| First release having graduated
+| 8
+| 33
+| 6
 |* core-1.0.0
 * security-file-1.0.0
 * viewer-wicket-1.0.0
 * viewer-restfulobjects-1.0.0
 * archetype-wrj-1.0.0
-| First release having graduated
-| 8
-| 33
-| 6
 
 
 | 0.2.0-incubating
 | 20-feb-2012
-| * 0.2.0-incubating
 |
 |
 |
 |
+| * 0.2.0-incubating
 
 | 0.1.2-incubating
 | 13-jul-2011
-| * 0.1.2-incubating
 | First release in the ASF incubator
 |
 |
 |
+| * 0.1.2-incubating
 |===