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 2015/12/04 11:12:59 UTC
[1/3] isis git commit: ISIS-1243: fixing links to fundamentals guide;
updating asciidoc live templates;
updating contributors guide that documents the asciidoc live templates
Repository: isis
Updated Branches:
refs/heads/master 1ad824700 -> f6f60c703
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/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 ffa31ef..18d8b70 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
@@ -11,7 +11,7 @@ Nevertheless, we do need to bootstrap the runtime for the very first test.
As of 1.9.0 the bootstrapping of integration tests and webapps has been simplified through the xref:rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[`AppManifest`] class. Since this isn't mandatory, for now we present both techniques.
-The example code in this section is taken from the app generated by the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype].
+The example code in this section is taken from the app generated by the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype].
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugtst_integ-test-support_maven-configuration.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugtst_integ-test-support_maven-configuration.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugtst_integ-test-support_maven-configuration.adoc
index 587fe92..3f15828 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugtst_integ-test-support_maven-configuration.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugtst_integ-test-support_maven-configuration.adoc
@@ -5,7 +5,7 @@
:_imagesdir: images/
-Apache Isis' integration test support is automatically configured if you use the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]. To set it up manually, update the `pom.xml` of your domain object model module:
+Apache Isis' integration test support is automatically configured if you use the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]. To set it up manually, update the `pom.xml` of your domain object model module:
[source,xml]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugtst_unit-test-support_contract-tests.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugtst_unit-test-support_contract-tests.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugtst_unit-test-support_contract-tests.adoc
index 6171c86..0073431 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugtst_unit-test-support_contract-tests.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugtst_unit-test-support_contract-tests.adoc
@@ -64,11 +64,11 @@ public class SortedSetsContractTestAll extends SortedSetsContractTestAbstract {
== Bidirectional
-This contract test automatically checks that bidirectional 1:m or 1:1 associations are being maintained correctly (assuming that they follow the xref:ug.adoc#_ugfun_how-tos_entity-relationships_managed-1-to-m-bidirectional-relationships[mutual registration pattern]
+This contract test automatically checks that bidirectional 1:m or 1:1 associations are being maintained correctly (assuming that they follow the xref:ugfun.adoc#_ugfun_how-tos_entity-relationships_managed-1-to-m-bidirectional-relationships[mutual registration pattern]
[TIP]
====
-(If using the JDO objectstore, then) there is generally no need to programmatically maintain 1:m relationships (indeed it may introduce subtle errors). For more details, see xref:ug.adoc#_ugfun_how-tos_entity-relationships_managed-1-to-m-bidirectional-relationships[here]. Also check out the xref:cg.adoc#_cg_ide-templates[IDE templates] for further guidance.
+(If using the JDO objectstore, then) there is generally no need to programmatically maintain 1:m relationships (indeed it may introduce subtle errors). For more details, see xref:ugfun.adoc#_ugfun_how-tos_entity-relationships_managed-1-to-m-bidirectional-relationships[here]. Also check out the xref:cg.adoc#_cg_ide-templates[IDE templates] for further guidance.
====
For example, suppose that `ParentDomainObject` and `ChildDomainObject` have a 1:m relationship (`ParentDomainObject#children` / `ChildDomainObject#parent`), and also `PeerDomainObject` has a 1:1 relationship with itself (`PeerDomainObject#next` / `PeerDomainObject#previous`).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugtst_unit-test-support_maven-configuration.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugtst_unit-test-support_maven-configuration.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugtst_unit-test-support_maven-configuration.adoc
index 9fa4881..36af192 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugtst_unit-test-support_maven-configuration.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugtst_unit-test-support_maven-configuration.adoc
@@ -5,7 +5,7 @@
:_imagesdir: images/
-Apache Isis' unit test support is automatically configured if you use the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]. To set it up manually, update the `pom.xml` of your domain object model module:
+Apache Isis' unit test support is automatically configured if you use the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]. To set it up manually, update the `pom.xml` of your domain object model module:
[source,xml]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugvw_customisation_about-page.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugvw_customisation_about-page.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugvw_customisation_about-page.adoc
index 8a6426f..e1f394b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugvw_customisation_about-page.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugvw_customisation_about-page.adoc
@@ -31,7 +31,7 @@ If none of these are found, then no version is displayed.
[TIP]
====
-This configuration is included within the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype].
+This configuration is included within the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype].
====
=== Adding attributes to the WAR's manifest
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugvw_customisation_tweaking-css-classes.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugvw_customisation_tweaking-css-classes.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugvw_customisation_tweaking-css-classes.adoc
index 5e1d869..5bd0d8f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugvw_customisation_tweaking-css-classes.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugvw_customisation_tweaking-css-classes.adoc
@@ -92,7 +92,7 @@ div.x-myapp-highlight span.scalarName {
}
----
-Note also that instead of using `@PropertyLayout(cssClass=...)` annotation, you can also specify the CSS style using a xref:ug.adoc#_ugfun_object-layout_dynamic[dynamic layout] JSON file:
+Note also that instead of using `@PropertyLayout(cssClass=...)` annotation, you can also specify the CSS style using a xref:ugfun.adoc#_ugfun_object-layout_dynamic[dynamic layout] JSON file:
[source,javascript]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugvw_layout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugvw_layout.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugvw_layout.adoc
index 322e045..bc2a1ea 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugvw_layout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugvw_layout.adoc
@@ -6,7 +6,7 @@
-The wicket viewer has full support for the various methods of specifying the xref:ug.adoc#_ugfun_object-layout[layout of objects], either statically or dynamically.
+The wicket viewer has full support for the various methods of specifying the xref:ugfun.adoc#_ugfun_object-layout[layout of objects], either statically or dynamically.
Dynamic reloading is automatically supported when running in xref:rgcfg.adoc#_rgcfg_deployment-types[prototype (development) mode], the Wicket viewer automatically rebuilds the metamodel for each class as it is rendered. Conversely, do note that the Wicket viewer will *not* pick up new metadata if running in production/server mode.
@@ -46,7 +46,7 @@ And finally, from the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Is
image::{_imagesdir}wicket-viewer/layouts/todoapp-ToDoItem.png[width="800px",link="{_imagesdir}wicket-viewer/layouts/todoapp-ToDoItem.png"]
-To learn more about how to configure these types of layout, see the xref:ug.adoc#_ugfun_object-layout[object layout] chapter.
+To learn more about how to configure these types of layout, see the xref:ugfun.adoc#_ugfun_object-layout[object layout] chapter.
@@ -92,6 +92,6 @@ Therefore, make sure the following is added to the dom project's `pom.xml`:
</resources>
----
-If using an Apache Isis xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype], then the POM is already correctly configured.
+If using an Apache Isis xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype], then the POM is already correctly configured.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/cg.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/cg.adoc b/adocs/documentation/src/main/asciidoc/guides/cg.adoc
index 9da1818..b294bab 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cg.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cg.adoc
@@ -39,7 +39,7 @@ The reference guides are:
* xref:rgant.adoc#[Annotations]
* xref:rgsvc.adoc#[Domain Services]
* xref:rgcfg.adoc#[Configuration Properties]
-* xref:rg.adoc#[Classes, Methods and Schema]
+* xref:rgcms.adoc#[Classes, Methods and Schema]
In addition, there is (this) xref:cg.adoc#_cg[Contributors' Guide] describing development practices for contributors and committers alike.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/rg.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rg.adoc b/adocs/documentation/src/main/asciidoc/guides/rg.adoc
index 4711809..8197779 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rg.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rg.adoc
@@ -22,6 +22,6 @@ The reference guides are:
* xref:rgant.adoc#[Annotations]
* xref:rgsvc.adoc#[Domain Services]
* xref:rgcfg.adoc#[Configuration Properties]
-* xref:rg.adoc#[Classes, Methods and Schema]
+* xref:rgcms.adoc#[Classes, Methods and Schema]
In addition, there is a xref:cg.adoc#_cg[Contributors' Guide] describing development practices for contributors and committers alike.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/rgant.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgant.adoc b/adocs/documentation/src/main/asciidoc/guides/rgant.adoc
index 491e973..e0259b1 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgant.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgant.adoc
@@ -3,6 +3,7 @@
: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/
+:numbered:
[[_rgant]]
@@ -30,7 +31,7 @@ The reference guides are:
* xref:rgant.adoc#[Annotations]
* xref:rgsvc.adoc#[Domain Services]
* xref:rgcfg.adoc#[Configuration Properties]
-* xref:rg.adoc#[Classes, Methods and Schema]
+* xref:rgcms.adoc#[Classes, Methods and Schema]
In addition, there is a xref:cg.adoc#_cg[Contributors' Guide] describing development practices for contributors and committers alike.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/rgcfg.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgcfg.adoc b/adocs/documentation/src/main/asciidoc/guides/rgcfg.adoc
index d064cce..09ab94e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgcfg.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgcfg.adoc
@@ -3,6 +3,7 @@
: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/
+:numbered:
[[_rgcfg]]
@@ -11,6 +12,17 @@
Apache Isis' own configuration properties are simple key-value pairs, typically held in the `WEBINF/isis.properties`
file and other related files. This guide describes how to configure an Apache Isis application.
+[NOTE]
+====
+Configuration properties for the viewers can be found in the xref:ugvw.adoc#[Wicket Viewer] guide
+and the xref:ugvro.adoc#[RestfulObjects viewer] guide. Likewise[details of configuring security (Apache Shiro) can be
+found in the xref:ugsec.adoc#[Security] guide.
+
+Also, note that by default the configuration values are part of the built WAR file. Details on how to override these
+configuration properties externally for different environments can be found in the
+xref:ugbtb.adoc#_ugbtb_deployment[Beyond the Basics] guide, (deployment chapter).
+====
+
=== Other Guides
Apache Isis documentation is broken out into a number of user and reference guides.
@@ -28,20 +40,12 @@ The reference guides are:
* xref:rgant.adoc#[Annotations]
* xref:rgsvc.adoc#[Domain Services]
-* xref:rgcfg.adoc#[Configuration Properties]
-* xref:rg.adoc#[Classes, Methods and Schema]
+* xref:rgcfg.adoc#[Configuration Properties] (this guide)
+* xref:rgcms.adoc#[Classes, Methods and Schema]
In addition, there is a xref:cg.adoc#_cg[Contributors' Guide] describing development practices for contributors and committers alike.
-[NOTE]
-====
-Configuration properties for the viewers can be found in the xref:ugvw.adoc#[Wicket Viewer] guide and the xref:ugvro.adoc#[RestfulObjects viewer] guide. Likewise[details of configuring security (Apache Shiro) can be found in the xref:ugsec.adoc#[Security] guide.
-
-Also, note that by default the configuration values are part of the built WAR file. Details on how to override these
-configuration properties externally for different environments can be found in the
-xref:ugbtb.adoc#_ugbtb_deployment[Beyond the Basics] guide, (deployment chapter).
-====
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/rgcms.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgcms.adoc b/adocs/documentation/src/main/asciidoc/guides/rgcms.adoc
index b6dcc5e..750cfa4 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgcms.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgcms.adoc
@@ -1,4 +1,4 @@
-[[rg]]
+[[rgcms]]
= Classes, Methods and Schema
: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: ../
@@ -6,7 +6,7 @@
:numbered:
-[[_rg]]
+[[_rgcms]]
= Classes, Methods and Schema
This reference guide lists and describes various elements of the the Apache Isis Programming Model, specifically
@@ -34,7 +34,7 @@ The reference guides are:
* xref:rgant.adoc#[Annotations]
* xref:rgsvc.adoc#[Domain Services]
* xref:rgcfg.adoc#[Configuration Properties]
-* xref:rg.adoc#[Classes, Methods and Schema] (this guide)
+* xref:rgcms.adoc#[Classes, Methods and Schema] (this guide)
In addition, there is a xref:cg.adoc#_cg[Contributors' Guide] describing development practices for contributors and committers alike.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/rgsvc.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/rgsvc.adoc b/adocs/documentation/src/main/asciidoc/guides/rgsvc.adoc
index a141126..5feb1fd 100644
--- a/adocs/documentation/src/main/asciidoc/guides/rgsvc.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/rgsvc.adoc
@@ -3,6 +3,7 @@
: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/
+:numbered:
[[_rgsvc]]
@@ -30,7 +31,7 @@ The reference guides are:
* xref:rgant.adoc#[Annotations]
* xref:rgsvc.adoc#[Domain Services] (this guide)
* xref:rgcfg.adoc#[Configuration Properties]
-* xref:rg.adoc#[Classes, Methods and Schema]
+* xref:rgcms.adoc#[Classes, Methods and Schema]
In addition, there is a xref:cg.adoc#_cg[Contributors' Guide] describing development practices for contributors and committers alike.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/tg.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/tg.adoc b/adocs/documentation/src/main/asciidoc/guides/tg.adoc
index 8856b4c..624a352 100644
--- a/adocs/documentation/src/main/asciidoc/guides/tg.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/tg.adoc
@@ -3,6 +3,7 @@
: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/
+:numbered:
[[_tg]]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/ug.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ug.adoc b/adocs/documentation/src/main/asciidoc/guides/ug.adoc
index c34ef34..90ddfb3 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ug.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ug.adoc
@@ -22,6 +22,6 @@ The reference guides are:
* xref:rgant.adoc#[Annotations]
* xref:rgsvc.adoc#[Domain Services]
* xref:rgcfg.adoc#[Configuration Properties]
-* xref:rg.adoc#[Classes, Methods and Schema]
+* xref:rgcms.adoc#[Classes, Methods and Schema]
In addition, there is a xref:cg.adoc#_cg[Contributors' Guide] describing development practices for contributors and committers alike.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/ugbtb.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugbtb.adoc b/adocs/documentation/src/main/asciidoc/guides/ugbtb.adoc
index 7001a58..a7ba529 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugbtb.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugbtb.adoc
@@ -32,7 +32,7 @@ The reference guides are:
* xref:rgant.adoc#[Annotations]
* xref:rgsvc.adoc#[Domain Services]
* xref:rgcfg.adoc#[Configuration Properties]
-* xref:rg.adoc#[Classes, Methods and Schema]
+* xref:rgcms.adoc#[Classes, Methods and Schema]
In addition, there is a xref:cg.adoc#_cg[Contributors' Guide] describing development practices for contributors and committers alike.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/ugfun.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugfun.adoc b/adocs/documentation/src/main/asciidoc/guides/ugfun.adoc
index 00abbf2..ddda6ff 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugfun.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugfun.adoc
@@ -9,12 +9,12 @@
[[_ugfun]]
== Fundamentals
-This guide introduces the xref:ug.adoc#_ugfun_core-concepts[core concepts] and ideas behind Apache Isis,
-and tells you how to xref:ug.adoc#_ugfun_getting-started[get started] with a Maven archetype.
+This guide introduces the xref:ugfun.adoc#_ugfun_core-concepts[core concepts] and ideas behind Apache Isis,
+and tells you how to xref:ugfun.adoc#_ugfun_getting-started[get started] with a Maven archetype.
-It also describes a number of xref:ug.adoc#_ugfun_how-tos[how-to]s, describes how to influence the
-xref:ug.adoc#_ugfun_object-layout[UI layout] of your domain objects (this is ultimately just a type of metadata), and it
- catalogues various xref:ug.adoc#_ugfun_faqs.adoc[FAQ]s.
+It also describes a number of xref:ugfun.adoc#_ugfun_how-tos[how-to]s, describes how to influence the
+xref:ugfun.adoc#_ugfun_object-layout[UI layout] of your domain objects (this is ultimately just a type of metadata), and it
+ catalogues various xref:ugfun.adoc#_ugfun_faqs.adoc[FAQ]s.
=== Other Guides
@@ -34,7 +34,7 @@ The reference guides are:
* xref:rgant.adoc#[Annotations]
* xref:rgsvc.adoc#[Domain Services]
* xref:rgcfg.adoc#[Configuration Properties]
-* xref:rg.adoc#[Classes, Methods and Schema]
+* xref:rgcms.adoc#[Classes, Methods and Schema]
In addition, there is a xref:cg.adoc#_cg[Contributors' Guide] describing development practices for contributors and committers alike.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/ugsec.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugsec.adoc b/adocs/documentation/src/main/asciidoc/guides/ugsec.adoc
index 34f9de3..2038eff 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugsec.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugsec.adoc
@@ -3,6 +3,7 @@
: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/
+:numbered:
[[_ugsec]]
@@ -29,7 +30,7 @@ The reference guides are:
* xref:rgant.adoc#[Annotations]
* xref:rgsvc.adoc#[Domain Services]
* xref:rgcfg.adoc#[Configuration Properties]
-* xref:rg.adoc#[Classes, Methods and Schema]
+* xref:rgcms.adoc#[Classes, Methods and Schema]
In addition, there is a xref:cg.adoc#_cg[Contributors' Guide] describing development practices for contributors and committers alike.
@@ -46,7 +47,7 @@ Isis has two levels of permissions. _Read_ permission means that the user can v
Isis provides an API for both authentication and authorization, and provides an implementation that integrates with link:http://shiro.apache.org[Apache Shiro]. Shiro in turn uses the concept of a _realm_ as a source for both authentication and optionally authorization.
-Shiro ships with a simple text-based realm -- the `IniRealm` -- which reads users (and password), user roles and role permissions from the `WEB-INF/shiro.ini` file. The xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] is configured to use this realm.
+Shiro ships with a simple text-based realm -- the `IniRealm` -- which reads users (and password), user roles and role permissions from the `WEB-INF/shiro.ini` file. The xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] is configured to use this realm.
Shiro also ships with an implementation of an LDAP-based realm; LDAP is often used to manage user/passwords and corresponding user groups. Apache Isis in turn extends this with its `IsisLdapRealm`, which provides more flexibility for both group/role and role/permissions management.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/ugtst.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugtst.adoc b/adocs/documentation/src/main/asciidoc/guides/ugtst.adoc
index 1997486..c558cc2 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugtst.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugtst.adoc
@@ -3,6 +3,7 @@
: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/
+:numbered:
@@ -34,7 +35,7 @@ The reference guides are:
* xref:rgant.adoc#[Annotations]
* xref:rgsvc.adoc#[Domain Services]
* xref:rgcfg.adoc#[Configuration Properties]
-* xref:rg.adoc#[Classes, Methods and Schema]
+* xref:rgcms.adoc#[Classes, Methods and Schema]
In addition, there is a xref:cg.adoc#_cg[Contributors' Guide] describing development practices for contributors and committers alike.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/ugvro.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvro.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvro.adoc
index 2dbdd6c..95ee4b7 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvro.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvro.adoc
@@ -3,6 +3,7 @@
: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/
+:numbered:
@@ -12,6 +13,7 @@
Apache Isis' Restful Objects viewer is an implementation of the link:http://restfulobjects.org[Restful Objects spec],
which defines a generic way to expose a domain model through a REST (or more precisely, hypermedia) API.
+It also provides a number of extensions specific to Apache Isis. Most significant of these is
This user guide discuss features, configuration and how to extend the Restful Objects viewer.
=== Other Guides
@@ -32,7 +34,7 @@ The reference guides are:
* xref:rgant.adoc#[Annotations]
* xref:rgsvc.adoc#[Domain Services]
* xref:rgcfg.adoc#[Configuration Properties]
-* xref:rg.adoc#[Classes, Methods and Schema]
+* xref:rgcms.adoc#[Classes, Methods and Schema]
In addition, there is a xref:cg.adoc#_cg[Contributors' Guide] describing development practices for contributors and committers alike.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/ugvw.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/ugvw.adoc b/adocs/documentation/src/main/asciidoc/guides/ugvw.adoc
index bfe7b43..29add35 100644
--- a/adocs/documentation/src/main/asciidoc/guides/ugvw.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/ugvw.adoc
@@ -36,7 +36,7 @@ The reference guides are:
* xref:rgant.adoc#[Annotations]
* xref:rgsvc.adoc#[Domain Services]
* xref:rgcfg.adoc#[Configuration Properties]
-* xref:rg.adoc#[Classes, Methods and Schema]
+* xref:rgcms.adoc#[Classes, Methods and Schema]
In addition, there is a xref:cg.adoc#_cg[Contributors' Guide] describing development practices for contributors and committers alike.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/resources/templates/isis-asciidoc-templates-idea.xml
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/resources/templates/isis-asciidoc-templates-idea.xml b/adocs/documentation/src/main/asciidoc/resources/templates/isis-asciidoc-templates-idea.xml
index 2c0e28b..5b65582 100644
--- a/adocs/documentation/src/main/asciidoc/resources/templates/isis-asciidoc-templates-idea.xml
+++ b/adocs/documentation/src/main/asciidoc/resources/templates/isis-asciidoc-templates-idea.xml
@@ -102,7 +102,7 @@
<option name="AsciiDoc" value="true" />
</context>
</template>
- <template name="adlinkaddonsapp" value="(non-ASF) http://github.com/isisaddons/isis-app-$APP$[Isis addons' $APP$]" description="Link to specific Isis Addons app" toReformat="false" toShortenFQNames="true" deactivated="true">
+ <template name="adlinkaddonsapp" value="(non-ASF) http://github.com/isisaddons/isis-app-$APP$[Isis addons' $APP$]" description="Link to specific Isis Addons app" toReformat="false" toShortenFQNames="true">
<variable name="APP" expression="" defaultValue="" alwaysStopAt="true" />
<context>
<option name="AsciiDoc" value="true" />
@@ -167,50 +167,43 @@
<option name="AsciiDoc" value="true" />
</context>
</template>
- <template name="adrgmp" value="xref:rg.adoc#_rg_methods_prefixes_manpage-$methodName$[`$methodName$...()`]" description="x-ref to ref guide manpage for method prefix" toReformat="false" toShortenFQNames="true">
+ <template name="adrgmp" value="xref:rgcsm.adoc#_rgcsm_methods_prefixes_$methodName$[`$methodName$...()`]" description="x-ref to ref guide manpage for method prefix" toReformat="false" toShortenFQNames="true">
<variable name="methodName" expression="" defaultValue="" alwaysStopAt="true" />
<context>
<option name="AsciiDoc" value="true" />
</context>
</template>
- <template name="adug1" value="xref:ug.adoc#$chapter$[$DisplayText$]" description="x-ref to user guide level 1 (chapter)" toReformat="false" toShortenFQNames="true">
- <variable name="chapter" expression="" defaultValue="_ug_" alwaysStopAt="true" />
- <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adrgsa" value="xref:rg.adoc#_rg_services-api_manpage-$ServiceType$[`$ServiceType$`]" description="x-ref to ref guide manpage for service api" toReformat="false" toShortenFQNames="true">
+ <template name="adrgsa" value="xref:rgsvc.adoc#_rgsvc_api_$ServiceType$[`$ServiceType$`]" description="x-ref to ref guide manpage for service api" toReformat="false" toShortenFQNames="true">
<variable name="ServiceType" expression="" defaultValue="" alwaysStopAt="true" />
<context>
<option name="AsciiDoc" value="true" />
</context>
</template>
- <template name="adrgmr" value="xref:rg.adoc#_rg_methods_reserved_manpage-$methodName$[`$methodName$()`]" description="x-ref to ref guide manpage for reserved method" toReformat="false" toShortenFQNames="true">
+ <template name="adrgmr" value="xref:rgcsm.adoc#_rgcsm_methods_reserved_$methodName$[`$methodName$()`]" description="x-ref to ref guide manpage for reserved method" toReformat="false" toShortenFQNames="true">
<variable name="methodName" expression="" defaultValue="" alwaysStopAt="true" />
<context>
<option name="AsciiDoc" value="true" />
</context>
</template>
- <template name="adrgss" value="xref:rg.adoc#_rg_services-spi_manpage-$ServiceType$[`$ServiceType$`]" description="x-ref to ref guide manpage for service spi" toReformat="false" toShortenFQNames="true">
+ <template name="adrgss" value="xref:rgsvc.adoc#_rgsvc-spi_$ServiceType$[`$ServiceType$`]" description="x-ref to ref guide manpage for service spi" toReformat="false" toShortenFQNames="true">
<variable name="ServiceType" expression="" defaultValue="" alwaysStopAt="true" />
<context>
<option name="AsciiDoc" value="true" />
</context>
</template>
- <template name="adrgcv" value="xref:rg.adoc#_rg_classes_value-types_manpage-$Type$[`$Type$`]" description="x-ref to ref guide manpage for class value type" toReformat="false" toShortenFQNames="true">
+ <template name="adrgcv" value="xref:rgcsm.adoc#_rgcsm_classes_value-types_$Type$[`$Type$`]" description="x-ref to ref guide manpage for class value type" toReformat="false" toShortenFQNames="true">
<variable name="Type" expression="" defaultValue="" alwaysStopAt="true" />
<context>
<option name="AsciiDoc" value="true" />
</context>
</template>
- <template name="adrgcs" value="xref:rg.adoc#_rg_classes_super_manpage-$Type$[`$Type$`]" description="x-ref to ref guide manpage for class superclass" toReformat="false" toShortenFQNames="true">
+ <template name="adrgcs" value="xref:rgcsm.adoc#_rgcsm_classes_super_$Type$[`$Type$`]" description="x-ref to ref guide manpage for class superclass" toReformat="false" toShortenFQNames="true">
<variable name="Type" expression="" defaultValue="" alwaysStopAt="true" />
<context>
<option name="AsciiDoc" value="true" />
</context>
</template>
- <template name="adrgcu" value="xref:rg.adoc#_rg_classes_utility_manpage-$Type$[`$Type$`]" description="x-ref to ref guide manpage for class utility" toReformat="false" toShortenFQNames="true">
+ <template name="adrgcu" value="xref:rgcsm.adoc#_rgcsm_classes_utility_$Type$[`$Type$`]" description="x-ref to ref guide manpage for class utility" toReformat="false" toShortenFQNames="true">
<variable name="Type" expression="" defaultValue="" alwaysStopAt="true" />
<context>
<option name="AsciiDoc" value="true" />
@@ -222,29 +215,12 @@
<option name="AsciiDoc" value="true" />
</context>
</template>
- <template name="adrgna" value="xref:rg.adoc#_rg_annotations_manpage-$Type$[`@$Type$`]" description="x-ref to ref guide manpage for annotation" toReformat="false" toShortenFQNames="true">
+ <template name="adrgna" value="xref:rgant.adoc#_rgant_$Type$[`@$Type$`]" description="x-ref to ref guide manpage for annotation" toReformat="false" toShortenFQNames="true">
<variable name="Type" expression="" defaultValue="" alwaysStopAt="true" />
<context>
<option name="AsciiDoc" value="true" />
</context>
</template>
- <template name="adug2" value="xref:ug.adoc#$chapter$_$section$[$DisplayText$]" description="x-ref to user guide level 2 (chapter section)" toReformat="false" toShortenFQNames="true">
- <variable name="chapter" expression="" defaultValue="_ug_" alwaysStopAt="true" />
- <variable name="section" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adug3" value="xref:ug.adoc#$chapter$_$section$_$subsection$[$DisplayText$]" description="x-ref to user guide level 3 (chapter section subsection)" toReformat="false" toShortenFQNames="true">
- <variable name="chapter" expression="" defaultValue="_ug_" alwaysStopAt="true" />
- <variable name="section" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="subsection" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
<template name="adxrefany" value="xref:$chapter$[$DisplayText$]" description="x-ref to any" toReformat="false" toShortenFQNames="true">
<variable name="chapter" expression="" defaultValue="" alwaysStopAt="true" />
<variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
@@ -252,24 +228,21 @@
<option name="AsciiDoc" value="true" />
</context>
</template>
- <template name="adrgnt" value="xref:rg.adoc#_rg_annotations_manpage-$Type$_$attribute$[`@$Type$#$attribute$()`]" description="x-ref to ref guide manpage for annotation's attribute" toReformat="false" toShortenFQNames="true">
+ <template name="adrgnt" value="xref:rgant.adoc#_rgant_$Type$_$attribute$[`@$Type$#$attribute$()`]" description="x-ref to ref guide manpage for annotation's attribute" toReformat="false" toShortenFQNames="true">
<variable name="Type" expression="" defaultValue="" alwaysStopAt="true" />
<variable name="attribute" expression="" defaultValue="" alwaysStopAt="true" />
<context>
<option name="AsciiDoc" value="true" />
</context>
</template>
- <template name="adugvw" value="xref:ug.adoc#_ug_wicket-viewer[Wicket viewer]" description="x-ref to user guide wicket viewer" toReformat="false" toShortenFQNames="true">
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adugvro" value="xref:ug.adoc#_ug_restfulobjects-viewer[RestfulObjects viewer]" description="x-ref to user guide restfulobjects viewer" toReformat="false" toShortenFQNames="true">
+ <template name="adugvw" value="xref:ugvw.adoc#$bookmark$[$DisplayText$]" description="x-ref to user guide wicket viewer" toReformat="false" toShortenFQNames="true">
+ <variable name="bookmark" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="DisplayText" expression="" defaultValue="Wicket viewer" alwaysStopAt="true" />
<context>
<option name="AsciiDoc" value="true" />
</context>
</template>
- <template name="adrgntx" value="xref:rg.adoc#_rg_annotations_manpage-$Type$_$attribute$[$linkText$]" description="x-ref to ref guide manpage for annotation's attribute, overriding the link text" toReformat="false" toShortenFQNames="true">
+ <template name="adrgntx" value="xref:rgant.adoc#_rgant_$Type$_$attribute$[$linkText$]" description="x-ref to ref guide manpage for annotation's attribute, overriding the link text" toReformat="false" toShortenFQNames="true">
<variable name="Type" expression="" defaultValue="" alwaysStopAt="true" />
<variable name="attribute" expression="" defaultValue="" alwaysStopAt="true" />
<variable name="linkText" expression="" defaultValue="" alwaysStopAt="true" />
@@ -291,73 +264,63 @@
<option name="AsciiDoc" value="true" />
</context>
</template>
- <template name="adrg1" value="xref:rg.adoc#$chapter$[$DisplayText$]" description="x-ref to ref guide level 1 (chapter)" toReformat="false" toShortenFQNames="true">
- <variable name="chapter" expression="" defaultValue="_rg_" alwaysStopAt="true" />
- <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adrg2" value="xref:rg.adoc#$chapter$_$section$[$DisplayText$]" description="x-ref to ref guide level 2 (chapter section)" toReformat="false" toShortenFQNames="true">
- <variable name="chapter" expression="" defaultValue="_rg_" alwaysStopAt="true" />
- <variable name="section" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
- <context>
- <option name="AsciiDoc" value="true" />
- </context>
- </template>
- <template name="adrg3" value="xref:rg.adoc#$chapter$_$section$_$subsection$[$DisplayText$]" description="x-ref to ref guide level 3 (chapter section subsection)" toReformat="false" toShortenFQNames="true">
- <variable name="chapter" expression="" defaultValue="_rg_" alwaysStopAt="true" />
- <variable name="section" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="subsection" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
+ <template name="adrgcfg" value="xref:rgcfg.adoc#$bookmark$[$DisplayText$]" description="x-ref to ref guide configuration properties guide" toReformat="false" toShortenFQNames="true">
+ <variable name="bookmark" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="DisplayText" expression="" defaultValue="Configuration Properties guide" alwaysStopAt="true" />
<context>
<option name="AsciiDoc" value="true" />
</context>
</template>
- <template name="adrgcfg" value="xref:rg.adoc#_rg_runtime_configuring-core[configuration property]" description="x-ref to ref guide configuration properties section" toReformat="false" toShortenFQNames="true">
+ <template name="adrgsvc" value="xref:rgsvc.adoc#$bookmark$[$DisplayText$]" description="xref to domain services guide" toReformat="false" toShortenFQNames="true">
+ <variable name="bookmark" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="DisplayText" expression="" defaultValue="Domain Services guide" alwaysStopAt="true" />
<context>
<option name="AsciiDoc" value="true" />
</context>
</template>
- <template name="adcg" value="xref:cg.adoc#_cg[Contributors' Guide]" description="xref to contributors guide" toReformat="false" toShortenFQNames="true">
+ <template name="adugfun" value="xref:ugfun.adoc#$bookmark$[$DisplayText$]" description="xref to fundamentals guide" toReformat="false" toShortenFQNames="true">
+ <variable name="bookmark" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="DisplayText" expression="" defaultValue="Fundamentals Guide" alwaysStopAt="true" />
<context>
<option name="AsciiDoc" value="true" />
</context>
</template>
- <template name="adrg" value="xref:rg.adoc#_rg[Reference Guide]" description="xref to reference guide" toReformat="false" toShortenFQNames="true">
+ <template name="adai" value="Apache Isis " description="Apache Isis" toReformat="false" toShortenFQNames="true">
<context>
<option name="AsciiDoc" value="true" />
</context>
</template>
- <template name="adug" value="xref:ug.adoc#_ug[Users' Guide]" description="xref to user' guide" toReformat="false" toShortenFQNames="true">
+ <template name="adcg" value="xref:cg.adoc#$bookmark$[$DisplayText$]" description="x-ref to contributors guide" toReformat="false" toShortenFQNames="true">
+ <variable name="bookmark" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="DisplayText" expression="" defaultValue="Contributors guide" alwaysStopAt="true" />
<context>
<option name="AsciiDoc" value="true" />
</context>
</template>
- <template name="adai" value="Apache Isis " description="Apache Isis" toReformat="false" toShortenFQNames="true">
+ <template name="adtg" value="xref:tg.adoc#$bookmark$[$DisplayText$]" description="x-ref to tutorials guide" toReformat="false" toShortenFQNames="true">
+ <variable name="bookmark" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="DisplayText" expression="" defaultValue="Tutorials" alwaysStopAt="true" />
<context>
<option name="AsciiDoc" value="true" />
</context>
</template>
- <template name="adcg1" value="xref:cg.adoc#_cg_$chapter$[$DisplayText$]" description="x-ref to contributors guide level 1 (chapter)" toReformat="false" toShortenFQNames="true">
- <variable name="chapter" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
+ <template name="adugtst" value="xref:ugtst.adoc#$bookmark$[$DisplayText$]" description="x-ref to user guide testing guide" toReformat="false" toShortenFQNames="true">
+ <variable name="bookmark" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="DisplayText" expression="" defaultValue="Testing guide" alwaysStopAt="true" />
<context>
<option name="AsciiDoc" value="true" />
</context>
</template>
- <template name="adcg2" value="xref:cg.adoc#_cg_$chapter$_$section$[$DisplayText$]" description="x-ref to contributors guide level 2 (chapter section)" toReformat="false" toShortenFQNames="true">
- <variable name="chapter" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="section" expression="" defaultValue="" alwaysStopAt="true" />
- <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
+ <template name="adugbtb" value="xref:ugbtb.adoc#$bookmark$[$DisplayText$]" description="x-ref to user guide beyond the basics" toReformat="false" toShortenFQNames="true">
+ <variable name="bookmark" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="DisplayText" expression="" defaultValue="Beyond the Basics guide" alwaysStopAt="true" />
<context>
<option name="AsciiDoc" value="true" />
</context>
</template>
- <template name="adtg1" value="xref:tg.adoc#$chapter$[$DisplayText$]" description="x-ref to tutorials level 1 (chapter)" toReformat="false" toShortenFQNames="true">
- <variable name="chapter" expression="" defaultValue="_tg_" alwaysStopAt="true" />
- <variable name="DisplayText" expression="" defaultValue="" alwaysStopAt="true" />
+ <template name="adugsec" value="xref:ugsec.adoc#$bookmark$[$DisplayText$]" description="x-ref to user guide security guide" toReformat="false" toShortenFQNames="true">
+ <variable name="bookmark" expression="" defaultValue="" alwaysStopAt="true" />
+ <variable name="DisplayText" expression="" defaultValue="Security guide" alwaysStopAt="true" />
<context>
<option name="AsciiDoc" value="true" />
</context>
[2/3] isis git commit: ISIS-1243: fixing links to fundamentals guide;
updating asciidoc live templates;
updating contributors guide that documents the asciidoc live templates
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_JaxbService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_JaxbService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_JaxbService.adoc
index 56c6328..303c0d5 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_JaxbService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_JaxbService.adoc
@@ -63,5 +63,5 @@ so no further configuration is required.
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_MementoService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_MementoService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_MementoService.adoc
index 6358231..5f4ceb9 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_MementoService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_MementoService.adoc
@@ -128,4 +128,4 @@ implementation of `MementoService` service is automatically registered and injec
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_MetamodelService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_MetamodelService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_MetamodelService.adoc
index 7aa8a58..7f4dd2f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_MetamodelService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_MetamodelService.adoc
@@ -39,4 +39,4 @@ implementation of `MetamodelService` service is automatically registered and inj
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_QueryResultsCache.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_QueryResultsCache.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_QueryResultsCache.adoc
index a5a63c3..ba1619c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_QueryResultsCache.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_QueryResultsCache.adoc
@@ -117,7 +117,7 @@ implementation of `QueryResultsCache` service is automatically registered and in
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_Scratchpad.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_Scratchpad.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_Scratchpad.adoc
index 3d091e2..0b550c0 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_Scratchpad.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_Scratchpad.adoc
@@ -115,7 +115,7 @@ so no further configuration is required.
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_SudoService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_SudoService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_SudoService.adoc
index c1b8a84..8d29c42 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_SudoService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_SudoService.adoc
@@ -66,4 +66,4 @@ implementation of `SudoService` service is automatically registered and injected
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_WrapperFactory.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_WrapperFactory.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_WrapperFactory.adoc
index 7f7eba8..f8ebe76 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_WrapperFactory.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_WrapperFactory.adoc
@@ -159,4 +159,4 @@ implementation of `WrapperFactory` service is automatically registered and injec
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_XmlSnapshotService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_XmlSnapshotService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_XmlSnapshotService.adoc
index 316f4fa..e6fce99 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_XmlSnapshotService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_XmlSnapshotService.adoc
@@ -200,7 +200,7 @@ implementation of `XmlSnapshotService` service is automatically registered and i
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_ClassDiscoveryService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_ClassDiscoveryService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_ClassDiscoveryService.adoc
index f40de54..5d328aa 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_ClassDiscoveryService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_ClassDiscoveryService.adoc
@@ -46,7 +46,7 @@ This implementation is also used to discover domain services annotated with xref
The usage will vary depending upon the conventions of the design. As of 1.9.0, the usage of the service has been
centralized such that the packages to be scanned are located from the xref:rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[`AppManifest`]'s `#getModules()` method.
-For example, the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]'s app manifest includes:
+For example, the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]'s app manifest includes:
[source,java]
----
@@ -77,6 +77,6 @@ implementation of `ClassDiscoveryService2` service is automatically registered a
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_ContentNegotiationService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_ContentNegotiationService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_ContentNegotiationService.adoc
index 4164327..f624c1e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_ContentNegotiationService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_ContentNegotiationService.adoc
@@ -193,7 +193,7 @@ implementation of `ContentNegotiationService` service is automatically registere
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_EmailNotificationService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_EmailNotificationService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_EmailNotificationService.adoc
index 34553a2..1ab854b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_EmailNotificationService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_EmailNotificationService.adoc
@@ -70,7 +70,7 @@ implementation of `EmailNotificationService` service is automatically registered
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
== Related Services
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_FixtureScriptsSpecificationProvider.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_FixtureScriptsSpecificationProvider.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_FixtureScriptsSpecificationProvider.adoc
index 2ea5d3a..666a7dc 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_FixtureScriptsSpecificationProvider.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_FixtureScriptsSpecificationProvider.adoc
@@ -56,7 +56,7 @@ The class is immutable but it has a builder (obtained using `FixturescriptsSpeci
== Implementation
-The xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] has a simple implementation of this service:
+The xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] has a simple implementation of this service:
[source,java]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_LocaleProvider.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_LocaleProvider.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_LocaleProvider.adoc
index 213b179..e5b66df 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_LocaleProvider.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_LocaleProvider.adoc
@@ -56,7 +56,7 @@ automatically registered and injected (it is annotated with `@DomainService`) so
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_RepresentationService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_RepresentationService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_RepresentationService.adoc
index 5a4dd62..664f1e0 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_RepresentationService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_RepresentationService.adoc
@@ -87,7 +87,7 @@ As discussed in the introduction, the framework provides a default implementatio
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
== Registering the Services
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_TranslationService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_TranslationService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_TranslationService.adoc
index 21a7e64..7227e52 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_TranslationService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_TranslationService.adoc
@@ -68,7 +68,7 @@ If the menu items are not required then these can be suppressed either using sec
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_TranslationsResolver.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_TranslationsResolver.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_TranslationsResolver.adoc
index eb61c5b..30dab51 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_TranslationsResolver.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_TranslationsResolver.adoc
@@ -52,7 +52,7 @@ automatically registered and injected (it is annotated with `@DomainService`) so
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_UrlEncodingService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_UrlEncodingService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_UrlEncodingService.adoc
index 39a352b..18167a7 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_UrlEncodingService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-spi_UrlEncodingService.adoc
@@ -55,5 +55,5 @@ cases register an alternative implementation of this service.
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_tg_pet-clinic.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_tg_pet-clinic.adoc b/adocs/documentation/src/main/asciidoc/guides/_tg_pet-clinic.adoc
index 89c7785..04426c6 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_tg_pet-clinic.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_tg_pet-clinic.adoc
@@ -5,7 +5,7 @@
:_imagesdir: images/
-This is a step-by-step tutorial to build up a simple "petclinic" application, starting from the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]. It was originally written by Jeroen van der Wal.
+This is a step-by-step tutorial to build up a simple "petclinic" application, starting from the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]. It was originally written by Jeroen van der Wal.
It consists of just three domain classes (http://yuml.me/edit/3db2078c[http://yuml.me/3db2078c]):
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_tg_stop-scaffolding-start-coding.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_tg_stop-scaffolding-start-coding.adoc b/adocs/documentation/src/main/asciidoc/guides/_tg_stop-scaffolding-start-coding.adoc
index 5a44e23..3656b2d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_tg_stop-scaffolding-start-coding.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_tg_stop-scaffolding-start-coding.adoc
@@ -202,8 +202,8 @@ Most domain objects in Apache Isis applications are persistent entities. In the
** eg rename to `Pet`
* if required, rename the `SimpleObject` class' `name` property
** for `Pet`, can leave `name` property as is
-* specify a xref:ug.adoc#_ugfun_how-tos_ui-hints_object-titles-and-icons[title]
-* specify an xref:ug.adoc#_ugfun_how-tos_ui-hints_object-titles-and-icons[icon]
+* specify a xref:ugfun.adoc#_ugfun_how-tos_ui-hints_object-titles-and-icons[title]
+* specify an xref:ugfun.adoc#_ugfun_how-tos_ui-hints_object-titles-and-icons[icon]
* make the entity bookmarkable by adding the xref:rgant.adoc#_rgant-DomainObjectLayout_bookmarking[`@DomainObjectLayout#bookmarking()`] attribute.
* confirm is available from bookmark panel (top-left of Wicket UI)
@@ -219,11 +219,11 @@ In the simpleapp archetype the `SimpleObjects` service is a factory/repository f
* rename the `SimpleObjects` class
** eg rename to `Pets`
* review `create` action (acting as a factory)
-** as per the docs describing xref:ug.adoc#_ugfun_how-tos_crud[how to create or delete objects]
+** as per the docs describing xref:ugfun.adoc#_ugfun_how-tos_crud[how to create or delete objects]
* rename if you wish
** eg `newPet(...)` or `addPet(...)`
* review `listAll` action (acting as a repository)
-* as per the docs describing xref:ug.adoc#_ugfun_how-tos_crud[how to write a custom repository]
+* as per the docs describing xref:ugfun.adoc#_ugfun_how-tos_crud[how to write a custom repository]
* note the annotations on the corresponding domain class (originally called `SimpleObject`, though renamed by now, eg to `Pet`)
* rename if you wish
** eg `listPets()`
@@ -296,7 +296,7 @@ The semantics of an action (whether it is safe/query only, whether it is idempot
Domain entities have state: either values (primitives, strings) or references to other entities. In this section we explore adding some value properties
-* add some xref:ug.adoc#_ugfun_how-tos_class-structure_properties[value properties]; also:
+* add some xref:ugfun.adoc#_ugfun_how-tos_class-structure_properties[value properties]; also:
* for string properties
** use the xref:rgant.adoc#_rgant-PropertyLayout_multiLine[`@Property(multiLine=...)`] annotation to render a text area instead of a text box
** use the xref:rgant.adoc#_rgant-Property_maxLength[`@Property(maxLength=...)`] annotation to specify the maximum number of characters allowable
@@ -309,7 +309,7 @@ Domain entities have state: either values (primitives, strings) or references to
* revisit the title, consider whether to use the xref:rgant.adoc#_rgant-Title[`@Title`] annotation
** rather than the xref:rgcms.adoc#_rgcms_methods_reserved_title[`title()`] `title()` method
* order the properties using the xref:rgant.adoc#_rgant-MemberOrder[`@MemberOrder`], also `@MemberGroupLayout`
-** see also the docs on xref:ug.adoc#_ugfun_object-layout_static[static layouts]
+** see also the docs on xref:ugfun.adoc#_ugfun_object-layout_static[static layouts]
* use the xref:rgant.adoc#_rgant-PropertyLayout[`@PropertyLayout`] annotation to position property/action parameter labels either to the LEFT, TOP or NONE
** do the same for parameters using xref:rgant.adoc#_rgant-ParameterLayout[`@ParameterLayout`]
@@ -320,7 +320,7 @@ Domain entities have state: either values (primitives, strings) or references to
Domain entities can also reference other domain entities. These references may be either scalar (single-valued) or vector (multi-valued). In this section we focus on scalar reference properties.
-* add some xref:ug.adoc#_ugfun_how-tos_class-structure_properties[reference properties]
+* add some xref:ugfun.adoc#_ugfun_how-tos_class-structure_properties[reference properties]
* update the corresponding domain service (for creation actoin)
* use different techniques to obtain references (shown in drop-down list box)
** use the xref:rgant.adoc#_rgant-DomainObject_bounded[`@DomainObjectLayout(bounded=...)`] annotation on the referenced type if there are only a small number (bounded) of instances
@@ -338,7 +338,7 @@ Domain entities can also reference other domain entities. These references may b
Quick detour: often we want to set up defaults to go with choices. Sensible defaults for action parameters can really improve the usability of the app.
-* Add xref:ug.adoc#_ugfun_how-tos_drop-downs-and-defaults[defaults] for action parameters
+* Add xref:ugfun.adoc#_ugfun_how-tos_drop-downs-and-defaults[defaults] for action parameters
@@ -350,7 +350,7 @@ Returning back to references, Isis also supports vector (multi-valued) reference
* Ensure that all domain classes implement `java.lang.Comparable`
** use the xref:rgcms.adoc#_rgcms_classes_utility_ObjectContracts[`ObjectContracts`] utility class to help implement `Comparable`
*** you can also `equals()`, `hashCode()`, `toString()`
-* Add a xref:ug.adoc#_ugfun_how-tos_class-structure_collections[collection] to one of the entities
+* Add a xref:ugfun.adoc#_ugfun_how-tos_class-structure_collections[collection] to one of the entities
** Use `SortedSet` as the class
** Use the xref:rgant.adoc#_rgant-CollectionLayout_render[`@CollectionLayout(render=...)`] annotation to indicate if the collection should be visible or hidden by default
* optional: use the xref:rgant.adoc#_rgant-CollectionLayout_sortedBy[`@CollectionLayout(sortedBy=...)`] annotation to specify a different comparator than the natural ordering
@@ -364,7 +364,7 @@ Returning back to references, Isis also supports vector (multi-valued) reference
The Wicket UI doesn't allow collections to be modified (added to/removed from). However, we can easily write actions to accomplish the same. Moreover, these actions can provide some additional business logic. For example: it probably shouldn't be possible to add an object twice into a collection, so it should not be presented in the list of choices/autoComplete; conversely, only those objects in the collection should be offered as choices to be removed.
* Add domain actions to add/remove from the collection
-* to create objects, xref:ug.adoc#_ugfun_how-tos_class-structure_inject-services[inject] associated domain service
+* to create objects, xref:ugfun.adoc#_ugfun_how-tos_class-structure_inject-services[inject] associated domain service
** generally we recommend using the xref:rgant.adoc#_rgant-Inject[`@Inject`] annotation with either private or default visibility
* the service itself should use xref:rgsvc.adoc#_rgsvc-api_DomainObjectContainer[`DomainObjectContainer`]
* use the xref:rgant.adoc#_rgant-MemberOrder[`@MemberOrder(name=...)`] annotation to associate an action with a property or with a collection
@@ -380,7 +380,7 @@ CSS classes can be associated with any class member (property, collection, actio
* the http://fortawesome.github.io/Font-Awesome/icons/[Font Awesome] icons can be used using the xref:rgant.adoc#_rgant-ActionLayout_cssClassFa[`@ActionLayout(cssClassFa=...)`]
-It's also possible to use Font Awesome icons for the xref:ug.adoc#_ugfun_how-tos_ui-hints_object-titles-and-icons[domain object icon].
+It's also possible to use Font Awesome icons for the xref:ugfun.adoc#_ugfun_how-tos_ui-hints_object-titles-and-icons[domain object icon].
So:
- for some of the actions of your domain services or entities, annotate using `@ActionLayout(cssClass=...)` or `@ActionLayout(cssClassFa=...)`
@@ -392,7 +392,7 @@ So:
Up to this point we've been using annotations (`@MemberOrder`, `@MemberGroupLayout`, `@Named`, `@PropertyLayout`, `@ParameterLayout`, `@ActionLayout` and so on) for UI hints. However, the feedback loop is not good: it requires us stopping the app, editing the code, recompiling and running again. So instead, all these UI hints (and more) can be specified dynamically, using a corresponding `.layout.json` file. If edited while the app is running, it will be reloaded automatically (in IntelliJ, use Run>Reload Changed Classes):
-* Delete the various hint annotations and instead specify layout hints using a xref:ug.adoc#_ugfun_object-layout_dynamic[.layout.json] file.
+* Delete the various hint annotations and instead specify layout hints using a xref:ugfun.adoc#_ugfun_object-layout_dynamic[.layout.json] file.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugbtb_deployment_neo4j.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugbtb_deployment_neo4j.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugbtb_deployment_neo4j.adoc
index 9587662..6728047 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugbtb_deployment_neo4j.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugbtb_deployment_neo4j.adoc
@@ -6,7 +6,7 @@
As of 1.8.0 Apache Isis has experimental support for Neo4J, courtesy of DataNucleus' http://www.datanucleus.org/products/datanucleus/datastores/neo4j.html[Neo4J Datastore] implementation.
-The xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] has been updated so that they can be optionally run under Neo4J.
+The xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] has been updated so that they can be optionally run under Neo4J.
[TIP]
====
@@ -44,13 +44,13 @@ Add the following dependency to the `webapp` project's `pom.xml`:
----
<1> for Isis v1.9.0, use the value shown. for Isis v1.8.0, use 3.2.3.
-In the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] this is defined under the "neo4j" profile so can be activated using `-P neo4j`.
+In the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] this is defined under the "neo4j" profile so can be activated using `-P neo4j`.
== Try it out!
If you want to quickly try out neo4j for yourself:
-* run the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] (v1.8.0)
+* run the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] (v1.8.0)
* build the app:
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugbtb_more-advanced_decoupling_contributions.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugbtb_more-advanced_decoupling_contributions.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugbtb_more-advanced_decoupling_contributions.adoc
index 29a75c2..255f716 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugbtb_more-advanced_decoupling_contributions.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugbtb_more-advanced_decoupling_contributions.adoc
@@ -15,7 +15,7 @@ singletons, whereas mixins are instantiated as required (by the framework) and t
For more on contributed services:
-* the syntax of writing contributed actions/properties/collections is described in this xref:ug.adoc#_ugfun_how-tos_contributed-members[how-to]
+* the syntax of writing contributed actions/properties/collections is described in this xref:ugfun.adoc#_ugfun_how-tos_contributed-members[how-to]
* there's also useful information in the reference guide, discussing the xref:rgant.adoc#_rgant-DomainService_nature[@DomainService#nature()] attribute, for the `NatureOfService.VIEW_CONTRIBUTIONS_ONLY` nature.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugbtb_more-advanced_i18n.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugbtb_more-advanced_i18n.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugbtb_more-advanced_i18n.adoc
index b7064a1..78008b3 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugbtb_more-advanced_i18n.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugbtb_more-advanced_i18n.adoc
@@ -110,7 +110,7 @@ However, for an application to be fully internationalized, any validation messag
The first part of the puzzle is tackled by an extension to Apache Isis' programming model. Whereas previously the `disableXxx()` / `validateXxx()` / `title()` methods could only return a `java.lang.String`, they may now optionally return a `TranslatableString` (defined in Isis applib) instead.
-Here's a (silly) example from the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]:
+Here's a (silly) example from the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]:
[source,java]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugbtb_more-advanced_view-models_use-cases.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugbtb_more-advanced_view-models_use-cases.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugbtb_more-advanced_view-models_use-cases.adoc
index a9e523d..ccaffb6 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugbtb_more-advanced_view-models_use-cases.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugbtb_more-advanced_view-models_use-cases.adoc
@@ -87,7 +87,7 @@ what the use cases are that those domain entities are trying to support. You ce
domain layer that could support every conceivable use case before starting to think about view models.
Instead, you should iterate. Identify the use case/story/end-user objective that you will deliver value to the
-business. Then build out the minimum domain entities to support that use case (refining the xref:ug.adoc#_ugfun_core-concepts_philosophy_domain-driven-design_ubiquitous-language[ubiquitous language] as you
+business. Then build out the minimum domain entities to support that use case (refining the xref:ugfun.adoc#_ugfun_core-concepts_philosophy_domain-driven-design_ubiquitous-language[ubiquitous language] as you
go). Then, identify if there any view models that could be introduced which would simplify the end-user interactions
with the system (perhaps automating several related use cases together).
****
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugbtb_programming-model_custom-validator.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugbtb_programming-model_custom-validator.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugbtb_programming-model_custom-validator.adoc
index 31777f3..a60e876 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugbtb_programming-model_custom-validator.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugbtb_programming-model_custom-validator.adoc
@@ -17,7 +17,7 @@ You can also impose your own application-specific rules by installing your own m
[TIP]
====
-Isis' xref:ug.adoc#_ugfun_isis-maven-plugin[Maven plugin] will also validate the domain object model during build time.
+Isis' xref:ugfun.adoc#_ugfun_isis-maven-plugin[Maven plugin] will also validate the domain object model during build time.
====
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugbtb_programming-model_layout-metadata-reader.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugbtb_programming-model_layout-metadata-reader.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugbtb_programming-model_layout-metadata-reader.adoc
index d684ac1..ec088ec 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugbtb_programming-model_layout-metadata-reader.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugbtb_programming-model_layout-metadata-reader.adoc
@@ -5,7 +5,7 @@
:_imagesdir: images/
-The metadata for domain objects is obtained both xref:ug.adoc#_ugfun_object-layout_static[statically] and xref:ug.adoc#_ugfun_object-layout_dynamic[dynamically].
+The metadata for domain objects is obtained both xref:ugfun.adoc#_ugfun_object-layout_static[statically] and xref:ugfun.adoc#_ugfun_object-layout_dynamic[dynamically].
The default implementation for reading dynamic layout metadata is `org.apache.isis.core.metamodel.layoutmetadata.json.LayoutMetadataReaderFromJson`, which is responsible for reading from the `Xxx.layout.json` files on the classpath (for each domain entity `Xxx`).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_building-blocks.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_building-blocks.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_building-blocks.adoc
index b194875..c526ced 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_building-blocks.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_building-blocks.adoc
@@ -28,7 +28,7 @@ which can map domain objects either to an RDBMS or to various NoSQL objectstores
recognizes a number of the JDO annotations such as `@javax.jdo.annotations.Column(allowNulls=...)`.
In addition, the framework builds up the metamodel for each domain object using
-xref:ug.adoc#_ugfun_object-layout[layout hints], such as `Customer.layout.json`. These provide metadata such as
+xref:ugfun.adoc#_ugfun_object-layout[layout hints], such as `Customer.layout.json`. These provide metadata such as
grouping elements of the UI together, using multi-column layouts, and so on. The layout file can be modified while the
application is still running, and are picked up automatically; a useful way to speed up feedback.
@@ -287,7 +287,7 @@ NOTE: TODO; see xref:rgcms.adoc#_rgcms_classes_uievent[UI event] classes.
[[_ugfun_core-concepts_building-blocks_oid]]
== OIDs
-As well as defining a xref:ug.adoc#_ugfun_core-concepts_building-blocks_metamodel[metamodel] of the structure (domain
+As well as defining a xref:ugfun.adoc#_ugfun_core-concepts_building-blocks_metamodel[metamodel] of the structure (domain
classes) of its domain objects, Apache Isis also manages the runtime instances of said domain objects.
When a domain entity is recreated from the database, the framework keeps track of its identity through an "OID": an
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_other-deployment-options.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_other-deployment-options.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_other-deployment-options.adoc
index ca69816..6d25950 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_other-deployment-options.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_other-deployment-options.adoc
@@ -18,7 +18,7 @@ Let's start though with the default use case for Apache Isis: building line-of-b
Apache Wicket, and therefore Apache Isis in this configuration, is a stateful architecture. As a platform it is certainly capable of supporting user bases of several thousand (with perhaps one or two hundred concurrent); however it isn't an architecture that you should try to scale up to tens of thousands of concurrent users.
-The UI UI generated by the Wicket viewer is well suited to many line-of-business apps, but it's also worth knowing that (with a little knowledge of the Wicket APIs) it relatively straightforward to extend. As described in xref:ug.adoc#_ugfun_core-concepts_add-ons[Isis addons] chapter, the viewer already has integrations with https://github.com/isisaddons/isis-wicket-gmap3[google maps], https://github.com/isisaddons/isis-wicket-fullcalendar2[a full calendar] and an https://github.com/isisaddons/isis-wicket-excel[export to Excel] component. We are also aware of integrations with SVG images (for floor maps of shopping center) and of custom widgets displaying a catalogue (text and images) of medical diseases.
+The UI UI generated by the Wicket viewer is well suited to many line-of-business apps, but it's also worth knowing that (with a little knowledge of the Wicket APIs) it relatively straightforward to extend. As described in xref:ugfun.adoc#_ugfun_core-concepts_add-ons[Isis addons] chapter, the viewer already has integrations with https://github.com/isisaddons/isis-wicket-gmap3[google maps], https://github.com/isisaddons/isis-wicket-fullcalendar2[a full calendar] and an https://github.com/isisaddons/isis-wicket-excel[export to Excel] component. We are also aware of integrations with SVG images (for floor maps of shopping center) and of custom widgets displaying a catalogue (text and images) of medical diseases.
Deploying on Apache Isis means that the framework also manages object persistence. For many line-of-business applications this will mean using a relational database. It is also possible (courtesy of its integratinon with link:http://www.datanucleus.org[DataNucleus]) to deploy an Isis app to a NoSQL store such as Neo4J or MongoDB; and it is also possible to deploy to cloud platforms such as link:https://cloud.google.com/appengine/docs[Google App Engine (GAE)].
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_philosophy_aop.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_philosophy_aop.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_philosophy_aop.adoc
index a295fba..286296a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_philosophy_aop.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_philosophy_aop.adoc
@@ -5,7 +5,7 @@
:_imagesdir: images/
-Although not a book about object modelling, Evans' "Domain Driven Design" does use object orientation as its primary modelling tool; while xref:ug.adoc#_ugfun_core-concepts_philosophy_naked-objects-pattern[naked objects pattern] very much comes from an OO background (it even has 'object' in its name); Richard Pawson lists Alan Kay as a key influence.
+Although not a book about object modelling, Evans' "Domain Driven Design" does use object orientation as its primary modelling tool; while xref:ugfun.adoc#_ugfun_core-concepts_philosophy_naked-objects-pattern[naked objects pattern] very much comes from an OO background (it even has 'object' in its name); Richard Pawson lists Alan Kay as a key influence.
It's certainly true that to develop an Apache Isis application you will need to have good object oriented modelling skills. But given that all the mainstream languages for developing business systems are object oriented (Java, C#, Ruby), that's not such a stretch.
@@ -31,6 +31,6 @@ Another example of interceptors are the http://github.com/isisaddons/isis-module
Apache Isis also has an internal event bus (you can switch between an underlying implementation of Gauva or Axon). A domain event is fired whenever an object is interacted with, and this allows any subscribers to influence the operation (or even veto it). This is a key mechanism in ensuring that Isis applications are maintainable, and we discuss it in depth in the section on xref:ugbtb.adoc#_ugbtb_more-advanced_decoupling[Decoupling]. But fundamentally its relying on this AOP concept of interceptors.
-Finally, Isis also a feature that is akin to AOP mix-ins. A "contributed action" is one that is implemented on a domain service but that appears to be a behaviour of rendered domain object. In other words, we can dissociate behaviour from data. That's not always the right thing to do of course. In Richard Pawson's description of the xref:ug.adoc#_ugfun_core-concepts_philosophy_naked-objects-pattern[naked objects pattern] he talks about "behaviourally rich" objects, in other words where the business functionality encapsulated the data. But on the other hand sometimes the behaviour and data structures change at different rates. The link:http://en.wikipedia.org/wiki/Single_responsibility_principle[single responsibility principle] says we should only lump code together that changes at the same rate. Apache Isis' support for contributions (not only contributed actions, but also contributed properties and contributed collections) enables this. And again, to loop back to the topic
of this section, it's an AOP concept that being implemented by the framework.
+Finally, Isis also a feature that is akin to AOP mix-ins. A "contributed action" is one that is implemented on a domain service but that appears to be a behaviour of rendered domain object. In other words, we can dissociate behaviour from data. That's not always the right thing to do of course. In Richard Pawson's description of the xref:ugfun.adoc#_ugfun_core-concepts_philosophy_naked-objects-pattern[naked objects pattern] he talks about "behaviourally rich" objects, in other words where the business functionality encapsulated the data. But on the other hand sometimes the behaviour and data structures change at different rates. The link:http://en.wikipedia.org/wiki/Single_responsibility_principle[single responsibility principle] says we should only lump code together that changes at the same rate. Apache Isis' support for contributions (not only contributed actions, but also contributed properties and contributed collections) enables this. And again, to loop back to the to
pic of this section, it's an AOP concept that being implemented by the framework.
The nice thing about aspect orientation is that for the most part you can ignore these cross-cutting concerns and - at least initially at least - just focus on implementing your domain object. Later when your app starts to grow and you start to break it out into smaller modules, you can leverage Apache Isis' AOP support for (xref:ugbtb.adoc#_ugbtb_more-advanced_decoupling_mixins[mixins]), (xref:ugbtb.adoc#_ugbtb_more-advanced_decoupling_contributions[contributions]) and interceptors (the xref:ugbtb.adoc#_ugbtb_more-advanced_decoupling_event-bus[event bus]) to ensure that your codebase remains maintainable.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_philosophy_how-eases-ddd.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_philosophy_how-eases-ddd.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_philosophy_how-eases-ddd.adoc
index 1c42f71..affc49d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_philosophy_how-eases-ddd.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_philosophy_how-eases-ddd.adoc
@@ -40,7 +40,7 @@ If we are using code as the primary means of expressing the model, then we need
We could generate UML diagrams and the like from code. That will work for some members of the business community, but not for everyone. Or we could generate a PDF document from Javadoc comments, but comments aren't code and so the document may be inaccurate. Anyway, even if we do create such a document, not everyone will read it.
-A better way to represent the model is to show it in action as a working prototype. As we show in the xref:ug.adoc#_ugfun_getting-started[Getting Started] section, Apache Isis enables this with ease. Such prototypes bring the domain model to life, engaging the audience in a way that a piece of paper never can.
+A better way to represent the model is to show it in action as a working prototype. As we show in the xref:ugfun.adoc#_ugfun_getting-started[Getting Started] section, Apache Isis enables this with ease. Such prototypes bring the domain model to life, engaging the audience in a way that a piece of paper never can.
Moreover, with Apache Isis prototypes, the domain model will come shining through. If there are mistakes or misunderstandings in the domain model (inevitable when building any complex system), they will be obvious to all.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_philosophy_naked-objects-pattern_object-interface-mapping.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_philosophy_naked-objects-pattern_object-interface-mapping.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_philosophy_naked-objects-pattern_object-interface-mapping.adoc
index df40264..c38458d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_philosophy_naked-objects-pattern_object-interface-mapping.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_philosophy_naked-objects-pattern_object-interface-mapping.adoc
@@ -13,6 +13,6 @@ This is the way that the link:http://metawidget.org/[MetaWidget] team, in partic
[NOTE]
====
-We compare Apache Isis' with MetaWidget xref:ug.adoc#_ugfun_core-concepts_principles_apache-isis-vs_metawidget[here].
+We compare Apache Isis' with MetaWidget xref:ugfun.adoc#_ugfun_core-concepts_principles_apache-isis-vs_metawidget[here].
====
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_principles_apache-isis-vs_cqrs.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_principles_apache-isis-vs_cqrs.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_principles_apache-isis-vs_cqrs.adoc
index 08a7d31..d1b4244 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_principles_apache-isis-vs_cqrs.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_principles_apache-isis-vs_cqrs.adoc
@@ -23,6 +23,6 @@ With respect to commands, Apache Isis does of course support the xref:rgsvc.adoc
In CQRS the commands correspond to the business logic that mutates the system. Whether this logic is part of the command class (`PlaceOrderCommand`) or whether that command delegates to methods on the domain object is an implementation detail; but it certainly is common for the business logic to be wholly within the command object and for the domain object to be merely a data holder of the data within the command/write datastore.
-In Apache Isis this same separation of business logic from the underlying data can be accomplished most straightforwardly using xref:ugbtb.adoc#_ugbtb_more-advanced_decoupling_mixins[mixins] or xref:ug.adoc#_ugfun_how-tos_contributed-members[contributions]. In the UI (surfaced by the xref:ugvw.adoc#[Wicket viewer]) or in the REST API (surfaced by the xref:ugvro.adoc#[RestfulObjects viewer]) the behaviour appears to reside on the domain object; however the behaviour actually resides on separate classes and is mixed in (like a trait) only at runtime.
+In Apache Isis this same separation of business logic from the underlying data can be accomplished most straightforwardly using xref:ugbtb.adoc#_ugbtb_more-advanced_decoupling_mixins[mixins] or xref:ugfun.adoc#_ugfun_how-tos_contributed-members[contributions]. In the UI (surfaced by the xref:ugvw.adoc#[Wicket viewer]) or in the REST API (surfaced by the xref:ugvro.adoc#[RestfulObjects viewer]) the behaviour appears to reside on the domain object; however the behaviour actually resides on separate classes and is mixed in (like a trait) only at runtime.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_principles_apache-isis-vs_metawidget.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_principles_apache-isis-vs_metawidget.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_principles_apache-isis-vs_metawidget.adoc
index 67b02d3..298b19f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_principles_apache-isis-vs_metawidget.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_core-concepts_principles_apache-isis-vs_metawidget.adoc
@@ -5,7 +5,7 @@
:_imagesdir: images/
-MetaWidget (mentioned xref:ug.adoc#_ugfun_core-concepts_philosophy_naked-objects-pattern_object-interface-mapping[earlier] has a number of ideas in common with Apache Isis, specifically the runtime generation of a UI for domain objects. And like Apache Isis, MetaWidget builds its own metamodel of the domain objects and uses this to render the object.
+MetaWidget (mentioned xref:ugfun.adoc#_ugfun_core-concepts_philosophy_naked-objects-pattern_object-interface-mapping[earlier] has a number of ideas in common with Apache Isis, specifically the runtime generation of a UI for domain objects. And like Apache Isis, MetaWidget builds its own metamodel of the domain objects and uses this to render the object.
However, there is a difference in philosophy in that MW is not a full-stack framework and does not (in their words) try to "own the UI". Rather they support a huge variety of UI technologies and allow the domain object to be rendered in any of them.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugfun_faqs_enabling-logging.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_faqs_enabling-logging.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_faqs_enabling-logging.adoc
index 571d1be..d183bec 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_faqs_enabling-logging.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_faqs_enabling-logging.adoc
@@ -16,7 +16,7 @@ As per the http://www.datanucleus.org/products/accessplatform/logging.html[DN lo
* In the JDBC Driver +
+
-Configure `log4jdbc` JDBC rather than the vanilla driver (see `WEB-INF/persistor_datanucleus.properties`) and configure log4j logging (see `WEB-INF/logging.properties`). There are examples of both in the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype].
+Configure `log4jdbc` JDBC rather than the vanilla driver (see `WEB-INF/persistor_datanucleus.properties`) and configure log4j logging (see `WEB-INF/logging.properties`). There are examples of both in the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype].
* In the database +
+
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started.adoc
index 2a4ad32..955501c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started.adoc
@@ -7,13 +7,13 @@
-To get you up and running quickly, Apache Isis provides a xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] to setup a simple application as the basis of your own apps. This is deliberately very minimal so that you won't have to spend lots of time removing generated artifacts. On the other hand, it does set up a standard multi-module maven structure with unit- and integration tests pre-configured, as well as a webapp module so that you can easily run your app. We strongly recommend that you preserve this structure as you develop your own Isis application.
+To get you up and running quickly, Apache Isis provides a xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] to setup a simple application as the basis of your own apps. This is deliberately very minimal so that you won't have to spend lots of time removing generated artifacts. On the other hand, it does set up a standard multi-module maven structure with unit- and integration tests pre-configured, as well as a webapp module so that you can easily run your app. We strongly recommend that you preserve this structure as you develop your own Isis application.
-In this chapter we also discuss the xref:ug.adoc#_ugfun_getting-started_datanucleus-enhancer[DataNucleus enhancer]. link:http://www.datanucleus.org/[DataNucleus] is the reference implementation of the JDO (Java data objects) spec, and Apache Isis integrates with DataNucleus as its persistence layer. The enhancer performs post-processing on the bytecode of your persistent domain entities, such that they can be persisted by Apache Isis' JDO/DataNucleus objectstore.
+In this chapter we also discuss the xref:ugfun.adoc#_ugfun_getting-started_datanucleus-enhancer[DataNucleus enhancer]. link:http://www.datanucleus.org/[DataNucleus] is the reference implementation of the JDO (Java data objects) spec, and Apache Isis integrates with DataNucleus as its persistence layer. The enhancer performs post-processing on the bytecode of your persistent domain entities, such that they can be persisted by Apache Isis' JDO/DataNucleus objectstore.
[NOTE]
====
-The xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] automatically configures the enhancer, so there's little you need to do at this stage. Even so we feel it's a good idea to be aware of this critical part of Apache Isis runtime; if the enhancer does not run, then you'll find the app fails to start with (what will seem like) quite an obscure exception message.
+The xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] automatically configures the enhancer, so there's little you need to do at this stage. Even so we feel it's a good idea to be aware of this critical part of Apache Isis runtime; if the enhancer does not run, then you'll find the app fails to start with (what will seem like) quite an obscure exception message.
====
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started_datanucleus-enhancer.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started_datanucleus-enhancer.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started_datanucleus-enhancer.adoc
index 88dc068..121277e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started_datanucleus-enhancer.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started_datanucleus-enhancer.adoc
@@ -21,7 +21,7 @@ If working from the Maven command line, JDO enhancement is done using the `maven
[TIP]
====
-The configuration described below is automatically set up by the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype].
+The configuration described below is automatically set up by the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype].
====
@@ -75,7 +75,7 @@ The configuration described below is automatically set up by the xref:ug.adoc#_u
</profile>
----
-The xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] sets up the plugin correctly in the `dom` (domain object model) module. (It's actually a little bit more complex to cater for users of the Eclipse IDE using Eclipse's m2e plugin).
+The xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] sets up the plugin correctly in the `dom` (domain object model) module. (It's actually a little bit more complex to cater for users of the Eclipse IDE using Eclipse's m2e plugin).
@@ -97,7 +97,7 @@ It's also a good idea to ensure that the `dom` module has a JDO `META-INF/persis
----
<1> change as required; typically is the name of the app.
-Again, the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] does this.
+Again, the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] does this.
[WARNING]
====
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started_simpleapp-archetype.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started_simpleapp-archetype.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started_simpleapp-archetype.adoc
index 6620162..336f7fc 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started_simpleapp-archetype.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_getting-started_simpleapp-archetype.adoc
@@ -143,7 +143,7 @@ You can also take the built WAR file and deploy it into a standalone servlet con
=== From within the IDE
-Most of the time, though, you'll probably want to run the app from within your IDE. The mechanics of doing this will vary by IDE; see the xref:cg.adoc#_cg_ide[Contributors' Guide] for details of setting up Eclipse or IntelliJ IDEA. Basically, though, it amounts to running `org.apache.isis.WebServer`, and ensuring that the xref:ug.adoc#_ugfun_getting-started_datanucleus-enhancer[DataNucleus enhancer] has properly processed all domain entities.
+Most of the time, though, you'll probably want to run the app from within your IDE. The mechanics of doing this will vary by IDE; see the xref:cg.adoc#_cg_ide[Contributors' Guide] for details of setting up Eclipse or IntelliJ IDEA. Basically, though, it amounts to running `org.apache.isis.WebServer`, and ensuring that the xref:ugfun.adoc#_ugfun_getting-started_datanucleus-enhancer[DataNucleus enhancer] has properly processed all domain entities.
Here's what the setup looks like in IntelliJ IDEA:
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_actions.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_actions.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_actions.adoc
index 8f82ffa..e822517 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_actions.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_actions.adoc
@@ -13,7 +13,7 @@ NOTE: TODO
====
While Apache Isis support actions whose parameters' types are scalar (values such as `String`, `int`, or references such as `Customer`), the framework (currently) does not support parameter types that are collections or maps.
-The workaround is to mark the collection as `@Programmatic`, as described in xref:ug.adoc#_ugfun_how-tos_class-structure_ignoring-methods[Ignoring Methods]. This ensures that the collection is ignored by Apache Isis.
+The workaround is to mark the collection as `@Programmatic`, as described in xref:ugfun.adoc#_ugfun_how-tos_class-structure_ignoring-methods[Ignoring Methods]. This ensures that the collection is ignored by Apache Isis.
====
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_collections.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_collections.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_collections.adoc
index 01afcd9..23f87bd 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_collections.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_collections.adoc
@@ -16,7 +16,7 @@ Or, actually, you can, because that is a valid mapping supported by JDO/DataNucl
One workaround is to mark the collection as xref:rgant.adoc#_rgant-Programmatic[`@Programmatic`]. This ensures that the collection is ignored by Apache Isis.
-Another workaround is to wrap each value in a view model, as explained in this xref:ug.adoc#_ugfun_how-tos_simulating-collections-of-values[tip].
+Another workaround is to wrap each value in a view model, as explained in this xref:ugfun.adoc#_ugfun_how-tos_simulating-collections-of-values[tip].
====
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_properties.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_properties.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_properties.adoc
index 6bc76fa..c1e5327 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_properties.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_class-structure_properties.adoc
@@ -15,7 +15,7 @@ NOTE: TODO
NOTE: TODO
-The annotations for mapping value types tend to be different for properties vs action parameters, because JDO annotations are only valid on properties. The table in the xref:ug.adoc#_ugfun_how-tos_class-structure_properties-vs-parameters[Properties vs Parameters] section provides a handy reference of each.
+The annotations for mapping value types tend to be different for properties vs action parameters, because JDO annotations are only valid on properties. The table in the xref:ugfun.adoc#_ugfun_how-tos_class-structure_properties-vs-parameters[Properties vs Parameters] section provides a handy reference of each.
@@ -190,7 +190,7 @@ More information can be found http://www.opentaps.org/docs/index.php/How_to_Use_
Apache Isis configures JDO/DataNucleus so that the properties of type `org.apache.isis.applib.value.Blob` and `org.apache.isis.applib.value.Clob` can also be persisted.
-As for xref:ug.adoc#_ugfun_how-tos_class-structure_properties_mapping-joda-dates[Joda dates], this requires the `@javax.jdo.annotations.Persistent` annotation. However, whereas for dates one would always expect this value to be retrieved eagerly, for blobs and clobs it is not so clear cut.
+As for xref:ugfun.adoc#_ugfun_how-tos_class-structure_properties_mapping-joda-dates[Joda dates], this requires the `@javax.jdo.annotations.Persistent` annotation. However, whereas for dates one would always expect this value to be retrieved eagerly, for blobs and clobs it is not so clear cut.
=== Mapping Blobs
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_domain-services.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_domain-services.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_domain-services.adoc
index 0acd13e..a3f2e36 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_domain-services.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_domain-services.adoc
@@ -16,7 +16,7 @@ In Apache Isis domain services have several responsibilities:
- they provide other services (eg performing calculations, attach a barcode, send an email etc).
- to implement an SPI of the framework, most notably cross-cutting concerns such as security, command profiling, auditing and publishing.
-It's worth extending the xref:ug.adoc#_ugfun_core-concepts_philosophy_hexagonal-architecture[Hexagonal Architecture] to show where domain services -- and in particular the domain services provided by link:http://www.isisaddons.org[Isis Addons] (non-ASF) -- fit in:
+It's worth extending the xref:ugfun.adoc#_ugfun_core-concepts_philosophy_hexagonal-architecture[Hexagonal Architecture] to show where domain services -- and in particular the domain services provided by link:http://www.isisaddons.org[Isis Addons] (non-ASF) -- fit in:
.The hexagonal architecture with Isis addons
image::{_imagesdir}how-tos/domain-services/hexagonal-architecture-addons.png[width="700px"]
@@ -172,7 +172,7 @@ public OrderContributions {
<2> contributed as an association, in particular as a collection because returns a `List<T>`.
<3> Only actions with a single argument can be contributed as associations
-More information about contributions can be found xref:ug.adoc#_ugfun_how-tos_contributed-members[here]. More information
+More information about contributions can be found xref:ugfun.adoc#_ugfun_how-tos_contributed-members[here]. More information
about using contributions and mixins to keep your domain application decoupled can be found xref:ugbtb.adoc#_ugbtb_more-advanced_decoupling_contributions[here] and xref:ugbtb.adoc#_ugbtb_more-advanced_decoupling_mixins[here].
@@ -207,7 +207,7 @@ public CustomerOrderSubscriptions {
== Prototyping
-While for long-term maintainability we do recommend the naming conventions described xref:ug.adoc#_ugfun_how-tos_domain-services_organizing-services[above], you can get away with far fewer services when just prototyping a domain.
+While for long-term maintainability we do recommend the naming conventions described xref:ugfun.adoc#_ugfun_how-tos_domain-services_organizing-services[above], you can get away with far fewer services when just prototyping a domain.
If the domain service nature is not specified (or is left to its default, `VIEW`), then the service's actions will
appear in the UI both as menu items _and_ as contributions (and the service can of course be injected into other domain objects for programmatic invocation).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_ui-hints_action-icons-and-css.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_ui-hints_action-icons-and-css.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_ui-hints_action-icons-and-css.adoc
index 859e2ca..146832c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_ui-hints_action-icons-and-css.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_ui-hints_action-icons-and-css.adoc
@@ -14,7 +14,7 @@ These UI hint can be applied either to individual actions, or can be applied en-
NOTE: TODO - xref:rgant.adoc#_rgant-ActionLayout_cssClass[`@ActionLayout#cssClass()`] and xref:rgant.adoc#_rgant-ActionLayout_cssClassFa[`@ActionLayout#cssClassFa()`]
-Alternatively, you can specify these hints dynamically in the xref:ug.adoc#_ugfun_object-layout[`Xxx.layout.json`] for the entity.
+Alternatively, you can specify these hints dynamically in the xref:ugfun.adoc#_ugfun_object-layout[`Xxx.layout.json`] for the entity.
== Per pattern matching
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_ui-hints_layout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_ui-hints_layout.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_ui-hints_layout.adoc
index 390a69d..1226521 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_ui-hints_layout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_how-tos_ui-hints_layout.adoc
@@ -5,5 +5,5 @@
:_imagesdir: images/
-See the xref:ug.adoc#_ugfun_object-layout[object layout] chapter.
+See the xref:ugfun.adoc#_ugfun_object-layout[object layout] chapter.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugfun_object-layout_dynamic.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_object-layout_dynamic.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_object-layout_dynamic.adoc
index a0bdb51..53c488c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_object-layout_dynamic.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_object-layout_dynamic.adoc
@@ -101,7 +101,7 @@ The format of the file is:
Although advisable, it is not necessary to list all class members in this file. Any members not listed with be
ordered according either to annotations (if present) or fallback/default values.
-Note also that the layout file may contain entries for xref:ug.adoc#_ugfun_how-tos_contributed-members[contributed associations and actions]; this allows each contributee classes to define their own layout for their contributions, possibly overriding any static metadata on the original domain service contributor.
+Note also that the layout file may contain entries for xref:ugfun.adoc#_ugfun_how-tos_contributed-members[contributed associations and actions]; this allows each contributee classes to define their own layout for their contributions, possibly overriding any static metadata on the original domain service contributor.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugfun_object-layout_static-vs-dynamic.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugfun_object-layout_static-vs-dynamic.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugfun_object-layout_static-vs-dynamic.adoc
index f5cfb98..980545c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugfun_object-layout_static-vs-dynamic.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugfun_object-layout_static-vs-dynamic.adoc
@@ -7,9 +7,9 @@
-Using xref:ug.adoc#_ugfun_object-layout_dynamic[dynamic object layout]s using JSON has the huge benefit that the layout can be updated without requiring a recompile of the code and redeploy of the app. Many developers also find it easier to rationalize about layout when all the hints are collated together in a single place (rather than scattered across the class members as annotations).
+Using xref:ugfun.adoc#_ugfun_object-layout_dynamic[dynamic object layout]s using JSON has the huge benefit that the layout can be updated without requiring a recompile of the code and redeploy of the app. Many developers also find it easier to rationalize about layout when all the hints are collated together in a single place (rather than scattered across the class members as annotations).
-Another benefit of dynamic layout is that UI hints can be provided for xref:ug.adoc#_ugfun_how-tos_contributed-members[contributed associations and actions] that are synthesised at runtime.
+Another benefit of dynamic layout is that UI hints can be provided for xref:ugfun.adoc#_ugfun_how-tos_contributed-members[contributed associations and actions] that are synthesised at runtime.
The main downsides of using dynamic layouts are a lack of typesafety (a typo will result in the metadata not being picked up for the element) and syntactic fragility (an invalid JSON document will result in no metadata for the entire class).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugsec_configuring-isis-to-use-shiro.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugsec_configuring-isis-to-use-shiro.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugsec_configuring-isis-to-use-shiro.adoc
index 62c565d..4b6880f 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugsec_configuring-isis-to-use-shiro.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugsec_configuring-isis-to-use-shiro.adoc
@@ -9,7 +9,7 @@ Apache Isis' security mechanism is configurable, specifying an `Authenticator` a
[TIP]
====
-The xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] is pre-configured to use Apache Shiro, so much of what follows is set up already.
+The xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] is pre-configured to use Apache Shiro, so much of what follows is set up already.
====
== Telling Apache Isis to use Shiro
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-ini-realm.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-ini-realm.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-ini-realm.adoc
index 623dfe4..9397bfd 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-ini-realm.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugsec_shiro-ini-realm.adoc
@@ -7,7 +7,7 @@
Probably the simplest realm to use is Shiro's built-in `IniRealm`, which reads from the (same) `WEB-INF/shiro.ini` file.
-This is suitable for prototyping, but isn't intended for production use, if only because user/password credentials are stored in plain text. Nevertheless, it's a good starting point. The app generated by the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] is configured to use this realm.
+This is suitable for prototyping, but isn't intended for production use, if only because user/password credentials are stored in plain text. Nevertheless, it's a good starting point. The app generated by the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] is configured to use this realm.
The diagram below shows the Isis and components involved:
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugtst_bdd-spec-support_maven-configuration.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugtst_bdd-spec-support_maven-configuration.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugtst_bdd-spec-support_maven-configuration.adoc
index edc20e3..13bc26b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugtst_bdd-spec-support_maven-configuration.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugtst_bdd-spec-support_maven-configuration.adoc
@@ -7,7 +7,7 @@
-Apache Isis' BDD spec support is automatically configured if you use the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]. To set it up manually, update the `pom.xml` of your domain object model module:
+Apache Isis' BDD spec support is automatically configured if you use the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]. To set it up manually, update the `pom.xml` of your domain object model module:
[source,xml]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugtst_bdd-spec-support_writing-a-bdd-spec.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugtst_bdd-spec-support_writing-a-bdd-spec.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugtst_bdd-spec-support_writing-a-bdd-spec.adoc
index b8e483c..d8a730e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugtst_bdd-spec-support_writing-a-bdd-spec.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugtst_bdd-spec-support_writing-a-bdd-spec.adoc
@@ -24,7 +24,7 @@ The `glue` attribute of the Cucumber-JVM JUnit runner eallows you to indicate wh
* a system initializer class. You can reuse the system initializer from any integration tests (as described in xref:ugtst.adoc#_ugtst_integ-test-support[Integration Test Support], bootstrapping section).
-Here's an example of a feature from the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]:
+Here's an example of a feature from the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]:
[source,java]
----
@@ -49,7 +49,7 @@ Apache Isis does also support running BDD specs in unit test mode; by annotating
To support unit testing scope Apache Isis provides the `InMemoryDB` class; a glorified hashmap of "persisted" objects. Use of this utility class is optional.
-Writing a BDD spec that supports both modes of operation therefore takes more effort and we expect most users interested in BDD will use integration-testing scope; for these reasons we have chosen _not_ to include unit-testing support in the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]. For those who do require faster-executing test suite, it's worthwhile knowing that Apache Isis can support this.
+Writing a BDD spec that supports both modes of operation therefore takes more effort and we expect most users interested in BDD will use integration-testing scope; for these reasons we have chosen _not_ to include unit-testing support in the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]. For those who do require faster-executing test suite, it's worthwhile knowing that Apache Isis can support this.
====
@@ -72,7 +72,7 @@ public class RunSpecs {
}
----
-The JSON formatter allows integration with enhanced reports, for example as provided by http://www.masterthought.net/section/cucumber-reporting[Masterthought.net] (screenshots at end of page). (Commented out) configuration for this is provided in the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype].
+The JSON formatter allows integration with enhanced reports, for example as provided by http://www.masterthought.net/section/cucumber-reporting[Masterthought.net] (screenshots at end of page). (Commented out) configuration for this is provided in the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype].
The bootstrapping of Apache Isis can be moved into a `BootstrappingGlue` step definition:
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_ugtst_fixture-scripts_api-and-usage.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugtst_fixture-scripts_api-and-usage.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugtst_fixture-scripts_api-and-usage.adoc
index 344f32a..079e7aa 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugtst_fixture-scripts_api-and-usage.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugtst_fixture-scripts_api-and-usage.adoc
@@ -23,7 +23,7 @@ As of 1.9.0 there is an alternative design. Instead of subclassing `FixtureScri
The actual implementation of the `FixtureScripts` service is then provided by the framework itself, namely the xref:rgsvc.adoc#_rgsvc-api_FixtureScriptsDefault[`FixtureScriptsDefault`] domain service, annotated to be rendered on the secondary "Prototyping" menu. This uses the `FixtureScriptsSpecificationProvider` to adjust itself accordinly.
-For example, here's the `FixtureScriptsSpecificationProvider` service that's generated by the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]:
+For example, here's the `FixtureScriptsSpecificationProvider` service that's generated by the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]:
[source,java]
----
@@ -113,7 +113,7 @@ If you had defined many fixture scripts then a drop-down might become unwieldy,
----
-You are free, of course, to add additional "convenience" actions into it if you wish for the most commonly used/demo'd setups ; you'll find that the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] adds this additional action:
+You are free, of course, to add additional "convenience" actions into it if you wish for the most commonly used/demo'd setups ; you'll find that the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] adds this additional action:
[source,java]
----
@@ -139,7 +139,7 @@ Let's now look at the `FixtureScript` class, where there's a bit more going on.
A fixture script is ultimately just a block of code that can be executed, so it's up to you how you implement it to set up the system. However, we strongly recommend that you use it to invoke actions on business objects, in essence to replay what a real-life user would have done. That way, the fixture script will remain valid even if the underlying implementation of the system changes in the future.
-Here's the `RecreateSimpleObjects` fixture script from the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]:
+Here's the `RecreateSimpleObjects` fixture script from the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]:
[source,java]
----
@@ -251,7 +251,7 @@ public class SimpleObjectCreate extends FixtureScript { // <1>
Fixture scripts can be called from integration tests just the same way that fixture scripts can call one another.
-For example, here's an integration test from the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]:
+For example, here's an integration test from the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]:
[source,java]
----
@@ -296,7 +296,7 @@ public class SimpleObjectIntegTest extends SimpleAppIntegTest {
There are lots of ways to organize fixture scripts, but we've used them as either:
-* a fairly flat style, eg as in the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype], also as in the http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp];
+* a fairly flat style, eg as in the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype], also as in the http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp];
* in a "composite pattern" style, eg as in the https://github.com/estatio/estatio/blob/ea20a6ce257acede50de6ce4fd2ff29713fcd689/estatioapp/fixture/src/main/java/org/estatio/fixture/invoice/InvoiceForLeaseItemTypeOfDiscountOneQuarterForOxfMiracle005.java#L66)[Estatio open source app].
@@ -318,7 +318,7 @@ image::{_imagesdir}testing/fixture-scripts/composite.png[width="550px",link="{_i
Back in the earlier section we noted the `MultipleExecutionStrategy` setting. We can now explain the meaning of this: the enum value of `EXECUTE` is designed for the flat style (where every fixture script will be called), whereas the enum value of `IGNORE` is designed for the composite style, and ensures that any fixture scripts visited more than once (eg TearDown) are only every executed the first time.
-As already noted , the app generated by the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] uses the flat structure, and we feel that it's a better at separating out the "how" (how we set up some graph of domain objects into a known state, eg a customer with shipped placed orders and a newly placed order) from the "what" (what data should we actually use for the customer's name, say).
+As already noted , the app generated by the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] uses the flat structure, and we feel that it's a better at separating out the "how" (how we set up some graph of domain objects into a known state, eg a customer with shipped placed orders and a newly placed order) from the "what" (what data should we actually use for the customer's name, say).
The composite style tends to combine these, which one could argue does not separate responsibilities well enough. On the other hand, one could also make an argument that the composite style is a good way to implement precanned personas, eg "Joe", the customer who has a newly placed order, from "Mary" customer who has none.
[3/3] isis git commit: ISIS-1243: fixing links to fundamentals guide;
updating asciidoc live templates;
updating contributors guide that documents the asciidoc live templates
Posted by da...@apache.org.
ISIS-1243: fixing links to fundamentals guide; updating asciidoc live templates; updating contributors guide that documents the asciidoc live templates
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f6f60c70
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f6f60c70
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f6f60c70
Branch: refs/heads/master
Commit: f6f60c7038fb12cb706e58b500b7d06cfad11da3
Parents: 1ad8247
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Dec 4 10:11:17 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Dec 4 10:11:17 2015 +0000
----------------------------------------------------------------------
...o-1.9.0_bootstrapping-using-AppManifest.adoc | 2 +-
...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 +-
.../src/main/asciidoc/documentation.adoc | 2 +-
.../asciidoc/guides/_cg_asciidoc-templates.adoc | 205 ++++++-------------
.../main/asciidoc/guides/_cg_ide_eclipse.adoc | 2 +-
.../asciidoc/guides/_cg_isis-maven-plugin.adoc | 2 +-
.../guides/_cg_isis-maven-plugin_validate.adoc | 2 +-
.../asciidoc/guides/_rgant-ActionLayout.adoc | 2 +-
.../guides/_rgant-ActionLayout_bookmarking.adoc | 2 +-
.../_rgant-ActionLayout_contributedAs.adoc | 2 +-
.../guides/_rgant-ActionLayout_cssClass.adoc | 2 +-
.../guides/_rgant-ActionLayout_cssClassFa.adoc | 2 +-
.../guides/_rgant-ActionLayout_describedAs.adoc | 2 +-
.../guides/_rgant-ActionLayout_hidden.adoc | 2 +-
.../guides/_rgant-ActionLayout_named.adoc | 2 +-
.../guides/_rgant-ActionLayout_position.adoc | 2 +-
.../asciidoc/guides/_rgant-Action_hidden.adoc | 2 +-
.../guides/_rgant-CollectionLayout.adoc | 2 +-
.../_rgant-CollectionLayout_cssClass.adoc | 2 +-
.../_rgant-CollectionLayout_defaultView.adoc | 2 +-
.../_rgant-CollectionLayout_describedAs.adoc | 2 +-
.../guides/_rgant-CollectionLayout_hidden.adoc | 2 +-
.../guides/_rgant-CollectionLayout_named.adoc | 2 +-
.../guides/_rgant-CollectionLayout_paged.adoc | 2 +-
.../guides/_rgant-CollectionLayout_render.adoc | 4 +-
.../_rgant-CollectionLayout_sortedBy.adoc | 2 +-
.../guides/_rgant-Collection_hidden.adoc | 2 +-
.../guides/_rgant-DomainObjectLayout.adoc | 2 +-
.../guides/_rgant-DomainServiceLayout.adoc | 4 +-
.../main/asciidoc/guides/_rgant-HomePage.adoc | 2 +-
.../src/main/asciidoc/guides/_rgant-Inject.adoc | 2 +-
.../guides/_rgant-MemberGroupLayout.adoc | 2 +-
.../asciidoc/guides/_rgant-MemberOrder.adoc | 2 +-
.../asciidoc/guides/_rgant-ParameterLayout.adoc | 2 +-
.../asciidoc/guides/_rgant-PropertyLayout.adoc | 2 +-
.../guides/_rgant-PropertyLayout_cssClass.adoc | 2 +-
.../_rgant-PropertyLayout_describedAs.adoc | 2 +-
.../guides/_rgant-PropertyLayout_hidden.adoc | 4 +-
.../_rgant-PropertyLayout_labelPosition.adoc | 2 +-
.../guides/_rgant-PropertyLayout_multiLine.adoc | 2 +-
.../guides/_rgant-PropertyLayout_named.adoc | 2 +-
...gant-PropertyLayout_renderedAsDayBefore.adoc | 2 +-
.../asciidoc/guides/_rgant-ViewModelLayout.adoc | 2 +-
.../asciidoc/guides/_rgant_aaa_deprecated.adoc | 2 +-
.../main/asciidoc/guides/_rgant_aaa_jee.adoc | 2 +-
.../main/asciidoc/guides/_rgant_aaa_main.adoc | 4 +-
.../main/asciidoc/guides/_rgant_aaa_other.adoc | 2 +-
.../guides/_rgcfg_configuring-core.adoc | 6 +-
...s_disabling-persistence-by-reachability.adoc | 2 +-
.../guides/_rgcfg_specifying-components.adoc | 2 +-
.../main/asciidoc/guides/_rgcms_classes.adoc | 2 +-
...rgcms_classes_AppManifest-bootstrapping.adoc | 2 +-
.../guides/_rgcms_methods_prefixes_choices.adoc | 2 +-
.../guides/_rgcms_methods_prefixes_default.adoc | 2 +-
.../asciidoc/guides/_rgcms_schema-common.adoc | 2 +-
.../_rgsvc-api_ActionInvocationContext.adoc | 2 +-
.../guides/_rgsvc-api_BackgroundService.adoc | 2 +-
.../guides/_rgsvc-api_BookmarkService.adoc | 2 +-
.../guides/_rgsvc-api_CommandContext.adoc | 2 +-
.../guides/_rgsvc-api_DeepLinkService.adoc | 2 +-
.../guides/_rgsvc-api_EmailService.adoc | 2 +-
.../guides/_rgsvc-api_EventBusService.adoc | 2 +-
.../guides/_rgsvc-api_GuiceBeanProvider.adoc | 2 +-
.../guides/_rgsvc-api_IsisJdoSupport.adoc | 2 +-
.../asciidoc/guides/_rgsvc-api_JaxbService.adoc | 2 +-
.../guides/_rgsvc-api_MementoService.adoc | 2 +-
.../guides/_rgsvc-api_MetamodelService.adoc | 2 +-
.../guides/_rgsvc-api_QueryResultsCache.adoc | 2 +-
.../asciidoc/guides/_rgsvc-api_Scratchpad.adoc | 2 +-
.../asciidoc/guides/_rgsvc-api_SudoService.adoc | 2 +-
.../guides/_rgsvc-api_WrapperFactory.adoc | 2 +-
.../guides/_rgsvc-api_XmlSnapshotService.adoc | 2 +-
.../_rgsvc-spi_ClassDiscoveryService.adoc | 4 +-
.../_rgsvc-spi_ContentNegotiationService.adoc | 2 +-
.../_rgsvc-spi_EmailNotificationService.adoc | 2 +-
...spi_FixtureScriptsSpecificationProvider.adoc | 2 +-
.../guides/_rgsvc-spi_LocaleProvider.adoc | 2 +-
.../_rgsvc-spi_RepresentationService.adoc | 2 +-
.../guides/_rgsvc-spi_TranslationService.adoc | 2 +-
.../guides/_rgsvc-spi_TranslationsResolver.adoc | 2 +-
.../guides/_rgsvc-spi_UrlEncodingService.adoc | 2 +-
.../main/asciidoc/guides/_tg_pet-clinic.adoc | 2 +-
.../_tg_stop-scaffolding-start-coding.adoc | 24 +--
.../guides/_ugbtb_deployment_neo4j.adoc | 6 +-
..._more-advanced_decoupling_contributions.adoc | 2 +-
.../guides/_ugbtb_more-advanced_i18n.adoc | 2 +-
...btb_more-advanced_view-models_use-cases.adoc | 2 +-
...gbtb_programming-model_custom-validator.adoc | 2 +-
...rogramming-model_layout-metadata-reader.adoc | 2 +-
.../_ugfun_core-concepts_building-blocks.adoc | 4 +-
..._core-concepts_other-deployment-options.adoc | 2 +-
.../_ugfun_core-concepts_philosophy_aop.adoc | 4 +-
..._core-concepts_philosophy_how-eases-ddd.adoc | 2 +-
...bjects-pattern_object-interface-mapping.adoc | 2 +-
...concepts_principles_apache-isis-vs_cqrs.adoc | 2 +-
...ts_principles_apache-isis-vs_metawidget.adoc | 2 +-
.../guides/_ugfun_faqs_enabling-logging.adoc | 2 +-
.../asciidoc/guides/_ugfun_getting-started.adoc | 6 +-
...un_getting-started_datanucleus-enhancer.adoc | 6 +-
...fun_getting-started_simpleapp-archetype.adoc | 2 +-
.../_ugfun_how-tos_class-structure_actions.adoc | 2 +-
...fun_how-tos_class-structure_collections.adoc | 2 +-
...gfun_how-tos_class-structure_properties.adoc | 4 +-
.../guides/_ugfun_how-tos_domain-services.adoc | 6 +-
...n_how-tos_ui-hints_action-icons-and-css.adoc | 2 +-
.../guides/_ugfun_how-tos_ui-hints_layout.adoc | 2 +-
.../guides/_ugfun_object-layout_dynamic.adoc | 2 +-
.../_ugfun_object-layout_static-vs-dynamic.adoc | 4 +-
.../_ugsec_configuring-isis-to-use-shiro.adoc | 2 +-
.../asciidoc/guides/_ugsec_shiro-ini-realm.adoc | 2 +-
...st_bdd-spec-support_maven-configuration.adoc | 2 +-
...tst_bdd-spec-support_writing-a-bdd-spec.adoc | 6 +-
.../_ugtst_fixture-scripts_api-and-usage.adoc | 12 +-
..._ugtst_integ-test-support_bootstrapping.adoc | 2 +-
..._integ-test-support_maven-configuration.adoc | 2 +-
..._ugtst_unit-test-support_contract-tests.adoc | 4 +-
...t_unit-test-support_maven-configuration.adoc | 2 +-
.../guides/_ugvw_customisation_about-page.adoc | 2 +-
...ugvw_customisation_tweaking-css-classes.adoc | 2 +-
.../src/main/asciidoc/guides/_ugvw_layout.adoc | 6 +-
.../src/main/asciidoc/guides/cg.adoc | 2 +-
.../src/main/asciidoc/guides/rg.adoc | 2 +-
.../src/main/asciidoc/guides/rgant.adoc | 3 +-
.../src/main/asciidoc/guides/rgcfg.adoc | 24 ++-
.../src/main/asciidoc/guides/rgcms.adoc | 6 +-
.../src/main/asciidoc/guides/rgsvc.adoc | 3 +-
.../src/main/asciidoc/guides/tg.adoc | 1 +
.../src/main/asciidoc/guides/ug.adoc | 2 +-
.../src/main/asciidoc/guides/ugbtb.adoc | 2 +-
.../src/main/asciidoc/guides/ugfun.adoc | 12 +-
.../src/main/asciidoc/guides/ugsec.adoc | 5 +-
.../src/main/asciidoc/guides/ugtst.adoc | 3 +-
.../src/main/asciidoc/guides/ugvro.adoc | 4 +-
.../src/main/asciidoc/guides/ugvw.adoc | 2 +-
.../templates/isis-asciidoc-templates-idea.xml | 115 ++++-------
136 files changed, 306 insertions(+), 407 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/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 0617439..121bb73 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:ug.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: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.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/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 7fd697d..b868f3f 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:ug.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: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/f6f60c70/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 5e72ba0..e137657 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:ug.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: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:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] has been updated with this change.
+For future projects the xref: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/f6f60c70/adocs/documentation/src/main/asciidoc/documentation.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/documentation.adoc b/adocs/documentation/src/main/asciidoc/documentation.adoc
index 5e1b2d8..272e919 100644
--- a/adocs/documentation/src/main/asciidoc/documentation.adoc
+++ b/adocs/documentation/src/main/asciidoc/documentation.adoc
@@ -79,7 +79,7 @@ pass:[<br/>]
|*Contributors' Guide*
-* *link:./guides/cg.html[Contributors Guide^]*
+* *link:./guides/cg.html[Contributors' Guide^]*
including:
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_cg_asciidoc-templates.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_asciidoc-templates.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_asciidoc-templates.adoc
index 6a97968..81c4597 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_asciidoc-templates.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_asciidoc-templates.adoc
@@ -92,9 +92,9 @@ where:
-== Xref to Contributors' Guide
+== Xref to Guides
-Cross-references (links) to the xref:cg.adoc#_cg[Contributors' Guide] (this document).
+Cross-references (links) to the various guides
[cols="1,4a,2a", options="header"]
|===
@@ -104,115 +104,34 @@ Cross-references (links) to the xref:cg.adoc#_cg[Contributors' Guide] (this docu
|`adcg`
-|pass:[<pre>xref:cg.adoc#_cg[Contributors' Guide\]</pre>] +
+|pass:[<pre>xref:cg.adoc#xxx[ttt\]</pre>]
-a hyperlink to the contributors guide.
-|xref:cg.adoc#_cg[Contributors' Guide]
+a hyperlink to a bookmark within the contributors guide, where:
-|`adcg1`
-|pass:[<pre>xref:cg.adoc#_cg_xxx[ttt\]</pre>]
-
-a hyperlink to a level 1 (chapter) within the contributors guide, where:
-
-* `xxx` is the chapter's anchor
+* `xxx` is the bookmark's anchor
* `ttt` is the text to display as the hyperlink
for example:
-pass:[<pre>xref:cg.adoc#_cg_asciidoc-templates[Asciidoc templates/]</pre>]
+pass:[<pre>xref:cg.adoc#_cg_asciidoc-templates[Asciidoc templates\]</pre>]
|xref:cg.adoc#_cg_asciidoc-templates[Asciidoc templates]
-|`adcg2`
-|pass:[<pre>xref:cg.adoc#_cg_xxx_yyy[ttt\]</pre>]
-
-a hyperlink to a level 2 (chapter and section) within the contributors guide, where:
-
-* `xxx` and `yyy` make up the anchor to the section within the chapter
-* `ttt` is the text to display as the hyperlink
-
-for example:
-
-pass:[<pre>xref:cg.adoc#_cg_committers_release-process[Release process/]</pre>]
-
-|xref:cg.adoc#_cg_committers_release-process[Release process]
-
-|===
-
-
-
-== Xref to Reference Guide
-
-Cross-references (links) to the xref:rg.adoc#_rg[Reference Guide].
-
-[cols="1,4a,2a", options="header"]
-|===
-| Abbrev.
-| Produces
-| Example
-
-|`adrg`
-|pass:[<pre>xref:rg.adoc#_rg[Reference Guide\]</pre>]
-
-a hyperlink to the Reference Guide.
-
-|xref:rg.adoc#_rg[Reference Guide]
-
-|`adrg1`
-|pass:[<pre>xref:rg.adoc#_rg_xxx[ttt\]</pre>]
-
-a hyperlink to a level 1 (chapter) within the reference guide, where:
-
-* `xxx` is the chapter's anchor
-* `ttt` is the text to display as the hyperlink
-
-for example:
-
-pass:[<pre>xref:rgant.adoc#_rgant[Annotations\]</pre>]
-
-|xref:rgant.adoc#_rgant[Annotations]
-
-
-
-|`adrg2`
-|pass:[<pre>xref:rg.adoc#_rg_xxx_yyy[ttt\]</pre>]
-
-a hyperlink to a level 2 (chapter and section) within the reference guide, where:
-
-* `xxx` and `yyy` make up the anchor to the section within the chapter
-* `ttt` is the text to display as the hyperlink
-
-for example:
-
-pass:[<pre>xref:ug.adoc#_ugfun_object-layout_dynamic_[Dynamic object layout]</pre>]
-
-|xref:ug.adoc#_ugfun_object-layout_dynamic[Dynamic object layout]
-
-
-|`adrg3`
-|pass:[<pre>xref:rg.adoc#_rg_xxx_yyy_zzz[ttt\]</pre>]
+|`adrgcfg`
+|pass:[<pre>xref:rgcfg.adoc#xxx[ttt\]</pre>]
-a hyperlink to a level 3 (chapter, section, subsection) within the reference guide, where:
+a hyperlink to a bookmark within configuration properties guide, where:
-* `xxx`, `yyy`, `zzz` make up the anchor to the subsection within the chapter
+* `xxx` is the bookmark
* `ttt` is the text to display as the hyperlink
for example:
-pass:[<pre>xref:rgcfg.adoc#_rgcfg_application-specific_application-css[Application-specific CSS\]</pre>]
-
-|xref:rgcfg.adoc#_rgcfg_application-specific_application-css[Application-specific CSS]
-
-
-
-|`adrgcfg`
-|pass:[<pre>xref:rgcfg.adoc#_rgcfg_configuring-core[configuration properties]</pre>]
-
-a hyperlink to the reference guide's catalogue of the Apache Isis configuration properties.
+pass:[<pre>xref:rgcfg.adoc#_rgcfg_configuring-core[Configuring Core\]</pre>]
-|xref:rgcfg.adoc#_rgcfg_configuring-core[configuration properties]
+|xref:rgcfg.adoc#_rgcfg_configuring-core[Configuring Core]
@@ -352,102 +271,108 @@ pass:[<pre>xref:rgsvc.adoc#_rgsvc-spi_ContentMappingService[`ContentMappingServi
-|===
+|`adugfun`
+|pass:[<pre>xref:ugfun.adoc#xxx[ttt\]</pre>]
+a hyperlink to a bookmark within the fundamentals users' guide, where:
-== Xref to the Users' Guide
-
-Cross-references (links) to the xref:ug.adoc#_ug[Users' Guide].
+* `xxx` is the bookmark's anchor
+* `ttt` is the text to display as the hyperlink
-[cols="1,4a,2a", options="header"]
-|===
-| Abbrev.
-| Produces
-| Example
+for example:
-|`adug`
-|pass:[<pre>xref:ug.adoc#_ug[Users' Guide\]</pre>]
+pass:[<pre>xref:ugfun.adoc#_ugfun_core-concepts[Core concepts\]</pre>]
-a hyperlink to the Users' Guide.
+|xref:ugfun.adoc#_ugfun_core-concepts[Core concepts]
-|xref:ug.adoc#_ug[Users' Guide]
-|`adug1`
-|pass:[<pre>xref:ug.adoc#xxx[ttt\]</pre>]
+|`adugvw`
+|pass:[<pre>xref:ugvw.adoc#xxx[ttt\]</pre>]
-a hyperlink to a level 1 (chapter) within the users' guide, where:
+A hyperlink to a bookmark within the Wicket viewer guide, where:
-* `xxx` is the chapter's anchor
-* `ttt` is the text to display as the hyperlink
+* `xxx` is the bookmark's anchor
+* `ttt` is the text to display as the hyperlink.
for example:
-pass:[<pre>xref:ug.adoc#_ugfun_core-concepts[Core concepts\]</pre>]
+pass:[<pre>xref:ugvw.adoc#_ugvw_customisation[Customisation\]</pre>]
-|xref:ug.adoc#_ugfun_core-concepts[Core concepts]
+|xref:ugvw.adoc#_ugvw_customisation[Customisation]
+|`adugvro`
+|pass:[<pre>xref:ugvro.adoc#xxx[ttt\]</pre>]
-|`adug2`
-|pass:[<pre>xref:ug.adoc#xxx_yyy[ttt\]</pre>]
-
-a hyperlink to a level 2 (chapter and section) within the users' guide, where:
+A hyperlink to a bookmark within the Restful Objects viewer guide, where:
-* `xxx` and `yyy` make up the anchor to the section within the chapter
-* `ttt` is the text to display as the hyperlink
+* `xxx` is the bookmark's anchor
+* `ttt` is the text to display as the hyperlink.
for example:
-pass:[<pre>xref:ug.adoc#core-concepts_philosophy[Philosophy\]</pre>]
+pass:[<pre>xref:ugvro.adoc#_ugvro_ro-spec[RestfulObjects specification\]</pre>]
+|xref:ugvro.adoc#_ugvro_ro-spec[RestfulObjects specification]
-|xref:ug.adoc#core-concepts_philosophy[Philosophy]
-|`adug3`
-|pass:[<pre>xref:ug.adoc#xxx_yyy_zzz[ttt\]</pre>]
+|`adugsec`
+|pass:[<pre>xref:ugsec.adoc#xxx[ttt\]</pre>]
-a hyperlink to a level 3 (chapter, section, subsection) within the users' guide, where:
+A hyperlink to a bookmark within the Secrurity guide, where:
-* `xxx`, `yyy`, `zzz` make up the anchor to the subsection within the chapter
-* `ttt` is the text to display as the hyperlink
+* `xxx` is the bookmark's anchor
+* `ttt` is the text to display as the hyperlink.
for example:
-pass:[<pre>xref:ug.adoc#_ugfun_core-concepts_philosophy_naked-objects-pattern[Naked objects pattern\]</pre>]
+pass:[<pre>xref:ugsec.adoc#_ugsec_shiro-caching[Caching and other Shiro Features\]</pre>]
-|xref:ug.adoc#_ugfun_core-concepts_philosophy_naked-objects-pattern[Naked objects pattern]
+|xref:ugsec.adoc#_ugsec_shiro-caching[Caching and other Shiro Features]
+|`adugtst`
+|pass:[<pre>xref:ugtst.adoc#xxx[ttt\]</pre>]
+A hyperlink to a bookmark within the Testing guide, where:
-|`adugsimpleapp`
-|pass:[<pre>xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype\]</pre>]
+* `xxx` is the bookmark's anchor
+* `ttt` is the text to display as the hyperlink.
-A hyperlink to the `simpleapp` archetype in the "getting started" chapter.
+for example:
-|xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]
+pass:[<pre>xref:ugtst.adoc#_ugtst_bdd-spec-support[BDD Spec Support\]</pre>]
+|xref:ugtst.adoc#_ugtst_bdd-spec-support[BDD Spec Support]
-|`adugvro`
-|pass:[<pre>xref:ugvro.adoc#[RestfulObjects viewer\]</pre>]
-A hyperlink to the Restful Objects viewer chapter.
+|`adugbtb`
+|pass:[<pre>xref:ugbtb.adoc#xxx[ttt\]</pre>]
-|xref:ugvro.adoc#[RestfulObjects viewer]
+A hyperlink to a bookmark within the 'Beyond the Basics' user guide, where:
+* `xxx` is the bookmark's anchor
+* `ttt` is the text to display as the hyperlink.
+for example:
+
+pass:[<pre>xref:ugbtb.adoc#_ugbtb_deployment_externalized-configuration[Externalized Configuration\]</pre>]
+
+|xref:ugbtb.adoc#_ugbtb_deployment_externalized-configuration[Externalized Configuration]
-|`adugvw`
-|pass:[<pre>xref:ugvw.adoc#[Wicket viewer\]</pre>]
-A hyperlink to the Wicket viewer chapter.
-|xref:ugvw.adoc#[Wicket viewer]
+|`adugsimpleapp`
+|pass:[<pre>xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype\]</pre>]
+
+A hyperlink to the `simpleapp` archetype in the "getting started" chapter.
+
+|xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_cg_ide_eclipse.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_ide_eclipse.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_ide_eclipse.adoc
index bbf0d98..51a2c27 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_ide_eclipse.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_ide_eclipse.adoc
@@ -62,7 +62,7 @@ image::{_imagesdir}appendices/dev-env/eclipse/eclipse-110-project-support.png[wi
DataNucleus' enhancer uses the domain object model's own classpath to reference DataNucleus JARs. So, even though your domain objects are unlikely to depend on DataNucleus, these references must still be present.
-See the earlier section on xref:ug.adoc#_ugfun_getting-started_datanucleus-enhancer[DataNucleus enhancer] for details of the contents of the `pom.xml`. Chances are it is already set up from running the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype].
+See the earlier section on xref:ugfun.adoc#_ugfun_getting-started_datanucleus-enhancer[DataNucleus enhancer] for details of the contents of the `pom.xml`. Chances are it is already set up from running the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype].
Then, tell DataNucleus to use the project classpath:
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_cg_isis-maven-plugin.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_isis-maven-plugin.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_isis-maven-plugin.adoc
index 6b9a13d..e08c844 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_isis-maven-plugin.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_isis-maven-plugin.adoc
@@ -29,7 +29,7 @@ it knows how to bootstrap an Isis runtime. This is discussed below, followed by
As noted in the introduction, both goals require an xref:rgcms.adoc#_rgcms_classes_AppManifest-bootstrapping[`AppManifest`]
to point the plugin at, so that it knows how to bootstrap an Isis runtime.
-This can be extremely minimal. For example, the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp]'s
+This can be extremely minimal. For example, the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp]'s
manifest is:
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_cg_isis-maven-plugin_validate.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_cg_isis-maven-plugin_validate.adoc b/adocs/documentation/src/main/asciidoc/guides/_cg_isis-maven-plugin_validate.adoc
index 9771752..f480034 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_cg_isis-maven-plugin_validate.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_cg_isis-maven-plugin_validate.adoc
@@ -110,7 +110,7 @@ mvn test -Dskip.isis-validate
== Example of failure
-In the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp] application the `SimpleObject` defines an `updateName` action. This has a supporting method:
+In the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp] application the `SimpleObject` defines an `updateName` action. This has a supporting method:
[source,java]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout.adoc
index cc16e56..c2537a1 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout.adoc
@@ -100,7 +100,7 @@ public class ToDoItems {
-As an alternative to using the `@ActionLayout` annotation, a dynamic layout using xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file can be specified; for example:
+As an alternative to using the `@ActionLayout` annotation, a dynamic layout using xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file can be specified; for example:
[source,javascript]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_bookmarking.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_bookmarking.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_bookmarking.adoc
index 6a646dc..d7d7157 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_bookmarking.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_bookmarking.adoc
@@ -50,7 +50,7 @@ The enum value `AS_CHILD` has no meaning for actions; it relates only to bookmar
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_contributedAs.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_contributedAs.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_contributedAs.adoc
index 13b1fe8..ce3d5e2 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_contributedAs.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_contributedAs.adoc
@@ -49,6 +49,6 @@ In such cases, though, it would probably make more sense to annotate the action
[NOTE]
====
-Unlike other `@ActionLayout` attributes, this attribute _cannot_ be specified dynamically in the `.layout.json` xref:ug.adoc#_ugfun_object-layout_dynamic[dynamic layout file] because it relates to the contributor domain service, not the contributee domain object.
+Unlike other `@ActionLayout` attributes, this attribute _cannot_ be specified dynamically in the `.layout.json` xref:ugfun.adoc#_ugfun_object-layout_dynamic[dynamic layout file] because it relates to the contributor domain service, not the contributee domain object.
====
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_cssClass.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_cssClass.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_cssClass.adoc
index e2f0bac..50663ba 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_cssClass.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_cssClass.adoc
@@ -30,7 +30,7 @@ to apply CSS, specifically to add http://fortawesome.github.io/Font-Awesome/icon
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_cssClassFa.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_cssClassFa.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_cssClassFa.adoc
index 3e393c7..97e4640 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_cssClassFa.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_cssClassFa.adoc
@@ -31,7 +31,7 @@ public class ToDoItem {
There can be multiple "fa-" classes, eg to mirror or rotate the icon. There is no need to include the mandatory `fa` "marker" CSS class; it will be automatically added to the list. The `fa-` prefix can also be omitted from the class names; it will be prepended to each if required.
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_describedAs.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_describedAs.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_describedAs.adoc
index f1543f8..ff07b6b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_describedAs.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_describedAs.adoc
@@ -24,7 +24,7 @@ public class Customer {
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_hidden.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_hidden.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_hidden.adoc
index bb28835..8b24d47 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_hidden.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_hidden.adoc
@@ -37,7 +37,7 @@ The action should not be hidden.
The other values of the `Where` enum have no meaning for a collection.
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_named.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_named.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_named.adoc
index 7813dca..2c6952c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_named.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_named.adoc
@@ -25,7 +25,7 @@ public class Customer {
----
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_position.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_position.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_position.adoc
index c3d09c0..2338f5e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_position.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-ActionLayout_position.adoc
@@ -67,7 +67,7 @@ image::{_imagesdir}reference-annotations/ActionLayout/position-PANEL_DROPDOWN.pn
If there are multiple actions associated with a single property then the positioning can be mix'ed-and-match'ed as required. If the `PANEL` or `PANEL_DROPDOWN` are used, then (as the screenshots above show) the actions from potentially multiple properties grouped by that panel will be shown together.
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-Action_hidden.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-Action_hidden.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-Action_hidden.adoc
index f65b28c..fb9876a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-Action_hidden.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-Action_hidden.adoc
@@ -11,7 +11,7 @@ Actions can be hidden at the domain-level, indicating that they are not visible
[TIP]
====
-It is also possible to use xref:rgant.adoc#_rgant-ActionLayout_hidden[`@ActionLayout#hidden()`] or xref:ug.adoc#_ugfun_object-layout_dynamic[dynamic layouts] such that the action can be hidden at the view layer. Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
+It is also possible to use xref:rgant.adoc#_rgant-ActionLayout_hidden[`@ActionLayout#hidden()`] or xref:ugfun.adoc#_ugfun_object-layout_dynamic[dynamic layouts] such that the action can be hidden at the view layer. Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
====
For example:
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout.adoc
index 0ff2f80..0d0500e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout.adoc
@@ -94,7 +94,7 @@ public class ToDoItem {
-As an alternative to using the `@CollectionLayout` annotation, a dynamic layout using xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file can be specified; for example:
+As an alternative to using the `@CollectionLayout` annotation, a dynamic layout using xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file can be specified; for example:
[source,javascript]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_cssClass.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_cssClass.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_cssClass.adoc
index e18e3e1..58b7d0d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_cssClass.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_cssClass.adoc
@@ -24,7 +24,7 @@ public class ToDoItem {
----
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_defaultView.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_defaultView.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_defaultView.adoc
index 9641d78..5b77688 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_defaultView.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_defaultView.adoc
@@ -24,7 +24,7 @@ public class BusRoute {
----
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_describedAs.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_describedAs.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_describedAs.adoc
index effc006..26b329a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_describedAs.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_describedAs.adoc
@@ -24,7 +24,7 @@ public class ToDoItem {
----
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_hidden.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_hidden.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_hidden.adoc
index ad906c3..c85db7e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_hidden.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_hidden.adoc
@@ -47,7 +47,7 @@ The collection should not be hidden.
The other values of the `Where` enum have no meaning for a collection.
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_named.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_named.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_named.adoc
index 9fe50e2..2ab0b68 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_named.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_named.adoc
@@ -33,7 +33,7 @@ public class ToDoItem {
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_paged.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_paged.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_paged.adoc
index 2551458..256efa4 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_paged.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_paged.adoc
@@ -31,7 +31,7 @@ It is also possible to specify a global default for the page size of standalone
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_render.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_render.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_render.adoc
index 121e185..ae076bc 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_render.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_render.adoc
@@ -20,7 +20,7 @@ public class Order {
----
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
@@ -35,7 +35,7 @@ can be used instead, eg:
[NOTE]
====
-Note that xref:ug.adoc#_ugfun_how-tos_contributed-members[contributed collections] (which, under the covers are just action invocations against a domain service) are always rendered eagerly.
+Note that xref:ugfun.adoc#_ugfun_how-tos_contributed-members[contributed collections] (which, under the covers are just action invocations against a domain service) are always rendered eagerly.
Also, if a xref:rgant.adoc#_rgant-CollectionLayout_defaultView[`@CollectionLayout#defaultView()`] attribute has been specified then that will take precedence over the value of the `render()` attribute.
====
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_sortedBy.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_sortedBy.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_sortedBy.adoc
index 2083be4..73da475 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_sortedBy.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-CollectionLayout_sortedBy.adoc
@@ -46,7 +46,7 @@ Without this annotation, the order would have been inverted (because the natural
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-Collection_hidden.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-Collection_hidden.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-Collection_hidden.adoc
index c16c14a..59d51d5 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-Collection_hidden.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-Collection_hidden.adoc
@@ -9,7 +9,7 @@ Collections can be hidden at the domain-level, indicating that they are not visi
[TIP]
====
-It is also possible to use xref:rgant.adoc#_rgant-CollectionLayout_hidden[`@CollectionLayout#hidden()`] or xref:ug.adoc#_ugfun_object-layout_dynamic[dynamic layouts] such that the collection can be hidden at the view layer. Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
+It is also possible to use xref:rgant.adoc#_rgant-CollectionLayout_hidden[`@CollectionLayout#hidden()`] or xref:ugfun.adoc#_ugfun_object-layout_dynamic[dynamic layouts] such that the collection can be hidden at the view layer. Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
====
For example:
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-DomainObjectLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-DomainObjectLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-DomainObjectLayout.adoc
index e49a5f5..5948b59 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-DomainObjectLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-DomainObjectLayout.adoc
@@ -109,7 +109,7 @@ public class ToDoItem {
[NOTE]
====
-Note that there is (currently) no support for specifying UI hints for domain objects through the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
+Note that there is (currently) no support for specifying UI hints for domain objects through the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
====
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-DomainServiceLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-DomainServiceLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-DomainServiceLayout.adoc
index 240951e..effc805 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-DomainServiceLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-DomainServiceLayout.adoc
@@ -10,7 +10,7 @@ The `@DomainServiceLayout` annotation applies to domain services, collecting tog
[TIP]
====
-You will also find some additional material in the xref:ug.adoc#_ugfun_object-layout_application-menu[object layout] chapter.
+You will also find some additional material in the xref:ugfun.adoc#_ugfun_object-layout_application-menu[object layout] chapter.
====
@@ -64,7 +64,7 @@ public class ToDoItems {
[NOTE]
====
-Note that there is (currently) no support for specifying UI hints for domain services through the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
+Note that there is (currently) no support for specifying UI hints for domain services through the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
====
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-HomePage.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-HomePage.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-HomePage.adoc
index 159caae..ade4095 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-HomePage.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-HomePage.adoc
@@ -45,7 +45,7 @@ public class ToDoAppDashboard {
public Blob exportToWordDoc() { ... } // <1>
}
----
-<1> associated using xref:ug.adoc#_ugfun_object-layout_dynamic[dynamic layouts] with the `notYetComplete` collection.
+<1> associated using xref:ugfun.adoc#_ugfun_object-layout_dynamic[dynamic layouts] with the `notYetComplete` collection.
The other two actions shown in the above screenshot -- `exportAsXml` and `downloadLayout` -- are actually contributed to the `ToDoAppDashboard` through various domain services, as is the `downloadLayout` action.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-Inject.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-Inject.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-Inject.adoc
index 77dc434..7025e43 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-Inject.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-Inject.adoc
@@ -27,7 +27,7 @@ public class Customer {
OrderRepository orders; // <2>
}
----
-<1> an alternative implementation would be to implement `findRecentOrders()` as a xref:ug.adoc#_ugfun_how-tos_contributed-members[contributed action].
+<1> an alternative implementation would be to implement `findRecentOrders()` as a xref:ugfun.adoc#_ugfun_how-tos_contributed-members[contributed action].
<2> we recommend default (rather than `private`) visibility so that unit tests can easily mock out the service
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-MemberGroupLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-MemberGroupLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-MemberGroupLayout.adoc
index f93af0d..acb285a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-MemberGroupLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-MemberGroupLayout.adoc
@@ -16,5 +16,5 @@ The annotation defines two attributes, `name()` and `sequence()`. Broadly speak
[IMPORTANT]
====
-As this is an important topic, there is a xref:ug.adoc#_ugfun_object-layout[separate chapter] that discussed object layout in full.
+As this is an important topic, there is a xref:ugfun.adoc#_ugfun_object-layout[separate chapter] that discussed object layout in full.
====
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-MemberOrder.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-MemberOrder.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-MemberOrder.adoc
index c642d84..f09c574 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-MemberOrder.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-MemberOrder.adoc
@@ -21,7 +21,7 @@ Collections are always rendered in the "last" column. This can appear either be
[IMPORTANT]
====
-As this is an important topic, there is a xref:ug.adoc#_ugfun_object-layout[separate chapter] that discussed object layout in full.
+As this is an important topic, there is a xref:ugfun.adoc#_ugfun_object-layout[separate chapter] that discussed object layout in full.
====
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-ParameterLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-ParameterLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-ParameterLayout.adoc
index fd7cc1c..1592b2c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-ParameterLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-ParameterLayout.adoc
@@ -96,7 +96,7 @@ public class ToDoItem {
[NOTE]
====
-Note that there is (currently) no support for specifying UI hints for domain services through the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
+Note that there is (currently) no support for specifying UI hints for domain services through the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
====
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout.adoc
index 9687634..68d4518 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout.adoc
@@ -102,7 +102,7 @@ It is also possible to apply the annotation to actions of domain services that a
-As an alternative to using the `@PropertyLayout` annotation, a dynamic layout using xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file can be specified; for example:
+As an alternative to using the `@PropertyLayout` annotation, a dynamic layout using xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file can be specified; for example:
[source,javascript]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_cssClass.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_cssClass.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_cssClass.adoc
index 0c31226..1ffe390 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_cssClass.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_cssClass.adoc
@@ -23,7 +23,7 @@ public class ToDoItem {
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_describedAs.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_describedAs.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_describedAs.adoc
index 8c63f37..401fb46 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_describedAs.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_describedAs.adoc
@@ -20,7 +20,7 @@ public class Customer {
----
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_hidden.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_hidden.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_hidden.adoc
index 2e83211..7743805 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_hidden.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_hidden.adoc
@@ -10,7 +10,7 @@ The `hidden()` attribute indicates where (in the UI) the property should be hidd
[TIP]
====
-It is also possible to use xref:rgant.adoc#_rgant-PropertyLayout_hidden[`@PropertyLayout#hidden()`] or xref:ug.adoc#_ugfun_object-layout_dynamic[dynamic layouts] such that the property can be hidden at the view layer. Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
+It is also possible to use xref:rgant.adoc#_rgant-PropertyLayout_hidden[`@PropertyLayout#hidden()`] or xref:ugfun.adoc#_ugfun_object-layout_dynamic[dynamic layouts] such that the property can be hidden at the view layer. Both options are provided with a view that in the future the view-layer semantics may be under the control of (expert) users, whereas domain-layer semantics should never be overridden or modified by the user.
====
@@ -67,7 +67,7 @@ The xref:ugvro.adoc#[RestfulObjects viewer] has only partial support for these `
====
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_labelPosition.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_labelPosition.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_labelPosition.adoc
index 7eef03e..508b2cb 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_labelPosition.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_labelPosition.adoc
@@ -58,7 +58,7 @@ image::{_imagesdir}reference-annotations/PropertyLayout/labelPosition-boolean-RI
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_multiLine.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_multiLine.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_multiLine.adoc
index f506d24..758f765 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_multiLine.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_multiLine.adoc
@@ -25,7 +25,7 @@ Here the `stepsToReproduce` will be displayed in a text area of 10 rows.
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_named.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_named.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_named.adoc
index 43fc46d..9aece74 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_named.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_named.adoc
@@ -31,7 +31,7 @@ public class ToDoItem {
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_renderedAsDayBefore.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_renderedAsDayBefore.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_renderedAsDayBefore.adoc
index d041d5a..60e89cb 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_renderedAsDayBefore.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-PropertyLayout_renderedAsDayBefore.adoc
@@ -32,7 +32,7 @@ public class Tenancy {
-As an alternative to using the annotation, the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
+As an alternative to using the annotation, the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`]
can be used instead, eg:
[source,javascript]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant-ViewModelLayout.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant-ViewModelLayout.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant-ViewModelLayout.adoc
index a7406c1..34c1389 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant-ViewModelLayout.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant-ViewModelLayout.adoc
@@ -82,7 +82,7 @@ public class CategoryPieChart { ... }
[NOTE]
====
-Note that there is (currently) no support for specifying UI hints for view models through the dynamic xref:ug.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
+Note that there is (currently) no support for specifying UI hints for view models through the dynamic xref:ugfun.adoc#_ugfun_object-layout_dynamic[`.layout.json`] file (only for properties, collections and actions are supported).
====
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_deprecated.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_deprecated.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_deprecated.adoc
index b40bdeb..3a52807 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_deprecated.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_deprecated.adoc
@@ -19,7 +19,7 @@ The annotations listed in the table below are still supported by Apache Isis, bu
|Purpose
|Use instead
|Layer
-|xref:ug.adoc#_ugfun_object-layout_dynamic[Dynamic layout]?
+|xref:ugfun.adoc#_ugfun_object-layout_dynamic[Dynamic layout]?
|`@ActionOrder`
|Order of buttons and menu items representing actions.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_jee.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_jee.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_jee.adoc
index a68682c..9ad9522 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_jee.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_jee.adoc
@@ -16,7 +16,7 @@ The table below lists the JEE annotations currently recognized. Expect to see m
|Annotation
|Purpose
|Layer
-|xref:ug.adoc#_ugfun_object-layout_dynamic[Dynamic layout]?
+|xref:ugfun.adoc#_ugfun_object-layout_dynamic[Dynamic layout]?
|xref:rgant.adoc#_rgant-Digits[`@javax.validation.` +
`constraints.` +
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_main.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_main.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_main.adoc
index 42a19f5..013c0b8 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_main.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_main.adoc
@@ -11,7 +11,7 @@ For each of these domain types and members there are two annotations. One cover
[TIP]
====
-Most UI semantics can also be specified using xref:ug.adoc#_ugfun_object-layout_dynamic[dynamic object layout].
+Most UI semantics can also be specified using xref:ugfun.adoc#_ugfun_object-layout_dynamic[dynamic object layout].
====
@@ -24,7 +24,7 @@ The table below summarizes these most commonly used annotations in Apache Isis.
|Annotation
|Purpose
|Layer
-|xref:ug.adoc#_ugfun_object-layout_dynamic[Dynamic layout]?
+|xref:ugfun.adoc#_ugfun_object-layout_dynamic[Dynamic layout]?
|xref:rgant.adoc#_rgant-Action[`@Action`]
|Domain semantics for actions
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_other.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_other.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_other.adoc
index 824d77b..2c15a7a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_other.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgant_aaa_other.adoc
@@ -13,7 +13,7 @@ These annotations are also commonly used, but relate _not_ to objects or object
|Annotation
|Purpose
|Layer
-|xref:ug.adoc#_ugfun_object-layout_dynamic[Dynamic layout]?
+|xref:ugfun.adoc#_ugfun_object-layout_dynamic[Dynamic layout]?
|xref:rgant.adoc#_rgant-Facets[`@Facets`]
|Install arbitrary facets within the Apache Isis metamodel.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgcfg_configuring-core.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgcfg_configuring-core.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgcfg_configuring-core.adoc
index 224be40..0d675e4 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgcfg_configuring-core.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgcfg_configuring-core.adoc
@@ -55,14 +55,14 @@ Only intended for "emergency use" as a workaround while pending fix/patch to Apa
|regex:css1, regex2:css2,...
|Comma separated list of key:value pairs, where the key is a regex matching action names (eg `delete.*`) and the value is a link:http://getbootstrap.com/css/[Bootstrap] CSS button class (eg `btn-warning) to be applied (as per `@CssClass()`) to all action members matching the regex. +
-See xref:ug.adoc#_ugfun_how-tos_ui-hints_action-icons-and-css[UI hints] for more details.
+See xref:ugfun.adoc#_ugfun_how-tos_ui-hints_action-icons-and-css[UI hints] for more details.
|`isis.reflector.facet.` +
`cssClassFa.patterns`
|regex:fa-icon,regex2:fa-icon2,...
|Comma separated list of key:value pairs, where the key is a regex matching action names (eg `create.*`) and the value is a link:http://fortawesome.github.io/Font-Awesome/icons/[font-awesome] icon name (eg `fa-plus`) to be applied (as per `@CssClassFa()`) to all action members matching the regex. +
-See xref:ug.adoc#_ugfun_how-tos_ui-hints_action-icons-and-css[UI hints] for more details.
+See xref:ugfun.adoc#_ugfun_how-tos_ui-hints_action-icons-and-css[UI hints] for more details.
|`isis.reflector.facet.` +
`domainObjectAnnotation.` +
@@ -189,7 +189,7 @@ See xref:ugbtb.adoc#_ugbtb_programming-model_finetuning[finetuning the programmi
|`isis.reflector.` +
`layoutMetadataReaders`
|`FQCN`,`FQCN2`,...
-|Fully qualified class names of classes to be instantiated to read layout metadata, as used in for xref:ug.adoc#_ugfun_object-layout_dynamic[dynamic layout]s. +
+|Fully qualified class names of classes to be instantiated to read layout metadata, as used in for xref:ugfun.adoc#_ugfun_object-layout_dynamic[dynamic layout]s. +
See xref:ugbtb.adoc#_ugbtb_programming-model_layout-metadata-reader[Layout Metadata Reader] for more information.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgcfg_configuring-datanucleus_disabling-persistence-by-reachability.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgcfg_configuring-datanucleus_disabling-persistence-by-reachability.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgcfg_configuring-datanucleus_disabling-persistence-by-reachability.adoc
index fa994ce..40f5f89 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgcfg_configuring-datanucleus_disabling-persistence-by-reachability.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgcfg_configuring-datanucleus_disabling-persistence-by-reachability.adoc
@@ -23,7 +23,7 @@ We therefore recommend that you disable persistence-by-reachability by adding th
isis.persistor.datanucleus.impl.datanucleus.persistenceByReachabilityAtCommit=false
----
-This change has been made to the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]
+This change has been made to the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]
If you do disable this feature, then you will (of course) need to ensure that you explicitly persist all entities using the `DomainObjectContainer#persist(.)` or `DomainObjectContainer#persistIfNotAlready(.)` methods.
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgcfg_specifying-components.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgcfg_specifying-components.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgcfg_specifying-components.adoc
index ad20bb1..3205a5b 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgcfg_specifying-components.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgcfg_specifying-components.adoc
@@ -27,7 +27,7 @@ To specify the `AppManifest` as a configuration property, use:
|`FQCN`
|`o.a.i.applib.AppManifest` +
-By convention this implementation resides in an `myapp-app` Maven module (as opposed to `myapp-dom` or `myapp-fixture`). See the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] for details.
+By convention this implementation resides in an `myapp-app` Maven module (as opposed to `myapp-dom` or `myapp-fixture`). See the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] for details.
|===
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes.adoc
index 071d8b6..1e8649d 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes.adoc
@@ -5,7 +5,7 @@
:_imagesdir: images/
-This chapter describes the usage of various classes and interfaces that are not otherwise associated with xref:rgsvc.adoc#_rgsvc-api[domain] xref:rgsvc.adoc#_rgsvc-spi[services], xref:ug.adoc#_ugfun_object-layout[object layout] or xref:rgcfg.adoc#_rgcfg[configuration].
+This chapter describes the usage of various classes and interfaces that are not otherwise associated with xref:rgsvc.adoc#_rgsvc-api[domain] xref:rgsvc.adoc#_rgsvc-spi[services], xref:ugfun.adoc#_ugfun_object-layout[object layout] or xref:rgcfg.adoc#_rgcfg[configuration].
include::_rgcms_classes_AppManifest-bootstrapping.adoc[leveloffset=+1]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes_AppManifest-bootstrapping.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes_AppManifest-bootstrapping.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes_AppManifest-bootstrapping.adoc
index 19a4e4f..71ba5da 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes_AppManifest-bootstrapping.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgcms_classes_AppManifest-bootstrapping.adoc
@@ -183,7 +183,7 @@ What then remains is to update the bootstrapping code itself.
Bootstrapping integration tests is still performed using the `IsisSystemForTest.Builder`, but very often the bootstrapping code can be substantially simplified (compared to not using an `AppManifest`, that is).
-For example, this is the bootstrapping code for the xref:ug.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] looks something like:
+For example, this is the bootstrapping code for the xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype] looks something like:
[source,java]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_choices.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_choices.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_choices.adoc
index eefc9ba..42de401 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_choices.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_choices.adoc
@@ -60,7 +60,7 @@ image::{_imagesdir}reference-methods/prefixes/choices/dependent.png[width="800px
-This functionality is actually implemented as a xref:ug.adoc#_ugfun_how-tos_contributed-members[contributed action], so the code for this is:
+This functionality is actually implemented as a xref:ugfun.adoc#_ugfun_how-tos_contributed-members[contributed action], so the code for this is:
[source,java]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_default.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_default.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_default.adoc
index 037538a..635cf6e 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_default.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgcms_methods_prefixes_default.adoc
@@ -58,7 +58,7 @@ public class ShoppingCartItem {
-Defaults are also supported (of course) for xref:ug.adoc#_ugfun_how-tos_contributed-members[contributed actions]. For example, here is a contributed action for updating category/subcategory of the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp]:
+Defaults are also supported (of course) for xref:ugfun.adoc#_ugfun_how-tos_contributed-members[contributed actions]. For example, here is a contributed action for updating category/subcategory of the (non-ASF) http://github.com/isisaddons/isis-app-todoapp[Isis addons' todoapp]:
[source,java]
----
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgcms_schema-common.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgcms_schema-common.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgcms_schema-common.adoc
index 211f064..def83e7 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgcms_schema-common.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgcms_schema-common.adoc
@@ -12,7 +12,7 @@ xref:rgsvc.adoc#_rgsvc-api_BookmarkService[`BookmarkService`].
Although simple, this is an enormously powerful concept, in that it represents a URI to any domain object managed by
a given Apache Isis application. With it, we have the ability to lookup any arbitrary object. Further discussion and
-examples can be found xref:ug.adoc#_ugfun_core-concepts_building-blocks_oid[here].
+examples can be found xref:ugfun.adoc#_ugfun_core-concepts_building-blocks_oid[here].
[source,xml]
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_ActionInvocationContext.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_ActionInvocationContext.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_ActionInvocationContext.adoc
index 2ab1258..6b501a1 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_ActionInvocationContext.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_ActionInvocationContext.adoc
@@ -71,7 +71,7 @@ so no further configuration is required.
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_BackgroundService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_BackgroundService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_BackgroundService.adoc
index 25706eb..f3c4fce 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_BackgroundService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_BackgroundService.adoc
@@ -100,7 +100,7 @@ further configuration is required.
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_BookmarkService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_BookmarkService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_BookmarkService.adoc
index 4ff46db..a31ba85 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_BookmarkService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_BookmarkService.adoc
@@ -111,6 +111,6 @@ configuration is required.
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_CommandContext.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_CommandContext.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_CommandContext.adoc
index 8994a5c..2bcdddb 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_CommandContext.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_CommandContext.adoc
@@ -203,7 +203,7 @@ implementation of `CommandContext` service is automatically registered and injec
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_DeepLinkService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_DeepLinkService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_DeepLinkService.adoc
index 363b0c7..a635b05 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_DeepLinkService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_DeepLinkService.adoc
@@ -53,4 +53,4 @@ automatically registered and injected (it is annotated with `@DomainService`) so
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_EmailService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_EmailService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_EmailService.adoc
index 2042983..ea86c0c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_EmailService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_EmailService.adoc
@@ -87,7 +87,7 @@ implementation of `EmailService` service is automatically registered and injecte
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
== Related Services
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_EventBusService.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_EventBusService.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_EventBusService.adoc
index 1e3ecbb..940ed87 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_EventBusService.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_EventBusService.adoc
@@ -393,7 +393,7 @@ implementation of `EventBusService` service is automatically registered and inje
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_GuiceBeanProvider.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_GuiceBeanProvider.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_GuiceBeanProvider.adoc
index 261195f..87004c1 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_GuiceBeanProvider.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_GuiceBeanProvider.adoc
@@ -86,6 +86,6 @@ automatically registered and injected (it is annotated with `@DomainService`) so
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
http://git-wip-us.apache.org/repos/asf/isis/blob/f6f60c70/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_IsisJdoSupport.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_IsisJdoSupport.adoc b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_IsisJdoSupport.adoc
index 9553542..e5395c9 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_IsisJdoSupport.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_rgsvc-api_IsisJdoSupport.adoc
@@ -273,4 +273,4 @@ implementation of `IsisJdoSupport` service is automatically registered and injec
To use an alternative implementation, use
xref:rgant.adoc#_rgant-DomainServiceLayout_menuOrder[`@DomainServiceLayout#menuOrder()`] (as explained
-further in this xref:ug.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).
+further in this xref:ugfun.adoc#_ugfun_how-tos_replacing-default-service-implementations["how to"] tip).