You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2017/09/25 08:34:00 UTC

[12/24] isis-site git commit: ISIS-1712 - updates docs, replace references to isisaddons and catalog.incode.org with platform.incode.org

http://git-wip-us.apache.org/repos/asf/isis-site/blob/e5dcb0be/content/guides/ugbtb/ugbtb.html
----------------------------------------------------------------------
diff --git a/content/guides/ugbtb/ugbtb.html b/content/guides/ugbtb/ugbtb.html
index 73f1e99..d31ee2d 100644
--- a/content/guides/ugbtb/ugbtb.html
+++ b/content/guides/ugbtb/ugbtb.html
@@ -1306,7 +1306,7 @@ log4j.additivity.org.apache.isis.core.runtime.services.i18n.po.PotWriter=false</
            <p>The <code>BackgroundCommandExecutionFromBackgroundCommandServiceJdo</code> is a concrete subclass of <code>BackgroundCommandExecution</code> (see the <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-api_BackgroundService"><code>BackgroundCommandService</code></a>), the intended use being for the class to be instantiated regularly (eg every 10 seconds) by a scheduler such as <a href="http://quartz-scheduler.org">Quartz</a>) to poll for <code>Command</code>s to be executed, and then execute them.</p> 
           </div> 
           <div class="paragraph"> 
-           <p>This implementation queries for <code>Command</code>s persisted by the <a href="http://www.github.com/isisaddons/isis-module-command">Isis addons Command Module</a>'s implementations of <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-spi_CommandService"><code>CommandService</code></a> and <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-spi_BackgroundCommandService"><code>BackgroundCommandService</code></a> using the <code>BackgroundCommandServiceJdoRepository</code>.</p> 
+           <p>This implementation queries for <code>Command</code>s persisted by the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s command module’s implementations of <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-spi_CommandService"><code>CommandService</code></a> and <a href="../rgsvc/rgsvc.html#_rgsvc_application-layer-spi_BackgroundCommandService"><code>BackgroundCommandService</code></a> using the <code>BackgroundCommandServiceJdoRepository</code>.</p> 
           </div> 
           <div class="paragraph"> 
            <p>The diagram below (<a href="http://yuml.me/edit/25343da1">yuml.me/25343da1</a>) shows the inheritance hierarchy for this class:</p> 
@@ -2225,10 +2225,10 @@ serviceRegistry.injectServicesInto(viewModel);</code></pre>
           </ul>
          </div> 
          <div class="paragraph"> 
-          <p>Of the various Isis Addons, the <a href="https://github.com/isisaddons/isis-module-security">security module</a> has the most features. One significant feature is the ability to associate users and objects with a "tenancy".</p> 
+          <p>Of the various modules provided by the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>, the security module has the most features. One significant feature is the ability to associate users and objects with a "tenancy".</p> 
          </div> 
          <div class="paragraph"> 
-          <p>For more details, see the <a href="https://github.com/isisaddons/isis-module-security">security module</a> README.</p> 
+          <p>For more details, see the <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s security module README.</p> 
          </div> 
         </div> 
         <div class="sect2"> 
@@ -3421,7 +3421,7 @@ serviceRegistry.injectServicesInto(viewModel);</code></pre>
          <div class="sect3"> 
           <h4 id="_spring_config">6.1.4. Spring Config</h4> 
           <div class="paragraph"> 
-           <p>Although Apache Isis does not use Spring, it’s possible that your app may use other components that do use Spring. For example, the (non-ASF) <a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> module uses ActiveMQ and Camel to support publishing; both of these leverage Spring.</p> 
+           <p>Although Apache Isis does not use Spring, it’s possible that your app may use other components that do use Spring. For example, the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s publishmq module uses ActiveMQ and Camel to support publishing; both of these leverage Spring.</p> 
           </div> 
           <div class="paragraph"> 
            <p>There are several ways to externalized Spring config, but the mechanism described here is similar in nature to those that we use for externalizing Apache Isis' and Shiro’s configuration. In your <code>web.xml</code>, you will probably load the Spring application context using code such as:</p> 
@@ -3823,7 +3823,7 @@ export ISIS_OPTS="isis.appManifest=domainapp.app.DomainAppAppManifestWithFixture
           </ul>
          </div> 
          <div class="paragraph"> 
-          <p>As of 1.8.0 Apache Isis has experimental support for Neo4J, courtesy of DataNucleus' <a href="http://www.datanucleus.org/products/datanucleus/datastores/neo4j.html">Neo4J Datastore</a> implementation.</p> 
+          <p>As of <code>1.8.0</code>, Apache Isis has experimental support for Neo4J, courtesy of DataNucleus' <a href="http://www.datanucleus.org/products/datanucleus/datastores/neo4j.html">Neo4J Datastore</a> implementation.</p> 
          </div> 
          <div class="paragraph"> 
           <p>The <a href="../ugfun/ugfun.html#_ugfun_getting-started_simpleapp-archetype">SimpleApp archetype</a> has been updated so that they can be optionally run under Neo4J.</p> 

http://git-wip-us.apache.org/repos/asf/isis-site/blob/e5dcb0be/content/guides/ugbtb/ugbtb.pdf
----------------------------------------------------------------------
diff --git a/content/guides/ugbtb/ugbtb.pdf b/content/guides/ugbtb/ugbtb.pdf
index 77029c2..7f5bb10 100644
--- a/content/guides/ugbtb/ugbtb.pdf
+++ b/content/guides/ugbtb/ugbtb.pdf
@@ -4,8 +4,8 @@
 << /Title (Beyond the Basics)
 /Creator (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
 /Producer (Asciidoctor PDF 1.5.0.alpha.11, based on Prawn 1.3.0)
-/CreationDate (D:20170915174239+01'00')
-/ModDate (D:20170915174239+01'00')
+/CreationDate (D:20170925074949+01'00')
+/ModDate (D:20170925074949+01'00')
 >>
 endobj
 2 0 obj
@@ -23930,7 +23930,7 @@ egRE
 endstream
 endobj
 141 0 obj
-<< /Length 6902
+<< /Length 6915
 >>
 stream
 q
@@ -24168,7 +24168,7 @@ ET
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
-4.601 Tw
+1.405 Tw
 
 BT
 48.24 330.6690769230769 Td
@@ -24183,10 +24183,10 @@ ET
 0.694 0.129 0.275 scn
 0.694 0.129 0.275 SCN
 
-4.601 Tw
+1.405 Tw
 
 BT
-231.27230184659092 330.6690769230769 Td
+218.4890291193182 330.6690769230769 Td
 /F3.0 10.5 Tf
 <436f6d6d616e64> Tj
 ET
@@ -24198,12 +24198,12 @@ ET
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
-4.601 Tw
+1.405 Tw
 
 BT
-268.0223018465909 330.6690769230769 Td
+255.2390291193182 330.6690769230769 Td
 /F1.0 10.5 Tf
-[<73207065727369737465642062> 20.01953125 <792074686520>] TJ
+[<73207065727369737465642062> 20.01953125 <792074686520286e6f6e2d4153462920>] TJ
 ET
 
 
@@ -24213,12 +24213,12 @@ ET
 0.259 0.545 0.792 scn
 0.259 0.545 0.792 SCN
 
-4.601 Tw
+1.405 Tw
 
 BT
-375.7273986150568 330.6690769230769 Td
+403.6982354403409 330.6690769230769 Td
 /F1.0 10.5 Tf
-<49736973206164646f6e7320436f6d6d616e64204d6f64756c65> Tj
+<496e636f646520506c6174666f726d> Tj
 ET
 
 
@@ -24228,12 +24228,12 @@ ET
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
-4.601 Tw
+1.405 Tw
 
 BT
-539.9945 330.6690769230769 Td
+485.71161772017047 330.6690769230769 Td
 /F1.0 10.5 Tf
-<2773> Tj
+<277320636f6d6d616e64> Tj
 ET
 
 
@@ -24243,12 +24243,12 @@ ET
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
-20.954 Tw
+9.374 Tw
 
 BT
 48.24 314.8890769230769 Td
 /F1.0 10.5 Tf
-<696d706c656d656e746174696f6e73206f6620> Tj
+<6d6f64756c65d5732020696d706c656d656e746174696f6e73206f6620> Tj
 ET
 
 
@@ -24258,10 +24258,10 @@ ET
 0.694 0.129 0.275 scn
 0.694 0.129 0.275 SCN
 
-20.954 Tw
+9.374 Tw
 
 BT
-190.60166666666666 314.8890769230769 Td
+236.92374999999998 314.8890769230769 Td
 /F3.0 10.5 Tf
 <436f6d6d616e6453657276696365> Tj
 ET
@@ -24273,10 +24273,10 @@ ET
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
-20.954 Tw
+9.374 Tw
 
 BT
-264.10166666666663 314.8890769230769 Td
+310.42375 314.8890769230769 Td
 /F1.0 10.5 Tf
 <20616e6420> Tj
 ET
@@ -24288,10 +24288,10 @@ ET
 0.694 0.129 0.275 scn
 0.694 0.129 0.275 SCN
 
-20.954 Tw
+9.374 Tw
 
 BT
-330.55883333333327 314.8890769230769 Td
+353.719875 314.8890769230769 Td
 /F3.0 10.5 Tf
 <4261636b67726f756e64436f6d6d616e6453657276696365> Tj
 ET
@@ -24303,10 +24303,10 @@ ET
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
-20.954 Tw
+9.374 Tw
 
 BT
-456.55883333333327 314.8890769230769 Td
+479.719875 314.8890769230769 Td
 /F1.0 10.5 Tf
 <207573696e6720746865> Tj
 ET
@@ -24452,10 +24452,10 @@ endobj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
-/URI (http://www.github.com/isisaddons/isis-module-command)
+/URI (http://platform.incode.org)
 >>
 /Subtype /Link
-/Rect [375.7273986150568 327.6030769230769 539.9945 341.8830769230769]
+/Rect [403.6982354403409 327.6030769230769 485.71161772017047 341.8830769230769]
 /Type /Annot
 >>
 endobj
@@ -24466,7 +24466,7 @@ endobj
 /URI (../rgsvc/rgsvc.pdf#_rgsvc_application-layer-spi_CommandService)
 >>
 /Subtype /Link
-/Rect [190.60166666666666 313.4190769230769 264.10166666666663 323.9190769230769]
+/Rect [236.92374999999998 313.4190769230769 310.42375 323.9190769230769]
 /Type /Annot
 >>
 endobj
@@ -24477,7 +24477,7 @@ endobj
 /URI (../rgsvc/rgsvc.pdf#_rgsvc_application-layer-spi_BackgroundCommandService)
 >>
 /Subtype /Link
-/Rect [330.55883333333327 313.4190769230769 456.55883333333327 323.9190769230769]
+/Rect [353.719875 313.4190769230769 479.719875 323.9190769230769]
 /Type /Annot
 >>
 endobj
@@ -50858,7 +50858,7 @@ endobj
 >>
 endobj
 249 0 obj
-<< /Length 21874
+<< /Length 21985
 >>
 stream
 q
@@ -50937,12 +50937,12 @@ ET
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
-0.281 Tw
+1.573 Tw
 
 BT
 48.239999999999995 661.4760000000001 Td
 /F1.0 10.5 Tf
-[<4f662074686520766172696f757320497369732041> 20.01953125 <64646f6e732c2074686520>] TJ
+[<4f662074686520766172696f7573206d6f64756c65732070726f76696465642062> 20.01953125 <792074686520286e6f6e2d4153462920>] TJ
 ET
 
 
@@ -50952,12 +50952,12 @@ ET
 0.259 0.545 0.792 scn
 0.259 0.545 0.792 SCN
 
-0.281 Tw
+1.573 Tw
 
 BT
-204.50912182617185 661.4760000000001 Td
+313.5089835379464 661.4760000000001 Td
 /F1.0 10.5 Tf
-<7365637572697479206d6f64756c65> Tj
+<496e636f646520506c6174666f726d> Tj
 ET
 
 
@@ -50967,12 +50967,12 @@ ET
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
-0.281 Tw
+1.573 Tw
 
 BT
-285.53550964355463 661.4760000000001 Td
+395.69081961495533 661.4760000000001 Td
 /F1.0 10.5 Tf
-<2068617320746865206d6f73742066656174757265732e204f6e65207369676e69666963616e74206665617475726520697320746865> Tj
+<2c20746865207365637572697479206d6f64756c652068617320746865> Tj
 ET
 
 
@@ -50985,7 +50985,7 @@ ET
 BT
 48.239999999999995 645.6960000000001 Td
 /F1.0 10.5 Tf
-<6162696c69747920746f206173736f636961746520757365727320616e64206f626a6563747320776974682061202274656e616e6379222e> Tj
+<6d6f73742066656174757265732e204f6e65207369676e69666963616e74206665617475726520697320746865206162696c69747920746f206173736f636961746520757365727320616e64206f626a6563747320776974682061202274656e616e6379222e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -51007,7 +51007,7 @@ ET
 BT
 172.69608984375 617.9160000000002 Td
 /F1.0 10.5 Tf
-<7365637572697479206d6f64756c65> Tj
+<496e636f646520506c6174666f726d> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -51016,9 +51016,9 @@ ET
 0.200 0.200 0.200 SCN
 
 BT
-253.44108984375004 617.9160000000002 Td
+253.30458984375002 617.9160000000002 Td
 /F1.0 10.5 Tf
-<20524541444d452e> Tj
+<2773207365637572697479206d6f64756c6520524541444d452e> Tj
 ET
 
 0.000 0.000 0.000 SCN
@@ -52293,10 +52293,10 @@ endobj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
-/URI (https://github.com/isisaddons/isis-module-security)
+/URI (http://platform.incode.org)
 >>
 /Subtype /Link
-/Rect [204.50912182617185 658.4100000000001 285.53550964355463 672.6900000000002]
+/Rect [313.5089835379464 658.4100000000001 395.69081961495533 672.6900000000002]
 /Type /Annot
 >>
 endobj
@@ -52304,10 +52304,10 @@ endobj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
-/URI (https://github.com/isisaddons/isis-module-security)
+/URI (http://platform.incode.org)
 >>
 /Subtype /Link
-/Rect [172.69608984375 614.8500000000001 253.44108984375004 629.1300000000002]
+/Rect [172.69608984375 614.8500000000001 253.30458984375002 629.1300000000002]
 /Type /Annot
 >>
 endobj
@@ -72296,7 +72296,7 @@ endobj
 [336 0 R /XYZ 0 329.4800000000001 null]
 endobj
 345 0 obj
-<< /Length 18020
+<< /Length 18031
 >>
 stream
 q
@@ -73248,7 +73248,7 @@ ET
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
-0.820 Tw
+0.285 Tw
 
 BT
 48.24000000000001 106.46600000000015 Td
@@ -73263,12 +73263,12 @@ ET
 0.259 0.545 0.792 scn
 0.259 0.545 0.792 SCN
 
-0.820 Tw
+0.285 Tw
 
 BT
-289.0785128348214 106.46600000000015 Td
+284.79535306490385 106.46600000000015 Td
 /F1.0 10.5 Tf
-<49736973206164646f6e7327207075626c6973686d71> Tj
+<496e636f646520506c6174666f726d> Tj
 ET
 
 
@@ -73278,12 +73278,12 @@ ET
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
-0.820 Tw
+0.285 Tw
 
 BT
-405.3582435825893 106.46600000000015 Td
+365.6888234675481 106.46600000000015 Td
 /F1.0 10.5 Tf
-[<206d6f64756c6520757365732041> 20.01953125 <63746976654d5120616e64>] TJ
+[<2773207075626c6973686d71206d6f64756c6520757365732041> 20.01953125 <63746976654d51>] TJ
 ET
 
 
@@ -73296,7 +73296,7 @@ ET
 BT
 48.24000000000001 90.68600000000015 Td
 /F1.0 10.5 Tf
-[<43616d656c20746f20737570706f7274207075626c697368696e673b20626f7468206f66207468657365206c65766572> 20.01953125 <61676520537072696e672e>] TJ
+[<616e642043616d656c20746f20737570706f7274207075626c697368696e673b20626f7468206f66207468657365206c65766572> 20.01953125 <61676520537072696e672e>] TJ
 ET
 
 0.000 0.000 0.000 SCN
@@ -73395,10 +73395,10 @@ endobj
 << /Border [0 0 0]
 /A << /Type /Action
 /S /URI
-/URI (http://github.com/isisaddons/isis-module-publishmq)
+/URI (http://platform.incode.org)
 >>
 /Subtype /Link
-/Rect [289.0785128348214 103.40000000000015 405.3582435825893 117.68000000000015]
+/Rect [284.79535306490385 103.40000000000015 365.6888234675481 117.68000000000015]
 /Type /Annot
 >>
 endobj
@@ -80455,7 +80455,7 @@ endobj
 [389 0 R /XYZ 0 308.5700000000001 null]
 endobj
 394 0 obj
-<< /Length 20467
+<< /Length 20812
 >>
 stream
 q
@@ -81481,12 +81481,42 @@ ET
 0.200 0.200 0.200 scn
 0.200 0.200 0.200 SCN
 
-3.604 Tw
+3.141 Tw
 
 BT
 48.24 276.36600000000016 Td
 /F1.0 10.5 Tf
-<4173206f6620312e382e3020417061636865204973697320686173206578706572696d656e74616c20737570706f727420666f72204e656f344a2c20636f757274657379206f6620446174614e75636c6575732720> Tj
+<4173206f6620> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.694 0.129 0.275 scn
+0.694 0.129 0.275 SCN
+
+3.141 Tw
+
+BT
+82.03184615384615 276.36600000000016 Td
+/F3.0 10.5 Tf
+<312e382e30> Tj
+ET
+
+
+0.000 Tw
+0.000 0.000 0.000 SCN
+0.000 0.000 0.000 scn
+0.200 0.200 0.200 scn
+0.200 0.200 0.200 SCN
+
+3.141 Tw
+
+BT
+108.28184615384615 276.36600000000016 Td
+/F1.0 10.5 Tf
+<2c20417061636865204973697320686173206578706572696d656e74616c20737570706f727420666f72204e656f344a2c20636f757274657379206f6620446174614e75636c6575732720> Tj
 ET
 
 
@@ -81496,10 +81526,10 @@ ET
 0.259 0.545 0.792 scn
 0.259 0.545 0.792 SCN
 
-3.604 Tw
+3.141 Tw
 
 BT
-517.7449999999999 276.36600000000016 Td
+517.745 276.36600000000016 Td
 /F1.0 10.5 Tf
 <4e656f344a> Tj
 ET
@@ -81784,7 +81814,7 @@ endobj
 /URI (http://www.datanucleus.org/products/datanucleus/datastores/neo4j.html)
 >>
 /Subtype /Link
-/Rect [517.7449999999999 273.3000000000002 547.04 287.58000000000015]
+/Rect [517.745 273.3000000000002 547.04 287.58000000000015]
 /Type /Annot
 >>
 endobj
@@ -96815,518 +96845,518 @@ xref
 0000392408 00000 n 
 0000410697 00000 n 
 0000414654 00000 n 
-0000421610 00000 n 
-0000421942 00000 n 
-0000422148 00000 n 
-0000422205 00000 n 
-0000422448 00000 n 
-0000422661 00000 n 
-0000422890 00000 n 
-0000423140 00000 n 
-0000423400 00000 n 
-0000423613 00000 n 
-0000451323 00000 n 
-0000454892 00000 n 
-0000455755 00000 n 
-0000456008 00000 n 
-0000473092 00000 n 
-0000473399 00000 n 
-0000473445 00000 n 
-0000473651 00000 n 
-0000473861 00000 n 
-0000474076 00000 n 
-0000474291 00000 n 
-0000474506 00000 n 
-0000474710 00000 n 
-0000474767 00000 n 
-0000474824 00000 n 
-0000475050 00000 n 
-0000485797 00000 n 
-0000488952 00000 n 
-0000489251 00000 n 
-0000489447 00000 n 
-0000489493 00000 n 
-0000497792 00000 n 
-0000497993 00000 n 
-0000498197 00000 n 
-0000507164 00000 n 
-0000523874 00000 n 
-0000524202 00000 n 
-0000524403 00000 n 
-0000533888 00000 n 
-0000534098 00000 n 
-0000534324 00000 n 
-0000534538 00000 n 
-0000534753 00000 n 
-0000555741 00000 n 
-0000556029 00000 n 
-0000556075 00000 n 
-0000556270 00000 n 
-0000556500 00000 n 
-0000556726 00000 n 
-0000591062 00000 n 
-0000591363 00000 n 
-0000591585 00000 n 
-0000591801 00000 n 
-0000592032 00000 n 
-0000592089 00000 n 
-0000610952 00000 n 
-0000611266 00000 n 
-0000611323 00000 n 
-0000611568 00000 n 
-0000611625 00000 n 
-0000611877 00000 n 
-0000612128 00000 n 
-0000627708 00000 n 
-0000628007 00000 n 
-0000628053 00000 n 
-0000628301 00000 n 
-0000628505 00000 n 
-0000628698 00000 n 
-0000628756 00000 n 
-0000628960 00000 n 
-0000629156 00000 n 
-0000629414 00000 n 
-0000663608 00000 n 
-0000663880 00000 n 
-0000663926 00000 n 
-0000664598 00000 n 
-0000664825 00000 n 
-0000700231 00000 n 
-0000700514 00000 n 
-0000700716 00000 n 
-0000700905 00000 n 
-0000700962 00000 n 
-0000701186 00000 n 
-0000701431 00000 n 
-0000741797 00000 n 
-0000742051 00000 n 
-0000742108 00000 n 
-0000748824 00000 n 
-0000779153 00000 n 
-0000779444 00000 n 
-0000779637 00000 n 
-0000786389 00000 n 
-0000786610 00000 n 
-0000828488 00000 n 
-0000828742 00000 n 
-0000828800 00000 n 
-0000838924 00000 n 
-0000839247 00000 n 
-0000839293 00000 n 
-0000839350 00000 n 
-0000839576 00000 n 
-0000839633 00000 n 
-0000839857 00000 n 
-0000840032 00000 n 
-0000840282 00000 n 
-0000840500 00000 n 
-0000891025 00000 n 
-0000891266 00000 n 
-0000913195 00000 n 
-0000913496 00000 n 
-0000913553 00000 n 
-0000913791 00000 n 
-0000914026 00000 n 
-0000914083 00000 n 
-0000914315 00000 n 
-0000944516 00000 n 
-0000944783 00000 n 
-0000944829 00000 n 
-0000944875 00000 n 
-0000945316 00000 n 
-0000971498 00000 n 
-0000971739 00000 n 
-0000971785 00000 n 
-0001018260 00000 n 
-0001018646 00000 n 
-0001018859 00000 n 
-0001019073 00000 n 
-0001019287 00000 n 
-0001019507 00000 n 
-0001019728 00000 n 
-0001019949 00000 n 
-0001020007 00000 n 
-0001020223 00000 n 
-0001020468 00000 n 
-0001020703 00000 n 
-0001020939 00000 n 
-0001021149 00000 n 
-0001021383 00000 n 
-0001023898 00000 n 
-0001024126 00000 n 
-0001041871 00000 n 
-0001042172 00000 n 
-0001042218 00000 n 
-0001042275 00000 n 
-0001042503 00000 n 
-0001042708 00000 n 
-0001042765 00000 n 
-0001043312 00000 n 
-0001043370 00000 n 
-0001043590 00000 n 
-0001043648 00000 n 
-0001073467 00000 n 
-0001073721 00000 n 
-0001073778 00000 n 
-0001073836 00000 n 
-0001089406 00000 n 
-0001089750 00000 n 
-0001089796 00000 n 
-0001090091 00000 n 
-0001090404 00000 n 
-0001090720 00000 n 
-0001091029 00000 n 
-0001091349 00000 n 
-0001091664 00000 n 
-0001092013 00000 n 
-0001092377 00000 n 
-0001092677 00000 n 
-0001092735 00000 n 
-0001093059 00000 n 
-0001108957 00000 n 
-0001109253 00000 n 
-0001109299 00000 n 
-0001109535 00000 n 
-0001109752 00000 n 
-0001109809 00000 n 
-0001110042 00000 n 
-0001110271 00000 n 
-0001110328 00000 n 
-0001110386 00000 n 
-0001152514 00000 n 
-0001152768 00000 n 
-0001152814 00000 n 
-0001156688 00000 n 
-0001156942 00000 n 
-0001156988 00000 n 
-0001180409 00000 n 
-0001180689 00000 n 
-0001180735 00000 n 
-0001180792 00000 n 
-0001181033 00000 n 
-0001181274 00000 n 
-0001203853 00000 n 
-0001204138 00000 n 
-0001204371 00000 n 
-0001223118 00000 n 
-0001223438 00000 n 
-0001223645 00000 n 
-0001223857 00000 n 
-0001224070 00000 n 
-0001224284 00000 n 
-0001224493 00000 n 
-0001224674 00000 n 
-0001224857 00000 n 
-0001224914 00000 n 
-0001242989 00000 n 
-0001243277 00000 n 
-0001243323 00000 n 
-0001243566 00000 n 
-0001243623 00000 n 
-0001243681 00000 n 
-0001243931 00000 n 
-0001243989 00000 n 
-0001244227 00000 n 
-0001263892 00000 n 
-0001264120 00000 n 
-0001287933 00000 n 
-0001288174 00000 n 
-0001288231 00000 n 
-0001296313 00000 n 
-0001296604 00000 n 
-0001296817 00000 n 
-0001296863 00000 n 
-0001297112 00000 n 
-0001297319 00000 n 
-0001297376 00000 n 
-0001297602 00000 n 
-0001297659 00000 n 
-0001297860 00000 n 
-0001297917 00000 n 
-0001322586 00000 n 
-0001322898 00000 n 
-0001323162 00000 n 
-0001323406 00000 n 
-0001323672 00000 n 
-0001323729 00000 n 
-0001323995 00000 n 
-0001324241 00000 n 
-0001324508 00000 n 
-0001324566 00000 n 
-0001344008 00000 n 
-0001344309 00000 n 
-0001344355 00000 n 
-0001344895 00000 n 
-0001345115 00000 n 
-0001345377 00000 n 
-0001345435 00000 n 
-0001345659 00000 n 
-0001358303 00000 n 
-0001358575 00000 n 
-0001358621 00000 n 
-0001358679 00000 n 
-0001358906 00000 n 
-0001358963 00000 n 
-0001379485 00000 n 
-0001379802 00000 n 
-0001379848 00000 n 
-0001380115 00000 n 
-0001380172 00000 n 
-0001380417 00000 n 
-0001380651 00000 n 
-0001380889 00000 n 
-0001381123 00000 n 
-0001381181 00000 n 
-0001395852 00000 n 
-0001396158 00000 n 
-0001396204 00000 n 
-0001396447 00000 n 
-0001396505 00000 n 
-0001396745 00000 n 
-0001396803 00000 n 
-0001406731 00000 n 
-0001407014 00000 n 
-0001407242 00000 n 
-0001407483 00000 n 
-0001407529 00000 n 
-0001407785 00000 n 
-0001408021 00000 n 
-0001415663 00000 n 
-0001415979 00000 n 
-0001416025 00000 n 
-0001416213 00000 n 
-0001416407 00000 n 
-0001416629 00000 n 
-0001419097 00000 n 
-0001419918 00000 n 
-0001420123 00000 n 
-0001454089 00000 n 
-0001456454 00000 n 
-0001456670 00000 n 
-0001464272 00000 n 
-0001464531 00000 n 
-0001479063 00000 n 
-0001479884 00000 n 
-0001480086 00000 n 
-0001495438 00000 n 
-0001496259 00000 n 
-0001504074 00000 n 
-0001504359 00000 n 
-0001504546 00000 n 
-0001504603 00000 n 
-0001505293 00000 n 
-0001505351 00000 n 
-0001505409 00000 n 
-0001522264 00000 n 
-0001522518 00000 n 
-0001522576 00000 n 
-0001523416 00000 n 
-0001537462 00000 n 
-0001537703 00000 n 
-0001537749 00000 n 
-0001537795 00000 n 
-0001537852 00000 n 
-0001557062 00000 n 
-0001557303 00000 n 
-0001557360 00000 n 
-0001557418 00000 n 
-0001572364 00000 n 
-0001572605 00000 n 
-0001572662 00000 n 
-0001572720 00000 n 
-0001578135 00000 n 
-0001578376 00000 n 
-0001595338 00000 n 
-0001595579 00000 n 
-0001595636 00000 n 
-0001608966 00000 n 
-0001609238 00000 n 
-0001609458 00000 n 
-0001609516 00000 n 
-0001628895 00000 n 
-0001629136 00000 n 
-0001649276 00000 n 
-0001649535 00000 n 
-0001649593 00000 n 
-0001649800 00000 n 
-0001660102 00000 n 
-0001660343 00000 n 
-0001660389 00000 n 
-0001660519 00000 n 
-0001660640 00000 n 
-0001660765 00000 n 
-0001660891 00000 n 
-0001661024 00000 n 
-0001661160 00000 n 
-0001661330 00000 n 
-0001661491 00000 n 
-0001661646 00000 n 
-0001661815 00000 n 
-0001661972 00000 n 
-0001662138 00000 n 
-0001662295 00000 n 
-0001662464 00000 n 
-0001662626 00000 n 
-0001662800 00000 n 
-0001662977 00000 n 
-0001663126 00000 n 
-0001663286 00000 n 
-0001663455 00000 n 
-0001663626 00000 n 
-0001663790 00000 n 
-0001663954 00000 n 
-0001664111 00000 n 
-0001664278 00000 n 
-0001664470 00000 n 
-0001664665 00000 n 
-0001664858 00000 n 
-0001665053 00000 n 
-0001665207 00000 n 
-0001665373 00000 n 
-0001665548 00000 n 
-0001665727 00000 n 
-0001665936 00000 n 
-0001666145 00000 n 
-0001666332 00000 n 
-0001666519 00000 n 
-0001666710 00000 n 
-0001666901 00000 n 
-0001667074 00000 n 
-0001667257 00000 n 
-0001667448 00000 n 
-0001667639 00000 n 
-0001667829 00000 n 
-0001668029 00000 n 
-0001668232 00000 n 
-0001668435 00000 n 
-0001668606 00000 n 
-0001668788 00000 n 
-0001668975 00000 n 
-0001669172 00000 n 
-0001669354 00000 n 
-0001669536 00000 n 
-0001669734 00000 n 
-0001669932 00000 n 
-0001670103 00000 n 
-0001670274 00000 n 
-0001670451 00000 n 
-0001670639 00000 n 
-0001670810 00000 n 
-0001670992 00000 n 
-0001671184 00000 n 
-0001671376 00000 n 
-0001671536 00000 n 
-0001671698 00000 n 
-0001671859 00000 n 
-0001672023 00000 n 
-0001672197 00000 n 
-0001672368 00000 n 
-0001672539 00000 n 
-0001672710 00000 n 
-0001672881 00000 n 
-0001673052 00000 n 
-0001673220 00000 n 
-0001673388 00000 n 
-0001673556 00000 n 
-0001673724 00000 n 
-0001673886 00000 n 
-0001674058 00000 n 
-0001674194 00000 n 
-0001674353 00000 n 
-0001674501 00000 n 
-0001674665 00000 n 
-0001674840 00000 n 
-0001674988 00000 n 
-0001675146 00000 n 
-0001675303 00000 n 
-0001675471 00000 n 
-0001675648 00000 n 
-0001675827 00000 n 
-0001676114 00000 n 
-0001676192 00000 n 
-0001676369 00000 n 
-0001676561 00000 n 
-0001676826 00000 n 
-0001677001 00000 n 
-0001677214 00000 n 
-0001677436 00000 n 
-0001677663 00000 n 
-0001677895 00000 n 
-0001678103 00000 n 
-0001678334 00000 n 
-0001678550 00000 n 
-0001678759 00000 n 
-0001678978 00000 n 
-0001679236 00000 n 
-0001679486 00000 n 
-0001679721 00000 n 
-0001679976 00000 n 
-0001680202 00000 n 
-0001680479 00000 n 
-0001680707 00000 n 
-0001680955 00000 n 
-0001681160 00000 n 
-0001681412 00000 n 
-0001681653 00000 n 
-0001681933 00000 n 
-0001682141 00000 n 
-0001682417 00000 n 
-0001682678 00000 n 
-0001682953 00000 n 
-0001683255 00000 n 
-0001683461 00000 n 
-0001683646 00000 n 
-0001683928 00000 n 
-0001684166 00000 n 
-0001684404 00000 n 
-0001684636 00000 n 
-0001684817 00000 n 
-0001685094 00000 n 
-0001685270 00000 n 
-0001685449 00000 n 
-0001685661 00000 n 
-0001685903 00000 n 
-0001686080 00000 n 
-0001686264 00000 n 
-0001686471 00000 n 
-0001687135 00000 n 
-0001696096 00000 n 
-0001696312 00000 n 
-0001697675 00000 n 
-0001698727 00000 n 
-0001706668 00000 n 
-0001706889 00000 n 
-0001708252 00000 n 
-0001709326 00000 n 
-0001715212 00000 n 
-0001715426 00000 n 
-0001716789 00000 n 
-0001717838 00000 n 
-0001719350 00000 n 
-0001719568 00000 n 
-0001720931 00000 n 
-0001722069 00000 n 
-0001723523 00000 n 
-0001723734 00000 n 
-0001724054 00000 n 
-0001724970 00000 n 
-0001730283 00000 n 
-0001730509 00000 n 
-0001731872 00000 n 
-0001732962 00000 n 
-0001735230 00000 n 
-0001735444 00000 n 
-0001735785 00000 n 
-0001736923 00000 n 
-0001738464 00000 n 
-0001738677 00000 n 
-0001740040 00000 n 
+0000421623 00000 n 
+0000421955 00000 n 
+0000422161 00000 n 
+0000422218 00000 n 
+0000422461 00000 n 
+0000422674 00000 n 
+0000422887 00000 n 
+0000423128 00000 n 
+0000423372 00000 n 
+0000423585 00000 n 
+0000451295 00000 n 
+0000454864 00000 n 
+0000455727 00000 n 
+0000455980 00000 n 
+0000473064 00000 n 
+0000473371 00000 n 
+0000473417 00000 n 
+0000473623 00000 n 
+0000473833 00000 n 
+0000474048 00000 n 
+0000474263 00000 n 
+0000474478 00000 n 
+0000474682 00000 n 
+0000474739 00000 n 
+0000474796 00000 n 
+0000475022 00000 n 
+0000485769 00000 n 
+0000488924 00000 n 
+0000489223 00000 n 
+0000489419 00000 n 
+0000489465 00000 n 
+0000497764 00000 n 
+0000497965 00000 n 
+0000498169 00000 n 
+0000507136 00000 n 
+0000523846 00000 n 
+0000524174 00000 n 
+0000524375 00000 n 
+0000533860 00000 n 
+0000534070 00000 n 
+0000534296 00000 n 
+0000534510 00000 n 
+0000534725 00000 n 
+0000555713 00000 n 
+0000556001 00000 n 
+0000556047 00000 n 
+0000556242 00000 n 
+0000556472 00000 n 
+0000556698 00000 n 
+0000591034 00000 n 
+0000591335 00000 n 
+0000591557 00000 n 
+0000591773 00000 n 
+0000592004 00000 n 
+0000592061 00000 n 
+0000610924 00000 n 
+0000611238 00000 n 
+0000611295 00000 n 
+0000611540 00000 n 
+0000611597 00000 n 
+0000611849 00000 n 
+0000612100 00000 n 
+0000627680 00000 n 
+0000627979 00000 n 
+0000628025 00000 n 
+0000628273 00000 n 
+0000628477 00000 n 
+0000628670 00000 n 
+0000628728 00000 n 
+0000628932 00000 n 
+0000629128 00000 n 
+0000629386 00000 n 
+0000663580 00000 n 
+0000663852 00000 n 
+0000663898 00000 n 
+0000664570 00000 n 
+0000664797 00000 n 
+0000700203 00000 n 
+0000700486 00000 n 
+0000700688 00000 n 
+0000700877 00000 n 
+0000700934 00000 n 
+0000701158 00000 n 
+0000701403 00000 n 
+0000741769 00000 n 
+0000742023 00000 n 
+0000742080 00000 n 
+0000748796 00000 n 
+0000779125 00000 n 
+0000779416 00000 n 
+0000779609 00000 n 
+0000786361 00000 n 
+0000786582 00000 n 
+0000828460 00000 n 
+0000828714 00000 n 
+0000828772 00000 n 
+0000838896 00000 n 
+0000839219 00000 n 
+0000839265 00000 n 
+0000839322 00000 n 
+0000839548 00000 n 
+0000839605 00000 n 
+0000839829 00000 n 
+0000840004 00000 n 
+0000840254 00000 n 
+0000840472 00000 n 
+0000890997 00000 n 
+0000891238 00000 n 
+0000913278 00000 n 
+0000913579 00000 n 
+0000913636 00000 n 
+0000913849 00000 n 
+0000914060 00000 n 
+0000914117 00000 n 
+0000914349 00000 n 
+0000944550 00000 n 
+0000944817 00000 n 
+0000944863 00000 n 
+0000944909 00000 n 
+0000945350 00000 n 
+0000971532 00000 n 
+0000971773 00000 n 
+0000971819 00000 n 
+0001018294 00000 n 
+0001018680 00000 n 
+0001018893 00000 n 
+0001019107 00000 n 
+0001019321 00000 n 
+0001019541 00000 n 
+0001019762 00000 n 
+0001019983 00000 n 
+0001020041 00000 n 
+0001020257 00000 n 
+0001020502 00000 n 
+0001020737 00000 n 
+0001020973 00000 n 
+0001021183 00000 n 
+0001021417 00000 n 
+0001023932 00000 n 
+0001024160 00000 n 
+0001041905 00000 n 
+0001042206 00000 n 
+0001042252 00000 n 
+0001042309 00000 n 
+0001042537 00000 n 
+0001042742 00000 n 
+0001042799 00000 n 
+0001043346 00000 n 
+0001043404 00000 n 
+0001043624 00000 n 
+0001043682 00000 n 
+0001073501 00000 n 
+0001073755 00000 n 
+0001073812 00000 n 
+0001073870 00000 n 
+0001089440 00000 n 
+0001089784 00000 n 
+0001089830 00000 n 
+0001090125 00000 n 
+0001090438 00000 n 
+0001090754 00000 n 
+0001091063 00000 n 
+0001091383 00000 n 
+0001091698 00000 n 
+0001092047 00000 n 
+0001092411 00000 n 
+0001092711 00000 n 
+0001092769 00000 n 
+0001093093 00000 n 
+0001108991 00000 n 
+0001109287 00000 n 
+0001109333 00000 n 
+0001109569 00000 n 
+0001109786 00000 n 
+0001109843 00000 n 
+0001110076 00000 n 
+0001110305 00000 n 
+0001110362 00000 n 
+0001110420 00000 n 
+0001152548 00000 n 
+0001152802 00000 n 
+0001152848 00000 n 
+0001156722 00000 n 
+0001156976 00000 n 
+0001157022 00000 n 
+0001180443 00000 n 
+0001180723 00000 n 
+0001180769 00000 n 
+0001180826 00000 n 
+0001181067 00000 n 
+0001181308 00000 n 
+0001203887 00000 n 
+0001204172 00000 n 
+0001204405 00000 n 
+0001223152 00000 n 
+0001223472 00000 n 
+0001223679 00000 n 
+0001223891 00000 n 
+0001224104 00000 n 
+0001224318 00000 n 
+0001224527 00000 n 
+0001224708 00000 n 
+0001224891 00000 n 
+0001224948 00000 n 
+0001243034 00000 n 
+0001243322 00000 n 
+0001243368 00000 n 
+0001243611 00000 n 
+0001243668 00000 n 
+0001243726 00000 n 
+0001243976 00000 n 
+0001244034 00000 n 
+0001244249 00000 n 
+0001263914 00000 n 
+0001264142 00000 n 
+0001287955 00000 n 
+0001288196 00000 n 
+0001288253 00000 n 
+0001296335 00000 n 
+0001296626 00000 n 
+0001296839 00000 n 
+0001296885 00000 n 
+0001297134 00000 n 
+0001297341 00000 n 
+0001297398 00000 n 
+0001297624 00000 n 
+0001297681 00000 n 
+0001297882 00000 n 
+0001297939 00000 n 
+0001322608 00000 n 
+0001322920 00000 n 
+0001323184 00000 n 
+0001323428 00000 n 
+0001323694 00000 n 
+0001323751 00000 n 
+0001324017 00000 n 
+0001324263 00000 n 
+0001324530 00000 n 
+0001324588 00000 n 
+0001344030 00000 n 
+0001344331 00000 n 
+0001344377 00000 n 
+0001344917 00000 n 
+0001345137 00000 n 
+0001345399 00000 n 
+0001345457 00000 n 
+0001345681 00000 n 
+0001358325 00000 n 
+0001358597 00000 n 
+0001358643 00000 n 
+0001358701 00000 n 
+0001358928 00000 n 
+0001358985 00000 n 
+0001379852 00000 n 
+0001380169 00000 n 
+0001380215 00000 n 
+0001380482 00000 n 
+0001380539 00000 n 
+0001380774 00000 n 
+0001381008 00000 n 
+0001381246 00000 n 
+0001381480 00000 n 
+0001381538 00000 n 
+0001396209 00000 n 
+0001396515 00000 n 
+0001396561 00000 n 
+0001396804 00000 n 
+0001396862 00000 n 
+0001397102 00000 n 
+0001397160 00000 n 
+0001407088 00000 n 
+0001407371 00000 n 
+0001407599 00000 n 
+0001407840 00000 n 
+0001407886 00000 n 
+0001408142 00000 n 
+0001408378 00000 n 
+0001416020 00000 n 
+0001416336 00000 n 
+0001416382 00000 n 
+0001416570 00000 n 
+0001416764 00000 n 
+0001416986 00000 n 
+0001419454 00000 n 
+0001420275 00000 n 
+0001420480 00000 n 
+0001454446 00000 n 
+0001456811 00000 n 
+0001457027 00000 n 
+0001464629 00000 n 
+0001464888 00000 n 
+0001479420 00000 n 
+0001480241 00000 n 
+0001480443 00000 n 
+0001495795 00000 n 
+0001496616 00000 n 
+0001504431 00000 n 
+0001504716 00000 n 
+0001504903 00000 n 
+0001504960 00000 n 
+0001505650 00000 n 
+0001505708 00000 n 
+0001505766 00000 n 
+0001522621 00000 n 
+0001522875 00000 n 
+0001522933 00000 n 
+0001523773 00000 n 
+0001537819 00000 n 
+0001538060 00000 n 
+0001538106 00000 n 
+0001538152 00000 n 
+0001538209 00000 n 
+0001557419 00000 n 
+0001557660 00000 n 
+0001557717 00000 n 
+0001557775 00000 n 
+0001572721 00000 n 
+0001572962 00000 n 
+0001573019 00000 n 
+0001573077 00000 n 
+0001578492 00000 n 
+0001578733 00000 n 
+0001595695 00000 n 
+0001595936 00000 n 
+0001595993 00000 n 
+0001609323 00000 n 
+0001609595 00000 n 
+0001609815 00000 n 
+0001609873 00000 n 
+0001629252 00000 n 
+0001629493 00000 n 
+0001649633 00000 n 
+0001649892 00000 n 
+0001649950 00000 n 
+0001650157 00000 n 
+0001660459 00000 n 
+0001660700 00000 n 
+0001660746 00000 n 
+0001660876 00000 n 
+0001660997 00000 n 
+0001661122 00000 n 
+0001661248 00000 n 
+0001661381 00000 n 
+0001661517 00000 n 
+0001661687 00000 n 
+0001661848 00000 n 
+0001662003 00000 n 
+0001662172 00000 n 
+0001662329 00000 n 
+0001662495 00000 n 
+0001662652 00000 n 
+0001662821 00000 n 
+0001662983 00000 n 
+0001663157 00000 n 
+0001663334 00000 n 
+0001663483 00000 n 
+0001663643 00000 n 
+0001663812 00000 n 
+0001663983 00000 n 
+0001664147 00000 n 
+0001664311 00000 n 
+0001664468 00000 n 
+0001664635 00000 n 
+0001664827 00000 n 
+0001665022 00000 n 
+0001665215 00000 n 
+0001665410 00000 n 
+0001665564 00000 n 
+0001665730 00000 n 
+0001665905 00000 n 
+0001666084 00000 n 
+0001666293 00000 n 
+0001666502 00000 n 
+0001666689 00000 n 
+0001666876 00000 n 
+0001667067 00000 n 
+0001667258 00000 n 
+0001667431 00000 n 
+0001667614 00000 n 
+0001667805 00000 n 
+0001667996 00000 n 
+0001668186 00000 n 
+0001668386 00000 n 
+0001668589 00000 n 
+0001668792 00000 n 
+0001668963 00000 n 
+0001669145 00000 n 
+0001669332 00000 n 
+0001669529 00000 n 
+0001669711 00000 n 
+0001669893 00000 n 
+0001670091 00000 n 
+0001670289 00000 n 
+0001670460 00000 n 
+0001670631 00000 n 
+0001670808 00000 n 
+0001670996 00000 n 
+0001671167 00000 n 
+0001671349 00000 n 
+0001671541 00000 n 
+0001671733 00000 n 
+0001671893 00000 n 
+0001672055 00000 n 
+0001672216 00000 n 
+0001672380 00000 n 
+0001672554 00000 n 
+0001672725 00000 n 
+0001672896 00000 n 
+0001673067 00000 n 
+0001673238 00000 n 
+0001673409 00000 n 
+0001673577 00000 n 
+0001673745 00000 n 
+0001673913 00000 n 
+0001674081 00000 n 
+0001674243 00000 n 
+0001674415 00000 n 
+0001674551 00000 n 
+0001674710 00000 n 
+0001674858 00000 n 
+0001675022 00000 n 
+0001675197 00000 n 
+0001675345 00000 n 
+0001675503 00000 n 
+0001675660 00000 n 
+0001675828 00000 n 
+0001676005 00000 n 
+0001676184 00000 n 
+0001676471 00000 n 
+0001676549 00000 n 
+0001676726 00000 n 
+0001676918 00000 n 
+0001677183 00000 n 
+0001677358 00000 n 
+0001677571 00000 n 
+0001677793 00000 n 
+0001678020 00000 n 
+0001678252 00000 n 
+0001678460 00000 n 
+0001678691 00000 n 
+0001678907 00000 n 
+0001679116 00000 n 
+0001679335 00000 n 
+0001679593 00000 n 
+0001679843 00000 n 
+0001680078 00000 n 
+0001680333 00000 n 
+0001680559 00000 n 
+0001680836 00000 n 
+0001681064 00000 n 
+0001681312 00000 n 
+0001681517 00000 n 
+0001681769 00000 n 
+0001682010 00000 n 
+0001682290 00000 n 
+0001682498 00000 n 
+0001682774 00000 n 
+0001683035 00000 n 
+0001683310 00000 n 
+0001683612 00000 n 
+0001683818 00000 n 
+0001684003 00000 n 
+0001684285 00000 n 
+0001684523 00000 n 
+0001684761 00000 n 
+0001684993 00000 n 
+0001685174 00000 n 
+0001685451 00000 n 
+0001685627 00000 n 
+0001685806 00000 n 
+0001686018 00000 n 
+0001686260 00000 n 
+0001686437 00000 n 
+0001686621 00000 n 
+0001686828 00000 n 
+0001687492 00000 n 
+0001696453 00000 n 
+0001696669 00000 n 
+0001698032 00000 n 
+0001699084 00000 n 
+0001707025 00000 n 
+0001707246 00000 n 
+0001708609 00000 n 
+0001709683 00000 n 
+0001715569 00000 n 
+0001715783 00000 n 
+0001717146 00000 n 
+0001718195 00000 n 
+0001719707 00000 n 
+0001719925 00000 n 
+0001721288 00000 n 
+0001722426 00000 n 
+0001723880 00000 n 
+0001724091 00000 n 
+0001724411 00000 n 
+0001725327 00000 n 
+0001730640 00000 n 
+0001730866 00000 n 
+0001732229 00000 n 
+0001733319 00000 n 
+0001735587 00000 n 
+0001735801 00000 n 
+0001736142 00000 n 
+0001737280 00000 n 
+0001738821 00000 n 
+0001739034 00000 n 
+0001740397 00000 n 
 trailer
 << /Size 649
 /Root 2 0 R
 /Info 1 0 R
 >>
 startxref
-1741175
+1741532
 %%EOF

http://git-wip-us.apache.org/repos/asf/isis-site/blob/e5dcb0be/content/guides/ugfun/ugfun.html
----------------------------------------------------------------------
diff --git a/content/guides/ugfun/ugfun.html b/content/guides/ugfun/ugfun.html
index 4bf8784..2927e18 100644
--- a/content/guides/ugfun/ugfun.html
+++ b/content/guides/ugfun/ugfun.html
@@ -520,7 +520,7 @@ table.CodeRay td.code>pre{padding:0}
                 <p>Reenskaug then goes on to say that "this simple and powerful idea failed because …​ users were used to seeing [objects] from different perspectives. The visible and tangible object would get very complex if it should be able to show itself and be manipulated in many different ways."</p> 
                </div> 
                <div class="paragraph"> 
-                <p>In Apache Isis the responsibility of rendering an object is not the object itself, it is the framework. Rather, the object inspects the object and uses that to decide how to render the object. This is also extensible. In the <a href="http://www.isisaddons.org">Isis Addons</a> (non-ASF) the <a href="http://github.com/isisaddons/isis-wicket-gmap3">Isis addons' gmap3</a> wicket extension renders any object with latitude/longitude on a map, while <a href="http://github.com/isisaddons/isis-wicket-fullcalendar2">Isis addons' fullcalendar2 wicket extension</a> renders any object with date(s) on a calendar.</p> 
+                <p>In Apache Isis the responsibility of rendering an object is not the object itself, it is the framework. Rather, the object inspects the object and uses that to decide how to render the object. This is also extensible. In the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a> the gmap3 wicket extension renders any object with latitude/longitude on a map, while fullcalendar2 renders any object with date(s) on a calendar.</p> 
                </div> </td> 
              </tr> 
             </tbody>
@@ -662,10 +662,10 @@ table.CodeRay td.code>pre{padding:0}
             <p>Well, a different way to think of the naked objects pattern is that the visualization of a domain object within a UI is a cross-cutting concern. By following certain very standard programming conventions that represent the <em>Apache Isis Programming Model</em> (POJOs plus annotations), the framework is able to build a metamodel and from this can render your domain objects in a standard generic fashion. That’s a rather more interesting cross-cutting concern than boring old logging!</p> 
            </div> 
            <div class="paragraph"> 
-            <p>Apache Isis also draws heavily on the AOP concept of interceptors. Whenever an object is rendered in the UI, it is filtered with respect to the user’s permissions. That is, if a user is not authorized to either view or perhaps modify an object, then this is applied transparently by the framework. The <a href="http://github.com/isisaddons/isis-module-security">Isis addons' security</a> module, mentioned previously, provides a rich user/role/permissions subdomain to use out of the box; but you can integrate with a different security mechanism if you have one already.</p> 
+            <p>Apache Isis also draws heavily on the AOP concept of interceptors. Whenever an object is rendered in the UI, it is filtered with respect to the user’s permissions. That is, if a user is not authorized to either view or perhaps modify an object, then this is applied transparently by the framework. The (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s security module, mentioned previously, provides a rich user/role/permissions subdomain to use out of the box; but you can integrate with a different security mechanism if you have one already.</p> 
            </div> 
            <div class="paragraph"> 
-            <p>Another example of interceptors are the <a href="http://github.com/isisaddons/isis-module-command">Isis addons' command</a> and <a href="http://github.com/isisaddons/isis-module-audit">Isis addons' audit</a> modules. The command module captures every user interaction that modifies the state of the system (the "cause" of a change) while the audit module captures every change to every object (the "effect" of a change). Again, this is all transparent to the user.</p> 
+            <p>Another example of interceptors are the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s command and audit modules. The command module captures every user interaction that modifies the state of the system (the "cause" of a change) while the audit module captures every change to every object (the "effect" of a change). Again, this is all transparent to the user.</p> 
            </div> 
            <div class="paragraph"> 
             <p>Apache Isis also has an internal event bus (you can switch between an underlying implementation of Gauva or Axon). A domain event is fired whenever an object is interacted with, and this allows any subscribers to influence the operation (or even veto it). This is a key mechanism in ensuring that Isis applications are maintainable, and we discuss it in depth in the section on <a href="../ugbtb/ugbtb.html#_ugbtb_decoupling">Decoupling</a>. But fundamentally its relying on this AOP concept of interceptors.</p> 
@@ -967,10 +967,10 @@ table.CodeRay td.code>pre{padding:0}
            <p>The most obvious difference when developing an Apache Isis application is its deliberate lack of an explicit controller layer; non- <em>CRUD</em> behavior is automatically made available in its generic object-oriented _UI_s. More sophisticated UIs can be built either by <a href="../ugvw/ugvw.html#_ugvw_extending">extending Apache Isis' Wicket viewer</a> or by writing a bespoke UI leveraging the REST (hypermedia) API automatically exposed by <a href="../ugvro/ugvro.html">Isis' Restful Objects viewer</a>. Other frameworks can also be used to implement REST APIs, of course, but generally they require a significant amount of development to get anywhere near the level of sophistication provided automatically by Apache Isis' REST API.</p> 
           </div> 
           <div class="paragraph"> 
-           <p>Although these frameworks all provide their own ecosystems of extensions, Apache Isis' equivalent <a href="http://www.isisaddons.org">Isis Addons</a> (non-ASF) tend to work at a higher-level of abstraction. For example, each of these frameworks will integrate with various security mechanism, but the <a href="http://github.com/isisaddons/isis-module-security">Isis addons' security module</a> provides a full subdomain of users, roles, features and permissions that can be plugged into any Isis application. Similarly, the <a href="http://github.com/isisaddons/isis-module-command">Isis addons' command</a> and <a href="http://github.com/isisaddons/isis-module-audit">Isis addons' audit</a> modules in combination provide a support for auditing and traceability that can also be used for out of the box profiling. Again, these addons can be plugged into any Isis app.</p> 
+           <p>Although these frameworks all provide their own ecosystems of extensions, Apache Isis' equivalent <a href="http://platform.incode.org" target="_blank">Incode Platform</a> modules (non-ASF) tend to work at a higher-level of abstraction. For example, each of these frameworks will integrate with various security mechanism, but the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s security module provides a full subdomain of users, roles, features and permissions that can be plugged into any Isis application. Similarly, the <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s command and audit modules in combination provide a support for auditing and traceability that can also be used for out of the box profiling. Again, these addons can be plugged into any Isis app.</p> 
           </div> 
           <div class="paragraph"> 
-           <p>In terms of testing support, each of these other frameworks provide mechanisms to allow the webapp to be tested from within a JUnit test harness. Apache Isis' support is similar. Where Apache Isis differs though is that it enables end-to-end testing without the need for slow and fragile Selenium tests. Instead, Apache Isis provides a "<a href="../ugtst/ugtst.html#_ugtst_integ-test-support_wrapper-factory">WrapperFactory</a>" domain service that allows the generic UI provided to in essence be simulated. On a more pragmatic level, the <a href="http://github.com/isisaddons/isis-module-fakedata">Isis addons' fakedata</a> module does "what it says on the tin", allowing both unit- and integration-tests to focus on the salient data and fake out the rest.</p> 
+           <p>In terms of testing support, each of these other frameworks provide mechanisms to allow the webapp to be tested from within a JUnit test harness. Apache Isis' support is similar. Where Apache Isis differs though is that it enables end-to-end testing without the need for slow and fragile Selenium tests. Instead, Apache Isis provides a "<a href="../ugtst/ugtst.html#_ugtst_integ-test-support_wrapper-factory">WrapperFactory</a>" domain service that allows the generic UI provided to in essence be simulated. On a more pragmatic level, the <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s fakedata module does "what it says on the tin", allowing both unit- and integration-tests to focus on the salient data and fake out the rest.</p> 
           </div> 
          </div> 
          <div class="sect3"> 
@@ -1044,7 +1044,7 @@ table.CodeRay td.code>pre{padding:0}
            <p>When combined with CQRS we see a command that triggers a business operation, and an event that results from it. So, a <code>PlaceOrderCommand</code> command can result in an <code>OrderPlacedEvent</code> event. A subscriber to this event might then generate a further command to act upon some other system (eg to dispatch the system). Note that the event might be dispatched and consumed in-process or alternatively this might occur out-of-process. If the latter, then the subscriber will operate within a separate transaction, meaning the usual eventual consistency concerns and also compensating actions if a rollback is required. CQRS/event sourcing advocates point out — correctly — that this is just how things are in the "real world" too.</p> 
           </div> 
           <div class="paragraph"> 
-           <p>In Apache Isis every business action (and indeed, property and collection) emits domain events through the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a>, and can optionally also be published through the <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublishingService"><code>PublishingService</code></a>. The former are dispatched and consumed in-process and within the same transaction, and for this reason the <a href="../rgcms/rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscribers</a> can also veto the events. The latter are intended for out-of-process consumption; the (non-ASF) <a href="http://github.com/isisaddons/isis-module-publishing">Isis addons' publishing</a> and <a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> modules provide implementations for dispatching either through a RDBMS database table, or directly through to an <a href="http://camel.apach
 e.org">ActiveMQ</a> message queue (eg wired up to <a href="http://camel.apache.org">Apache Camel</a> event bus).</p> 
+           <p>In Apache Isis every business action (and indeed, property and collection) emits domain events through the <a href="../rgsvc/rgsvc.html#_rgsvc_core-domain-api_EventBusService"><code>EventBusService</code></a>, and can optionally also be published through the <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublishingService"><code>PublishingService</code></a>. The former are dispatched and consumed in-process and within the same transaction, and for this reason the <a href="../rgcms/rgcms.html#_rgcms_classes_super_AbstractSubscriber">subscribers</a> can also veto the events. The latter are intended for out-of-process consumption; the (obsolete) <a href="http://github.com/isisaddons-legacy/isis-module-publishing">Isis addons' publishing</a> and the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s publishmq modules provide implementations for dispatching either through a RDBMS database table, or directly through to an <a href=
 "http://camel.apache.org">ActiveMQ</a> message queue (eg wired up to <a href="http://camel.apache.org">Apache Camel</a> event bus).</p> 
           </div> 
          </div> 
          <div class="sect3"> 
@@ -1066,7 +1066,7 @@ table.CodeRay td.code>pre{padding:0}
            <p>However, there is a difference in philosophy in that MW is not a full-stack framework and does not (in their words) try to "own the UI". Rather they support a huge variety of UI technologies and allow the domain object to be rendered in any of them.</p> 
           </div> 
           <div class="paragraph"> 
-           <p>In contrast, Apache Isis is full-stack and does generate a complete UI; we then allow you to customize or extend this UI (as per the various <a href="http://www.isisaddons.org">Isis Addons</a> (non-ASF), and we also provide a full REST API through the <a href="../ugvro/ugvro.html">Restful Objects viewer</a></p> 
+           <p>In contrast, Apache Isis is full-stack and does generate a complete UI; we then allow you to customize or extend this UI (as per the various (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a> modules), and we also provide a full REST API through the <a href="../ugvro/ugvro.html">Restful Objects viewer</a></p> 
           </div> 
           <div class="paragraph"> 
            <p>Also, it’s worth noting that MetaWidget does have an elegant pipeline architecture, with APIs to allow even its metamodel to be replaced. It would be feasible and probably quite straightforward to use Apache Isis' own metamodel as an implementation of the MetaWidget API. This would allow MetaWidget to be able to render an Apache Isis domain application.</p> 
@@ -1100,7 +1100,7 @@ table.CodeRay td.code>pre{padding:0}
            <p>Apache Wicket, and therefore Apache Isis in this configuration, is a stateful architecture. As a platform it is certainly capable of supporting user bases of several thousand (with perhaps one or two hundred concurrent); however it isn’t an architecture that you should try to scale up to tens of thousands of concurrent users.</p> 
           </div> 
           <div class="paragraph"> 
-           <p>The UI generated by the Wicket viewer is well suited to many line-of-business apps, but it’s also worth knowing that (with a little knowledge of the Wicket APIs) it relatively straightforward to extend. As described in <a href="../ugfun/ugfun.html#_ugfun_available-domain-services_isis-addons">Isis addons</a> chapter, the viewer already has integrations with <a href="https://github.com/isisaddons/isis-wicket-gmap3">google maps</a>, <a href="https://github.com/isisaddons/isis-wicket-fullcalendar2">a full calendar</a> and an <a href="https://github.com/isisaddons/isis-wicket-excel">export to Excel</a> component. We are also aware of integrations with SVG images (for floor maps of shopping center) and of custom widgets displaying a catalogue (text and images) of medical diseases.</p> 
+           <p>The UI generated by the Wicket viewer is well suited to many line-of-business apps, but it’s also worth knowing that (with a little knowledge of the Wicket APIs) it relatively straightforward to extend. As described in <a href="../ugfun/ugfun.html#_ugfun_available-domain-services_isis-addons">Isis addons</a> chapter, the viewer already has integrations with the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s gmap3, fullcalendar2 and excel Wicket components. We are also aware of integrations with SVG images (for floor maps of shopping center) and of custom widgets displaying a catalogue (text and images) of medical diseases.</p> 
           </div> 
           <div class="paragraph"> 
            <p>Deploying on Apache Isis means that the framework also manages object persistence. For many line-of-business applications this will mean using a relational database. It is also possible (courtesy of its integratinon with <a href="http://www.datanucleus.org">DataNucleus</a>) to deploy an Isis app to a NoSQL store such as Neo4J or MongoDB; and it is also possible to deploy to cloud platforms such as <a href="https://cloud.google.com/appengine/docs">Google App Engine (GAE)</a>.</p> 
@@ -1387,7 +1387,7 @@ table.CodeRay td.code>pre{padding:0}
             </div> 
            </div> 
            <div class="paragraph"> 
-            <p>The (non-ASF) <a href="http://www.isisaddons.org">Isis Addons</a> provide SPI implementations of the common cross-cutting concerns. They also provide a number of APIs for domain objects to invoke (not shown in the diagram). You can also write your own domain services as well, for example to interface with some external CMS system, say.</p> 
+            <p>The (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a> provide SPI implementations of the common cross-cutting concerns. They also provide a number of APIs for domain objects to invoke (not shown in the diagram). You can also write your own domain services as well, for example to interface with some external CMS system, say.</p> 
            </div> 
           </div> 
          </div> 
@@ -1985,7 +1985,7 @@ table.CodeRay td.code>pre{padding:0}
            <p>This can be particularly useful for <a href="../ugfun/ugfun.html#_ugfun_programming-model_view-models_jaxb">JAXB-style view models</a> which are used as DTOs and so must have no dependencies on the rest of the Apache Isis framework.</p> 
           </div> 
           <div class="paragraph"> 
-           <p>It can also be more generally useful to allow one module to influence/fine-tune the title of entities provided by some other module. The obvious use case is when reusing library modules, eg as provided by (non-ASF) <a href="http://catalog.incode.org">Incode Catalog</a> modules.</p> 
+           <p>It can also be more generally useful to allow one module to influence/fine-tune the title of entities provided by some other module. The obvious use case is when reusing library modules, eg as provided by (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>.</p> 
           </div> 
          </div> 
          <div class="sect3"> 
@@ -2057,7 +2057,7 @@ table.CodeRay td.code>pre{padding:0}
           <p>We tend to use Maven modules as a way to group related domain objects together; we can then reason about all the classes in that module as a single unit. By convention there will be a single top-level package corresponding to the module.</p> 
          </div> 
          <div class="paragraph"> 
-          <p>For example, the (non-ASF) <a href="https://github.com/incodehq/incode-module-document">Document module</a> (part of the <a href="http://catalog.incode.org">Incode Catalog</a>) has a top-level package of <code>org.incode.module.document</code>. Within the module there may be various subpackages, but its the module defines the namespace.</p> 
+          <p>For example, the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s document module has a top-level package of <code>org.incode.module.document</code>. Within the module there may be various subpackages, but its the module defines the namespace.</p> 
          </div> 
          <div class="paragraph"> 
           <p>The bootstrapping of Apache Isis also relies on module classes. (Currently) the only role of these classes is to identify a fully qualified package name, for example <code>org.incode.modules.document</code>. The framework then performs classpath scanning across all such packages to locate any domain entities provided by that module (though some modules have no entities), all domain services provided by the module (every module is likely to define at least one), and also any fixture scripts provided by the module.</p> 
@@ -2197,7 +2197,7 @@ table.CodeRay td.code>pre{padding:0}
             <pre class="CodeRay highlight"><code data-lang="bash">mvn archetype:generate  \
     -D archetypeGroupId=org.apache.isis.archetype \
     -D archetypeArtifactId=helloworld-archetype \
-    -D archetypeVersion=1.15.0 \
+    -D archetypeVersion=1.15.1 \
     -D groupId=com.mycompany \
     -D artifactId=myapp \
     -D version=1.0-SNAPSHOT \
@@ -2561,7 +2561,7 @@ mvn clean install</code></pre>
             <pre class="CodeRay highlight"><code data-lang="bash">mvn archetype:generate  \
     -D archetypeGroupId=org.apache.isis.archetype \
     -D archetypeArtifactId=simpleapp-archetype \
-    -D archetypeVersion=1.15.0 \
+    -D archetypeVersion=1.15.1 \
     -D groupId=com.mycompany \
     -D artifactId=myapp \
     -D version=1.0-SNAPSHOT \
@@ -3451,7 +3451,7 @@ RepositoryService repositoryService;</code></pre>
               <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
               <td class="content"> 
                <div class="paragraph"> 
-                <p>Annotating action parameters with <a href="../rgant/rgant.html#_rgant_ParameterLayout_named"><code>@ParameterLayout#named()</code></a> can become somewhat tiresome. You can avoid doing this by configuring the (non-ASF) <a href="http://github.com/isisaddons/isis-metamodel-paraname8">Isis addons' paraname8</a> metamodel extension.</p> 
+                <p>Annotating action parameters with <a href="../rgant/rgant.html#_rgant_ParameterLayout_named"><code>@ParameterLayout#named()</code></a> can become somewhat tiresome. You can avoid doing this by configuring the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s paraname8 metamodel extension.</p> 
                </div> </td> 
              </tr> 
             </tbody>
@@ -4408,7 +4408,7 @@ AddressService addressService;
               <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
               <td class="content"> 
                <div class="paragraph"> 
-                <p>The (non-ASF) Isis addons' <a href="http://github.com/isisaddons/isis-metamodel-paraname8">paraname8</a> metamodel extension allows the parameter name to be used in the UI, rather than the type.</p> 
+                <p>The (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s paraname8 metamodel extension allows the parameter name to be used in the UI, rather than the type.</p> 
                </div> </td> 
              </tr> 
             </tbody>
@@ -5734,7 +5734,7 @@ public <span class="type">class</span> <span class="class">ToDoItemV1_1</span> <
             </table> 
            </div> 
            <div class="paragraph"> 
-            <p>The (non-ASF) <a href="http://github.com/isisaddons/isis-module-publishmq">Isis addons' publishmq</a> module provides an out-of-the-box solution of this design. It provides an implementation of the <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublishingService"><code>PublishingService</code></a>, but which simply publishes instances of <a href="../rgcms/rgcms.html#_rgcms_schema-aim"><code>ActionInvocationMemento</code></a> to an ActiveMQ queue. Camel (or similar) can then be hooked up to consume these events from this queue, and use a processor to parse the action memento to determine what has changed on the source system. Thereafter, a subsequent Camel processor can then call back to the source - via the <a href="../ugvro/ugvro.html">Restful Objects viewer</a> - to enrich the message with additional details using a DTO.</p> 
+            <p>The (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s publishmq module provides an out-of-the-box solution of this design. It provides an implementation of the <a href="../rgsvc/rgsvc.html#_rgsvc_persistence-layer-spi_PublishingService"><code>PublishingService</code></a>, but which simply publishes instances of <a href="../rgcms/rgcms.html#_rgcms_schema-aim"><code>ActionInvocationMemento</code></a> to an ActiveMQ queue. Camel (or similar) can then be hooked up to consume these events from this queue, and use a processor to parse the action memento to determine what has changed on the source system. Thereafter, a subsequent Camel processor can then call back to the source - via the <a href="../ugvro/ugvro.html">Restful Objects viewer</a> - to enrich the message with additional details using a DTO.</p> 
            </div> 
           </div> 
          </div> 
@@ -7051,7 +7051,7 @@ public <span class="type">class</span> <span class="class">ToDoItemV1_1</span> <
              <td class="icon"> <i class="fa icon-tip" title="Tip"></i> </td> 
              <td class="content"> 
               <div class="paragraph"> 
-               <p>If you’re running on Java 8, then note that it’s possible to write Isis applications without using <code>@ParameterLayout(named=…​)</code> annotation. Support for this can be found in the <a href="http://github.com/isisaddons/isis-metamodel-paraname8">Isis addons' paraname8</a> metamodel extension (non-ASF). (In the future we’ll fold this into core). See also our guidance on <a href="../../migration-notes/migration-notes.html#_migration-notes_1.8.0-to-1.9.0_upgrading-to-java8">upgrading to Java 8</a>.</p> 
+               <p>If you’re running on Java 8, then note that it’s possible to write Isis applications without using <code>@ParameterLayout(named=…​)</code> annotation. Support for this can be found in the (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a>'s paraname8 metamodel extension (non-ASF). (In the future we’ll fold this into core). See also our guidance on <a href="../../migration-notes/migration-notes.html#_migration-notes_1.8.0-to-1.9.0_upgrading-to-java8">upgrading to Java 8</a>.</p> 
               </div> </td> 
             </tr> 
            </tbody>
@@ -8173,19 +8173,19 @@ repositoryService.remove(customer);</code></pre>
          </div> 
         </div> 
         <div class="sect2"> 
-         <h3 id="_ugfun_available-domain-services_isis-addons">10.2. Isis Add-ons</h3>
+         <h3 id="_ugfun_available-domain-services_incode-platform">10.2. Incode Platform</h3>
          <div class="btn-group" style="float: right; font-size: small; padding: 6px; margin-top: -55px; ">
-          <button type="button" class="btn btn-xs btn-default" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_isis-addons.adoc&quot;"><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button>
+          <button type="button" class="btn btn-xs btn-default" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_incode-platform.adoc&quot;"><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button>
           <button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="caret"></span><span class="sr-only">Toggle Dropdown</span></button>
           <ul class="dropdown-menu">
-           <li><a href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_isis-addons.adoc" target="_blank"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i>&nbsp; Edit</a></li>
-           <li><a href="https://github.com/apache/isis/commits/master/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_isis-addons.adoc" target="_blank"><i class="fa fa-clock-o fa-fw" aria-hidden="true"></i>&nbsp; History</a></li>
-           <li><a href="https://github.com/apache/isis/raw/master/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_isis-addons.adoc" target="_blank"><i class="fa fa-file-text-o fa-fw" aria-hidden="true"></i>&nbsp; Raw</a></li>
-           <li><a href="https://github.com/apache/isis/blame/master/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_isis-addons.adoc" target="_blank"><i class="fa fa-hand-o-right fa-fw" aria-hidden="true"></i>&nbsp; Blame</a></li>
+           <li><a href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_incode-platform.adoc" target="_blank"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i>&nbsp; Edit</a></li>
+           <li><a href="https://github.com/apache/isis/commits/master/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_incode-platform.adoc" target="_blank"><i class="fa fa-clock-o fa-fw" aria-hidden="true"></i>&nbsp; History</a></li>
+           <li><a href="https://github.com/apache/isis/raw/master/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_incode-platform.adoc" target="_blank"><i class="fa fa-file-text-o fa-fw" aria-hidden="true"></i>&nbsp; Raw</a></li>
+           <li><a href="https://github.com/apache/isis/blame/master/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_incode-platform.adoc" target="_blank"><i class="fa fa-hand-o-right fa-fw" aria-hidden="true"></i>&nbsp; Blame</a></li>
           </ul>
          </div> 
          <div class="paragraph"> 
-          <p>The <a href="http://www.isisaddons.org">Isis Addons</a> website provides a number of reusable modules for Apache Isis, focusing either on specific technologies or in technical cross-cutting concerns. Some of these modules implement SPIs defined by the framework.</p> 
+          <p>The (non-ASF) <a href="http://platform.incode.org" target="_blank">Incode Platform</a> provides a number of reusable modules for Apache Isis, focusing either on specific technologies, technical cross-cutting concerns, or providing business logic for generic subdomains. Some of these modules implement SPIs defined by the framework.</p> 
          </div> 
          <div class="admonitionblock warning"> 
           <table> 
@@ -8194,7 +8194,7 @@ repositoryService.remove(customer);</code></pre>
              <td class="icon"> <i class="fa icon-warning" title="Warning"></i> </td> 
              <td class="content"> 
               <div class="paragraph"> 
-               <p>Note that Isis Addons, although maintained by Apache Isis committers, are not part of the ASF.</p> 
+               <p>Note that the Incode Platform, although maintained by Apache Isis committers, are not part of the ASF.</p> 
               </div> </td> 
             </tr> 
            </tbody>
@@ -8205,82 +8205,15 @@ repositoryService.remove(customer);</code></pre>
          </div> 
          <div class="ulist"> 
           <ul> 
-           <li> <p>modules that provide an implementations of SPI defined by Apache Isis<br></p> 
-            <div class="paragraph"> 
-             <p>where Apache Isis has hooks to use the service if defined by provides no implementations of its own.<br></p> 
-            </div> 
-            <div class="paragraph"> 
-             <p>The <a href="http://github.com/isisaddons/isis-module-command">command</a>, <a href="http://github.com/isisaddons/isis-module-audit">auditer</a>, <a href="http://github.com/isisaddons/isis-module-publishmq">publisher</a>, <a href="http://github.com/isisaddons/isis-module-security">security</a> and <a href="http://github.com/isisaddons/isis-module-sessionlogger">sessionlogger</a> modules fall into this category. Typically the domain objects themselves wouldn’t interact with these services</p> 
-            </div> </li> 
-           <li> <p>modules that provide standalone domain services with their own API and implementation<br></p> 
-            <div class="paragraph"> 
-             <p>These are simply intended to be used by domain objects.<br></p> 
-            </div> 
-            <div class="paragraph"> 
-             <p>The <a href="http://github.com/isisaddons/isis-module-docx">docx</a>, <a href="http://github.com/isisaddons/isis-module-excel">excel</a>, <a href="http://github.com/isisaddons/isis-module-freemarker">freemarker</a>, <a href="http://github.com/isisaddons/isis-module-pdfbox">pdfbox</a>, <a href="http://github.com/isisaddons/isis-module-settings">settings</a>, <a href="http://github.com/isisaddons/isis-module-servletapi">servletapi</a>, <a href="http://github.com/isisaddons/isis-module-stringinterpolator">stringinterpolator</a> and <a href="http://github.com/isisaddons/isis-module-xdocreport">xdocreport</a> fall into this category.</p> 
-            </div> </li> 
-           <li> <p>modules that provide standalone domain entities (and supporting services) for a particular subdomain<br></p> 
-            <div class="paragraph"> 
-             <p>The <a href="http://github.com/isisaddons/isis-module-tags">tags</a> module falls into this category</p> 
-            </div> </li> 
-           <li> <p>modules that provide developer/testing utilities<br></p> 
-            <div class="paragraph"> 
-             <p>The <a href="http://github.com/isisaddons/isis-module-fakedata">fakedata</a> module provides fakedata for unit- and integration testing.</p> 
-            </div> </li> 
-          </ul> 
-         </div> 
-         <div class="paragraph"> 
-          <p>Each of the modules has a full README and demo application demonstrating their usage. The sections below briefly outline the capabilities of these modules.</p> 
-         </div> 
-        </div> 
-        <div class="sect2"> 
-         <h3 id="_ugfun_available-domain-services_incode-catalog">10.3. Incode Catalog</h3>
-         <div class="btn-group" style="float: right; font-size: small; padding: 6px; margin-top: -55px; ">
-          <button type="button" class="btn btn-xs btn-default" onclick="window.location.href=&quot;https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_incode-catalog.adoc&quot;"><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</button>
-          <button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="caret"></span><span class="sr-only">Toggle Dropdown</span></button>
-          <ul class="dropdown-menu">
-           <li><a href="https://github.com/apache/isis/edit/master/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_incode-catalog.adoc" target="_blank"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i>&nbsp; Edit</a></li>
-           <li><a href="https://github.com/apache/isis/commits/master/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_incode-catalog.adoc" target="_blank"><i class="fa fa-clock-o fa-fw" aria-hidden="true"></i>&nbsp; History</a></li>
-           <li><a href="https://github.com/apache/isis/raw/master/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_incode-catalog.adoc" target="_blank"><i class="fa fa-file-text-o fa-fw" aria-hidden="true"></i>&nbsp; Raw</a></li>
-           <li><a href="https://github.com/apache/isis/blame/master/adocs/documentation/src/main/asciidoc/guides/ugfun/_ugfun_available-domain-services_incode-catalog.adoc" target="_blank"><i class="fa fa-hand-o-right fa-fw" aria-hidden="true"></i>&nbsp; Blame</a></li>
-          </ul>
-         </div> 
-         <div class="paragraph"> 
-          <p>The <a href="http://catalog.incode.org">Incode Catalog</a> website also provides a number of reusable modules, focusing on business logic for generic subdomains.</p> 
-         </div> 
-         <div class="paragraph"> 
-          <p>This section surveys the functionality available.</p> 
-         </div> 
-         <div class="admonitionblock warning"> 
-          <table> 
-           <tbody>
-            <tr> 
-             <td class="icon"> <i class="fa icon-warning" title="Warning"></i> </td> 
-             <td class="content"> 
-              <div class="paragraph"> 
-               <p>Note that the Incode Catalog, although maintained by Apache Isis committers, are not part of the ASF.</p> 
-              </div> </td> 
-            </tr> 
-           </tbody>
-          </table> 
-         </div> 
-         <div class="paragraph"> 
-          <p>The modules themselves fall into a number of broader groups:</p> 
-         </div> 
-         <div class="ulist"> 
-          <ul> 
-           <li> <p>modules that provide standalone domain entities (and supporting services) for a particular subdomain<br></p> 
-            <div class="paragraph"> 
-             <p>The <a href="http://github.com/incodehq/incode-module-alias">alias</a>, <a href="http://github.com/incodehq/incode-module-classification">classification</a>, <a href="http://github.com/incodehq/incode-module-commchannel">commchannel</a>, <a href="http://github.com/incodehq/incode-module-communications">communications</a>, <a href="http://github.com/incodehq/incode-module-country">country</a>, <a href="http://github.com/incodehq/incode-module-docfragment">docfragment</a>, <a href="http://github.com/incodehq/incode-module-document">document</a> and <a href="http://github.com/incodehq/incode-module-document">note</a> modules fall into this category.</p> 
-            </div> </li> 
-           <li> <p>modules that provide developer/testing utilities<br></p> 
-            <div class="paragraph"> 
-             <p>The <a href="http://github.com/incodehq/incode-module-fixturesupport">fixturesupport</a>, <a href="http://github.com/incodehq/incode-module-integtestsupport">integtestsupport</a> and <a href="http://github.com/incodehq/incode-module-unittestsupport">unittestsupport</a> modules fall into this category.</p> 
-            </div> </li> 
+           <li> <p>technical libraries, such as excel, word and freemarker</p> </li> 
+           <li> <p>SPI implementations, such as security, commands, auditing and publishing</p> </li> 
+           <li> <p>framework extensions, such as flyway, quartz and feature toggles</p> </li> 
+           <li> <p>wicket components, such as maps, calendars and PDF viewer</p> </li> 
+           <li> <p>business modules, such as documents, notes and communications.</p> </li> 
           </ul> 
          </div> 
          <div class="paragraph"> 
-          <p>Each of the modules has a full README and demo application demonstrating their usage. The sections below briefly outline the capabilities of these modules.</p> 
+          <p>Each module can be used independently or combined, and the Incode Platform also provides a quickstart application to get you started quickly.</p> 
          </div> 
         </div> 
        </div>