You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/04/25 20:18:14 UTC

[2/2] isis git commit: ISIS-1335: improving docs for setting up file/live templates for IntelliJ, some small fixes. Also updated the cheat sheet PDF/docx

ISIS-1335: improving docs for setting up file/live templates for IntelliJ, some small fixes.  Also updated the cheat sheet PDF/docx


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

Branch: refs/heads/master
Commit: a42d7b5d33fe1dce37c132250860cfab8a546082
Parents: 20ab2ad
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Apr 25 19:10:12 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Apr 25 19:10:12 2016 +0100

----------------------------------------------------------------------
 .../src/main/asciidoc/guides/_dg_agilej.adoc    |   2 +-
 .../asciidoc/guides/_dg_asciidoc-templates.adoc |   2 +-
 .../src/main/asciidoc/guides/_dg_asciidoc.adoc  |   2 +-
 .../main/asciidoc/guides/_dg_ide-templates.adoc |  95 ----
 .../main/asciidoc/guides/_dg_ide_eclipse.adoc   |  15 +
 .../main/asciidoc/guides/_dg_ide_intellij.adoc  |  76 ++-
 ...fun_getting-started_simpleapp-archetype.adoc |   2 +-
 ..._ugtst_unit-test-support_contract-tests.adoc |   2 +-
 .../src/main/asciidoc/guides/dg.adoc            |   1 -
 .../010-settings-import-jar.png                 | Bin 24084 -> 13712 bytes
 .../030-import-settings/040-file-templates.png  | Bin 0 -> 39841 bytes
 .../030-import-settings/050-live-templates.png  | Bin 0 -> 38456 bytes
 .../dev-env/intellij/dan-settings-keymaps.jar   | Bin 2200 -> 0 bytes
 .../intellij/dan-settings-uisettings.jar        | Bin 861 -> 0 bytes
 .../intellij/isis-settings-code-style.jar       | Bin 0 -> 3512 bytes
 .../intellij/isis-settings-file-templates.jar   | Bin 0 -> 9315 bytes
 .../intellij/isis-settings-live-templates.jar   | Bin 0 -> 7492 bytes
 .../dev-env/intellij/isis-settings.jar          | Bin 11204 -> 0 bytes
 .../dev-env/intellij/other/.gitignore           |   1 +
 .../intellij/other/dan-settings-keymaps.jar     | Bin 0 -> 2200 bytes
 .../intellij/other/dan-settings-uisettings.jar  | Bin 0 -> 861 bytes
 .../main/asciidoc/images/cheat-sheets/cover.png | Bin 147058 -> 151235 bytes
 .../resources/cheat-sheets/IsisCheatSheet.docx  | Bin 32603 -> 33225 bytes
 .../resources/cheat-sheets/IsisCheatSheet.pdf   | Bin 425434 -> 432718 bytes
 ...-settings-file-templates-for-apache-isis.jar | Bin 9105 -> 0 bytes
 .../templates/isis-asciidoc-templates-idea.xml  | 331 ------------
 .../resources/templates/isis-templates-idea.xml | 522 -------------------
 .../resources/templates/isis-templates.xml      | 465 -----------------
 .../templates/jmock2-templates-idea.xml         |  91 ----
 .../resources/templates/jmock2-templates.xml    |   9 -
 .../templates/junit4-templates-idea.xml         |  55 --
 .../resources/templates/junit4-templates.xml    |  13 -
 32 files changed, 74 insertions(+), 1610 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/adocs/documentation/src/main/asciidoc/guides/_dg_agilej.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_dg_agilej.adoc b/adocs/documentation/src/main/asciidoc/guides/_dg_agilej.adoc
index d3d58e9..a951fa4 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_dg_agilej.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_dg_agilej.adoc
@@ -8,7 +8,7 @@
 
 [NOTE]
 ====
-This material does not constitute an endorsement; AgileJ Structure Views is not affiliated to Apache Software Foundation in any way.
+This material does not constitute an endorsement; AgileJ Structure Views is not affiliated to Apache Software Foundation in any way.  AgileJ has however provided a complimentary copy of its software to Apache Isis committers.
 ====
 
 link:http://www.agilej.com/[AgileJ Structure Views] is a commercial product to reverse engineer and visualize Java classes from source code.

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc-templates.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc-templates.adoc b/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc-templates.adoc
index 652c94a..45db996 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc-templates.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc-templates.adoc
@@ -7,7 +7,7 @@
 
 
 
-This appendix lists the (IntelliJ) live templates available for xref:dg.adoc#_dg_asciidoc[writing documentation] using Asciidoc.  Instructions for installing the templates can be found xref:dg.adoc#_dg_ide-templates[here].
+This appendix lists the (IntelliJ) live templates available for xref:dg.adoc#_dg_asciidoc[writing documentation] using Asciidoc.  Instructions for installing the templates can be found xref:dg.adoc#_dg_ide_intellij_live-templates[here].
 
 In the examples below the text `xxx`, `yyy`, `zzz` are correspond to template variables (ie placeholders).
 

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc.adoc b/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc.adoc
index 2e4e00d..3589252 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_dg_asciidoc.adoc
@@ -62,7 +62,7 @@ xxx-xxx/resources/.
 
 == Writing the docs
 
-We highly recommend that you install the (IntelliJ) live templates for Asciidoctor, as described in xref:dg.adoc#_dg_ide-templates[IDE templates].  These provide a large number of helper templates.
+We highly recommend that you install the (IntelliJ) live templates for Asciidoctor, as described in xref:dg.adoc#_dg_ide_intellij_live-templates[IDE templates].  These provide a large number of helper templates.
 
 An xref:dg.adoc#_dg_appendix_asciidoc-templates[appendix] lists all the templates available, demonstrating their intended usage and output.
 

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/adocs/documentation/src/main/asciidoc/guides/_dg_ide-templates.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_dg_ide-templates.adoc b/adocs/documentation/src/main/asciidoc/guides/_dg_ide-templates.adoc
deleted file mode 100644
index d8509b2..0000000
--- a/adocs/documentation/src/main/asciidoc/guides/_dg_ide-templates.adoc
+++ /dev/null
@@ -1,95 +0,0 @@
-[[_dg_ide-templates]]
-= Code and File Templates
-: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/
-:toc: right
-
-
-
-We provide parameterized templates, for both IntelliJ and Eclipse, to help you write your domain applications.
-
-On IntelliJ we provide both file templates (`File > Settings > Editor > File and Code Templates`) and also live templates (`File > Settings > Editor > Live Templates`).  The former are used to create new classes or files (eg a new domain entity), while the latter are intended to modify an existing file (eg create a new property or add a `toString()` method etc).
-
-On Eclipse we provide only the latter sort of template (Windows > Preferences > Java > Editor > Templates).
-
-There are templates for writing Apache Isis domain objects, for writing unit tests (JUnit and JMock), and also for writing Asciidoc documentation (see also the xref:dg.adoc#_dg_asciidoc-templates[appendix]).
-
-
-== Download
-
-The following table lists the templates available to download:
-
-[cols="2a,2a,1a,2a,2a", options="header"]
-|===
-
-
-|Purpose
-|IntelliJ +
-file template
-|Prefix
-|IntelliJ +
-live template
-|Eclipse +
-template
-
-|Domain Objects
-|link:../resources/templates/intellij-settings-file-templates-for-apache-isis.jar[Download]
-|`is`
-|link:../resources/templates/isis-templates-idea.xml[Download]
-|link:../resources/templates/isis-templates.xml[Download]
-
-|JUnit tests
-|(none)
-|`ju`
-|link:../resources/templates/junit4-templates-idea.xml[Download]
-|link:../resources/templates/junit4-templates.xml[Download]
-
-
-|JMock tests
-|(none)
-|`jm`
-|link:../resources/templates/jmock2-templates-idea.xml[Download]
-|link:../resources/templates/jmock2-templates.xml[Download]
-
-|Asciidoc
-|(none)
-|`ad`
-|link:../resources/templates/isis-asciidoc-templates-idea.xml[Download]
-|(none)
-
-|===
-
-
-The most commonly used domain objects (live) templates are also listed on the link:../cheat-sheet.html[Apache Isis cheat sheet].
-
-
-
-== Installation
-
-=== IntelliJ
-
-To install in the live templates IntelliJ (Community edition 15), copy to the relevant `config/templates` directory, eg:
-
-* Windows `<User home>\.IdeaIC15\config\templates`
-* Linux `~/.IdeaIC15/config/templates`
-* Mac OS `~/Library/Preferences/IdeaIC15/templates`
-
-If using the Ultimate edition, the directory is `.IntelliJIdea15` rather than `IdeaIC15`.
-
-
-To install the file templates, use `File > Import Settings`.
-
-
-=== Eclipse
-
-To install in Eclipse, go to `Windows > Preferences > Java > Editor > Templates` and choose `Import`.
-
-
-
-== Usage
-
-For the live templates, enter the prefix in the editor (`is`, `ju`, `jm`) and the IDE will list all available templates
-in that category.
-
-For the file templates (IntelliJ only), these are available from `File > New`.

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/adocs/documentation/src/main/asciidoc/guides/_dg_ide_eclipse.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_dg_ide_eclipse.adoc b/adocs/documentation/src/main/asciidoc/guides/_dg_ide_eclipse.adoc
index 7a20b2f..92d5436 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_dg_ide_eclipse.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_dg_ide_eclipse.adoc
@@ -24,6 +24,7 @@ This plugin needs to be configured for each of your domain modules (usually just
 
 
 
+[[_dg_ide_eclipse_screencast]]
 == Screencast
 
 This link:https://www.youtube.com/watch?v=RgcYfjQ8yJA[screencast] shows how to import an Apache Isis maven-based
@@ -31,8 +32,22 @@ application into Eclipse and configure to use with the JDO Objectstore.
 
 
 
+[[_dg_ide_eclipse_editor-templates]]
+== Editor Templates
 
+We provide a set of editor templates.  These are used to add new methods to existing classes.  (These are equivalent to the xref:dg.adoc#_dg_ide_intellij_live-templates[IntelliJ live templates]):
 
+* `is` (Apache Isis domain objects).  link:../resources/templates/isis-templates.xml[Download]
+* `ju` (for JUnit tests) link:../resources/templates/junit4-templates.xml[Download]
+* `jm` (for JMock mocks or libraries) link:../resources/templates/jmock2-templates.xml[Download]
+
+
+To install, download each XML file, then go to `Windows > Preferences > Java > Editor > Templates` and choose `Import`.
+
+
+
+
+[[_dg_ide_eclipse_importing-the-project]]
 == Importing the Project
 
 Use File &gt; Import, then Maven &gt; Existing Maven Projects.

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/adocs/documentation/src/main/asciidoc/guides/_dg_ide_intellij.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_dg_ide_intellij.adoc b/adocs/documentation/src/main/asciidoc/guides/_dg_ide_intellij.adoc
index d92884b..158478c 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_dg_ide_intellij.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_dg_ide_intellij.adoc
@@ -9,7 +9,7 @@
 
 [NOTE]
 ====
-This material does not constitute an endorsement; JetBrains is not affiliated to Apache Software Foundation in any way.
+This material does not constitute an endorsement; JetBrains is not affiliated to Apache Software Foundation in any way.  JetBrains does however provide complimentary copies of the IntelliJ IDE to Apache committers.
 ====
 
 This section describes how to install and setup JetBrains' IntelliJ IDEA, then how to import an application into IntelliJ and run it.
@@ -18,8 +18,7 @@ This section describes how to install and setup JetBrains' IntelliJ IDEA, then h
 
 == Installing and Setting up
 
-This section covers installation and setup. These notes relates to IntelliJ Community Edition 14.1.x, with
-screenshots taken for Windows.
+This section covers installation and setup. These notes/screenshots were prepared using IntelliJ Community Edition 14.1.x, but are believed to be compatible with more recent versions/other editions of the IDE.
 
 
 === Download and Install
@@ -76,15 +75,13 @@ image::{_imagesdir}appendices/dev-env/intellij-idea/020-create-new-project/010-n
 We want to create a new *Java* project:
 
 .IntelliJ Create New Project - Create a Java project
-image::{_imagesdir}appendices/dev-env/intellij-idea/020-create-new-project/020-java-project-setup-jdk.png[width="600px"]
+image::{_imagesdir}appendices/dev-env/intellij-idea/020-create-new-project/020-java-project-setup-jdk.png[width="500px"]
 
-We therefore need to specify the JDK.
-
-NOTE: at the time of writing Apache Isis supports only Java 7; Java 8 is scheduled for support in Apache Isis v1.9.0
+We therefore need to specify the JDK.  Apache Isis supports both Java 7 and Java 8.
 
 
 .IntelliJ Create New Java Project - Select the JDK
-image::{_imagesdir}appendices/dev-env/intellij-idea/020-create-new-project/030-java-project-select-jdk.png[width="300px"]
+image::{_imagesdir}appendices/dev-env/intellij-idea/020-create-new-project/030-java-project-select-jdk.png[width="250px"]
 
 Specify the directory containing the JDK:
 
@@ -94,28 +91,59 @@ image::{_imagesdir}appendices/dev-env/intellij-idea/020-create-new-project/050-n
 Finally allow IntelliJ to create the directory for the new project:
 
 .IntelliJ Create New Project
-image::{_imagesdir}appendices/dev-env/intellij-idea/020-create-new-project/060-create-dir.png[width="200px"]
+image::{_imagesdir}appendices/dev-env/intellij-idea/020-create-new-project/060-create-dir.png[width="250px"]
+
+
 
+[[_dg_ide_intellij_file-templates]]
+=== File templates
 
 
-=== Import Settings
+Next we recommend you import a set of standard file templates.  These are used to create new classes or supporting files:
 
-Next we need to configure IntelliJ with ASF/Apache Isis' standard templates and coding conventions.  These are bundled as the `settings.jar` JAR file link:resources/appendices/dev-env/intellij/isis-settings.jar[download from the Apache Isis website]).
+.File templates
+image::{_imagesdir}appendices/dev-env/intellij-idea/030-import-settings/040-file-templates.png[width="400px"]
 
-Import using: `File > Import Settings`, and specify the directory that you have downloaded the file to:
+The file templates are provided as a settings JAR file, namely *link:resources/appendices/dev-env/intellij/isis-settings-file-templates.jar[isis-settings-file-templates.jar]*.  Download this file and import using `File > Import Settings`, specifying the
+directory that you have downloaded the file to:
 
 .IntelliJ Import Settings - Specify JAR file
 image::{_imagesdir}appendices/dev-env/intellij-idea/030-import-settings/010-settings-import-jar.png[width="400px"]
 
-Select all the (two) categories of settings available in the JAR file:
+Select all the categories (there should just be one), and hit OK.  then hit restart:
 
-.IntelliJ Import Settings - Select all categories
-image::{_imagesdir}appendices/dev-env/intellij-idea/030-import-settings/020-select-all.png[width="300px"]
+.IntelliJ Import Settings - Restart
+image::{_imagesdir}appendices/dev-env/intellij-idea/030-import-settings/030-restart.png[width="250px"]
 
-And then restart:
 
-.IntelliJ Import Settings - Restart
-image::{_imagesdir}appendices/dev-env/intellij-idea/030-import-settings/030-restart.png[width="200px"]
+
+[[_dg_ide_intellij_live-templates]]
+=== Live templates
+
+We also recommend you import a set  of live templates.  These are used to add new methods to existing classes:
+
+.Live templates
+image::{_imagesdir}appendices/dev-env/intellij-idea/030-import-settings/050-live-templates.png[width="600px"]
+
+The live templates have a prefix of prefixed either:
+
+* `is` : for Apache Isis domain objects
+* `ju` : for JUnit tests
+* `jm` : for JMock mocks or libraries
+* `ad` : for Asciidoc documentation; a full list can be found in the xref:dg.adoc#_dg_asciidoc-templates[appendix].
+
+The live templates are also provided as a settings JAR file, namely *link:resources/appendices/dev-env/intellij/isis-settings-live-templates.jar[isis-settings-live-templates.jar]*.
+Download and import (as for the previous settings JAR files).
+
+
+
+
+[[_dg_ide_intellij_coding-standards]]
+=== Coding Standards
+
+Next, we suggest you recommend you import settings for standard ASF/Apache Isis coding conventions.  This file is also
+provided as a settings file, namely *link:resources/appendices/dev-env/intellij/isis-settings-code-style.jar[isis-settings-code-style.jar]*.  Download and import (as for the above settings JAR files).
+
 
 
 [[_dg_ide_intellij_other-settings-compiler]]
@@ -126,13 +154,13 @@ There are also some other settings that influence the compiler.  We highly recom
 On the *Compiler* Settings page, ensure that `build automatically` is enabled (and optionally `compile independent modules in parallel`):
 
 .IntelliJ Compiler Settings
-image::{_imagesdir}appendices/dev-env/intellij-idea/040-other-settings-compiler/010-build-automatically.png[width="600px"]
+image::{_imagesdir}appendices/dev-env/intellij-idea/040-other-settings-compiler/010-build-automatically.png[width="700px"]
 
 
 On the *Annotation Processors* page, enable and adjust for the 'default' setting:
 
 .IntelliJ Annotation Processor Settings
-image::{_imagesdir}appendices/dev-env/intellij-idea/040-other-settings-compiler/020-annotation-processor.png[width="600px"]
+image::{_imagesdir}appendices/dev-env/intellij-idea/040-other-settings-compiler/020-annotation-processor.png[width="700px"]
 
 This setting enables the generation of the `Q*` classes for DataNucleus type-safe queries, as well as being required
 for frameworks such as xref:_cg_ide_project-lombok[Project Lombok].
@@ -144,6 +172,8 @@ IntelliJ may also have inferred these settings for specific projects/modules whe
 
 
 
+
+
 [[_dg_ide_intellij_other-settings-maven]]
 === Other Settings (Maven)
 
@@ -152,12 +182,12 @@ There are also some other settings for Maven that we recommend you adjust (thoug
 First, specify an up-to-date Maven installation, using `File > Settings` (or `IntelliJ > Preferences` if on MacOS):
 
 .IntelliJ Maven Settings - Installation
-image::{_imagesdir}appendices/dev-env/intellij-idea/042-other-settings-maven/010-maven-installation.png[width="600px"]
+image::{_imagesdir}appendices/dev-env/intellij-idea/042-other-settings-maven/010-maven-installation.png[width="700px"]
 
 Still on the Maven settings page, configure as follows:
 
 .IntelliJ Maven Settings - Configuration
-image::{_imagesdir}appendices/dev-env/intellij-idea/042-other-settings-maven/020-maven-configuration.png[width="600px"]
+image::{_imagesdir}appendices/dev-env/intellij-idea/042-other-settings-maven/020-maven-configuration.png[width="700px"]
 
 
 === Other Settings (Misc)
@@ -167,7 +197,7 @@ These settings are optional but also recommended.
 On the *auto import* page, check the `optimize imports on the fly` and `add unambiguous imports on the fly`
 
 .IntelliJ Maven Settings - Auto Import
-image::{_imagesdir}appendices/dev-env/intellij-idea/044-other-settings-misc/010-auto-import.png[width="600px"]
+image::{_imagesdir}appendices/dev-env/intellij-idea/044-other-settings-misc/010-auto-import.png[width="700px"]
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/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 87ffe9f..99ed1f0 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
@@ -238,7 +238,7 @@ To log in, use `sven/pass`.
 
 Once you are familiar with the generated app, you'll want to start modifying it.  There is plenty of guidance on this site; check out the 'programming model how-tos' section on the main link:../documentation.html[documentation] page first).
 
-If you use Eclipse or IntelliJ IDEA, do also install the xref:dg.adoc#_dg_ide-templates[IDE templates]; these will help you follow the Apache Isis naming conventions.
+If you use IntelliJ IDEA or Eclipse, do also install the xref:dg.adoc#_dg_ide_intellij_live-templates[live templates (for IntelliJ)] / xref:dg.adoc#_dg_ide_eclipse_editor-templates[editor templates (for Eclipse)]; these will help you follow the Apache Isis naming conventions.
 
 
 

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/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 3939d1d..3109581 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
@@ -68,7 +68,7 @@ This contract test automatically checks that bidirectional 1:m or 1:1 associatio
 
 [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:ugfun.adoc#_ugfun_how-tos_entity-relationships_managed-1-to-m-bidirectional-relationships[here].  Also check out the xref:dg.adoc#_dg_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 templates in the developers' guide (xref:dg.adoc#_dg_ide_intellij_live-templates[live templates for IntelliJ] / xref:dg.adoc#_dg_ide_eclipse_editor-templates[editor templates for Eclipse]) 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/a42d7b5d/adocs/documentation/src/main/asciidoc/guides/dg.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/dg.adoc b/adocs/documentation/src/main/asciidoc/guides/dg.adoc
index c6fa99c..e63030a 100644
--- a/adocs/documentation/src/main/asciidoc/guides/dg.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/dg.adoc
@@ -51,7 +51,6 @@ The remaining guides are:
 
 
 include::_dg_ide.adoc[leveloffset=+1]
-include::_dg_ide-templates.adoc[leveloffset=+1]
 
 include::_dg_building-isis.adoc[leveloffset=+1]
 

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/adocs/documentation/src/main/asciidoc/guides/images/appendices/dev-env/intellij-idea/030-import-settings/010-settings-import-jar.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/images/appendices/dev-env/intellij-idea/030-import-settings/010-settings-import-jar.png b/adocs/documentation/src/main/asciidoc/guides/images/appendices/dev-env/intellij-idea/030-import-settings/010-settings-import-jar.png
index c607856..be6fb1e 100644
Binary files a/adocs/documentation/src/main/asciidoc/guides/images/appendices/dev-env/intellij-idea/030-import-settings/010-settings-import-jar.png and b/adocs/documentation/src/main/asciidoc/guides/images/appendices/dev-env/intellij-idea/030-import-settings/010-settings-import-jar.png differ

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/adocs/documentation/src/main/asciidoc/guides/images/appendices/dev-env/intellij-idea/030-import-settings/040-file-templates.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/images/appendices/dev-env/intellij-idea/030-import-settings/040-file-templates.png b/adocs/documentation/src/main/asciidoc/guides/images/appendices/dev-env/intellij-idea/030-import-settings/040-file-templates.png
new file mode 100644
index 0000000..c238509
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/images/appendices/dev-env/intellij-idea/030-import-settings/040-file-templates.png differ

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/adocs/documentation/src/main/asciidoc/guides/images/appendices/dev-env/intellij-idea/030-import-settings/050-live-templates.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/images/appendices/dev-env/intellij-idea/030-import-settings/050-live-templates.png b/adocs/documentation/src/main/asciidoc/guides/images/appendices/dev-env/intellij-idea/030-import-settings/050-live-templates.png
new file mode 100644
index 0000000..6fc56ba
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/images/appendices/dev-env/intellij-idea/030-import-settings/050-live-templates.png differ

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/dan-settings-keymaps.jar
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/dan-settings-keymaps.jar b/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/dan-settings-keymaps.jar
deleted file mode 100644
index 75d09be..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/dan-settings-keymaps.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/dan-settings-uisettings.jar
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/dan-settings-uisettings.jar b/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/dan-settings-uisettings.jar
deleted file mode 100644
index 0787a69..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/dan-settings-uisettings.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/isis-settings-code-style.jar
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/isis-settings-code-style.jar b/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/isis-settings-code-style.jar
new file mode 100644
index 0000000..b2ad298
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/isis-settings-code-style.jar differ

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/isis-settings-file-templates.jar
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/isis-settings-file-templates.jar b/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/isis-settings-file-templates.jar
new file mode 100644
index 0000000..fffc44f
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/isis-settings-file-templates.jar differ

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/isis-settings-live-templates.jar
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/isis-settings-live-templates.jar b/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/isis-settings-live-templates.jar
new file mode 100644
index 0000000..69ff3e4
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/isis-settings-live-templates.jar differ

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/isis-settings.jar
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/isis-settings.jar b/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/isis-settings.jar
deleted file mode 100644
index f1fdece..0000000
Binary files a/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/isis-settings.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/other/.gitignore
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/other/.gitignore b/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/other/.gitignore
new file mode 100644
index 0000000..27620d5
--- /dev/null
+++ b/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/other/.gitignore
@@ -0,0 +1 @@
+!*.jar

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/other/dan-settings-keymaps.jar
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/other/dan-settings-keymaps.jar b/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/other/dan-settings-keymaps.jar
new file mode 100644
index 0000000..75d09be
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/other/dan-settings-keymaps.jar differ

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/other/dan-settings-uisettings.jar
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/other/dan-settings-uisettings.jar b/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/other/dan-settings-uisettings.jar
new file mode 100644
index 0000000..0787a69
Binary files /dev/null and b/adocs/documentation/src/main/asciidoc/guides/resources/appendices/dev-env/intellij/other/dan-settings-uisettings.jar differ

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/adocs/documentation/src/main/asciidoc/images/cheat-sheets/cover.png
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/images/cheat-sheets/cover.png b/adocs/documentation/src/main/asciidoc/images/cheat-sheets/cover.png
index cb383ff..258356a 100644
Binary files a/adocs/documentation/src/main/asciidoc/images/cheat-sheets/cover.png and b/adocs/documentation/src/main/asciidoc/images/cheat-sheets/cover.png differ

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/adocs/documentation/src/main/asciidoc/resources/cheat-sheets/IsisCheatSheet.docx
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/resources/cheat-sheets/IsisCheatSheet.docx b/adocs/documentation/src/main/asciidoc/resources/cheat-sheets/IsisCheatSheet.docx
index dfd7d82..be3757f 100644
Binary files a/adocs/documentation/src/main/asciidoc/resources/cheat-sheets/IsisCheatSheet.docx and b/adocs/documentation/src/main/asciidoc/resources/cheat-sheets/IsisCheatSheet.docx differ

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/adocs/documentation/src/main/asciidoc/resources/cheat-sheets/IsisCheatSheet.pdf
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/resources/cheat-sheets/IsisCheatSheet.pdf b/adocs/documentation/src/main/asciidoc/resources/cheat-sheets/IsisCheatSheet.pdf
index dded201..4f2c297 100644
Binary files a/adocs/documentation/src/main/asciidoc/resources/cheat-sheets/IsisCheatSheet.pdf and b/adocs/documentation/src/main/asciidoc/resources/cheat-sheets/IsisCheatSheet.pdf differ

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/adocs/documentation/src/main/asciidoc/resources/templates/intellij-settings-file-templates-for-apache-isis.jar
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/resources/templates/intellij-settings-file-templates-for-apache-isis.jar b/adocs/documentation/src/main/asciidoc/resources/templates/intellij-settings-file-templates-for-apache-isis.jar
deleted file mode 100644
index 2d6771c..0000000
Binary files a/adocs/documentation/src/main/asciidoc/resources/templates/intellij-settings-file-templates-for-apache-isis.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/isis/blob/a42d7b5d/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
deleted file mode 100644
index 6267411..0000000
--- a/adocs/documentation/src/main/asciidoc/resources/templates/isis-asciidoc-templates-idea.xml
+++ /dev/null
@@ -1,331 +0,0 @@
-<templateSet group="Isis-AsciiDoc">
-  <template name="adtbl3" value=".$tableCaption$&#10;[cols=&quot;1a,1a,1a&quot;, options=&quot;header&quot;]&#10;|===&#10;&#10;| $cell1header$ &#10;| $cell2header$&#10;| $cell3header$&#10;&#10;&#10;| $cell1row1$&#10;| $cell2row1$&#10;| $cell3row1$&#10;&#10;&#10;|&#10;|&#10;|&#10;&#10;|===" description="Table with three columns" toReformat="false" toShortenFQNames="true">
-    <variable name="tableCaption" expression="" defaultValue="&quot;Table caption&quot;" alwaysStopAt="true" />
-    <variable name="cell1header" expression="" defaultValue="&quot;Header Cell 1&quot;" alwaysStopAt="true" />
-    <variable name="cell2header" expression="" defaultValue="&quot;Header Cell 2&quot;" alwaysStopAt="true" />
-    <variable name="cell3header" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="cell1row1" expression="" defaultValue="&quot;Row 1 Cell 1&quot;" alwaysStopAt="true" />
-    <variable name="cell2row1" expression="" defaultValue="&quot;Row 1 Cell 2&quot;" alwaysStopAt="true" />
-    <variable name="cell3row1" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adadmtip" value="[TIP]&#10;====&#10;$END$&#10;====&#10;" description="Tip admonition" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adadmnote" value="[NOTE]&#10;====&#10;$END$&#10;====&#10;" description="Note admonition" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adadmimportant" value="[IMPORTANT]&#10;====&#10;$END$&#10;====&#10;" description="Important admonition" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adadmwarning" value="[WARNING]&#10;====&#10;$END$&#10;====&#10;" description="Warning admonition" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adimgfile" value="image::{_imagesdir}$INCLUDED$/$FILE$.png[width=&quot;$END$$WIDTH$px&quot;,link=&quot;{_imagesdir}$INCLUDED$/$FILE$.png&quot;]" description="Image link to file" toReformat="false" toShortenFQNames="true">
-    <variable name="INCLUDED" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="FILE" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adimgurl" value="image::$URL$[width=&quot;$END$$WIDTH$px&quot;,link=&quot;$URL$&quot;]" description="Image link to URL" toReformat="false" toShortenFQNames="true">
-    <variable name="URL" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adlink" value="link:$URL$[$TEXT$]" description="Link to URL" toReformat="false" toShortenFQNames="true">
-    <variable name="URL" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="TEXT" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adsrcjava" value="[source,java]&#10;----&#10;$END$&#10;----&#10;" description="Source code (java)" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adsrcxml" value="[source,xml]&#10;----&#10;$END$&#10;----&#10;" description="Source code (XML)" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adsrcother" value="[source,$LANG$]&#10;----&#10;$END$&#10;----&#10;" description="Source code (None)" toReformat="false" toShortenFQNames="true">
-    <variable name="LANG" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adinclude" value="include::$INCLUDED$.adoc[leveloffset=+1]&#10;" description="Include" toReformat="false" toShortenFQNames="true">
-    <variable name="INCLUDED" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adlinkaddons" value="(non-ASF) link:http://isisaddons.org[Isis Addons]" description="Link to Isis Addons" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adlinkaddonsmodule" value="(non-ASF) http://github.com/isisaddons/isis-module-$MODULE$[Isis addons' $MODULE$] module" description="Link to specific Isis Addons module" toReformat="false" toShortenFQNames="true">
-    <variable name="MODULE" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adtodo" value="NOTE: TODO" description="TODO note" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adfootnote" value=".footnote:[$END$]" description="Footnote" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adlinkaddonswicket" value="(non-ASF) http://github.com/isisaddons/isis-wicket-$WICKET$[Isis addons' $WICKET$ ] wicket extension" description="Link to specific Isis Addons wicket cpt" toReformat="false" toShortenFQNames="true">
-    <variable name="WICKET" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <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">
-    <variable name="APP" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adyoutube" value="video::$REFERENCE$[youtube,width=&quot;$WIDTH$px&quot;,height=&quot;$END$$HEIGHT$px&quot;]" description="Link to youtube" toReformat="false" toShortenFQNames="true">
-    <variable name="REFERENCE" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="HEIGHT" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adimgfilec" value=".$CAPTION$&#10;image::{_imagesdir}$INCLUDED$/$FILE$.png[width=&quot;$END$$WIDTH$px&quot;,link=&quot;{_imagesdir}$INCLUDED$/$FILE$.png&quot;]" description="Image link to file with caption" toReformat="false" toShortenFQNames="true">
-    <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="INCLUDED" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="FILE" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adimgurlc" value=".$CAPTION$&#10;image::$URL$[width=&quot;$END$$WIDTH$px&quot;,link=&quot;$URL$&quot;]" description="Image link to URL with caption" toReformat="false" toShortenFQNames="true">
-    <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="URL" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adsrcjavac" value="[source,java]&#10;.$CAPTION$&#10;----&#10;$END$&#10;----&#10;" description="Source code (java) with caption" toReformat="false" toShortenFQNames="true">
-    <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adsrcotherc" value="[source,$LANG$]&#10;----&#10;$END$&#10;----&#10;" description="Source code (None) with caption" toReformat="false" toShortenFQNames="true">
-    <variable name="LANG" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adsrcxmlc" value="[source,xml]&#10;.$CAPTION$&#10;----&#10;$END$&#10;----&#10;" description="Source code (XML) with caption" toReformat="false" toShortenFQNames="true">
-    <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adsrcjavascript" value="[source,javascript]&#10;----&#10;$END$&#10;----&#10;" description="Source code (Javascript)" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adsrcjavascriptc" value="[source,javascript]&#10;.$CAPTION$&#10;----&#10;$END$&#10;----&#10;" description="Source code (javascript) with caption" toReformat="false" toShortenFQNames="true">
-    <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-
-  <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="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="adugvro" value="xref:ugvro.adoc#$bookmark$[$DisplayText$]" description="x-ref to user guide restful objects 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="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>
-  </template>
-  <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="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="adugsimpleapp" value="xref:ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype]" description="xref to the simpleapp archetype in the user guide (fundamentals)" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-
-  <template name="adrgant" value="xref:rgant.adoc#$bookmark$[$DisplayText$]" description="x-ref to ref guide (annotations)" 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="adrgsvc" value="xref:rgsvc.adoc#$bookmark$[$DisplayText$]" description="xref to ref guide (domain services)" 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="adrgcfg" value="xref:rgcfg.adoc#$bookmark$[$DisplayText$]" description="xref to ref guide (configuration properties)" 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="adrgcms" value="xref:rgcms.adoc#$bookmark$[$DisplayText$]" description="xref to ref guide (classes, methods, schema)" 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="adrgmvn" value="xref:rgmvn.adoc#$bookmark$[$DisplayText$]" description="xref to ref guide (maven plugin)" 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="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="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="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="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="addg" value="xref:cgcon.adoc#$bookmark$[$DisplayText$]" description="x-ref to developers' 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="adcgcom" value="xref:cgcom.adoc#$bookmark$[$DisplayText$]" description="x-ref to committers 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="adanchany" value="= anchor:$prefix$[]" description="anchor to any" toReformat="false" toShortenFQNames="true">
-    <variable name="prefix" expression="" defaultValue="chapter" 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" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-
-
-  <template name="adwip" value="NOTE: WIP - " description="WIP note" toReformat="false" toShortenFQNames="true">
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-  <template name="adyoutubec" value=".$CAPTION$&#10;video::$REFERENCE$[youtube,width=&quot;$WIDTH$px&quot;,height=&quot;$END$$HEIGHT$px&quot;]" description="Link to youtube with caption" toReformat="false" toShortenFQNames="true">
-    <variable name="CAPTION" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="REFERENCE" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="WIDTH" expression="" defaultValue="" alwaysStopAt="true" />
-    <variable name="HEIGHT" expression="" defaultValue="" alwaysStopAt="true" />
-    <context>
-      <option name="AsciiDoc" value="true" />
-    </context>
-  </template>
-
-  <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>
-
-</templateSet>
\ No newline at end of file