http://git-wip-us.apache.org/repos/asf/isis-site/blob/6ad91949/content/guides/dg/dg.html
----------------------------------------------------------------------
diff --git a/content/guides/dg/dg.html b/content/guides/dg/dg.html
index 8eb783b..a07aaef 100644
--- a/content/guides/dg/dg.html
+++ b/content/guides/dg/dg.html
@@ -411,12 +411,12 @@
         </div> 
         <div class="ulist"> 
          <ul> 
-          <li> <p><a href="rgant.html">Annotations</a></p> </li> 
-          <li> <p><a href="rgsvc.html">Domain Services</a></p> </li> 
-          <li> <p><a href="rgcfg.html">Configuration Properties</a></p> </li> 
-          <li> <p><a href="rgcms.html">Classes, Methods and Schema</a></p> 
</li> 
-          <li> <p><a href="rgmvn.html">Apache Isis Maven plugin</a></p> </li> 
-          <li> <p><a href="rgfis.html">Framework Internal Services</a></p> 
</li> 
+          <li> <p><a href="../rgant/rgant.html">Annotations</a></p> </li> 
+          <li> <p><a href="../rgsvc/rgsvc.html">Domain Services</a></p> </li> 
+          <li> <p><a href="../rgcfg/rgcfg.html">Configuration 
Properties</a></p> </li> 
+          <li> <p><a href="../rgcms/rgcms.html">Classes, Methods and 
Schema</a></p> </li> 
+          <li> <p><a href="../rgmvn/rgmvn.html">Apache Isis Maven 
plugin</a></p> </li> 
+          <li> <p><a href="../rgfis/rgfis.html">Framework Internal 
Services</a></p> </li> 
          </ul> 
         </div> 
         <div class="paragraph"> 
@@ -436,7 +436,7 @@
       <button type="button" class="button secondary" 
onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/dg/_dg_ide.adoc&quot;";
 style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i 
class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
       <div class="sectionbody"> 
        <div class="paragraph"> 
-        <p>The vast majority of Java developers use an IDE to assist with 
developing their code, and we highly recommend that you do like wise as you 
develop your Apache Isis applications using an IDE. Apache Isis is built with 
Maven, and all modern IDEs can import Maven projects.</p> 
+        <p>The vast majority of Java developers use an IDE to assist with 
developing their code, and we highly recommend that you do likewise as you 
develop your Apache Isis applications using an IDE. Apache Isis is built with 
Maven, and all modern IDEs can import Maven projects.</p> 
        </div> 
        <div class="paragraph"> 
         <p>This chapter shows how to setup and use two of the most popular 
IDEs, IntelliJ IDEA and Eclipse.</p> 
@@ -475,7 +475,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/010-installing/010-welcome-page.png"
 alt="010 welcome page" width="400px"> 
+            <img 
src="images/intellij-idea/010-installing/010-welcome-page.png" alt="010 welcome 
page" width="400px"> 
            </div> 
            <div class="title">
             Figure 1. IntelliJ Installation Wizard - Welcome page
@@ -486,7 +486,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/010-installing/020-choose-location.png"
 alt="020 choose location" width="400px"> 
+            <img 
src="images/intellij-idea/010-installing/020-choose-location.png" alt="020 
choose location" width="400px"> 
            </div> 
            <div class="title">
             Figure 2. IntelliJ Installation Wizard - Choose Location
@@ -497,7 +497,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/010-installing/030-installation-options.png"
 alt="030 installation options" width="400px"> 
+            <img 
src="images/intellij-idea/010-installing/030-installation-options.png" alt="030 
installation options" width="400px"> 
            </div> 
            <div class="title">
             Figure 3. IntelliJ Installation Wizard - Installation Options
@@ -508,7 +508,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/010-installing/040-start-menu-folder.png"
 alt="040 start menu folder" width="400px"> 
+            <img 
src="images/intellij-idea/010-installing/040-start-menu-folder.png" alt="040 
start menu folder" width="400px"> 
            </div> 
            <div class="title">
             Figure 4. IntelliJ Installation Wizard - Start Menu Folder
@@ -519,7 +519,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/010-installing/050-completing.png" 
alt="050 completing" width="400px"> 
+            <img src="images/intellij-idea/010-installing/050-completing.png" 
alt="050 completing" width="400px"> 
            </div> 
            <div class="title">
             Figure 5. IntelliJ Installation Wizard - Completing the Wizard
@@ -530,7 +530,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/010-installing/060-import-settings-or-not.png"
 alt="060 import settings or not" width="400px"> 
+            <img 
src="images/intellij-idea/010-installing/060-import-settings-or-not.png" 
alt="060 import settings or not" width="400px"> 
            </div> 
            <div class="title">
             Figure 6. IntelliJ Installation Wizard - Import Settings
@@ -541,7 +541,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/010-installing/070-set-ui-theme.png"
 alt="070 set ui theme" width="600px"> 
+            <img 
src="images/intellij-idea/010-installing/070-set-ui-theme.png" alt="070 set ui 
theme" width="600px"> 
            </div> 
            <div class="title">
             Figure 7. IntelliJ Installation Wizard Set UI Theme
@@ -558,7 +558,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/020-create-new-project/010-new-project-create.png"
 alt="010 new project create" width="400px"> 
+            <img 
src="images/intellij-idea/020-create-new-project/010-new-project-create.png" 
alt="010 new project create" width="400px"> 
            </div> 
            <div class="title">
             Figure 8. IntelliJ Create New Project
@@ -569,7 +569,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/020-create-new-project/020-java-project-setup-jdk.png"
 alt="020 java project setup jdk" width="500px"> 
+            <img 
src="images/intellij-idea/020-create-new-project/020-java-project-setup-jdk.png"
 alt="020 java project setup jdk" width="500px"> 
            </div> 
            <div class="title">
             Figure 9. IntelliJ Create New Project - Create a Java project
@@ -580,7 +580,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/020-create-new-project/030-java-project-select-jdk.png"
 alt="030 java project select jdk" width="250px"> 
+            <img 
src="images/intellij-idea/020-create-new-project/030-java-project-select-jdk.png"
 alt="030 java project select jdk" width="250px"> 
            </div> 
            <div class="title">
             Figure 10. IntelliJ Create New Java Project - Select the JDK
@@ -591,7 +591,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/020-create-new-project/050-name-and-location.png"
 alt="050 name and location" width="400px"> 
+            <img 
src="images/intellij-idea/020-create-new-project/050-name-and-location.png" 
alt="050 name and location" width="400px"> 
            </div> 
            <div class="title">
             Figure 11. IntelliJ Create New Project - Select the JDK location
@@ -602,7 +602,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/020-create-new-project/060-create-dir.png"
 alt="060 create dir" width="250px"> 
+            <img 
src="images/intellij-idea/020-create-new-project/060-create-dir.png" alt="060 
create dir" width="250px"> 
            </div> 
            <div class="title">
             Figure 12. IntelliJ Create New Project
@@ -616,21 +616,21 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/030-import-settings/040-file-templates.png"
 alt="040 file templates" width="400px"> 
+            <img 
src="images/intellij-idea/030-import-settings/040-file-templates.png" alt="040 
file templates" width="400px"> 
            </div> 
            <div class="title">
             Figure 13. File templates
            </div> 
           </div> 
           <div class="paragraph"> 
-           <p>The file templates are provided as a settings JAR file, namely 
<strong><a 
href="resources/appendices/dev-env/intellij/isis-settings-file-templates.jar">isis-settings-file-templates.jar</a></strong>.
 Download this file.</p> 
+           <p>The file templates are provided as a settings JAR file, namely 
<strong><a 
href="resources/intellij/isis-settings-file-templates.jar">isis-settings-file-templates.jar</a></strong>.
 Download this file.</p> 
           </div> 
           <div class="paragraph"> 
            <p>Next, import using <code>File &gt; Import Settings</code>, 
specifying the directory that you have downloaded the file to:</p> 
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/030-import-settings/010-settings-import-jar.png"
 alt="010 settings import jar" width="400px"> 
+            <img 
src="images/intellij-idea/030-import-settings/010-settings-import-jar.png" 
alt="010 settings import jar" width="400px"> 
            </div> 
            <div class="title">
             Figure 14. IntelliJ Import Settings - Specify JAR file
@@ -670,7 +670,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/030-import-settings/050-live-templates.png"
 alt="050 live templates" width="600px"> 
+            <img 
src="images/intellij-idea/030-import-settings/050-live-templates.png" alt="050 
live templates" width="600px"> 
            </div> 
            <div class="title">
             Figure 15. Live templates
@@ -684,17 +684,17 @@
             <li> <p><code>is</code> : for Apache Isis domain objects</p> </li> 
             <li> <p><code>ju</code> : for JUnit tests</p> </li> 
             <li> <p><code>jm</code> : for JMock mocks or libraries</p> </li> 
-            <li> <p><code>ad</code> : for Asciidoc documentation; a full list 
can be found in the <a href="#_dg_asciidoc-templates">appendix</a>.</p> </li> 
+            <li> <p><code>ad</code> : for Asciidoc documentation; a full list 
can be found in the <a 
href="../dg/dg.html#_dg_asciidoc-templates">appendix</a>.</p> </li> 
            </ul> 
           </div> 
           <div class="paragraph"> 
-           <p>The live templates are also provided as a settings JAR file, 
namely <strong><a 
href="resources/appendices/dev-env/intellij/isis-settings-live-templates.jar">isis-settings-live-templates.jar</a></strong>.
 Download and import (as for the previous settings JAR files).</p> 
+           <p>The live templates are also provided as a settings JAR file, 
namely <strong><a 
href="resources/intellij/isis-settings-live-templates.jar">isis-settings-live-templates.jar</a></strong>.
 Download and import (as for the previous settings JAR files).</p> 
           </div> 
          </div> 
          <div class="sect4"> 
           <h5 id="__dg_ide_intellij_coding-standards">Coding Standards</h5> 
           <div class="paragraph"> 
-           <p>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 <strong><a 
href="resources/appendices/dev-env/intellij/isis-settings-code-style.jar">isis-settings-code-style.jar</a></strong>.
 Download and import (as for the above settings JAR files).</p> 
+           <p>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 <strong><a 
href="resources/intellij/isis-settings-code-style.jar">isis-settings-code-style.jar</a></strong>.
 Download and import (as for the above settings JAR files).</p> 
           </div> 
          </div> 
          <div class="sect4"> 
@@ -707,7 +707,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/040-other-settings-compiler/010-build-automatically.png"
 alt="010 build automatically" width="700px"> 
+            <img 
src="images/intellij-idea/040-other-settings-compiler/010-build-automatically.png"
 alt="010 build automatically" width="700px"> 
            </div> 
            <div class="title">
             Figure 16. IntelliJ Compiler Settings
@@ -718,14 +718,14 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/040-other-settings-compiler/020-annotation-processor.png"
 alt="020 annotation processor" width="700px"> 
+            <img 
src="images/intellij-idea/040-other-settings-compiler/020-annotation-processor.png"
 alt="020 annotation processor" width="700px"> 
            </div> 
            <div class="title">
             Figure 17. IntelliJ Annotation Processor Settings
            </div> 
           </div> 
           <div class="paragraph"> 
-           <p>This setting enables the generation of the <code>Q*</code> 
classes for DataNucleus type-safe queries, as well as being required for 
frameworks such as <a href="#_cg_ide_project-lombok">Project Lombok</a>.</p> 
+           <p>This setting enables the generation of the <code>Q*</code> 
classes for DataNucleus type-safe queries, as well as being required for 
frameworks such as <a 
href="../cgcom/cgcom.html#_cgcom_ide_project-lombok">Project Lombok</a>.</p> 
           </div> 
           <div class="admonitionblock note"> 
            <table> 
@@ -751,7 +751,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/042-other-settings-maven/010-maven-installation.png"
 alt="010 maven installation" width="700px"> 
+            <img 
src="images/intellij-idea/042-other-settings-maven/010-maven-installation.png" 
alt="010 maven installation" width="700px"> 
            </div> 
            <div class="title">
             Figure 18. IntelliJ Maven Settings - Installation
@@ -762,7 +762,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/042-other-settings-maven/020-maven-configuration.png"
 alt="020 maven configuration" width="700px"> 
+            <img 
src="images/intellij-idea/042-other-settings-maven/020-maven-configuration.png" 
alt="020 maven configuration" width="700px"> 
            </div> 
            <div class="title">
             Figure 19. IntelliJ Maven Settings - Configuration
@@ -779,7 +779,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/044-other-settings-misc/010-auto-import.png"
 alt="010 auto import" width="700px"> 
+            <img 
src="images/intellij-idea/044-other-settings-misc/010-auto-import.png" alt="010 
auto import" width="700px"> 
            </div> 
            <div class="title">
             Figure 20. IntelliJ Maven Settings - Auto Import
@@ -797,7 +797,7 @@
          </div> 
          <div class="imageblock"> 
           <div class="content"> 
-           <img 
src="images/appendices/dev-env/intellij-idea/100-maven-module-mgmt/010-maven-modules-view.png"
 alt="010 maven modules view" width="730px"> 
+           <img 
src="images/intellij-idea/100-maven-module-mgmt/010-maven-modules-view.png" 
alt="010 maven modules view" width="730px"> 
           </div> 
           <div class="title">
            Figure 21. IntelliJ Maven Module Management - Importing Maven 
modules
@@ -808,7 +808,7 @@
          </div> 
          <div class="imageblock"> 
           <div class="content"> 
-           <img 
src="images/appendices/dev-env/intellij-idea/100-maven-module-mgmt/020-adding-another-module.png"
 alt="020 adding another module" width="400px"> 
+           <img 
src="images/intellij-idea/100-maven-module-mgmt/020-adding-another-module.png" 
alt="020 adding another module" width="400px"> 
           </div> 
           <div class="title">
            Figure 22. IntelliJ Maven Module Management - Importing another 
Module
@@ -819,7 +819,7 @@
          </div> 
          <div class="imageblock"> 
           <div class="content"> 
-           <img 
src="images/appendices/dev-env/intellij-idea/100-maven-module-mgmt/030-other-module-added.png"
 alt="030 other module added" width="730px"> 
+           <img 
src="images/intellij-idea/100-maven-module-mgmt/030-other-module-added.png" 
alt="030 other module added" width="730px"> 
           </div> 
           <div class="title">
            Figure 23. IntelliJ Maven Module Management -
@@ -836,7 +836,7 @@
          </div> 
          <div class="imageblock"> 
           <div class="content"> 
-           <img 
src="images/appendices/dev-env/intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png"
 alt="040 ignoring modules" width="730px"> 
+           <img 
src="images/intellij-idea/100-maven-module-mgmt/040-ignoring-modules.png" 
alt="040 ignoring modules" width="730px"> 
           </div> 
           <div class="title">
            Figure 24. IntelliJ Maven Module Management - Ignoring Modules
@@ -847,7 +847,7 @@
          </div> 
          <div class="imageblock"> 
           <div class="content"> 
-           <img 
src="images/appendices/dev-env/intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png"
 alt="050 ignoring modules 2" width="300px"> 
+           <img 
src="images/intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png" 
alt="050 ignoring modules 2" width="300px"> 
           </div> 
           <div class="title">
            Figure 25. IntelliJ Maven Module Management - Ignoring Modules (ctd)
@@ -858,7 +858,7 @@
          </div> 
          <div class="imageblock"> 
           <div class="content"> 
-           <img 
src="images/appendices/dev-env/intellij-idea/100-maven-module-mgmt/060-ignored-modules.png"
 alt="060 ignored modules" width="730px"> 
+           <img 
src="images/intellij-idea/100-maven-module-mgmt/060-ignored-modules.png" 
alt="060 ignored modules" width="730px"> 
           </div> 
           <div class="title">
            Figure 26. IntelliJ Maven Module Management - Updated Projects 
Window
@@ -880,7 +880,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/110-running-the-app/010-run-configuration.png"
 alt="010 run configuration" width="600px"> 
+            <img 
src="images/intellij-idea/110-running-the-app/010-run-configuration.png" 
alt="010 run configuration" width="600px"> 
            </div> 
            <div class="title">
             Figure 27. IntelliJ Running the App - Run Configuration
@@ -897,7 +897,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/110-running-the-app/020-datanucleus-enhancer-goal.png"
 alt="020 datanucleus enhancer goal" width="400px"> 
+            <img 
src="images/intellij-idea/110-running-the-app/020-datanucleus-enhancer-goal.png"
 alt="020 datanucleus enhancer goal" width="400px"> 
            </div> 
            <div class="title">
             Figure 28. IntelliJ Running the App - Datanucleus Enhancer Goal
@@ -927,7 +927,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/110-running-the-app/030-running-unit-tests.png"
 alt="030 running unit tests" width="600px"> 
+            <img 
src="images/intellij-idea/110-running-the-app/030-running-unit-tests.png" 
alt="030 running unit tests" width="600px"> 
            </div> 
            <div class="title">
             Figure 29. IntelliJ Running the App - Unit Tests Run Configuration
@@ -938,7 +938,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png"
 alt="040 running unit tests run configuration" width="600px"> 
+            <img 
src="images/intellij-idea/110-running-the-app/040-running-unit-tests-run-configuration.png"
 alt="040 running unit tests run configuration" width="600px"> 
            </div> 
            <div class="title">
             Figure 30. IntelliJ Running the App - Unit Tests Run Configuration
@@ -958,7 +958,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png"
 alt="050 running integration tests run configuration" width="600px"> 
+            <img 
src="images/intellij-idea/110-running-the-app/050-running-integration-tests-run-configuration.png"
 alt="050 running integration tests run configuration" width="600px"> 
            </div> 
            <div class="title">
             Figure 31. IntelliJ Running the App - Integration Tests Run 
Configuration
@@ -969,7 +969,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <a class="image" 
href="images/appendices/dev-env/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png"><img
 
src="images/appendices/dev-env/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png"
 alt="run debug configuration single module" width="600px"></a> 
+            <a class="image" 
href="images/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png"><img
 
src="images/intellij-idea/400-running-integtests/run-debug-configuration-single-module.png"
 alt="run debug configuration single module" width="600px"></a> 
            </div> 
           </div> 
           <div class="paragraph"> 
@@ -1139,7 +1139,7 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <img 
src="images/appendices/dev-env/intellij-idea/050-some-plugins/020-some-plugins-confirmation.png"
 alt="020 some plugins confirmation" width="600px"> 
+            <img 
src="images/intellij-idea/050-some-plugins/020-some-plugins-confirmation.png" 
alt="020 some plugins confirmation" width="600px"> 
            </div> 
            <div class="title">
             Figure 32. IntelliJ Plugins
@@ -1155,7 +1155,7 @@
            </div> 
            <div class="imageblock"> 
             <div class="content"> 
-             <a class="image" 
href="images/appendices/dev-env/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png"><img
 
src="images/appendices/dev-env/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png"
 alt="010 dependency tab" width="600px"></a> 
+             <a class="image" 
href="images/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png"><img
 
src="images/intellij-idea/050-some-plugins/maven-helper/010-dependency-tab.png" 
alt="010 dependency tab" width="600px"></a> 
             </div> 
            </div> 
            <div class="paragraph"> 
@@ -1163,7 +1163,7 @@
            </div> 
            <div class="imageblock"> 
             <div class="content"> 
-             <a class="image" 
href="images/appendices/dev-env/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png"><img
 
src="images/appendices/dev-env/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png"
 alt="020 dependency as tree" width="600px"></a> 
+             <a class="image" 
href="images/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png"><img
 
src="images/intellij-idea/050-some-plugins/maven-helper/020-dependency-as-tree.png"
 alt="020 dependency as tree" width="600px"></a> 
             </div> 
            </div> 
            <div class="paragraph"> 
@@ -1171,7 +1171,7 @@
            </div> 
            <div class="imageblock"> 
             <div class="content"> 
-             <a class="image" 
href="images/appendices/dev-env/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png"><img
 
src="images/appendices/dev-env/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png"
 alt="030 maven run goal" width="600px"></a> 
+             <a class="image" 
href="images/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png"><img
 
src="images/intellij-idea/050-some-plugins/maven-helper/030-maven-run-goal.png" 
alt="030 maven run goal" width="600px"></a> 
             </div> 
            </div> 
            <div class="paragraph"> 
@@ -1179,7 +1179,7 @@
            </div> 
            <div class="imageblock"> 
             <div class="content"> 
-             <a class="image" 
href="images/appendices/dev-env/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png"><img
 
src="images/appendices/dev-env/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png"
 alt="040 maven quick run" width="600px"></a> 
+             <a class="image" 
href="images/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png"><img
 
src="images/intellij-idea/050-some-plugins/maven-helper/040-maven-quick-run.png"
 alt="040 maven quick run" width="600px"></a> 
             </div> 
            </div> 
           </div> 
@@ -1203,11 +1203,11 @@
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <a class="image" 
href="images/appendices/dev-env/intellij-idea/060-troubleshooting/010-duplicate-classes.png"><img
 
src="images/appendices/dev-env/intellij-idea/060-troubleshooting/010-duplicate-classes.png"
 alt="010 duplicate classes" width="600px"></a> 
+            <a class="image" 
href="images/intellij-idea/060-troubleshooting/010-duplicate-classes.png"><img 
src="images/intellij-idea/060-troubleshooting/010-duplicate-classes.png" 
alt="010 duplicate classes" width="600px"></a> 
            </div> 
           </div> 
           <div class="paragraph"> 
-           <p>then make sure you have correctly configured the <a 
href="#_cg_ide_intellij_other-settings-compiler">annotation processor</a> 
settings. Pay attention in particular to the "Production sources directory" and 
"Test sources directory", that these are set up correctly.</p> 
+           <p>then make sure you have correctly configured the <a 
href="../dg/dg.html#_dg_ide_intellij_other-settings-compiler">annotation 
processor</a> settings. Pay attention in particular to the "Production sources 
directory" and "Test sources directory", that these are set up correctly.</p> 
           </div> 
          </div> 
         </div> 
@@ -1219,7 +1219,7 @@
          <div class="sect4"> 
           <h5 id="__dg_ide_intellij_advanced_gradle-compile-enhance">Using 
Grade to compile/enhance</h5> 
           <div class="paragraph"> 
-           <p>Running an Apache Isis application requires that the DataNucleus 
enhancer runs on the compiled bytecode. As described <a 
href="#__dg_ide_intellij_running_the-app">above</a>, the recommended way to do 
this with IntelliJ is to use a Run configuration that runs the enhancer goal 
prior to launch.</p> 
+           <p>Running an Apache Isis application requires that the DataNucleus 
enhancer runs on the compiled bytecode. As described <a 
href="../dg/dg.html#__dg_ide_intellij_running_the-app">above</a>, the 
recommended way to do this with IntelliJ is to use a Run configuration that 
runs the enhancer goal prior to launch.</p> 
           </div> 
           <div class="paragraph"> 
            <p>Alternative, you can use the following <code>build.gradle</code> 
script in your <code>dom</code> module:</p> 
@@ -1267,7 +1267,7 @@ task copyClasses &lt;&lt; {
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <a class="image" 
href="images/appendices/dev-env/intellij-idea/070-advanced/002-compiler-exclude.png"><img
 
src="images/appendices/dev-env/intellij-idea/070-advanced/002-compiler-exclude.png"
 alt="002 compiler exclude" width="800px"></a> 
+            <a class="image" 
href="images/intellij-idea/070-advanced/002-compiler-exclude.png"><img 
src="images/intellij-idea/070-advanced/002-compiler-exclude.png" alt="002 
compiler exclude" width="800px"></a> 
            </div> 
           </div> 
           <div class="paragraph"> 
@@ -1283,14 +1283,14 @@ task copyClasses &lt;&lt; {
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <a class="image" 
href="images/appendices/dev-env/intellij-idea/070-advanced/004-gradle-output.png"><img
 
src="images/appendices/dev-env/intellij-idea/070-advanced/004-gradle-output.png"
 alt="004 gradle output" width="600px"></a> 
+            <a class="image" 
href="images/intellij-idea/070-advanced/004-gradle-output.png"><img 
src="images/intellij-idea/070-advanced/004-gradle-output.png" alt="004 gradle 
output" width="600px"></a> 
            </div> 
           </div> 
          </div> 
          <div class="sect4"> 
           <h5 id="__dg_ide_intellij_advanced_gradle-liveReload">Using Gradle 
for liveReload</h5> 
           <div class="paragraph"> 
-           <p>Similarly, gradle can be run to reduce the turn-around time when 
tweaking the UI (defined by the <a 
href="ugfun.html#_ugfun_object-layout_dynamic_xml"><code>*.layout.xml</code></a>
 file for each domain class), when the app is running.</p> 
+           <p>Similarly, gradle can be run to reduce the turn-around time when 
tweaking the UI (defined by the <a 
href="../ugvw/ugvw.html#_ugvw_layout_file-based"><code>*.layout.xml</code></a> 
file for each domain class), when the app is running.</p> 
           </div> 
           <div class="paragraph"> 
            <p>The framework will automatically notice any changes to 
<code>.layout.xml</code> files, but these are read from the the classpath (the 
<code>target/classes</code> directory), not the source path. With IntelliJ 
these can be copied over manually by invoking <code>Run &gt; Reload Changed 
Classes</code>. Once the browser is refreshed, the new layout will be 
rendered.</p> 
@@ -1370,7 +1370,7 @@ gradle -t --offline -b liveReload.gradle 
&amp;</code></pre>
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <a class="image" 
href="images/appendices/dev-env/intellij-idea/070-advanced/005-gradle-output.png"><img
 
src="images/appendices/dev-env/intellij-idea/070-advanced/005-gradle-output.png"
 alt="005 gradle output" width="600px"></a> 
+            <a class="image" 
href="images/intellij-idea/070-advanced/005-gradle-output.png"><img 
src="images/intellij-idea/070-advanced/005-gradle-output.png" alt="005 gradle 
output" width="600px"></a> 
            </div> 
           </div> 
           <div class="paragraph"> 
@@ -1389,7 +1389,7 @@ gradle -t --offline -b liveReload.gradle 
&amp;</code></pre>
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <a class="image" 
href="images/appendices/dev-env/intellij-idea/070-advanced/006-livereload-js.png"><img
 
src="images/appendices/dev-env/intellij-idea/070-advanced/006-livereload-js.png"
 alt="006 livereload js" width="800px"></a> 
+            <a class="image" 
href="images/intellij-idea/070-advanced/006-livereload-js.png"><img 
src="images/intellij-idea/070-advanced/006-livereload-js.png" alt="006 
livereload js" width="800px"></a> 
            </div> 
           </div> 
          </div> 
@@ -1430,7 +1430,7 @@ gradle -t --offline -b liveReload.gradle 
&amp;</code></pre>
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <a class="image" 
href="images/appendices/dev-env/intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png"><img
 
src="images/appendices/dev-env/intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png"
 alt="010 dcevm list of found jdk installations" width="600px"></a> 
+            <a class="image" 
href="images/intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png"><img
 
src="images/intellij-idea/070-advanced/010-dcevm-list-of-found-jdk-installations.png"
 alt="010 dcevm list of found jdk installations" width="600px"></a> 
            </div> 
           </div> 
           <div class="paragraph"> 
@@ -1438,7 +1438,7 @@ gradle -t --offline -b liveReload.gradle 
&amp;</code></pre>
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <a class="image" 
href="images/appendices/dev-env/intellij-idea/070-advanced/020-dcevm-once-installed.png"><img
 
src="images/appendices/dev-env/intellij-idea/070-advanced/020-dcevm-once-installed.png"
 alt="020 dcevm once installed" width="600px"></a> 
+            <a class="image" 
href="images/intellij-idea/070-advanced/020-dcevm-once-installed.png"><img 
src="images/intellij-idea/070-advanced/020-dcevm-once-installed.png" alt="020 
dcevm once installed" width="600px"></a> 
            </div> 
           </div> 
           <div class="paragraph"> 
@@ -1446,7 +1446,7 @@ gradle -t --offline -b liveReload.gradle 
&amp;</code></pre>
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <a class="image" 
href="images/appendices/dev-env/intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png"><img
 
src="images/appendices/dev-env/intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png"
 alt="030 dcevm intellij project structure" width="600px"></a> 
+            <a class="image" 
href="images/intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png"><img
 
src="images/intellij-idea/070-advanced/030-dcevm-intellij-project-structure.png"
 alt="030 dcevm intellij project structure" width="600px"></a> 
            </div> 
           </div> 
           <div class="paragraph"> 
@@ -1454,7 +1454,7 @@ gradle -t --offline -b liveReload.gradle 
&amp;</code></pre>
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <a class="image" 
href="images/appendices/dev-env/intellij-idea/070-advanced/040-dcevm-run-configuration.png"><img
 
src="images/appendices/dev-env/intellij-idea/070-advanced/040-dcevm-run-configuration.png"
 alt="040 dcevm run configuration" width="600px"></a> 
+            <a class="image" 
href="images/intellij-idea/070-advanced/040-dcevm-run-configuration.png"><img 
src="images/intellij-idea/070-advanced/040-dcevm-run-configuration.png" 
alt="040 dcevm run configuration" width="600px"></a> 
            </div> 
           </div> 
          </div> 
@@ -1510,13 +1510,13 @@ gradle -t --offline -b liveReload.gradle 
&amp;</code></pre>
         <div class="sect3"> 
          <h4 id="__dg_ide_eclipse_editor-templates">2.2.2. Editor 
Templates</h4> 
          <div class="paragraph"> 
-          <p>We provide a set of editor templates. These are used to add new 
methods to existing classes. (These are equivalent to the <a 
href="#__dg_ide_intellij_live-templates">IntelliJ live templates</a>):</p> 
+          <p>We provide a set of editor templates. These are used to add new 
methods to existing classes. (These are equivalent to the <a 
href="../dg/dg.html#__dg_ide_intellij_live-templates">IntelliJ live 
templates</a>):</p> 
          </div> 
          <div class="ulist"> 
           <ul> 
-           <li> <p><code>is</code> (Apache Isis domain objects). <a 
href="./resources/appendices/dev-env/eclipse/isis-templates.xml">Download</a></p>
 </li> 
-           <li> <p><code>ju</code> (for JUnit tests) <a 
href="./resources/appendices/dev-env/eclipse/junit4-templates.xml">Download</a></p>
 </li> 
-           <li> <p><code>jm</code> (for JMock mocks or libraries) <a 
href="./resources/appendices/dev-env/eclipse/jmock2-templates.xml">Download</a></p>
 </li> 
+           <li> <p><code>is</code> (Apache Isis domain objects). <a 
href="./resources/eclipse/isis-templates.xml">Download</a></p> </li> 
+           <li> <p><code>ju</code> (for JUnit tests) <a 
href="./resources/eclipse/junit4-templates.xml">Download</a></p> </li> 
+           <li> <p><code>jm</code> (for JMock mocks or libraries) <a 
href="./resources/eclipse/jmock2-templates.xml">Download</a></p> </li> 
           </ul> 
          </div> 
          <div class="paragraph"> 
@@ -1549,7 +1549,7 @@ gradle -t --offline -b liveReload.gradle 
&amp;</code></pre>
          </div> 
          <div class="imageblock"> 
           <div class="content"> 
-           <a class="image" 
href="images/appendices/dev-env/eclipse/eclipse-100-project-support.png"><img 
src="images/appendices/dev-env/eclipse/eclipse-100-project-support.png" 
alt="eclipse 100 project support" width="600px"></a> 
+           <a class="image" 
href="images/eclipse/eclipse-100-project-support.png"><img 
src="images/eclipse/eclipse-100-project-support.png" alt="eclipse 100 project 
support" width="600px"></a> 
           </div> 
          </div> 
          <div class="paragraph"> 
@@ -1557,7 +1557,7 @@ gradle -t --offline -b liveReload.gradle 
&amp;</code></pre>
          </div> 
          <div class="imageblock"> 
           <div class="content"> 
-           <a class="image" 
href="images/appendices/dev-env/eclipse/eclipse-110-project-support.png"><img 
src="images/appendices/dev-env/eclipse/eclipse-110-project-support.png" 
alt="eclipse 110 project support" width="600px"></a> 
+           <a class="image" 
href="images/eclipse/eclipse-110-project-support.png"><img 
src="images/eclipse/eclipse-110-project-support.png" alt="eclipse 110 project 
support" width="600px"></a> 
           </div> 
          </div> 
          <div class="sect4"> 
@@ -1566,14 +1566,14 @@ gradle -t --offline -b liveReload.gradle 
&amp;</code></pre>
            <p>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.</p> 
           </div> 
           <div class="paragraph"> 
-           <p>See the earlier section on <a 
href="ugfun.html#_ugfun_getting-started_datanucleus-enhancer">DataNucleus 
enhancer</a> for details of the contents of the <code>pom.xml</code>. Chances 
are it is already set up from running the <a 
href="ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp 
archetype</a>.</p> 
+           <p>See the earlier section on <a 
href="../ugfun/ugfun.html#_ugfun_getting-started_datanucleus-enhancer">DataNucleus
 enhancer</a> for details of the contents of the <code>pom.xml</code>. Chances 
are it is already set up from running the <a 
href="../ugfun/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp 
archetype</a>.</p> 
           </div> 
           <div class="paragraph"> 
            <p>Then, tell DataNucleus to use the project classpath:</p> 
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <a class="image" 
href="images//appendices/dev-env/eclipse/eclipse-010-windows-preferences.png"><img
 src="images//appendices/dev-env/eclipse/eclipse-010-windows-preferences.png" 
alt="eclipse 010 windows preferences" width="750px"></a> 
+            <a class="image" 
href="images//appendices/dev-env/eclipse/eclipse-010-windows-preferences.png"><img
 src="images/eclipse/eclipse-010-windows-preferences.png" alt="eclipse 010 
windows preferences" width="750px"></a> 
            </div> 
           </div> 
           <div class="paragraph"> 
@@ -1581,12 +1581,12 @@ gradle -t --offline -b liveReload.gradle 
&amp;</code></pre>
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <a class="image" 
href="images//appendices/dev-env/eclipse/eclipse-120-console.png"><img 
src="images//appendices/dev-env/eclipse/eclipse-120-console.png" alt="eclipse 
120 console" width="500px"></a> 
+            <a class="image" 
href="images//appendices/dev-env/eclipse/eclipse-120-console.png"><img 
src="images/eclipse/eclipse-120-console.png" alt="eclipse 120 console" 
width="500px"></a> 
            </div> 
           </div> 
          </div> 
          <div class="sect4"> 
-          <h5 
id="_workaround_for_path_limits_the_dn_plugin_to_use_the_persistence_xml">Workaround
 for path limits (the DN plugin to use the persistence.xml)</h5> 
+          <h5 id="__dg_ide_eclipse_workaround-for-path-limits">Workaround for 
path limits (the DN plugin to use the persistence.xml)</h5> 
           <div class="paragraph"> 
            <p>If running on Windows then the DataNucleus plugin is very likely 
to hit the Windows path limit.</p> 
           </div> 
@@ -1598,7 +1598,7 @@ gradle -t --offline -b liveReload.gradle 
&amp;</code></pre>
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <a class="image" 
href="images//appendices/dev-env/eclipse/eclipse-025-project-properties.png"><img
 src="images//appendices/dev-env/eclipse/eclipse-025-project-properties.png" 
alt="eclipse 025 project properties" width="750px"></a> 
+            <a class="image" 
href="images//appendices/dev-env/eclipse/eclipse-025-project-properties.png"><img
 src="images/eclipse/eclipse-025-project-properties.png" alt="eclipse 025 
project properties" width="750px"></a> 
            </div> 
           </div> 
          </div> 
@@ -1609,7 +1609,7 @@ gradle -t --offline -b liveReload.gradle 
&amp;</code></pre>
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <a class="image" 
href="images//appendices/dev-env/eclipse/eclipse-210-enhancer-fails-duplicates.png"><img
 
src="images//appendices/dev-env/eclipse/eclipse-210-enhancer-fails-duplicates.png"
 alt="eclipse 210 enhancer fails duplicates" width="600px"></a> 
+            <a class="image" 
href="images//appendices/dev-env/eclipse/eclipse-210-enhancer-fails-duplicates.png"><img
 src="images/eclipse/eclipse-210-enhancer-fails-duplicates.png" alt="eclipse 
210 enhancer fails duplicates" width="600px"></a> 
            </div> 
           </div> 
           <div class="paragraph"> 
@@ -1617,7 +1617,7 @@ gradle -t --offline -b liveReload.gradle 
&amp;</code></pre>
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <a class="image" 
href="images//appendices/dev-env/eclipse/eclipse-200-enhancer-fails-duplicates.png"><img
 
src="images//appendices/dev-env/eclipse/eclipse-200-enhancer-fails-duplicates.png"
 alt="eclipse 200 enhancer fails duplicates" width="600px"></a> 
+            <a class="image" 
href="images//appendices/dev-env/eclipse/eclipse-200-enhancer-fails-duplicates.png"><img
 src="images/eclipse/eclipse-200-enhancer-fails-duplicates.png" alt="eclipse 
200 enhancer fails duplicates" width="600px"></a> 
            </div> 
           </div> 
           <div class="paragraph"> 
@@ -1625,7 +1625,7 @@ gradle -t --offline -b liveReload.gradle 
&amp;</code></pre>
           </div> 
           <div class="imageblock"> 
            <div class="content"> 
-            <a class="image" 
href="images//appendices/dev-env/eclipse/eclipse-220-enhancer-fails-duplicates.png"><img
 
src="images//appendices/dev-env/eclipse/eclipse-220-enhancer-fails-duplicates.png"
 alt="eclipse 220 enhancer fails duplicates" width="600px"></a> 
+            <a class="image" 
href="images//appendices/dev-env/eclipse/eclipse-220-enhancer-fails-duplicates.png"><img
 src="images/eclipse/eclipse-220-enhancer-fails-duplicates.png" alt="eclipse 
220 enhancer fails duplicates" width="600px"></a> 
            </div> 
           </div> 
           <div class="paragraph"> 
@@ -1684,7 +1684,7 @@ gradle -t --offline -b liveReload.gradle 
&amp;</code></pre>
            <p>Changing persisting domain entities is more problematic, for two 
reasons: the JDO/DataNucleus enhancer needs to run on domain entities, and also 
at runtime JDO/DataNucleus would need to rebuild its own metamodel. You may 
find that adding actions will work, but adding new properties or collections is 
much less likely to.</p> 
           </div> 
           <div class="paragraph"> 
-           <p>For details of setting up DCEVM, see the <a 
href="#__dg_ide_intellij_advanced_dcevm">corresponding section</a> in the 
IntelliJ documentation.</p> 
+           <p>For details of setting up DCEVM, see the <a 
href="../dg/dg.html#__dg_ide_intellij_advanced_dcevm">corresponding section</a> 
in the IntelliJ documentation.</p> 
           </div> 
          </div> 
         </div> 
@@ -1692,16 +1692,143 @@ gradle -t --offline -b liveReload.gradle 
&amp;</code></pre>
       </div> 
      </div> 
      <div class="sect1"> 
-      <h2 id="_dg_building-isis">3. Building Apache Isis</h2>
+      <h2 id="_dg_hints-and-tips">3. Hints and Tips</h2>
+      <button type="button" class="button secondary" 
onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips.adoc&quot;";
 style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i 
class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+      <div class="sectionbody"> 
+       <div class="paragraph"> 
+        <p>This chapter provides some solutions for problems we’ve 
encountered ourselves or have been raised on the Apache Isis mailing lists.</p> 
+       </div> 
+       <div class="paragraph"> 
+        <p>See also hints-n-tips chapters in the:</p> 
+       </div> 
+       <div class="ulist"> 
+        <ul> 
+         <li> <p>the <a 
href="../dg/dg.html#_dg_hints-and-tips">Developers'</a> guide (this 
chapter)</p> </li> 
+         <li> <p>the <a href="../ugvw/ugvw.html#_ugvw_hints-and-tips">Wicket 
viewer</a> guide</p> </li> 
+         <li> <p>the <a 
href="../ugvro/ugvro.html#_ugvro_hints-and-tips">Restful Objects viewer</a> 
guide</p> </li> 
+         <li> <p>the <a 
href="../ugodn/ugodn.html#_ugodn_hints-and-tips">Datanucleus ObjectStore</a> 
guide</p> </li> 
+         <li> <p>the <a 
href="../ugsec/ugsec.html#_ugsec_hints-and-tips">Security</a> guide</p> </li> 
+         <li> <p>the <a 
href="../ugbtb/ugbtb.html#_ugbtb_hints-and-tips">Beyond the Basics</a> 
guide.</p> </li> 
+        </ul> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_dg_hints-and-tips_enabling-logging">3.1. Enabling Logging</h3>
+        <button type="button" class="button secondary" 
onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips_enabling-logging.adoc&quot;";
 style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i 
class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+        <div class="paragraph"> 
+         <p>Sometimes you just need to see what is going on. There are various 
ways in which logging can be enabled, here are the ones we tend to use.</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>In Apache Isis<br></p> 
+           <div class="paragraph"> 
+            <p>Modify <code>WEB-INF/logging.properties</code> (a log4j config 
file)</p> 
+           </div> </li> 
+          <li> <p>In DataNucleus<br></p> 
+           <div class="paragraph"> 
+            <p>As per the <a 
href="http://www.datanucleus.org/products/accessplatform/logging.html";>DN 
logging page</a></p> 
+           </div> </li> 
+          <li> <p>In the JDBC Driver<br></p> 
+           <div class="paragraph"> 
+            <p>Configure <code>log4jdbc</code> JDBC rather than the vanilla 
driver (see <code>WEB-INF/persistor_datanucleus.properties</code>) and 
configure log4j logging (see <code>WEB-INF/logging.properties</code>). There 
are examples of both in the <a 
href="../ugfun/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp 
archetype</a>.</p> 
+           </div> </li> 
+          <li> <p>In the database<br></p> 
+           <div class="paragraph"> 
+            <p>Details below.</p> 
+           </div> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Database logging can be configured:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>for HSQLDB<br></p> 
+           <div class="paragraph"> 
+            <p>by adding`;sqllog=3` to the end of the JDBC URL.</p> 
+           </div> </li> 
+          <li> <p>for PostgreSQL:<br></p> 
+           <div class="paragraph"> 
+            <p>Can change <code>postgresql\9.2\data\postgresql.conf</code>; 
see <a 
href="http://www.postgresql.org/docs/9.2/static/runtime-config-logging.html";>this
 article</a> for details.</p> 
+           </div> </li> 
+          <li> <p>for MS SQL Server Logging:<br></p> 
+           <div class="paragraph"> 
+            <p>We like to use the excellent SQL Profiler tool.</p> 
+           </div> </li> 
+         </ul> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_dg_hints-and-tips_enhance-only">3.2. Enhance only 
(IntelliJ)</h3>
+        <button type="button" class="button secondary" 
onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips_enhance-only.adoc&quot;";
 style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i 
class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+        <div class="paragraph"> 
+         <p>From the Apache Isis mailing list is:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><em>Is there a simple way to make a run configuration in 
IntelliJ for running the datanucleus enhancer before running integration 
test?</em></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Yes, you can; here’s one way:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p>Duplicate your run configuration for running the webapp</p> 
+           <div class="ulist"> 
+            <ul> 
+             <li> <p>the one where the main class is 
<code>org.apache.isis.WebServer</code></p> </li> 
+             <li> <p>there’s a button for this on the run configurations 
dialog.</p> </li> 
+            </ul> 
+           </div> </li> 
+          <li> <p>then, on your copy change the main class to 
<code>org.apache.isis.Dummy</code></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Or, you could just write a small shell script and run from the 
command line:</p> 
+        </div> 
+        <div class="listingblock"> 
+         <div class="title">
+          enhance.sh
+         </div> 
+         <div class="content"> 
+          <pre class="CodeRay highlight"><code data-lang="bash">mvn -pl dom 
datanucleus:enhance -o</code></pre> 
+         </div> 
+        </div> 
+       </div> 
+       <div class="sect2"> 
+        <h3 id="_dg_hints-and-tips_how-run-fixtures-on-app-startup">3.3. How 
run fixtures on startup?</h3>
+        <button type="button" class="button secondary" 
onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/dg/_dg_hints-and-tips_how-run-fixtures-on-app-startup.adoc&quot;";
 style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i 
class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
+        <div class="paragraph"> 
+         <p>From this <a 
href="http://isis.markmail.org/thread/g6amfj2eyf2xfjbr";>thread</a> on the 
Apache Isis users mailing list:</p> 
+        </div> 
+        <div class="ulist"> 
+         <ul> 
+          <li> <p><em>my fixtures have grown into a couple of files the 
application needs to read in when it starts the first time (and possibly later 
on when the files content change). What is the right way to do this? Hook up 
into the webapp start? Use events?</em></p> </li> 
+         </ul> 
+        </div> 
+        <div class="paragraph"> 
+         <p>The standard approach is to use <a 
href="../ugtst/ugtst.html#_ugtst_fixture-scripts">fixture scripts</a>. These 
can be run in on start-up typically by being specified in the <a 
href="rgcsm.html#_rgcsm_classes_AppManifest-bootstrapping"><code>AppManifest</code></a>,
 see for example the <a 
href="ug.html#_ug_getting-started_simpleapp-archetype">SimpleApp 
archetype</a>.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>Alternatively just set "isis.fixtures" and 
"isis.persistor.datanucleus.install-fixtures" properties.</p> 
+        </div> 
+        <div class="paragraph"> 
+         <p>In terms of implementations, you might also want to check out the 
(non-ASF) <a href="http://github.com/isisaddons/isis-module-excel";>Isis addons' 
excel</a> module, by using <a 
href="https://github.com/isisaddons/isis-module-excel/blob/master/dom/src/main/java/org/isisaddons/module/excel/dom/ExcelFixture.java";><code>ExcelFixture</code></a>
 and overriding <code>ExcelFixtureRowHandler</code> (same package). An example 
can be found in this (non ASF) <a 
href="https://github.com/incodehq/contactapp";>contactapp</a>, see <a 
href="https://github.com/incodehq/contactapp/blob/master/backend/fixture/src/main/java/domainapp/fixture/scenarios/demo/ContactRowHandler.java";><code>ContactRowHandler</code></a>.</p>
 
+        </div> 
+       </div> 
+      </div> 
+     </div> 
+     <div class="sect1"> 
+      <h2 id="_dg_building-isis">4. Building Apache Isis</h2>
       <button type="button" class="button secondary" 
onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/dg/_dg_building-isis.adoc&quot;";
 style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i 
class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
       <div class="sectionbody"> 
        <div class="sect2"> 
-        <h3 id="__dg_building-isis_git">3.1. Git</h3> 
+        <h3 id="__dg_building-isis_git">4.1. Git</h3> 
         <div class="paragraph"> 
          <p>The Apache Isis source code lives in a git repo.</p> 
         </div> 
         <div class="sect3"> 
-         <h4 id="__dg_building-isis_git_installation">3.1.1. Installation</h4> 
+         <h4 id="__dg_building-isis_git_installation">4.1.1. Installation</h4> 
          <div class="paragraph"> 
           <p>The easiest place to get hold of command-line git is probably the 
<a href="http://git-scm.com/downloads";>github download page</a>.</p> 
          </div> 
@@ -1742,7 +1869,7 @@ gradle -t --offline -b liveReload.gradle 
&amp;</code></pre>
            </div> 
           </div> 
           <div class="paragraph"> 
-           <p>If you are <strong>not a committer</strong>, please see the <a 
href="#_dg_contributing">contributing</a> page for details on which repo to 
clone from.</p> 
+           <p>If you are <strong>not a committer</strong>, please see the <a 
href="../dg/dg.html#_dg_contributing">contributing</a> page for details on 
which repo to clone from.</p> 
           </div> 
          </div> 
          <div class="sect4"> 
@@ -1809,7 +1936,7 @@ git config user.email 
&lt;i&gt;myusern...@apache.org&lt;/i&gt;</code></pre>
          </div> 
         </div> 
         <div class="sect3"> 
-         <h4 id="__dg_building-isis_git_getting-help">3.1.2. Getting help</h4> 
+         <h4 id="__dg_building-isis_git_getting-help">4.1.2. Getting help</h4> 
          <div class="paragraph"> 
           <p>Three commands of git that in particular worth knowing:</p> 
          </div> 
@@ -1845,12 +1972,12 @@ git config user.email 
&lt;i&gt;myusern...@apache.org&lt;/i&gt;</code></pre>
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="__dg_building-isis_installing-java">3.2. Installing Java</h3> 
+        <h3 id="__dg_building-isis_installing-java">4.2. Installing Java</h3> 
         <div class="paragraph"> 
          <p>Apache Isis is compatible with Java 7 and Java 8. For every-day 
use, the framework is usually compiled against Java 8.</p> 
         </div> 
         <div class="paragraph"> 
-         <p>Releases however are <a href="#_cgcom_cutting-a-release">cut</a> 
using Java 7, leveraging the <a 
href="http://maven.apache.org/plugins/maven-toolchains-plugin/";>Maven 
toolchains plugin</a>).</p> 
+         <p>Releases however are <a 
href="../cgcom/cgcom.html#_cgcom_cutting-a-release">cut</a> using Java 7, 
leveraging the <a 
href="http://maven.apache.org/plugins/maven-toolchains-plugin/";>Maven 
toolchains plugin</a>).</p> 
         </div> 
         <div class="paragraph"> 
          <p>Therefore install either/both of Java 7 JDK and Java 8 JDK. Note 
that the JRE is <em>not</em> sufficient.</p> 
@@ -1869,7 +1996,7 @@ git config user.email 
&lt;i&gt;myusern...@apache.org&lt;/i&gt;</code></pre>
          </table> 
         </div> 
         <div class="sect3"> 
-         <h4 id="__dg_building-isis_configure-maven-toolchains-plugin">3.2.1. 
Configure Maven toolchains plugin</h4> 
+         <h4 id="__dg_building-isis_configure-maven-toolchains-plugin">4.2.1. 
Configure Maven toolchains plugin</h4> 
          <div class="paragraph"> 
           <p>If you are a committer that will be performing releases of Apache 
Isis, then you <em>must</em> configure the <a 
href="http://maven.apache.org/plugins/maven-toolchains-plugin/";>toolchains</a> 
plugin so that releases can be built using Java 7.</p> 
          </div> 
@@ -1921,7 +2048,7 @@ git config user.email 
&lt;i&gt;myusern...@apache.org&lt;/i&gt;</code></pre>
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="__dg_building-isis_installing-maven">3.3. Installing 
Maven</h3> 
+        <h3 id="__dg_building-isis_installing-maven">4.3. Installing 
Maven</h3> 
         <div class="paragraph"> 
          <p>Install Maven 3.0.x, downloadable <a 
href="http://maven.apache.org/download.html";>here</a>.</p> 
         </div> 
@@ -1948,7 +2075,7 @@ git config user.email 
&lt;i&gt;myusern...@apache.org&lt;/i&gt;</code></pre>
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="__dg_building-isis_building-all-of-apache-isis">3.4. Building 
all of Apache Isis</h3> 
+        <h3 id="__dg_building-isis_building-all-of-apache-isis">4.4. Building 
all of Apache Isis</h3> 
         <div class="paragraph"> 
          <p>To build the source code from the command line, simply go to the 
root directory and type:</p> 
         </div> 
@@ -1977,7 +2104,7 @@ mvn clean install -o -T1C</code></pre>
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="__dg_building-isis_checking-for-vulnerabilities">3.5. Checking 
for Vulnerabilities</h3> 
+        <h3 id="__dg_building-isis_checking-for-vulnerabilities">4.5. Checking 
for Vulnerabilities</h3> 
         <div class="paragraph"> 
          <p>Apache Isis configures the <a 
href="https://www.owasp.org/index.php/Main_Page";>OWASP</a> <a 
href="https://www.owasp.org/index.php/OWASP_Dependency_Check";>dependency 
check</a> <a 
href="http://jeremylong.github.io/DependencyCheck/dependency-check-maven/index.html";>Maven
 plugin</a> to determine whether the framework uses libraries that are known to 
have security vulnerabilities.</p> 
         </div> 
@@ -2010,7 +2137,7 @@ mvn clean install -o -T1C</code></pre>
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="__dg_building-isis_checking-for-use-of-internal-jdk-apis">3.6. 
Checking for use of internal JDK APIs</h3> 
+        <h3 id="__dg_building-isis_checking-for-use-of-internal-jdk-apis">4.6. 
Checking for use of internal JDK APIs</h3> 
         <div class="paragraph"> 
          <p>Apache Isis configures the <a 
href="https://maven.apache.org/plugins-archives/maven-jdeps-plugin-3.0.0/";>jdeps
 maven plugin</a> to check for any usage of internal JDK APIs. This is in 
preparation for Java 9 module system (Jigsaw) which will prevent such usage of 
APIs.</p> 
         </div> 
@@ -2042,7 +2169,7 @@ mvn clean install -o -T1C</code></pre>
       </div> 
      </div> 
      <div class="sect1"> 
-      <h2 id="_dg_asciidoc">4. AsciiDoc Documentation</h2>
+      <h2 id="_dg_asciidoc">5. AsciiDoc Documentation</h2>
       <button type="button" class="button secondary" 
onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc.adoc&quot;";
 style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i 
class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
       <div class="sectionbody"> 
        <div class="paragraph"> 
@@ -2052,19 +2179,19 @@ mvn clean install -o -T1C</code></pre>
         <p>The website and guides are created by running build tools 
(documented below) which create the HTML version of the site and guides. You 
can therefore easily check the documentation before raising a pull request (as 
a contributor) or publishing the site (if a committer).</p> 
        </div> 
        <div class="paragraph"> 
-        <p>To help write the Asciidoc text itself, we provide some <a 
href="#_dg_asciidoc-templates">Asciidoc templates</a>.</p> 
+        <p>To help write the Asciidoc text itself, we provide some <a 
href="../dg/dg.html#_dg_asciidoc-templates">Asciidoc templates</a>.</p> 
        </div> 
        <div class="paragraph"> 
-        <p>Publishing is performed by copying the generated HTML to a 
different git repository (<a 
href="https://git-wip-us.apache.org/repos/asf?p=isis-site.git";>isis-site</a>). 
Since this can only be done by Apache Isis committers, the process for doing 
this is described in the <a 
href="cgcom.html#_cgcom_asciidoc-publish-procedure">committers' guide</a>. This 
is synced by ASF infrastructure over to <a 
href="http://isis.apache.org";>isis.apache.org</a>.</p> 
+        <p>Publishing is performed by copying the generated HTML to a 
different git repository (<a 
href="https://git-wip-us.apache.org/repos/asf?p=isis-site.git";>isis-site</a>). 
Since this can only be done by Apache Isis committers, the process for doing 
this is described in the <a 
href="../cgcom/cgcom.html#_cgcom_asciidoc-publish-procedure">committers' 
guide</a>. This is synced by ASF infrastructure over to <a 
href="http://isis.apache.org";>isis.apache.org</a>.</p> 
        </div> 
        <div class="sect2"> 
-        <h3 id="_where_to_find_the_docs">4.1. Where to find the Docs</h3> 
+        <h3 id="_where_to_find_the_docs">5.1. Where to find the Docs</h3> 
         <div class="paragraph"> 
          <p>The (Asciidoc) source code can be found at 
<code>adocs/documentation</code> (relative to root). Online you’ll find it <a 
href="https://github.com/apache/isis/tree/master/adocs/documentation";>cloned to 
github here</a>.</p> 
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="_dg_asciidoc_naming-conventions">4.2. Naming Conventions</h3>
+        <h3 id="_dg_asciidoc_naming-conventions">5.2. Naming Conventions</h3>
         <button type="button" class="button secondary" 
onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc_naming-conventions.adoc&quot;";
 style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i 
class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
         <div class="paragraph"> 
          <p>For documents with inclusions, use '_' to separate out the logical 
hierarchy:</p> 
@@ -2104,17 +2231,17 @@ mvn clean install -o -T1C</code></pre>
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="_dg_asciidoc_writing-the-docs">4.3. Writing the docs</h3>
+        <h3 id="_dg_asciidoc_writing-the-docs">5.3. Writing the docs</h3>
         <button type="button" class="button secondary" 
onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc_writing-the-docs.adoc&quot;";
 style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i 
class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
         <div class="paragraph"> 
-         <p>We highly recommend that you install the (IntelliJ) live templates 
for Asciidoctor, as described in <a 
href="#__dg_ide_intellij_live-templates">IDE templates</a>. These provide a 
large number of helper templates.</p> 
+         <p>We highly recommend that you install the (IntelliJ) live templates 
for Asciidoctor, as described in <a 
href="../dg/dg.html#__dg_ide_intellij_live-templates">IDE templates</a>. These 
provide a large number of helper templates.</p> 
         </div> 
         <div class="paragraph"> 
-         <p>An <a href="#_dg_appendix_asciidoc-templates">appendix</a> lists 
all the templates available, demonstrating their intended usage and output.</p> 
+         <p>An <a 
href="../dg/dg.html#_dg_appendix_asciidoc-templates">appendix</a> lists all the 
templates available, demonstrating their intended usage and output.</p> 
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="_dg_asciidoc_build-and-review">4.4. Build and Review (using 
Maven)</h3>
+        <h3 id="_dg_asciidoc_build-and-review">5.4. Build and Review (using 
Maven)</h3>
         <button type="button" class="button secondary" 
onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc_build-and-review.adoc&quot;";
 style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i 
class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
         <div class="paragraph"> 
          <p>To (re)build the documentation locally prior to release, change 
into the <code>adocs/documentation</code> directory and use:</p> 
@@ -2132,13 +2259,13 @@ mvn clean install -o -T1C</code></pre>
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="_dg_asciidoc_instant-rebuild">4.5. Instant Rebuild (using 
Ruby)</h3>
+        <h3 id="_dg_asciidoc_instant-rebuild">5.5. Instant Rebuild (using 
Ruby)</h3>
         <button type="button" class="button secondary" 
onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc_instant-rebuild.adoc&quot;";
 style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i 
class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
         <div class="paragraph"> 
          <p>The ruby script, <code>monitor.rb</code> emulates the <code>mvn 
compile</code> command, regenerating any changed Asciidoctor files to the 
relevant <code>target/site</code> directory. Moreover if any included files are 
changed then it rebuilds the parent (per the above naming convention).</p> 
         </div> 
         <div class="sect3"> 
-         <h4 id="_one_time_setup">4.5.1. One-time setup</h4> 
+         <h4 id="_one_time_setup">5.5.1. One-time setup</h4> 
          <div class="paragraph"> 
           <p>To setup:</p> 
          </div> 
@@ -2172,7 +2299,7 @@ bundle install</code></pre>
          </div> 
         </div> 
         <div class="sect3"> 
-         <h4 id="_instant_rebuild">4.5.2. Instant Rebuild</h4> 
+         <h4 id="_instant_rebuild">5.5.2. Instant Rebuild</h4> 
          <div class="paragraph"> 
           <p>To run, we typically just use:</p> 
          </div> 
@@ -2195,26 +2322,26 @@ bundle install</code></pre>
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="_dg_asciidoc_publish-procedure">4.6. Publish procedure</h3>
+        <h3 id="_dg_asciidoc_publish-procedure">5.6. Publish procedure</h3>
         <button type="button" class="button secondary" 
onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/dg/_dg_asciidoc_publish-procedure.adoc&quot;";
 style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i 
class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
         <div class="paragraph"> 
-         <p>Only Apache Isis committers can publish to <a 
href="http://isis.apache.org";>isis.apache.org</a>. See the <a 
href="cgcom.html#_cgcom_publishing-the-docs">committers' guide</a> for further 
details.</p> 
+         <p>Only Apache Isis committers can publish to <a 
href="http://isis.apache.org";>isis.apache.org</a>. See the <a 
href="../cgcom/cgcom.html#_cgcom_publishing-the-docs">committers' guide</a> for 
further details.</p> 
         </div> 
        </div> 
       </div> 
      </div> 
      <div class="sect1"> 
-      <h2 id="_dg_contributing">5. Contributing</h2>
+      <h2 id="_dg_contributing">6. Contributing</h2>
       <button type="button" class="button secondary" 
onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/dg/_dg_contributing.adoc&quot;";
 style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i 
class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
       <div class="sectionbody"> 
        <div class="paragraph"> 
-        <p>This page explains how you can contribute to Apache Isis. You’ll 
probably also want <a href="#_dg_ide">set up your IDE</a> and learn <a 
href="#_dg_building-isis">how to build Apache Isis</a>.</p> 
+        <p>This page explains how you can contribute to Apache Isis. You’ll 
probably also want <a href="../dg/dg.html#_dg_ide">set up your IDE</a> and 
learn <a href="../dg/dg.html#_dg_building-isis">how to build Apache 
Isis</a>.</p> 
        </div> 
        <div class="paragraph"> 
         <p>Thanks for considering to help out, your contributions are 
appreciated!</p> 
        </div> 
        <div class="sect2"> 
-        <h3 id="_recommended_workflow_github">5.1. Recommended Workflow 
(github)</h3> 
+        <h3 id="_recommended_workflow_github">6.1. Recommended Workflow 
(github)</h3> 
         <div class="paragraph"> 
          <p>Apache Isis' source code is hosted in an Apache git repo (<a 
href="https://git-wip-us.apache.org/repos/asf/isis.git";>https</a>, <a 
href="http://git-wip-us.apache.org/repos/asf/isis.git";>http</a>), with a clone 
on github (<a href="https://github.com/apache/isis.git";>https</a>, or ssh: 
<code>g...@github.com:apache/isis.git</code>.</p> 
         </div> 
@@ -2250,7 +2377,7 @@ bundle install</code></pre>
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="_alternative_workflow_jira_patches">5.2. Alternative Workflow 
(JIRA patches)</h3> 
+        <h3 id="_alternative_workflow_jira_patches">6.2. Alternative Workflow 
(JIRA patches)</h3> 
         <div class="paragraph"> 
          <p>As an alternative, you may decide to clone directly from <a 
href="https://github.com/apache/isis.git";>github.com/apache/isis</a> rather 
than create your own fork:</p> 
         </div> 
@@ -2267,7 +2394,7 @@ bundle install</code></pre>
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="_setting_up_your_fork_clone">5.3. Setting up your 
fork/clone</h3> 
+        <h3 id="_setting_up_your_fork_clone">6.3. Setting up your 
fork/clone</h3> 
         <div class="paragraph"> 
          <p>If you choose to create your own fork then you’ll need an 
account on <a href="https://github.com";>github.com</a>. You then fork simply by 
pressing the "Fork" button:</p> 
         </div> 
@@ -2312,7 +2439,7 @@ bundle install</code></pre>
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="_commit_messages">5.4. Commit messages</h3> 
+        <h3 id="_commit_messages">6.4. Commit messages</h3> 
         <div class="paragraph"> 
          <p>Although with git your commits are always performed on your local 
repo, those commit messages become public when the patch is applied by an 
Apache Isis committer. You should take time to write a meaningful commit 
message that helps explain what the patch refers to; if you don’t then 
there’s a chance that your patch may be rejected and not applied. No-one 
likes hard work to go to waste!</p> 
         </div> 
@@ -2339,7 +2466,7 @@ why this is a problem, and how the patch fixes the 
problem when applied.</code><
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="_creating_the_patch_file">5.5. Creating the patch file</h3> 
+        <h3 id="_creating_the_patch_file">6.5. Creating the patch file</h3> 
         <div class="paragraph"> 
          <p>If you are working without a github fork of Apache Isis, then you 
can create the patches from your own local git repository.</p> 
         </div> 
@@ -2356,12 +2483,12 @@ why this is a problem, and how the patch fixes the 
problem when applied.</code><
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="_sample_contribution_workflow">5.6. Sample Contribution 
Workflow</h3> 
+        <h3 id="_sample_contribution_workflow">6.6. Sample Contribution 
Workflow</h3> 
         <div class="paragraph"> 
          <p>Assuming you’re development environment is all setup, let’s 
walk through how you might make contribute a patch. In this example, suppose 
that you’ve decided to work on JIRA ticket #123, an enhancement to support 
Blob/Clob datatypes.</p> 
         </div> 
         <div class="sect3"> 
-         <h4 id="_update_your_master_branch">5.6.1. Update your master 
branch</h4> 
+         <h4 id="_update_your_master_branch">6.6.1. Update your master 
branch</h4> 
          <div class="paragraph"> 
           <p>The first thing to do is to make sure your local clone is 
up-to-date. We do this by retrieving new commits from upstream repo and then 
merging them as a fast-forward into your local branch.</p> 
          </div> 
@@ -2376,7 +2503,7 @@ why this is a problem, and how the patch fixes the 
problem when applied.</code><
          </div> 
         </div> 
         <div class="sect3"> 
-         <h4 id="_create_a_topic_branch">5.6.2. Create a topic branch</h4> 
+         <h4 id="_create_a_topic_branch">6.6.2. Create a topic branch</h4> 
          <div class="paragraph"> 
           <p>We recommend you name topic branches by the JIRA ticket, ie 
&lt;tt&gt;ISIS-nnn-description&lt;/tt&gt;. So let’s create a new branch based 
off <code>master</code> and call it "ISIS-123-blobs"</p> 
          </div> 
@@ -2393,9 +2520,9 @@ why this is a problem, and how the patch fixes the 
problem when applied.</code><
          </div> 
         </div> 
         <div class="sect3"> 
-         <h4 id="_make_file_changes_and_commit">5.6.3. Make File Changes and 
Commit</h4> 
+         <h4 id="_make_file_changes_and_commit">6.6.3. Make File Changes and 
Commit</h4> 
          <div class="paragraph"> 
-          <p>Next, make changes to your files using the usual commands (see 
also our <a href="#_dg_git-cookbook">git cookbook</a> section):</p> 
+          <p>Next, make changes to your files using the usual commands (see 
also our <a href="../dg/dg.html#_dg_git-cookbook">git cookbook</a> 
section):</p> 
          </div> 
          <div class="ulist"> 
           <ul> 
@@ -2414,7 +2541,7 @@ why this is a problem, and how the patch fixes the 
problem when applied.</code><
          </div> 
         </div> 
         <div class="sect3"> 
-         <h4 id="_rebasing_with_code_master_code">5.6.4. Rebasing with 
<code>master</code></h4> 
+         <h4 id="_rebasing_with_code_master_code">6.6.4. Rebasing with 
<code>master</code></h4> 
          <div class="paragraph"> 
           <p>Before you can share your change, you should rebase (in other 
words replay) your changes on top of the <code>master</code> branch.</p> 
          </div> 
@@ -2438,7 +2565,7 @@ why this is a problem, and how the patch fixes the 
problem when applied.</code><
          </div> 
         </div> 
         <div class="sect3"> 
-         <h4 id="_raising_a_pull_request">5.6.5. Raising a pull request</h4> 
+         <h4 id="_raising_a_pull_request">6.6.5. Raising a pull request</h4> 
          <div class="paragraph"> 
           <p>If you have your own fork, you can now simply push the changes 
you’ve made locally to your fork:</p> 
          </div> 
@@ -2462,7 +2589,7 @@ why this is a problem, and how the patch fixes the 
problem when applied.</code><
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="_if_your_pull_request_is_accepted">5.7. If your pull request 
is accepted</h3> 
+        <h3 id="_if_your_pull_request_is_accepted">6.7. If your pull request 
is accepted</h3> 
         <div class="paragraph"> 
          <p>To double check that your pull request is accepted, update your 
<code>master</code> branch from the <code>upstream</code> remote:</p> 
         </div> 
@@ -2476,7 +2603,7 @@ why this is a problem, and how the patch fixes the 
problem when applied.</code><
          <p>Finally, you might want to push the latest changes in master back 
up to your github fork. If so, use:</p> 
         </div> 
         <div class="sect3"> 
-         <h4 id="_if_your_pull_request_is_rejected">5.7.1. If your pull 
request is rejected</h4> 
+         <h4 id="_if_your_pull_request_is_rejected">6.7.1. If your pull 
request is rejected</h4> 
          <div class="paragraph"> 
           <p>If your pull request is rejected, then you’ll need to update 
your branch from the main repository and then address the rejection reason.</p> 
          </div> 
@@ -2499,7 +2626,7 @@ why this is a problem, and how the patch fixes the 
problem when applied.</code><
       </div> 
      </div> 
      <div class="sect1"> 
-      <h2 id="_dg_git-cookbook">6. Appendix: Git Cookbook</h2>
+      <h2 id="_dg_git-cookbook">7. Appendix: Git Cookbook</h2>
       <button type="button" class="button secondary" 
onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/dg/_dg_git-cookbook.adoc&quot;";
 style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i 
class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
       <div class="sectionbody"> 
        <div class="paragraph"> 
@@ -2507,13 +2634,13 @@ why this is a problem, and how the patch fixes the 
problem when applied.</code><
        </div> 
        <div class="ulist"> 
         <ul> 
-         <li> <p><a href="#_dg_building-isis">building Apache Isis</a></p> 
</li> 
-         <li> <p><a href="#_dg_contributing">Contributing</a></p> </li> 
-         <li> <p><a href="#_cgcom_policies_git-policy">Git policy</a></p> 
</li> 
+         <li> <p><a href="../dg/dg.html#_dg_building-isis">building Apache 
Isis</a></p> </li> 
+         <li> <p><a href="../dg/dg.html#_dg_contributing">Contributing</a></p> 
</li> 
+         <li> <p><a href="../dg/dg.html#_cgcom_policies_git-policy">Git 
policy</a></p> </li> 
         </ul> 
        </div> 
        <div class="sect2"> 
-        <h3 id="_modifying_existing_files">6.1. Modifying existing files</h3> 
+        <h3 id="_modifying_existing_files">7.1. Modifying existing files</h3> 
         <div class="paragraph"> 
          <p>To modify existing files:</p> 
         </div> 
@@ -2539,7 +2666,7 @@ git commit -m "ISIS-nnn: yada yada"</code></pre>
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="_adding_new_files">6.2. Adding new files</h3> 
+        <h3 id="_adding_new_files">7.2. Adding new files</h3> 
         <div class="paragraph"> 
          <p>To add a new file:</p> 
         </div> 
@@ -2554,7 +2681,7 @@ git commit -m "ISIS-nnn: yada yada"</code></pre>
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="_deleting_files">6.3. Deleting files</h3> 
+        <h3 id="_deleting_files">7.3. Deleting files</h3> 
         <div class="paragraph"> 
          <p>To delete a file:</p> 
         </div> 
@@ -2566,7 +2693,7 @@ git commit -m "ISIS-nnn: yada yada"</code></pre>
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="_renaming_or_moving_files">6.4. Renaming or moving files</h3> 
+        <h3 id="_renaming_or_moving_files">7.4. Renaming or moving files</h3> 
         <div class="paragraph"> 
          <p>To rename or move a file:</p> 
         </div> 
@@ -2578,13 +2705,13 @@ git commit -m "ISIS-nnn: yada yada"</code></pre>
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="_common_workflows">6.5. Common Workflows</h3> 
+        <h3 id="_common_workflows">7.5. Common Workflows</h3> 
         <div class="paragraph"> 
-         <p>The <a href="#_dg_contributing">contributing</a> page describes 
the workflow for non-committers. The <a 
href="cgcom.html#_cgcom_policies_git-policy">Git policy</a> page describes a 
workflow for Apache Isis <strong>committers</strong>.</p> 
+         <p>The <a href="../dg/dg.html#_dg_contributing">contributing</a> page 
describes the workflow for non-committers. The <a 
href="../cgcom/cgcom.html#_cgcom_policies_git-policy">Git policy</a> page 
describes a workflow for Apache Isis <strong>committers</strong>.</p> 
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="_backing_up_a_local_branch">6.6. Backing up a local 
branch</h3> 
+        <h3 id="_backing_up_a_local_branch">7.6. Backing up a local 
branch</h3> 
         <div class="paragraph"> 
          <p>If committing to a local branch, the changes are still just that: 
local, and run risk of a disk failure or other disaster.</p> 
         </div> 
@@ -2623,7 +2750,7 @@ git commit -m "ISIS-nnn: yada yada"</code></pre>
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="_quick_change_stashing_changes">6.7. Quick change: stashing 
changes</h3> 
+        <h3 id="_quick_change_stashing_changes">7.7. Quick change: stashing 
changes</h3> 
         <div class="paragraph"> 
          <p>If you are working on something but are not ready to commit, then 
use:</p> 
         </div> 
@@ -2651,7 +2778,7 @@ git commit -m "ISIS-nnn: yada yada"</code></pre>
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="_ignoring_files">6.8. Ignoring files</h3> 
+        <h3 id="_ignoring_files">7.8. Ignoring files</h3> 
         <div class="paragraph"> 
          <p>Put file patterns into <code>.gitignore</code>. There is one at 
the root of the git repo, but they can additionally appear in subdirectories 
(the results are cumulative).</p> 
         </div> 
@@ -2666,9 +2793,9 @@ git commit -m "ISIS-nnn: yada yada"</code></pre>
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="_more_advanced_use_cases">6.9. More advanced use cases</h3> 
+        <h3 id="_more_advanced_use_cases">7.9. More advanced use cases</h3> 
         <div class="sect3"> 
-         <h4 id="_if_accidentally_push_to_remote">6.9.1. If accidentally push 
to remote</h4> 
+         <h4 id="_if_accidentally_push_to_remote">7.9.1. If accidentally push 
to remote</h4> 
          <div class="paragraph"> 
           <p>Suppose you committed to <code>master</code>, and then pushed the 
change, and then decided that you didn’t intend to do that:</p> 
          </div> 
@@ -2718,7 +2845,7 @@ git commit -m "ISIS-nnn: yada yada"</code></pre>
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 
id="_if_you_ve_accidentally_worked_on_code_master_code_branch">6.10. If 
you’ve accidentally worked on <code>master</code> branch</h3> 
+        <h3 
id="_if_you_ve_accidentally_worked_on_code_master_code_branch">7.10. If 
you’ve accidentally worked on <code>master</code> branch</h3> 
         <div class="paragraph"> 
          <p>If at any time the <code>git pull</code> from your upstream fails, 
it most likely means that you must have made commits on the <code>master</code> 
branch. You can use <code>gitk --all</code> to confirm; at some point in time 
both <code>master</code> and <code>origin\master</code> will have a common 
ancestor.</p> 
         </div> 
@@ -2752,7 +2879,7 @@ git reset --hard &lt;i&gt;shaId&lt;/i&gt;      # move 
master branch shaId of com
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 
id="_if_you_ve_forgotten_to_prefix_your_commits_but_not_pushed">6.11. If 
you’ve forgotten to prefix your commits (but not pushed)</h3> 
+        <h3 
id="_if_you_ve_forgotten_to_prefix_your_commits_but_not_pushed">7.11. If 
you’ve forgotten to prefix your commits (but not pushed)</h3> 
         <div class="paragraph"> 
          <p>One of our committers, Alexander Krasnukhin, has put together some 
git scripts to help his workflow. Using one of these, <code>git prefix</code>, 
you can just commit with proper message without bothering about prefix and add 
prefix only in the end <strong>before</strong> the final push.</p> 
         </div> 
@@ -2771,14 +2898,14 @@ git reset --hard &lt;i&gt;shaId&lt;/i&gt;      # move 
master branch shaId of com
       </div> 
      </div> 
      <div class="sect1"> 
-      <h2 id="_dg_working-with-many-repos">7. Appendix: Working with Many 
Repos</h2>
+      <h2 id="_dg_working-with-many-repos">8. Appendix: Working with Many 
Repos</h2>
       <button type="button" class="button secondary" 
onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/dg/_dg_working-with-many-repos.adoc&quot;";
 style="float: right; font-size: small; padding: 6px; margin-top: -55px; "><i 
class="fa fa-pencil-square-o"></i>&nbsp;Edit</button> 
       <div class="sectionbody"> 
        <div class="paragraph"> 
         <p>Applications built with Apache Isis often (should) consist of 
multiple modules, each in separate git repositories. For example, there are the 
various (non-ASF) <a href="http://isisaddons.org";>Isis Addons</a> that provide 
various cross-cutting concerns/technical services (security, mail-merge etc), 
as well the modules eg as provided by the (non-ASF) <a 
href="http://catalog.incode.org";>Incode Catalog</a>, which provides generic 
business subdomains (communication channels, documents etc).</p> 
        </div> 
        <div class="paragraph"> 
-        <p>In addition, your own application may well be structured as a 
number of distinct modules (probably with the entities in each module being 
mapped to a different schema), and using such techniques as the <a 
href="ugbtb.html#_ugbtb_decoupling_event-bus">event bus</a> and <a 
href="ugbtb.html#_ugbtb_decoupling_mixins">mixins</a> so that these modules are 
decoupled from each other.</p> 
+        <p>In addition, your own application may well be structured as a 
number of distinct modules (probably with the entities in each module being 
mapped to a different schema), and using such techniques as the <a 
href="../ugfun/ugfun.html#_ugfun_building-blocks_events_domain-events">event 
bus</a> and <a 
href="../ugfun/ugfun.html#_ugfun_building-blocks_types-of-domain-objects_mixins">mixins</a>
 so that these modules are decoupled from each other.</p> 
        </div> 
        <div class="paragraph"> 
         <p>All of which is a preamble to say that you will likely have 
multiple directories on your local development computer, for each such git 
repository that you contribute to.</p> 
@@ -2787,7 +2914,7 @@ git reset --hard &lt;i&gt;shaId&lt;/i&gt;      # move 
master branch shaId of com
         <p>In this appendix we provide some simple but useful bash scripts to 
help you manage each such.</p> 
        </div> 
        <div class="sect2"> 
-        <h3 id="_prerequisites">7.1. Prerequisites</h3> 
+        <h3 id="_prerequisites">8.1. Prerequisites</h3> 
         <div class="paragraph"> 
          <p>We recommend that you adopt a convention for your directories. For 
example, open source repositories (such as the Isis Addons and Incode Catalog 
mentioned above) reside in <a href="https://github.com/";>github.com</a>, while 
your own proprietary code might reside in some other service, eg <a 
href="https://bitbucket.org/";>bitbucket</a>. For example:</p> 
         </div> 
@@ -2810,7 +2937,7 @@ git reset --hard &lt;i&gt;shaId&lt;/i&gt;      # move 
master branch shaId of com
         </div> 
        </div> 
        <div class="sect2"> 
-        <h3 id="__code_repos_txt_code">7.2. <code>_repos.txt</code></h3> 
+        <h3 id="__code_repos_txt_code">8.2. <code>_repos.txt</code></h3> 
         <div class="paragraph"> 
          <p>Create a file <code>_repos.txt</code> that catalogues the 
repositories, eg:</p> 
         </div> 
@@ -2833,7 +2960,7 @@ git reset --hard &lt;i&gt;shaId&lt;/i&gt;      # move 
master branch shaId of com
         </div> 
        </div> 
        <div class="sect2"> 
-   

<TRUNCATED>

Reply via email to